diff --git a/app/code/Magento/AdminNotification/Model/Inbox.php b/app/code/Magento/AdminNotification/Model/Inbox.php
index 174ca7545b092..c471fd68b243c 100644
--- a/app/code/Magento/AdminNotification/Model/Inbox.php
+++ b/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
diff --git a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
index 02413a1899cd7..d76adac8331f4 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php
+++ b/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
 {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
index 62a7aefa77550..3f672320d5131 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
+++ b/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
@@ -412,7 +412,7 @@ protected function getTierPrices(array $productLinksIds, $table)
                 ImportAdvancedPricing::COL_TIER_PRICE                  => 'ap.value',
                 ImportAdvancedPricing::COL_TIER_PRICE_PERCENTAGE_VALUE => 'ap.percentage_value',
                 'product_link_id'                                      => 'ap.'
-                    .$productEntityLinkField,
+                    . $productEntityLinkField,
             ];
             if ($exportFilter) {
                 if (array_key_exists('tier_price', $exportFilter)) {
@@ -431,7 +431,7 @@ protected function getTierPrices(array $productLinksIds, $table)
                         $selectFields
                     )
                     ->where(
-                        'ap.'.$productEntityLinkField.' IN (?)',
+                        'ap.' . $productEntityLinkField . ' IN (?)',
                         $productLinksIds
                     );
 
@@ -475,7 +475,7 @@ protected function _getWebsiteCode(int $websiteId): string
             }
 
             if ($storeName && $currencyCode) {
-                $code = $storeName.' ['.$currencyCode.']';
+                $code = $storeName . ' [' . $currencyCode . ']';
             } else {
                 $code = $storeName;
             }
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
index 0e8acb37104e6..ee743b81a7aa7 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
+++ b/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',
     ];
 
     /**
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php
index 25a9fc244fe51..f94ead3afe612 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator.php
+++ b/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
 {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
index 0f3f8b3389c7d..f4e55aef60a29 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
+++ b/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() . ']';
     }
 }
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php
index 0dc2a0b7e6ddf..45220d7918dfe 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php
+++ b/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.
diff --git a/app/code/Magento/Analytics/Cron/SignUp.php b/app/code/Magento/Analytics/Cron/SignUp.php
index c17b9b8c381c3..b045fb2600437 100644
--- a/app/code/Magento/Analytics/Cron/SignUp.php
+++ b/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
diff --git a/app/code/Magento/Analytics/Cron/Update.php b/app/code/Magento/Analytics/Cron/Update.php
index 9062a7bac7551..33b2825dd0923 100644
--- a/app/code/Magento/Analytics/Cron/Update.php
+++ b/app/code/Magento/Analytics/Cron/Update.php
@@ -8,9 +8,9 @@
 use Magento\Analytics\Model\AnalyticsToken;
 use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
 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;
 
 /**
  * Executes by cron schedule in case base url was changed
diff --git a/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php b/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php
index c223bb1f3b07d..b7745bd6f15db 100644
--- a/app/code/Magento/Analytics/Model/Connector/Http/Client/Curl.php
+++ b/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.
diff --git a/app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php b/app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php
index f1a8ea6460f9d..c854d117df8b5 100644
--- a/app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php
+++ b/app/code/Magento/Analytics/Model/Connector/NotifyDataChangedCommand.php
@@ -6,11 +6,11 @@
 namespace Magento\Analytics\Model\Connector;
 
 use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Connector\Http\ResponseResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\HTTP\ZendClient;
-use Psr\Log\LoggerInterface;
 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.
diff --git a/app/code/Magento/Analytics/Model/Connector/ResponseHandler/ReSignUp.php b/app/code/Magento/Analytics/Model/Connector/ResponseHandler/ReSignUp.php
index c79630d6414d8..6a1491b96554b 100644
--- a/app/code/Magento/Analytics/Model/Connector/ResponseHandler/ReSignUp.php
+++ b/app/code/Magento/Analytics/Model/Connector/ResponseHandler/ReSignUp.php
@@ -19,7 +19,7 @@ class ReSignUp implements ResponseHandlerInterface
      * @var AnalyticsToken
      */
     private $analyticsToken;
-    
+
     /**
      * @var SubscriptionHandler
      */
diff --git a/app/code/Magento/Analytics/Model/Connector/SignUpCommand.php b/app/code/Magento/Analytics/Model/Connector/SignUpCommand.php
index a1f23637e04b1..4ce4c5d76e084 100644
--- a/app/code/Magento/Analytics/Model/Connector/SignUpCommand.php
+++ b/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\Framework\App\Config\ScopeConfigInterface;
-use Psr\Log\LoggerInterface;
 use Magento\Framework\HTTP\ZendClient;
 use Magento\Store\Model\Store;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class SignUpCommand
diff --git a/app/code/Magento/Analytics/Model/Exception/State/SubscriptionUpdateException.php b/app/code/Magento/Analytics/Model/Exception/State/SubscriptionUpdateException.php
index 5d127037afea9..43fb489bfe4fd 100644
--- a/app/code/Magento/Analytics/Model/Exception/State/SubscriptionUpdateException.php
+++ b/app/code/Magento/Analytics/Model/Exception/State/SubscriptionUpdateException.php
@@ -13,5 +13,4 @@
  */
 class SubscriptionUpdateException extends LocalizedException
 {
-
 }
diff --git a/app/code/Magento/Analytics/Model/IntegrationManager.php b/app/code/Magento/Analytics/Model/IntegrationManager.php
index 61a40a955e026..54838a2f9a527 100644
--- a/app/code/Magento/Analytics/Model/IntegrationManager.php
+++ b/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
diff --git a/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php b/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php
index e591ed2659651..8f959f9719d27 100644
--- a/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php
+++ b/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
diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php
index 251c43f5e1b71..e0e9241b3bca6 100644
--- a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php
+++ b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FilterAssembler.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Analytics\ReportXml\DB\Assembler;
 
+use Magento\Analytics\ReportXml\DB\ConditionResolver;
 use Magento\Analytics\ReportXml\DB\NameResolver;
 use Magento\Analytics\ReportXml\DB\SelectBuilder;
-use Magento\Analytics\ReportXml\DB\ConditionResolver;
 
 /**
  * Class FilterAssembler
diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php
index 811119ace221b..ad020763941c0 100644
--- a/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php
+++ b/app/code/Magento/Analytics/ReportXml/DB/Assembler/FromAssembler.php
@@ -7,8 +7,8 @@
 namespace Magento\Analytics\ReportXml\DB\Assembler;
 
 use Magento\Analytics\ReportXml\DB\ColumnsResolver;
-use Magento\Analytics\ReportXml\DB\SelectBuilder;
 use Magento\Analytics\ReportXml\DB\NameResolver;
+use Magento\Analytics\ReportXml\DB\SelectBuilder;
 use Magento\Framework\App\ResourceConnection;
 
 /**
@@ -57,8 +57,7 @@ public function assemble(SelectBuilder $selectBuilder, $queryConfig)
     {
         $selectBuilder->setFrom(
             [
-                $this->nameResolver->getAlias($queryConfig['source']) =>
-                    $this->resourceConnection
+                $this->nameResolver->getAlias($queryConfig['source']) => $this->resourceConnection
                         ->getTableName($this->nameResolver->getName($queryConfig['source'])),
             ]
         );
diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php
index f3c6540a25171..4130432b08447 100644
--- a/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php
+++ b/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Analytics\ReportXml\DB\Assembler;
 
+use Magento\Analytics\ReportXml\DB\ColumnsResolver;
+use Magento\Analytics\ReportXml\DB\ConditionResolver;
 use Magento\Analytics\ReportXml\DB\NameResolver;
 use Magento\Analytics\ReportXml\DB\SelectBuilder;
-use Magento\Analytics\ReportXml\DB\ConditionResolver;
-use Magento\Analytics\ReportXml\DB\ColumnsResolver;
 use Magento\Framework\App\ResourceConnection;
 
 /**
diff --git a/app/code/Magento/Analytics/ReportXml/ReportProvider.php b/app/code/Magento/Analytics/ReportXml/ReportProvider.php
index 3ebe5941108bc..6478385651d6e 100644
--- a/app/code/Magento/Analytics/ReportXml/ReportProvider.php
+++ b/app/code/Magento/Analytics/ReportXml/ReportProvider.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Analytics\ReportXml;
 
-use Magento\Framework\Api\SearchCriteria;
-
 /**
  * Class ReportProvider
  *
diff --git a/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php
index 4f54ce5059965..e579a79ef9e33 100644
--- a/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Controller/Adminhtml/Reports/ShowTest.php
@@ -114,7 +114,6 @@ public function testExecute()
      */
     public function testExecuteWithException(\Exception $exception)
     {
-
         $this->resultFactoryMock
             ->expects($this->once())
             ->method('create')
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Baseurl/SubscriptionUpdateHandlerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Baseurl/SubscriptionUpdateHandlerTest.php
index f5f721c038c57..3661f493ff7f8 100644
--- a/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Baseurl/SubscriptionUpdateHandlerTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Baseurl/SubscriptionUpdateHandlerTest.php
@@ -67,7 +67,7 @@ protected function setUp()
         $this->analyticsTokenMock = $this->getMockBuilder(AnalyticsToken::class)
             ->disableOriginalConstructor()
             ->getMock();
-        
+
         $this->flagManagerMock = $this->getMockBuilder(FlagManager::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/NotifyDataChangedCommandTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/NotifyDataChangedCommandTest.php
index cee3877631c2e..a434f9a0beec0 100644
--- a/app/code/Magento/Analytics/Test/Unit/Model/Connector/NotifyDataChangedCommandTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/NotifyDataChangedCommandTest.php
@@ -6,13 +6,13 @@
 namespace Magento\Analytics\Test\Unit\Model\Connector;
 
 use Magento\Analytics\Model\AnalyticsToken;
+use Magento\Analytics\Model\Connector\Http\ClientInterface;
 use Magento\Analytics\Model\Connector\Http\JsonConverter;
 use Magento\Analytics\Model\Connector\Http\ResponseResolver;
+use Magento\Analytics\Model\Connector\NotifyDataChangedCommand;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\HTTP\ZendClient;
 use Psr\Log\LoggerInterface;
-use Magento\Analytics\Model\Connector\NotifyDataChangedCommand;
-use Magento\Analytics\Model\Connector\Http\ClientInterface;
 
 class NotifyDataChangedCommandTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/OTPRequestTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/OTPRequestTest.php
index 8a3f4efb15cf4..1fa0ebddc8c77 100644
--- a/app/code/Magento/Analytics/Test/Unit/Model/Connector/OTPRequestTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/OTPRequestTest.php
@@ -71,7 +71,7 @@ public function setUp()
         $this->responseResolverMock = $this->getMockBuilder(ResponseResolver::class)
             ->disableOriginalConstructor()
             ->getMock();
-        
+
         $this->subject = new OTPRequest(
             $this->analyticsTokenMock,
             $this->httpClientMock,
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php
index 5593496a957b7..78e1b03517e6c 100644
--- a/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/SignUpCommandTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Analytics\Test\Unit\Model\Connector;
 
+use Magento\Analytics\Model\AnalyticsToken;
 use Magento\Analytics\Model\Connector\Http\ClientInterface;
 use Magento\Analytics\Model\Connector\Http\JsonConverter;
 use Magento\Analytics\Model\Connector\Http\ResponseResolver;
 use Magento\Analytics\Model\Connector\SignUpCommand;
-use Magento\Analytics\Model\AnalyticsToken;
 use Magento\Analytics\Model\IntegrationManager;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Integration\Model\Oauth\Token as IntegrationToken;
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php
index 47253a13530e5..681df9b78bf77 100644
--- a/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Connector/UpdateCommandTest.php
@@ -7,13 +7,13 @@
 
 use Magento\Analytics\Model\AnalyticsToken;
 use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
+use Magento\Analytics\Model\Connector\Http\ClientInterface;
 use Magento\Analytics\Model\Connector\Http\ResponseResolver;
+use Magento\Analytics\Model\Connector\UpdateCommand;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\FlagManager;
 use Magento\Framework\HTTP\ZendClient;
 use Psr\Log\LoggerInterface;
-use Magento\Analytics\Model\Connector\UpdateCommand;
-use Magento\Analytics\Model\Connector\Http\ClientInterface;
 
 /**
  * Class SignUpCommandTest
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php
index 4414b81cbc183..621c14f2d5e56 100644
--- a/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Model/ConnectorTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Analytics\Test\Unit\Model;
 
 use Magento\Analytics\Model\Connector;
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Analytics\Model\Connector\SignUpCommand;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
  * Class SignUpCommandTest
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php b/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php
index 3076a22c85be4..d341188625455 100644
--- a/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Model/IntegrationManagerTest.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Analytics\Test\Unit\Model;
 
-use Magento\Integration\Api\IntegrationServiceInterface;
-use Magento\Config\Model\Config;
-use Magento\Integration\Model\Integration;
 use Magento\Analytics\Model\IntegrationManager;
-use Magento\Integration\Api\OauthServiceInterface;
+use Magento\Config\Model\Config;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Integration\Api\IntegrationServiceInterface;
+use Magento\Integration\Api\OauthServiceInterface;
+use Magento\Integration\Model\Integration;
 
 /**
  * Class IntegrationManagerTest
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php
index a89e06562383b..0b4696d9f4f6d 100644
--- a/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php
@@ -7,7 +7,6 @@
 
 use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
 use Magento\Analytics\Model\Plugin\BaseUrlConfigPlugin;
-use Magento\Analytics\Model\SubscriptionStatusProvider;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Config\Value;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php
index 1e4ae9142c13d..9519a760eefbb 100644
--- a/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php
@@ -7,9 +7,9 @@
 
 use Magento\Analytics\ReportXml\ConnectionFactory;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Adapter\Pdo\Mysql as MysqlPdoAdapter;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php
index bdbe3d1d22c22..62b9166eb7cf3 100644
--- a/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/DB/ColumnsResolverTest.php
@@ -8,9 +8,9 @@
 use Magento\Analytics\ReportXml\DB\ColumnsResolver;
 use Magento\Analytics\ReportXml\DB\NameResolver;
 use Magento\Analytics\ReportXml\DB\SelectBuilder;
-use Magento\Framework\DB\Sql\ColumnValueExpression;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Sql\ColumnValueExpression;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
@@ -113,8 +113,7 @@ public function getColumnsDataProvider()
                     'expectedGroup' => [
                         'name' => new ColumnValueExpression('COUNT( DISTINCT `cpe`.`name`)')
                     ],
-                    'entityConfig' =>
-                        [
+                    'entityConfig' => [
                             'name' => 'catalog_product_entity',
                             'alias' => 'cpe',
                             'attribute' => [
@@ -132,8 +131,7 @@ public function getColumnsDataProvider()
                     'avg_name' => new ColumnValueExpression('AVG(`cpe`.`name`)')
                 ],
                 'expectedGroup' => [],
-                'entityConfig' =>
-                    [
+                'entityConfig' => [
                         'name' => 'catalog_product_entity',
                         'alias' => 'cpe',
                         'attribute' => [
diff --git a/app/code/Magento/Authorization/Setup/InstallData.php b/app/code/Magento/Authorization/Setup/InstallData.php
index b8b18706722a5..adf194431f5c3 100644
--- a/app/code/Magento/Authorization/Setup/InstallData.php
+++ b/app/code/Magento/Authorization/Setup/InstallData.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Authorization\Setup;
 
+use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
+use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
-use Magento\Authorization\Model\UserContextInterface;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php b/app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php
index 47da868f17190..4ee324bb65de4 100644
--- a/app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php
+++ b/app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Authorization\Test\Unit\Model;
 
-use \Magento\Authorization\Model\CompositeUserContext;
+use Magento\Authorization\Model\CompositeUserContext;
 
 use Magento\Framework\ObjectManager\Helper\Composite as CompositeHelper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
diff --git a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php
index b393015ce1231..9c0903ee4b419 100644
--- a/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php
+++ b/app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment/Place.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet\Directpost\Payment;
 
-use Magento\Framework\Escaper;
-use Magento\Catalog\Helper\Product;
+use Magento\Authorizenet\Helper\Backend\Data as DataHelper;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\View\Result\PageFactory;
 use Magento\Backend\Model\View\Result\ForwardFactory;
-use Magento\Authorizenet\Helper\Backend\Data as DataHelper;
+use Magento\Catalog\Helper\Product;
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Result\PageFactory;
 
 /**
  * Class Place
diff --git a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php
index 028b90bf7da50..27eb689164032 100644
--- a/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php
+++ b/app/code/Magento/Authorizenet/Controller/Directpost/Payment/Redirect.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\Authorizenet\Controller\Directpost\Payment;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Payment\Block\Transparent\Iframe;
 
 /**
diff --git a/app/code/Magento/Authorizenet/Helper/Backend/Data.php b/app/code/Magento/Authorizenet/Helper/Backend/Data.php
index 24bdb23873265..a908054095020 100644
--- a/app/code/Magento/Authorizenet/Helper/Backend/Data.php
+++ b/app/code/Magento/Authorizenet/Helper/Backend/Data.php
@@ -6,10 +6,10 @@
 namespace Magento\Authorizenet\Helper\Backend;
 
 use Magento\Authorizenet\Helper\Data as FrontendDataHelper;
+use Magento\Backend\Model\UrlInterface;
 use Magento\Framework\App\Helper\Context;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Sales\Model\OrderFactory;
-use Magento\Backend\Model\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Authorize.net Backend Data Helper
diff --git a/app/code/Magento/Authorizenet/Helper/Data.php b/app/code/Magento/Authorizenet/Helper/Data.php
index 8bcc1f3f3f03c..d6403d9c70fac 100644
--- a/app/code/Magento/Authorizenet/Helper/Data.php
+++ b/app/code/Magento/Authorizenet/Helper/Data.php
@@ -5,12 +5,11 @@
  */
 namespace Magento\Authorizenet\Helper;
 
+use Magento\Authorizenet\Model\Authorizenet;
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Sales\Model\OrderFactory;
-use Magento\Authorizenet\Model\Directpost;
-use Magento\Authorizenet\Model\Authorizenet;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Authorize.net Data Helper
diff --git a/app/code/Magento/Authorizenet/Model/Authorizenet.php b/app/code/Magento/Authorizenet/Model/Authorizenet.php
index ae9ac833a4395..3648dbd74017b 100644
--- a/app/code/Magento/Authorizenet/Model/Authorizenet.php
+++ b/app/code/Magento/Authorizenet/Model/Authorizenet.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Authorizenet\Model;
 
-use Magento\Authorizenet\Model\TransactionService;
 use Magento\Framework\HTTP\ZendClientFactory;
 
 /**
diff --git a/app/code/Magento/Authorizenet/Model/TransactionService.php b/app/code/Magento/Authorizenet/Model/TransactionService.php
index fef22d6c913c0..57854b975bf7d 100644
--- a/app/code/Magento/Authorizenet/Model/TransactionService.php
+++ b/app/code/Magento/Authorizenet/Model/TransactionService.php
@@ -9,7 +9,6 @@
 use Magento\Framework\HTTP\ZendClientFactory;
 use Magento\Framework\Simplexml\Element;
 use Magento\Framework\Xml\Security;
-use Magento\Authorizenet\Model\Authorizenet;
 use Magento\Payment\Model\Method\Logger;
 
 /**
@@ -95,7 +94,6 @@ public function getTransactionDetails(Authorizenet $context, $transactionId)
      */
     protected function loadTransactionDetails(Authorizenet $context, $transactionId)
     {
-
         $requestBody = $this->getRequestBody(
             $context->getConfigData('login'),
             $context->getConfigData('trans_key'),
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
index 6e5d55e52675e..501583b820d12 100644
--- a/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Authorizenet\Test\Unit\Model\Directpost;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Authorizenet\Model\Directpost;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class ResponseTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
index dbb6ac8333c14..33f401a88ca76 100644
--- a/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Authorizenet\Test\Unit\Model;
 
-use Magento\Framework\Simplexml\Element;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Authorizenet\Model\Directpost;
-use Magento\Authorizenet\Model\TransactionService;
-use Magento\Authorizenet\Model\Request;
 use Magento\Authorizenet\Model\Directpost\Request\Factory;
+use Magento\Authorizenet\Model\Request;
+use Magento\Authorizenet\Model\TransactionService;
+use Magento\Framework\Simplexml\Element;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment\Transaction\Repository as TransactionRepository;
 
diff --git a/app/code/Magento/Authorizenet/Test/Unit/Model/TransactionServiceTest.php b/app/code/Magento/Authorizenet/Test/Unit/Model/TransactionServiceTest.php
index 092d633648482..b214bfb38e39a 100644
--- a/app/code/Magento/Authorizenet/Test/Unit/Model/TransactionServiceTest.php
+++ b/app/code/Magento/Authorizenet/Test/Unit/Model/TransactionServiceTest.php
@@ -5,9 +5,8 @@
  */
 namespace Magento\Authorizenet\Test\Unit\Model;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\Simplexml\Element;
 use Magento\Authorizenet\Model\TransactionService;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class TransactionServiceTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
index 60fec263352fe..1313fa8e9821a 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
@@ -19,34 +19,34 @@ $fraudDetails = $payment->getAdditionalInformation('fraud_details');
 
     <div class="admin__page-section-item-content">
         <div class="order-payment-additional">
-            <?php if(!empty($fraudDetails['fds_filter_action'])): ?>
+            <?php if (!empty($fraudDetails['fds_filter_action'])): ?>
                 <?= $block->escapeHtml(__('FDS Filter Action')) ?>:
                 <?= $block->escapeHtml($fraudDetails['fds_filter_action']) ?>
                 </br>
             <?php endif; ?>
 
-            <?php if(!empty($fraudDetails['avs_response'])): ?>
+            <?php if (!empty($fraudDetails['avs_response'])): ?>
                 <?= $block->escapeHtml(__('AVS Response')) ?>:
                 <?= $block->escapeHtml($fraudDetails['avs_response']) ?>
                 </br>
             <?php endif; ?>
 
-            <?php if(!empty($fraudDetails['card_code_response'])): ?>
+            <?php if (!empty($fraudDetails['card_code_response'])): ?>
                 <?= $block->escapeHtml(__('Card Code Response')) ?>:
                 <?= $block->escapeHtml($fraudDetails['card_code_response']) ?>
                 </br>
             <?php endif; ?>
 
-            <?php if(!empty($fraudDetails['cavv_response']) || ($fraudDetails['cavv_response'] === 0)): ?>
+            <?php if (!empty($fraudDetails['cavv_response']) || ($fraudDetails['cavv_response'] === 0)): ?>
                 <?= $block->escapeHtml(__('CAVV Response')) ?>:
                 <?= $block->escapeHtml($fraudDetails['cavv_response']) ?>
                 </br>
             <?php endif; ?>
 
-            <?php if(!empty($fraudDetails['fraud_filters'])): ?>
+            <?php if (!empty($fraudDetails['fraud_filters'])): ?>
                 <b><?= $block->escapeHtml(__('Fraud Filters')) ?>:
                 </b></br>
-                <?php foreach($fraudDetails['fraud_filters'] as $filter): ?>
+                <?php foreach ($fraudDetails['fraud_filters'] as $filter): ?>
                     <?= $block->escapeHtml($filter['name']) ?>:
                     <?= $block->escapeHtml($filter['action']) ?>
                     </br>
diff --git a/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php b/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php
index 992c37a23e5d1..798d1816a9a7b 100644
--- a/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php
+++ b/app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php
@@ -7,8 +7,8 @@
  */
 namespace Magento\Backend\App\Action\Plugin;
 
-use Magento\Framework\App\RequestInterface;
 use Magento\Backend\App\AbstractAction;
+use Magento\Framework\App\RequestInterface;
 
 class MassactionKey
 {
diff --git a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
index 2f9b73f0ae037..286bd3388f78d 100644
--- a/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
+++ b/app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Backend\Block\Store\Switcher\Form\Renderer;
 
-use \Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
+use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
 
 /**
  * Form fieldset renderer
diff --git a/app/code/Magento/Backend/Block/Widget/Container.php b/app/code/Magento/Backend/Block/Widget/Container.php
index 7d89430c26c7c..51a6bfa2960b0 100644
--- a/app/code/Magento/Backend/Block/Widget/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Container.php
@@ -8,8 +8,6 @@
 
 namespace Magento\Backend\Block\Widget;
 
-use Magento\Framework\View\Element\Template;
-
 /**
  * @api
  * @since 100.0.2
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php
index 8b7babc1bb9b6..f4ac18b923cc4 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php
@@ -39,7 +39,7 @@ class Container extends \Magento\Backend\Block\Widget\Container
      * @var string
      */
     protected $_blockGroup = 'Magento_Backend';
-    
+
     /**
      *  @var string
      */
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php
index 32cb9366c8bf8..5f21647dcb65e 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php
@@ -7,7 +7,7 @@
 namespace Magento\Backend\Block\Widget\Form\Renderer\Fieldset;
 
 use Magento\Framework\Data\Form\Element\AbstractElement;
-use \Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
+use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
 
 /**
  * Fieldset element renderer
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
index b8a2e283b29a0..9df8c532adfdd 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php
@@ -58,7 +58,7 @@ public function render(DataObject $row)
             $result .= $this->getColumn()->getEditOnly() ? ''
                 : '<span class="admin__grid-control-value">' . $this->_getValue($row) . '</span>';
 
-            return $result . $this->_getInputValueElement($row) . '</div>' ;
+            return $result . $this->_getInputValueElement($row) . '</div>';
         }
         return $this->_getValue($row);
     }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
index 320713f8b57c4..db834860a40fa 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Massaction.php
@@ -66,11 +66,11 @@ public function render(\Magento\Framework\DataObject $row)
     protected function _getCheckboxHtml($value, $checked)
     {
         $id = 'id_' . rand(0, 999);
-        $html = '<label class="data-grid-checkbox-cell-inner" for="'. $id .'">';
+        $html = '<label class="data-grid-checkbox-cell-inner" for="' . $id . '">';
         $html .= '<input type="checkbox" name="' . $this->getColumn()->getName() . '" ';
         $html .= 'id="' . $id . '" data-role="select-row"';
         $html .= 'value="' . $this->escapeHtml($value) . '" class="admin__control-checkbox"' . $checked . '/>';
-        $html .= '<label for="'. $id .'"></label></label>';
+        $html .= '<label for="' . $id . '"></label></label>';
         return $html;
     }
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
index 8252ed1a1e2f8..93256e841d453 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php
@@ -278,13 +278,13 @@ public function getGridIdsJson()
         }
         /** @var \Magento\Framework\Data\Collection $allIdsCollection */
         $allIdsCollection = clone $this->getParentBlock()->getCollection();
-        
+
         if ($this->getMassactionIdField()) {
             $massActionIdField = $this->getMassactionIdField();
         } else {
             $massActionIdField = $this->getParentBlock()->getMassactionIdField();
         }
-        
+
         $gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);
         if (!empty($gridIds)) {
             return join(",", $gridIds);
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
index 42f5e61bf5fa8..32e33573f4e2e 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php
@@ -275,13 +275,13 @@ public function getGridIdsJson()
 
         /** @var \Magento\Framework\Data\Collection $allIdsCollection */
         $allIdsCollection = clone $this->getParentBlock()->getCollection();
-        
+
         if ($this->getMassactionIdField()) {
             $massActionIdField = $this->getMassactionIdField();
         } else {
             $massActionIdField = $this->getParentBlock()->getMassactionIdField();
         }
-        
+
         $gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);
 
         if (!empty($gridIds)) {
diff --git a/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php b/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php
index 2facdf165c5df..e103ce75f1c7e 100644
--- a/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php
+++ b/app/code/Magento/Backend/Console/Command/AbstractCacheTypeManageCommand.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Backend\Console\Command;
 
+use Magento\Framework\App\Cache\Manager;
 use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Framework\App\Cache\Manager;
 
 /**
  * @api
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
index 1895bd08c464f..de29cfa81b449 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
 
 class CleanImages extends \Magento\Backend\Controller\Adminhtml\Cache
 {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
index 521cb9806a135..59d28896ac59c 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
 
 class CleanMedia extends \Magento\Backend\Controller\Adminhtml\Cache
 {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
index 204105852b9f1..92cf3760c45ca 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php
@@ -6,10 +6,10 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Controller\ResultFactory;
-use Magento\Framework\App\State;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\State;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Controller disables some types of cache
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
index 32acf47887c44..626384365a642 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassEnable.php
@@ -6,10 +6,10 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Controller\ResultFactory;
-use Magento\Framework\App\State;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\State;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Controller enables some types of cache
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
index e18aa1555e11b..780c8f950e2ee 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\Cache;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
 
 class MassRefresh extends \Magento\Backend\Controller\Adminhtml\Cache
 {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
index 421885a0c32a3..fc27d578de414 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php
@@ -5,11 +5,10 @@
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Account;
 
-use Magento\Framework\Validator\Exception as ValidatorException;
-use Magento\Framework\Exception\AuthenticationException;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\State\UserLockedException;
+use Magento\Framework\Validator\Exception as ValidatorException;
 use Magento\Security\Model\SecurityCookie;
 
 /**
diff --git a/app/code/Magento/Backend/Model/Auth.php b/app/code/Magento/Backend/Model/Auth.php
index 08921d1615f87..d7011bcb47e96 100644
--- a/app/code/Magento/Backend/Model/Auth.php
+++ b/app/code/Magento/Backend/Model/Auth.php
@@ -179,7 +179,7 @@ public function login($username, $password)
                 ['user_name' => $username, 'exception' => $e]
             );
             self::throwException(
-                __($e->getMessage()? : 'You did not sign in correctly or your account is temporarily disabled.')
+                __($e->getMessage() ?: 'You did not sign in correctly or your account is temporarily disabled.')
             );
         }
     }
diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php
index 11edaa26f443f..43e533c63a91e 100644
--- a/app/code/Magento/Backend/Model/Session/Quote.php
+++ b/app/code/Magento/Backend/Model/Session/Quote.php
@@ -152,7 +152,7 @@ public function getQuote()
                     $this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId());
                     $this->_quote->setIsActive(false);
                     $this->_quote->setStoreId($this->getStoreId());
-                    
+
                     $this->quoteRepository->save($this->_quote);
                     $this->setQuoteId($this->_quote->getId());
                     $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);
diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php
index 48b443fe7ffd3..05543d27f97fc 100644
--- a/app/code/Magento/Backend/Model/Url.php
+++ b/app/code/Magento/Backend/Model/Url.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Backend\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Url\HostChecker;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class \Magento\Backend\Model\UrlInterface
diff --git a/app/code/Magento/Backend/Model/View/Layout/Builder.php b/app/code/Magento/Backend/Model/View/Layout/Builder.php
index c37630ca8f824..52dfa5920c880 100644
--- a/app/code/Magento/Backend/Model/View/Layout/Builder.php
+++ b/app/code/Magento/Backend/Model/View/Layout/Builder.php
@@ -5,10 +5,6 @@
  */
 namespace Magento\Backend\Model\View\Layout;
 
-use Magento\Framework\App;
-use Magento\Framework\Event;
-use Magento\Framework\View;
-
 /**
  * @api
  * @since 100.0.2
diff --git a/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php b/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php
index 2b44c52895805..9f4d7065b55e7 100644
--- a/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php
+++ b/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Backend\Model\View\Layout\Reader;
 
-use Magento\Framework\View\Layout;
 use Magento\Framework\Data\Argument\InterpreterInterface;
+use Magento\Framework\View\Layout;
 use Magento\Framework\View\Layout\Reader\Visibility\Condition;
 
 /**
diff --git a/app/code/Magento/Backend/Model/View/Layout/StructureManager.php b/app/code/Magento/Backend/Model/View/Layout/StructureManager.php
index fdcbbeeed1e12..a9f18fc1ba159 100644
--- a/app/code/Magento/Backend/Model/View/Layout/StructureManager.php
+++ b/app/code/Magento/Backend/Model/View/Layout/StructureManager.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Backend\Model\View\Layout;
 
-use Magento\Framework\View\Layout\ScheduledStructure;
 use Magento\Framework\View\Layout\Data\Structure;
+use Magento\Framework\View\Layout\ScheduledStructure;
 
 /**
  * Class StructureManager
diff --git a/app/code/Magento/Backend/Model/View/Page/Builder.php b/app/code/Magento/Backend/Model/View/Page/Builder.php
index b0654472b1ae2..40d1f4d771e1a 100644
--- a/app/code/Magento/Backend/Model/View/Page/Builder.php
+++ b/app/code/Magento/Backend/Model/View/Page/Builder.php
@@ -5,9 +5,6 @@
  */
 namespace Magento\Backend\Model\View\Page;
 
-use Magento\Backend\Model\View\Layout;
-use Magento\Framework\App;
-use Magento\Framework\Event;
 use Magento\Framework\View;
 
 /**
diff --git a/app/code/Magento/Backend/Model/View/Result/Page.php b/app/code/Magento/Backend/Model/View/Result/Page.php
index 2ea9cdf2ee7bd..d0ce14f498760 100644
--- a/app/code/Magento/Backend/Model/View/Result/Page.php
+++ b/app/code/Magento/Backend/Model/View/Result/Page.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Backend\Model\View\Result;
 
-use Magento\Framework\Translate;
 use Magento\Framework\View;
 
 /**
diff --git a/app/code/Magento/Backend/Model/View/Result/Redirect.php b/app/code/Magento/Backend/Model/View/Result/Redirect.php
index e8e39cb64ea2b..66a2b20c1d9a1 100644
--- a/app/code/Magento/Backend/Model/View/Result/Redirect.php
+++ b/app/code/Magento/Backend/Model/View/Result/Redirect.php
@@ -7,7 +7,6 @@
 
 use Magento\Backend\App\AbstractAction;
 use Magento\Backend\Model\Session;
-use Magento\Backend\Model\UrlInterface;
 use Magento\Framework\App;
 use Magento\Framework\App\ActionFlag;
 use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
diff --git a/app/code/Magento/Backend/Setup/ConfigOptionsList.php b/app/code/Magento/Backend/Setup/ConfigOptionsList.php
index 2d1723886b1dd..c793bd9e9b2fb 100644
--- a/app/code/Magento/Backend/Setup/ConfigOptionsList.php
+++ b/app/code/Magento/Backend/Setup/ConfigOptionsList.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Backend\Setup;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\Data\ConfigData;
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Setup\BackendFrontnameGenerator;
 use Magento\Framework\Setup\ConfigOptionsListInterface;
 use Magento\Framework\Setup\Option\TextConfigOption;
-use Magento\Framework\App\DeploymentConfig;
-use \Magento\Framework\Setup\BackendFrontnameGenerator;
 
 /**
  * Deployment configuration options needed for Backend module
diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php
index 2f808eaf2d1b8..7968a98cf2908 100644
--- a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php
+++ b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/MassactionKeyTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Backend\Test\Unit\App\Action\Plugin;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Backend\App\AbstractAction;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class MassactionKeyTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php b/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php
index a79050faeb84a..7f7c5dac18c23 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/MenuItemCheckerTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Backend\Test\Unit\Block;
 
-use Magento\Backend\Model\Menu\Item;
-use Magento\Backend\Model\Menu;
 use Magento\Backend\Block\MenuItemChecker;
+use Magento\Backend\Model\Menu;
+use Magento\Backend\Model\Menu\Item;
 
 class MenuItemCheckerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php b/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php
index f41447c608b10..f5a400efcf8ba 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/MenuTest.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Backend\Test\Unit\Block;
 
-use Magento\Backend\Model\Menu\Item;
-use Magento\Backend\Model\Menu as MenuModel;
+use Magento\Backend\Block\AnchorRenderer;
 use Magento\Backend\Block\Menu;
-use Magento\Backend\Model\UrlInterface;
-use Magento\Backend\Model\Menu\Filter\IteratorFactory;
+use Magento\Backend\Block\MenuItemChecker;
 use Magento\Backend\Model\Auth\Session;
+use Magento\Backend\Model\Menu as MenuModel;
 use Magento\Backend\Model\Menu\Config;
+use Magento\Backend\Model\Menu\Filter\IteratorFactory;
+use Magento\Backend\Model\Menu\Item;
+use Magento\Backend\Model\UrlInterface;
 use Magento\Framework\Locale\ResolverInterface;
-use Magento\Backend\Block\MenuItemChecker;
-use Magento\Backend\Block\AnchorRenderer;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class MenuTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Massaction/ExtendedTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Massaction/ExtendedTest.php
index 4525de1fee542..a74fc623cbd30 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Massaction/ExtendedTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Massaction/ExtendedTest.php
@@ -125,13 +125,13 @@ public function testGetGridIdsJsonWithoutUseSelectAll()
     public function testGetGridIdsJsonWithUseSelectAll(array $items, $result)
     {
         $this->_block->setUseSelectAll(true);
-        
+
         if ($this->_block->getMassactionIdField()) {
             $massActionIdField = $this->_block->getMassactionIdField();
         } else {
             $massActionIdField = $this->_block->getParentBlock()->getMassactionIdField();
         }
-        
+
         $collectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
index bb389a996e1ed..dc7ba93073c3f 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php
@@ -237,7 +237,7 @@ public function testGetGridIdsJsonWithoutUseSelectAll()
     public function testGetGridIdsJsonWithUseSelectAll(array $items, $result)
     {
         $this->_block->setUseSelectAll(true);
-        
+
         if ($this->_block->getMassactionIdField()) {
             $massActionIdField = $this->_block->getMassactionIdField();
         } else {
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
index 556db311748bd..f1ba00566c2f6 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassDisableTest.php
@@ -5,17 +5,17 @@
  */
 namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache;
 
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Backend\Controller\Adminhtml\Cache\MassDisable;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\App\State;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\Message\ManagerInterface as MessageManager;
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Backend\Controller\Adminhtml\Cache\MassDisable;
 use Magento\Backend\Model\View\Result\Redirect;
-use Magento\Framework\App\RequestInterface as Request;
-use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList;
 use Magento\Framework\App\Cache\StateInterface as CacheState;
+use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList;
+use Magento\Framework\App\RequestInterface as Request;
+use Magento\Framework\App\State;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Message\ManagerInterface as MessageManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
index ad622ca69757a..c29bbab8d6978 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/MassEnableTest.php
@@ -5,17 +5,17 @@
  */
 namespace Magento\Backend\Test\Unit\Controller\Adminhtml\Cache;
 
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Backend\Controller\Adminhtml\Cache\MassEnable;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\App\State;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\Message\ManagerInterface as MessageManager;
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Backend\Controller\Adminhtml\Cache\MassEnable;
 use Magento\Backend\Model\View\Result\Redirect;
-use Magento\Framework\App\RequestInterface as Request;
-use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList;
 use Magento\Framework\App\Cache\StateInterface as CacheState;
+use Magento\Framework\App\Cache\TypeListInterface as CacheTypeList;
+use Magento\Framework\App\RequestInterface as Request;
+use Magento\Framework\App\State;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Message\ManagerInterface as MessageManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php
index dbd1cbe5ec8ec..6049ef76fb183 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Dashboard/AbstractTestCase.php
@@ -21,8 +21,7 @@ protected function assertExecute($controllerName, $blockName)
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $outPut = "data";
-        $resultRawMock = $this->createPartialMock(\Magento\Framework\Controller\Result\Raw::class, ['setContents'])
-        ;
+        $resultRawMock = $this->createPartialMock(\Magento\Framework\Controller\Result\Raw::class, ['setContents']);
         $resultRawFactoryMock =
             $this->createPartialMock(\Magento\Framework\Controller\Result\RawFactory::class, ['create']);
         $layoutFactoryMock = $this->createPartialMock(\Magento\Framework\View\LayoutFactory::class, ['create']);
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php
index 1986c41e5cfb6..71a263dc0b225 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Store/IndexTest.php
@@ -6,9 +6,9 @@
  */
 namespace Magento\Backend\Test\Unit\Controller\Adminhtml\System\Store;
 
-use Magento\Framework\Controller\ResultFactory;
-use Magento\Backend\Model\View\Result\Page;
 use Magento\Backend\Controller\Adminhtml\System\Store\Index;
+use Magento\Backend\Model\View\Result\Page;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\Page\Config;
 use Magento\Framework\View\Page\Title;
diff --git a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php
index 4911dc1e9968e..8ccff487914c6 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/AdminPathConfigTest.php
@@ -6,7 +6,6 @@
 namespace Magento\Backend\Test\Unit\Model;
 
 use Magento\Backend\Model\AdminPathConfig;
-use Magento\Store\Model\Store;
 
 class AdminPathConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php b/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php
index 77eb7cdb34d1f..cfd153fed2d7e 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php
@@ -28,7 +28,7 @@ class ManagerTest extends \PHPUnit\Framework\TestCase
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Auth\Session
      */
     protected $_authSession;
-    
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\App\ConfigInterface
      */
@@ -39,14 +39,14 @@ protected function setUp()
         $this->_session = $this->createMock(\Magento\Backend\Model\Session::class);
 
         $this->_authSession = $this->createPartialMock(\Magento\Backend\Model\Auth\Session::class, ['getUser']);
-        
+
         $this->_backendConfig = $this->getMockForAbstractClass(
             \Magento\Backend\App\ConfigInterface::class,
             [],
             '',
             false
         );
-        
+
         $userMock = new \Magento\Framework\DataObject();
 
         $this->_authSession->expects($this->any())->method('getUser')->will($this->returnValue($userMock));
diff --git a/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php b/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php
index 23d1ed5da1425..49224d2351b6d 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php
@@ -37,6 +37,6 @@ public function testAfterGetResult($isPub, $times)
 
     public function afterGetResultDataProvider()
     {
-        return [[true, 1], [false, 0],];
+        return [[true, 1], [false, 0]];
     }
 }
diff --git a/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php b/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php
index 737f76a7fda33..237c27c82d53f 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/MenuTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Backend\Test\Unit\Model;
 
-use Magento\Backend\Model\Menu\Item;
 use Magento\Backend\Model\Menu\Item\Factory;
 use Magento\Framework\Serialize\SerializerInterface;
 
diff --git a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php
index fecb6434da83a..ab406d69ba660 100644
--- a/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Model/View/Layout/StructureManagerTest.php
@@ -7,9 +7,9 @@
 namespace Magento\Backend\Test\Unit\Model\View\Layout;
 
 use Magento\Backend\Model\View\Layout\StructureManager;
-use Magento\Framework\View\Layout\ScheduledStructure;
-use Magento\Framework\View\Layout\Data\Structure;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Layout\Data\Structure;
+use Magento\Framework\View\Layout\ScheduledStructure;
 
 /**
  * Class StructureManagerTest
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
index 843328fbf17d7..56876588bd781 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
@@ -21,7 +21,7 @@
         <li><span><?= $block->escapeHtml(__('Contact a system administrator or store owner to gain permissions.')) ?></span></li>
         <li>
             <span><?= $block->escapeHtml(__('Return to ')) ?>
-                <?php if(isset($_SERVER['HTTP_REFERER'])): ?>
+                <?php if (isset($_SERVER['HTTP_REFERER'])): ?>
                     <a href="<?= $block->escapeUrl(__($_SERVER['HTTP_REFERER'])) ?>">
                         <?= $block->escapeHtml(__('previous page')) ?></a><?= $block->escapeHtml(__('.')) ?>
                 <?php else: ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
index ae123511bd478..e4443b327cb94 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
@@ -15,8 +15,8 @@
                 onchange="changeDiagramsPeriod(this);" class="admin__control-select">
             <?php foreach ($this->helper('Magento\Backend\Helper\Dashboard\Data')->getDatePeriods() as $value => $label): ?>
                 <?php if (in_array($value, ['custom'])) {
-                    continue;
-                } ?>
+    continue;
+} ?>
                 <option value="<?= /* @escapeNotVerified */ $value ?>"
                     <?php if ($block->getRequest()->getParam('period') == $value): ?> selected="selected"<?php endif; ?>
                     ><?= /* @escapeNotVerified */ $label ?></option>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
index 1041aef59ceac..3b643b633f974 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
@@ -62,7 +62,7 @@ deps.push('Magento_Sales/order/create/form');
 deps.push('mage/adminhtml/grid');
 
 require(deps, function(<?= ($block->getDependencyJsObject() ? 'registry' : '') ?>){
-    <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
+    <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed?>
 
     <?php if ($block->getDependencyJsObject()): ?>
         registry.get('<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>', function (<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>) {
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
index bb968c57610be..fe9ca0a5abc1a 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
@@ -36,22 +36,22 @@
         </button>
         <ul class="dropdown-menu" data-role="stores-list">
             <?php if ($block->hasDefaultOption()): ?>
-                <li class="store-switcher-all <?php if ( ! ($block->getDefaultSelectionName() != $block->getCurrentSelectionName())) {
-                    echo "disabled";
-                } ?> <?php if ( ! $block->hasScopeSelected()) {
-                    ?> current<?php
-                } ?>">
+                <li class="store-switcher-all <?php if (! ($block->getDefaultSelectionName() != $block->getCurrentSelectionName())) {
+    echo "disabled";
+} ?> <?php if (! $block->hasScopeSelected()) {
+    ?> current<?php
+} ?>">
                     <?php if ($block->getDefaultSelectionName() != $block->getCurrentSelectionName()) {
-                        ?>
+        ?>
                         <a data-role="store-view-id" data-value="" href="#">
                             <?= /* @escapeNotVerified */ $block->getDefaultSelectionName() ?>
                         </a>
                     <?php
-                    } else {
-                        ?>
+    } else {
+        ?>
                         <span><?= /* @escapeNotVerified */ $block->getDefaultSelectionName() ?></span>
                     <?php
-                    } ?>
+    } ?>
                 </li>
             <?php endif; ?>
             <?php foreach ($websites as $website): ?>
@@ -61,60 +61,60 @@
                     <?php foreach ($block->getStores($group) as $store): ?>
                         <?php if ($showWebsite == false): ?>
                             <?php $showWebsite = true; ?>
-                            <li class="store-switcher-website <?php if ( ! ($block->isWebsiteSwitchEnabled() && ! $block->isWebsiteSelected($website))) {
-                                echo "disabled";
-                            } ?> <?php if ($block->isWebsiteSelected($website)) {
-                                ?> current<?php
-                            } ?>">
+                            <li class="store-switcher-website <?php if (! ($block->isWebsiteSwitchEnabled() && ! $block->isWebsiteSelected($website))) {
+        echo "disabled";
+    } ?> <?php if ($block->isWebsiteSelected($website)) {
+        ?> current<?php
+    } ?>">
                                 <?php if ($block->isWebsiteSwitchEnabled() && ! $block->isWebsiteSelected($website)) {
-                                    ?>
+        ?>
                                     <a data-role="website-id" data-value="<?= $block->escapeHtml($website->getId()) ?>" href="#">
                                         <?= $block->escapeHtml($website->getName()) ?>
                                     </a>
                                 <?php
-                                } else {
-                                    ?>
+    } else {
+        ?>
                                     <span><?= $block->escapeHtml($website->getName()) ?></span>
                                 <?php
-                                } ?>
+    } ?>
                             </li>
                         <?php endif; ?>
                         <?php if ($showGroup == false): ?>
                             <?php $showGroup = true; ?>
-                            <li class="store-switcher-store <?php if ( ! ($block->isStoreGroupSwitchEnabled() && ! $block->isStoreGroupSelected($group))) {
-                                echo "disabled";
-                            } ?> <?php if ($block->isStoreGroupSelected($group)) {
-                                ?> current<?php
-                            } ?>">
+                            <li class="store-switcher-store <?php if (! ($block->isStoreGroupSwitchEnabled() && ! $block->isStoreGroupSelected($group))) {
+        echo "disabled";
+    } ?> <?php if ($block->isStoreGroupSelected($group)) {
+        ?> current<?php
+    } ?>">
                                 <?php if ($block->isStoreGroupSwitchEnabled() && ! $block->isStoreGroupSelected($group)) {
-                                    ?>
+        ?>
                                     <a data-role="store-group-id" data-value="<?= $block->escapeHtml($group->getId()) ?>" href="#">
                                         <?= $block->escapeHtml($group->getName()) ?>
                                     </a>
                                 <?php
-                                } else {
-                                    ?>
+    } else {
+        ?>
                                     <span><?= $block->escapeHtml($group->getName()) ?></span>
                                 <?php
-                                } ?>
+    } ?>
                             </li>
                         <?php endif; ?>
-                        <li class="store-switcher-store-view <?php if ( ! ($block->isStoreSwitchEnabled() && ! $block->isStoreSelected($store))) {
-                            echo "disabled";
-                        } ?> <?php if ($block->isStoreSelected($store)) {
-                            ?> current<?php
-                        } ?>">
+                        <li class="store-switcher-store-view <?php if (! ($block->isStoreSwitchEnabled() && ! $block->isStoreSelected($store))) {
+        echo "disabled";
+    } ?> <?php if ($block->isStoreSelected($store)) {
+        ?> current<?php
+    } ?>">
                             <?php if ($block->isStoreSwitchEnabled() && ! $block->isStoreSelected($store)) {
-                                ?>
+        ?>
                                 <a data-role="store-view-id" data-value="<?= $block->escapeHtml($store->getId()) ?>" href="#">
                                     <?= $block->escapeHtml($store->getName()) ?>
                                 </a>
                             <?php
-                            } else {
-                                ?>
+    } else {
+        ?>
                                 <span><?= $block->escapeHtml($store->getName()) ?></span>
                             <?php
-                            } ?>
+    } ?>
                         </li>
                     <?php endforeach; ?>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
index aaf1cb5ff550e..6bb94f33f786c 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
@@ -90,7 +90,7 @@ if ($isField) {
         <?php endif; ?>
 
         <?php if ($element->hasAdvanced() && !$isField): ?>
-            <?= (!$element->getNoContainer() && $advancedAfter)  ? '</fieldset>' : '' ?>
+            <?= (!$element->getNoContainer() && $advancedAfter) ? '</fieldset>' : '' ?>
             <details data-mage-init='{"details": {}}' class="details admin__collapsible-block-wrapper" id="details<?= /* @escapeNotVerified */ $id ?>">
                 <summary class="details-summary admin__collapsible-title" id="details-summary<?= /* @escapeNotVerified */ $id ?>">
                     <span><?= /* @escapeNotVerified */ $advancedLabel ?></span>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index c99759a60d1bf..d55c385b6333e 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -42,7 +42,9 @@ $numColumns = sizeof($block->getColumns());
                 <?php endif; ?>
             </div>
             <?php endif; ?>
-            <div class="<?php if($massActionAvailable) { echo '_massaction ';} ?>admin__data-grid-header-row">
+            <div class="<?php if ($massActionAvailable) {
+    echo '_massaction ';
+} ?>admin__data-grid-header-row">
                 <?php if ($massActionAvailable): ?>
                     <?= $block->getChildHtml('grid.massaction') ?>
                 <?php else: ?>
@@ -156,7 +158,7 @@ $numColumns = sizeof($block->getColumns());
     deps.push('mage/adminhtml/grid');
 
     require(deps, function(<?= ($block->getDependencyJsObject() ? 'registry' : '') ?>){
-        <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
+        <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed?>
 
         <?php if ($block->getDependencyJsObject()): ?>
             registry.get('<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>', function (<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>) {
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
index 5ff9cfbd96f2c..38cc154802802 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
@@ -60,7 +60,7 @@ $numColumns = sizeof($block->getColumns());
                             $_rowspan = $block->getRowspan($_item, $_column);
                           ?><td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
                                 <?= ($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
-                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
+                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell' : '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
                             >
                                 <?= (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
                             </td><?php
@@ -80,7 +80,7 @@ $numColumns = sizeof($block->getColumns());
                     <tr data-role="row">
                         <?php $i = 0; foreach ($block->getMultipleRowColumns($_i) as $_column):
                             ?><td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
-                            class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns-1 ? 'last' : '' ?>"
+                            class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell' : '' ?> <?= ++$i == $numColumns-1 ? 'last' : '' ?>"
                         >
                             <?= (($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
                         </td><?php
@@ -92,7 +92,7 @@ $numColumns = sizeof($block->getColumns());
                     <tr class="subtotals">
                         <?php $i = 0; foreach ($block->getMultipleRowColumns() as $_column): ?>
                             <td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
-                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
+                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell' : '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
                             >
                                 <?php /* @escapeNotVerified */ echo $_column->hasSubtotalsLabel() ? $_column->getSubtotalsLabel()
                                     : $_column->getRowField($block->getSubTotals($_item));
@@ -108,7 +108,7 @@ $numColumns = sizeof($block->getColumns());
                     <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
                         <?php if ($block->shouldRenderCell($_item, $_column)):?>
                             <td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
-                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
+                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell' : '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
                             >
                                 <?= (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
                             </td>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index f97db4ad993b1..158ee25df2e8b 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -190,7 +190,7 @@ $numColumns = sizeof($block->getColumns());
                                 ?>
                             <td <?= ($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
                                 class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?>
-                                        <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
+                                        <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell' : '' ?>">
                                 <?= (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
                                 </td><?php
                                 if ($block->shouldRenderEmptyCell($_item, $_column)):
@@ -207,7 +207,7 @@ $numColumns = sizeof($block->getColumns());
                                 <?php $i = 0;
                                 foreach ($block->getMultipleRowColumns($_i) as $_column): ?>
                                     <td class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?>
-                                        <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
+                                        <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell' : '' ?>">
                                         <?= (($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
                                     </td>
                                 <?php endforeach; ?>
@@ -220,7 +220,7 @@ $numColumns = sizeof($block->getColumns());
                             <?php $i = 0;
                             foreach ($block->getSubTotalColumns() as $_column): ?>
                                 <td class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?>
-                                           <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
+                                           <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell' : '' ?>">
                                     <?php /* @escapeNotVerified */ echo($_column->hasSubtotalsLabel() ? $_column->getSubtotalsLabel() :
                                         $_column->getRowField($block->getSubTotalItem($_item))
                                     );
@@ -262,7 +262,7 @@ $numColumns = sizeof($block->getColumns());
     <?php endif; ?>
 
     require(deps, function(<?= ($block->getDependencyJsObject() ? 'registry' : '') ?>){
-        <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
+        <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed?>
 
         //<![CDATA[
     <?php if ($block->getDependencyJsObject()): ?>
diff --git a/app/code/Magento/Backup/Model/ResourceModel/Helper.php b/app/code/Magento/Backup/Model/ResourceModel/Helper.php
index 6d7084a87546c..1af9561e471f6 100644
--- a/app/code/Magento/Backup/Model/ResourceModel/Helper.php
+++ b/app/code/Magento/Backup/Model/ResourceModel/Helper.php
@@ -349,7 +349,7 @@ public function restoreTransactionIsolationLevel()
     public function getTableTriggersSql($tableName, $addDropIfExists = false, $stripDefiner = true)
     {
         $script = "--\n-- Triggers structure for table `{$tableName}`\n--\n";
-        $triggers = $this->getConnection()->query('SHOW TRIGGERS LIKE \''. $tableName . '\'')->fetchAll();
+        $triggers = $this->getConnection()->query('SHOW TRIGGERS LIKE \'' . $tableName . '\'')->fetchAll();
 
         if (!$triggers) {
             return '';
@@ -360,7 +360,7 @@ public function getTableTriggersSql($tableName, $addDropIfExists = false, $strip
             }
             $script .= "delimiter ;;\n";
 
-            $triggerData = $this->getConnection()->query('SHOW CREATE TRIGGER '. $trigger['Trigger'])->fetch();
+            $triggerData = $this->getConnection()->query('SHOW CREATE TRIGGER ' . $trigger['Trigger'])->fetch();
             if ($stripDefiner) {
                 $cleanedScript = preg_replace('/DEFINER=[^\s]*/', '', $triggerData['SQL Original Statement']);
                 $script .= $cleanedScript . "\n";
diff --git a/app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/DownloadTest.php b/app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/DownloadTest.php
index 8715d0046c1f2..02df464c6d1c5 100644
--- a/app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/DownloadTest.php
+++ b/app/code/Magento/Backup/Test/Unit/Controller/Adminhtml/Index/DownloadTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Backup\Test\Unit\Controller\Adminhtml\Index;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * @covers \Magento\Backup\Controller\Adminhtml\Index\Download
diff --git a/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php b/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php
index b7dfb30c0a1b3..a735680d44077 100644
--- a/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php
+++ b/app/code/Magento/Backup/Test/Unit/Cron/SystemBackupTest.php
@@ -126,7 +126,7 @@ public function testExecuteThrowsException()
 
         $this->backupFactoryMock->expects($this->once())->method('create')->willReturn($this->backupDbMock);
 
-        $this->backupDbMock->expects($this->once())->method('create')->willThrowException(new \Exception);
+        $this->backupDbMock->expects($this->once())->method('create')->willThrowException(new \Exception());
 
         $this->backupDataMock->expects($this->never())->method('getCreateSuccessMessageByType')->with($type);
         $this->loggerMock->expects($this->never())->method('info');
diff --git a/app/code/Magento/Backup/Test/Unit/Model/BackupTest.php b/app/code/Magento/Backup/Test/Unit/Model/BackupTest.php
index c43456ce76de5..a79d74ab365c9 100644
--- a/app/code/Magento/Backup/Test/Unit/Model/BackupTest.php
+++ b/app/code/Magento/Backup/Test/Unit/Model/BackupTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Backup\Test\Unit\Model;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * @covers \Magento\Backup\Model\Backup
diff --git a/app/code/Magento/Braintree/Block/Customer/CardRenderer.php b/app/code/Magento/Braintree/Block/Customer/CardRenderer.php
index 55ba049f72297..7534bcc24b997 100644
--- a/app/code/Magento/Braintree/Block/Customer/CardRenderer.php
+++ b/app/code/Magento/Braintree/Block/Customer/CardRenderer.php
@@ -6,7 +6,6 @@
 namespace Magento\Braintree\Block\Customer;
 
 use Magento\Braintree\Model\Ui\ConfigProvider;
-use Magento\Framework\View\Element\Template;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Block\AbstractCardRenderer;
 
diff --git a/app/code/Magento/Braintree/Controller/Paypal/AbstractAction.php b/app/code/Magento/Braintree/Controller/Paypal/AbstractAction.php
index d6a81eefc6fdb..b4ca63934fb98 100644
--- a/app/code/Magento/Braintree/Controller/Paypal/AbstractAction.php
+++ b/app/code/Magento/Braintree/Controller/Paypal/AbstractAction.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Braintree\Controller\Paypal;
 
+use Magento\Braintree\Gateway\Config\PayPal\Config;
 use Magento\Checkout\Model\Session;
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
-use Magento\Quote\Api\Data\CartInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Redirect;
-use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Quote\Api\Data\CartInterface;
 
 /**
  * Abstract class AbstractAction
diff --git a/app/code/Magento/Braintree/Controller/Paypal/Review.php b/app/code/Magento/Braintree/Controller/Paypal/Review.php
index 4576e3b033df8..5eace0b736534 100644
--- a/app/code/Magento/Braintree/Controller/Paypal/Review.php
+++ b/app/code/Magento/Braintree/Controller/Paypal/Review.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Braintree\Controller\Paypal;
 
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
 use Magento\Checkout\Model\Session;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\Braintree\Gateway\Config\PayPal\Config;
-use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
 use Magento\Framework\Exception\LocalizedException;
 
 /**
diff --git a/app/code/Magento/Braintree/Controller/Paypal/SaveShippingMethod.php b/app/code/Magento/Braintree/Controller/Paypal/SaveShippingMethod.php
index 5dd19d7acf7ae..fd42fa18782ef 100644
--- a/app/code/Magento/Braintree/Controller/Paypal/SaveShippingMethod.php
+++ b/app/code/Magento/Braintree/Controller/Paypal/SaveShippingMethod.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Braintree\Controller\Paypal;
 
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Paypal\Helper\ShippingMethodUpdater;
 use Magento\Checkout\Model\Session;
-use Magento\Framework\View\Result\Page;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\Braintree\Gateway\Config\PayPal\Config;
-use Magento\Braintree\Model\Paypal\Helper\ShippingMethodUpdater;
+use Magento\Framework\View\Result\Page;
 
 /**
  * Class SaveShippingMethod
diff --git a/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php b/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php
index c8359f69bc47d..933788a29f679 100644
--- a/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php
+++ b/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php
@@ -14,11 +14,11 @@
 use Magento\Payment\Gateway\Command\CommandPoolInterface;
 use Magento\Payment\Gateway\CommandInterface;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Payment\Gateway\Helper\ContextHelper;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Api\Data\TransactionInterface;
 use Magento\Sales\Api\TransactionRepositoryInterface;
-use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 
 /**
  * Class CaptureStrategyCommand
diff --git a/app/code/Magento/Braintree/Gateway/Http/TransferFactory.php b/app/code/Magento/Braintree/Gateway/Http/TransferFactory.php
index c6e4601c59d04..bbce84655e603 100644
--- a/app/code/Magento/Braintree/Gateway/Http/TransferFactory.php
+++ b/app/code/Magento/Braintree/Gateway/Http/TransferFactory.php
@@ -8,7 +8,6 @@
 use Magento\Payment\Gateway\Http\TransferBuilder;
 use Magento\Payment\Gateway\Http\TransferFactoryInterface;
 use Magento\Payment\Gateway\Http\TransferInterface;
-use Magento\Payment\Gateway\ConfigInterface;
 
 class TransferFactory implements TransferFactoryInterface
 {
diff --git a/app/code/Magento/Braintree/Gateway/Request/AddressDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/AddressDataBuilder.php
index f7d3aae823e56..b964eb0681b1a 100644
--- a/app/code/Magento/Braintree/Gateway/Request/AddressDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/AddressDataBuilder.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Gateway\Request;
 
-use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Request\BuilderInterface;
 
 /**
  * Class AddressDataBuilder
diff --git a/app/code/Magento/Braintree/Gateway/Request/CaptureDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/CaptureDataBuilder.php
index 6f3a262d7efb4..95d4fcfa94fe7 100644
--- a/app/code/Magento/Braintree/Gateway/Request/CaptureDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/CaptureDataBuilder.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Gateway\Request;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Payment\Helper\Formatter;
 
diff --git a/app/code/Magento/Braintree/Gateway/Request/CustomerDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/CustomerDataBuilder.php
index 6b3403bcd15c1..6617ed7872ba4 100644
--- a/app/code/Magento/Braintree/Gateway/Request/CustomerDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/CustomerDataBuilder.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Gateway\Request;
 
-use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Request\BuilderInterface;
 
 /**
  * Class CustomerDataBuilder
diff --git a/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php
index aac603bfb621a..9792153c35cb2 100644
--- a/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Braintree\Gateway\Request;
 
+use Magento\Braintree\Gateway\Config\Config;
 use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Request\BuilderInterface;
-use Magento\Braintree\Gateway\Config\Config;
 
 /**
  * Class DescriptorDataBuilder
diff --git a/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
index 85a0c64451398..580f0e3c26562 100644
--- a/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
@@ -6,8 +6,8 @@
 namespace Magento\Braintree\Gateway\Request;
 
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Payment\Helper\Formatter;
 
diff --git a/app/code/Magento/Braintree/Gateway/Request/StoreConfigBuilder.php b/app/code/Magento/Braintree/Gateway/Request/StoreConfigBuilder.php
index 014df33690fa0..093531e2f4ba6 100644
--- a/app/code/Magento/Braintree/Gateway/Request/StoreConfigBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/StoreConfigBuilder.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Gateway\Request;
 
-use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Request\BuilderInterface;
 
 /**
  * This builder is used for correct store resolving and used only to retrieve correct store ID.
diff --git a/app/code/Magento/Braintree/Gateway/Request/ThreeDSecureDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/ThreeDSecureDataBuilder.php
index 520aa58457753..31f7826613253 100644
--- a/app/code/Magento/Braintree/Gateway/Request/ThreeDSecureDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/ThreeDSecureDataBuilder.php
@@ -6,8 +6,8 @@
 namespace Magento\Braintree\Gateway\Request;
 
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Payment\Helper\Formatter;
 
diff --git a/app/code/Magento/Braintree/Gateway/Response/PayPalDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/PayPalDetailsHandler.php
index 97bb312af4bd4..614b12807595c 100644
--- a/app/code/Magento/Braintree/Gateway/Response/PayPalDetailsHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/PayPalDetailsHandler.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Gateway\Response;
 
-use Magento\Payment\Gateway\Response\HandlerInterface;
 use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Response\HandlerInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 
 /**
diff --git a/app/code/Magento/Braintree/Gateway/Response/PaymentDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/PaymentDetailsHandler.php
index 6e509fae35fec..7329755344a34 100644
--- a/app/code/Magento/Braintree/Gateway/Response/PaymentDetailsHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/PaymentDetailsHandler.php
@@ -5,10 +5,8 @@
  */
 namespace Magento\Braintree\Gateway\Response;
 
-use Braintree\Transaction;
-use Magento\Braintree\Observer\DataAssignObserver;
-use Magento\Payment\Gateway\Helper\ContextHelper;
 use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Payment\Gateway\Response\HandlerInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 
diff --git a/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php b/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php
index d4976ff18e0ee..72d8a31d66bde 100644
--- a/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Gateway\Response;
 
-use Magento\Payment\Gateway\Helper\ContextHelper;
 use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Helper\ContextHelper;
 use Magento\Payment\Gateway\Response\HandlerInterface;
 
 /**
diff --git a/app/code/Magento/Braintree/Gateway/Response/ThreeDSecureDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/ThreeDSecureDetailsHandler.php
index 8d61660f03ce5..780ba4e965135 100644
--- a/app/code/Magento/Braintree/Gateway/Response/ThreeDSecureDetailsHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/ThreeDSecureDetailsHandler.php
@@ -6,8 +6,8 @@
 namespace Magento\Braintree\Gateway\Response;
 
 use Braintree\Transaction;
-use Magento\Payment\Gateway\Helper\ContextHelper;
 use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Helper\ContextHelper;
 use Magento\Payment\Gateway\Response\HandlerInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 
diff --git a/app/code/Magento/Braintree/Gateway/Validator/GeneralResponseValidator.php b/app/code/Magento/Braintree/Gateway/Validator/GeneralResponseValidator.php
index 7bafa35e13185..a6d3e6a7e1d85 100644
--- a/app/code/Magento/Braintree/Gateway/Validator/GeneralResponseValidator.php
+++ b/app/code/Magento/Braintree/Gateway/Validator/GeneralResponseValidator.php
@@ -7,8 +7,8 @@
 
 use Braintree\Result\Error;
 use Braintree\Result\Successful;
-use Magento\Payment\Gateway\Validator\AbstractValidator;
 use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Validator\AbstractValidator;
 use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
 
 class GeneralResponseValidator extends AbstractValidator
diff --git a/app/code/Magento/Braintree/Gateway/Validator/ResponseValidator.php b/app/code/Magento/Braintree/Gateway/Validator/ResponseValidator.php
index 70e94125f2b96..97a19de751803 100644
--- a/app/code/Magento/Braintree/Gateway/Validator/ResponseValidator.php
+++ b/app/code/Magento/Braintree/Gateway/Validator/ResponseValidator.php
@@ -5,10 +5,8 @@
  */
 namespace Magento\Braintree\Gateway\Validator;
 
-use Braintree\Result\Error;
 use Braintree\Result\Successful;
 use Braintree\Transaction;
-use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
 
 /**
  * Class ResponseValidator
diff --git a/app/code/Magento/Braintree/Helper/Country.php b/app/code/Magento/Braintree/Helper/Country.php
index 18a1a303d649e..4f8a510a7b16a 100644
--- a/app/code/Magento/Braintree/Helper/Country.php
+++ b/app/code/Magento/Braintree/Helper/Country.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Helper;
 
-use Magento\Directory\Model\ResourceModel\Country\CollectionFactory;
 use Magento\Braintree\Model\Adminhtml\System\Config\Country as CountryConfig;
+use Magento\Directory\Model\ResourceModel\Country\CollectionFactory;
 
 /**
  * Class Country
diff --git a/app/code/Magento/Braintree/Model/Adapter/BraintreeSearchAdapter.php b/app/code/Magento/Braintree/Model/Adapter/BraintreeSearchAdapter.php
index 167ff13a06fe8..65012f94c11bb 100644
--- a/app/code/Magento/Braintree/Model/Adapter/BraintreeSearchAdapter.php
+++ b/app/code/Magento/Braintree/Model/Adapter/BraintreeSearchAdapter.php
@@ -8,7 +8,6 @@
 use Braintree\MultipleValueNode;
 use Braintree\RangeNode;
 use Braintree\TextNode;
-use Braintree\Transaction;
 use Braintree\TransactionSearch;
 
 /**
diff --git a/app/code/Magento/Braintree/Model/LocaleResolver.php b/app/code/Magento/Braintree/Model/LocaleResolver.php
index cebd90dffc70e..ca8246910db3c 100644
--- a/app/code/Magento/Braintree/Model/LocaleResolver.php
+++ b/app/code/Magento/Braintree/Model/LocaleResolver.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Model;
 
-use Magento\Framework\Locale\ResolverInterface;
 use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Framework\Locale\ResolverInterface;
 
 class LocaleResolver implements ResolverInterface
 {
diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php b/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
index b833798eabf90..0f75a382318ab 100644
--- a/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
+++ b/app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Braintree\Model\Paypal\Helper;
 
-use Magento\Quote\Model\Quote;
+use Magento\Checkout\Api\AgreementsValidatorInterface;
 use Magento\Checkout\Helper\Data;
+use Magento\Checkout\Model\Type\Onepage;
 use Magento\Customer\Model\Group;
 use Magento\Customer\Model\Session;
-use Magento\Checkout\Model\Type\Onepage;
-use Magento\Quote\Api\CartManagementInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Checkout\Api\AgreementsValidatorInterface;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Model\Quote;
 
 /**
  * Class OrderPlace
diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php b/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
index fe5895541543d..849f94ebd2fd5 100644
--- a/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
+++ b/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
@@ -5,14 +5,13 @@
  */
 namespace Magento\Braintree\Model\Paypal\Helper;
 
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\Quote\Address;
-use Magento\Quote\Model\Quote\Payment;
-use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Braintree\Gateway\Config\PayPal\Config;
 use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Braintree\Observer\DataAssignObserver;
-use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
 
 /**
  * Class QuoteUpdater
diff --git a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
index e06b913db8ef4..93ae17bf41836 100644
--- a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
@@ -47,6 +47,8 @@ public function __construct(Config $config, ResolverInterface $resolver)
      */
     public function getConfig()
     {
+        $paymentAcceptanceMarkSrc = 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png';
+
         return [
             'payment' => [
                 self::PAYPAL_CODE => [
@@ -55,8 +57,7 @@ public function getConfig()
                     'isAllowShippingAddressOverride' => $this->config->isAllowToEditShippingAddress(),
                     'merchantName' => $this->config->getMerchantName(),
                     'locale' => $this->resolver->getLocale(),
-                    'paymentAcceptanceMarkSrc' =>
-                        'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png',
+                    'paymentAcceptanceMarkSrc' => $paymentAcceptanceMarkSrc,
                     'vaultCode' => self::PAYPAL_VAULT_CODE,
                     'skipOrderReview' => $this->config->isSkipOrderReview(),
                     'paymentIcon' => $this->config->getPayPalIcon(),
diff --git a/app/code/Magento/Braintree/Model/Ui/TokenUiComponentProvider.php b/app/code/Magento/Braintree/Model/Ui/TokenUiComponentProvider.php
index da2b2225e19d4..90e37a485771b 100644
--- a/app/code/Magento/Braintree/Model/Ui/TokenUiComponentProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/TokenUiComponentProvider.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Braintree\Model\Ui;
 
+use Magento\Framework\UrlInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Model\Ui\TokenUiComponentInterface;
-use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
 use Magento\Vault\Model\Ui\TokenUiComponentInterfaceFactory;
-use Magento\Framework\UrlInterface;
+use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
 
 /**
  * Class TokenUiComponentProvider
diff --git a/app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php b/app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php
index 132f4b92a3e2d..439c4c840d509 100644
--- a/app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php
+++ b/app/code/Magento/Braintree/Observer/AddPaypalShortcuts.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Observer;
 
-use Magento\Framework\Event\Observer;
 use Magento\Catalog\Block\ShortcutButtons;
+use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 
 /**
diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Payment/GetNonceTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Payment/GetNonceTest.php
index 723897491da63..8f36c11c6ca4e 100644
--- a/app/code/Magento/Braintree/Test/Unit/Controller/Payment/GetNonceTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Controller/Payment/GetNonceTest.php
@@ -15,8 +15,8 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Webapi\Exception;
 use Magento\Payment\Gateway\Command\ResultInterface as CommandResultInterface;
-use Psr\Log\LoggerInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class GetNonceTest
diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php
index cb911a8396b36..113906afbd04d 100644
--- a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/ReviewTest.php
@@ -5,20 +5,20 @@
  */
 namespace Magento\Braintree\Test\Unit\Controller\Paypal;
 
-use Magento\Quote\Model\Quote;
-use Magento\Framework\View\Layout;
+use Magento\Braintree\Block\Paypal\Checkout\Review as CheckoutReview;
+use Magento\Braintree\Controller\Paypal\Review;
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
 use Magento\Checkout\Model\Session;
-use Magento\Framework\View\Result\Page;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Message\ManagerInterface;
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\View\Element\AbstractBlock;
-use Magento\Braintree\Controller\Paypal\Review;
-use Magento\Braintree\Gateway\Config\PayPal\Config;
-use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
-use Magento\Braintree\Block\Paypal\Checkout\Review as CheckoutReview;
+use Magento\Framework\View\Layout;
+use Magento\Framework\View\Result\Page;
+use Magento\Quote\Model\Quote;
 
 /**
  * Class ReviewTest
diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/SaveShippingMethodTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/SaveShippingMethodTest.php
index 5be5df0e33c49..8542b0eace7fa 100644
--- a/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/SaveShippingMethodTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Controller/Paypal/SaveShippingMethodTest.php
@@ -5,21 +5,21 @@
  */
 namespace Magento\Braintree\Test\Unit\Controller\Paypal;
 
-use Magento\Quote\Model\Quote;
-use Magento\Framework\View\Layout;
+use Magento\Braintree\Block\Paypal\Checkout\Review;
+use Magento\Braintree\Controller\Paypal\SaveShippingMethod;
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Paypal\Helper\ShippingMethodUpdater;
 use Magento\Checkout\Model\Session;
-use Magento\Framework\UrlInterface;
-use Magento\Framework\View\Result\Page;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Message\ManagerInterface;
-use Magento\Framework\App\Response\RedirectInterface;
-use Magento\Braintree\Block\Paypal\Checkout\Review;
-use Magento\Braintree\Gateway\Config\PayPal\Config;
-use Magento\Braintree\Controller\Paypal\SaveShippingMethod;
-use Magento\Braintree\Model\Paypal\Helper\ShippingMethodUpdater;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Layout;
+use Magento\Framework\View\Result\Page;
+use Magento\Quote\Model\Quote;
 
 /**
  * Class SaveShippingMethodTest
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
index 52e17c4ff5d55..6791b656f16fe 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
@@ -20,7 +20,6 @@
 use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Sales\Api\TransactionRepositoryInterface;
 use Magento\Sales\Model\Order\Payment;
-use Magento\Sales\Model\ResourceModel\Order\Payment\Transaction\CollectionFactory;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionSaleTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionSaleTest.php
index 48889f1efd2e5..6908ca2981d8d 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionSaleTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionSaleTest.php
@@ -133,7 +133,7 @@ private function getTransferObjectMock()
      */
     private function getResponseObject()
     {
-        $obj = new \stdClass;
+        $obj = new \stdClass();
         $obj->success = true;
 
         return $obj;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/AddressDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
index 702b3254e3085..60fbcdd234b01 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\AddressDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\AddressAdapterInterface;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CaptureDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CaptureDataBuilderTest.php
index b42b1162b3d70..cf410fbad32a6 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CaptureDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CaptureDataBuilderTest.php
@@ -6,9 +6,9 @@
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
 use Magento\Braintree\Gateway\Request\CaptureDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Model\Order\Payment;
-use Magento\Braintree\Gateway\SubjectReader;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CustomerDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CustomerDataBuilderTest.php
index 9b5cee30940df..692195d9417d7 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CustomerDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CustomerDataBuilderTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\CustomerDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\AddressAdapterInterface;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/DescriptorDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/DescriptorDataBuilderTest.php
index eda9121236045..639152e493468 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/DescriptorDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/DescriptorDataBuilderTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\DescriptorDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/KountPaymentDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/KountPaymentDataBuilderTest.php
index 3737089ed175e..ab40529cae2c2 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/KountPaymentDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/KountPaymentDataBuilderTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
-use Magento\Payment\Gateway\Data\OrderAdapterInterface;
-use Magento\Sales\Model\Order\Payment;
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Observer\DataAssignObserver;
-use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Braintree\Gateway\Request\KountPaymentDataBuilder;
 use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Braintree\Observer\DataAssignObserver;
+use Magento\Payment\Gateway\Data\OrderAdapterInterface;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use Magento\Sales\Model\Order\Payment;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/DeviceDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/DeviceDataBuilderTest.php
index b363f2bcac673..37084683406b4 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/DeviceDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/DeviceDataBuilderTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request\PayPal;
 
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\PayPal\DeviceDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Payment\Model\InfoInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
@@ -35,7 +35,7 @@ protected function setUp()
     {
         $this->paymentDO = $this->createMock(PaymentDataObjectInterface::class);
         $this->paymentInfo = $this->createMock(InfoInterface::class);
-        
+
         $this->builder = new DeviceDataBuilder(new SubjectReader());
     }
 
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/VaultDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/VaultDataBuilderTest.php
index 10a96734b849a..69fbe2e84ec7c 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/VaultDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/VaultDataBuilderTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request\PayPal;
 
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\PayPal\VaultDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Vault\Model\Ui\VaultConfigProvider;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
index 16f11559f73cc..130f996eba612 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/RefundDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/RefundDataBuilderTest.php
index ff4b2f4545fa6..557633f0b1c41 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/RefundDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/RefundDataBuilderTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
 use Magento\Braintree\Gateway\Request\RefundDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Api\Data\TransactionInterface;
 use Magento\Sales\Model\Order\Payment;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/ThreeDSecureDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/ThreeDSecureDataBuilderTest.php
index e2bcc2c3b3967..2f218b886465b 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/ThreeDSecureDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/ThreeDSecureDataBuilderTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\ThreeDSecureDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\Order\AddressAdapter;
 use Magento\Payment\Gateway\Data\Order\OrderAdapter;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
index 5af050002eb2d..52dcaebd10ba4 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Api\Data\OrderPaymentExtension;
 use Magento\Sales\Model\Order\Payment;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/CardDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/CardDetailsHandlerTest.php
index 525b474040ea4..da8c7cc85ee50 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/CardDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/CardDetailsHandlerTest.php
@@ -5,13 +5,12 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Response;
 
-use Braintree\Result\Successful;
 use Braintree\Transaction;
+use Magento\Braintree\Gateway\Config\Config;
 use Magento\Braintree\Gateway\Response\CardDetailsHandler;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Sales\Model\Order\Payment;
-use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\SubjectReader;
 
 /**
  * Class CardDetailsHandlerTest
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php
index 0a3a9f2918a21..85bd1bd6b87f1 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php
@@ -7,8 +7,8 @@
 
 use Braintree\Transaction;
 use Braintree\Transaction\PayPalDetails;
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Framework\Intl\DateTimeFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
@@ -16,7 +16,6 @@
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
-use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory;
 use Magento\Vault\Model\AccountPaymentTokenFactory;
 use Magento\Vault\Model\PaymentToken;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
@@ -122,7 +121,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        
+
         $this->handler = new VaultDetailsHandler(
             $this->paymentTokenFactory,
             $this->paymentExtensionFactory,
@@ -153,7 +152,7 @@ public function testHandle()
             ->method('readTransaction')
             ->with($response)
             ->willReturn($transaction);
-        
+
         $this->paymentDataObject->expects(static::once())
             ->method('getPayment')
             ->willReturn($this->paymentInfo);
@@ -171,7 +170,7 @@ public function testHandle()
         $this->dateTimeFactory->expects(static::once())
             ->method('create')
             ->willReturn($dateTime);
-        
+
         $this->handler->handle($this->subject, $response);
 
         $extensionAttributes = $this->paymentInfo->getExtensionAttributes();
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPalDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPalDetailsHandlerTest.php
index 341135b6c03d0..2c509f42b24a9 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPalDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPalDetailsHandlerTest.php
@@ -7,10 +7,10 @@
 
 use Braintree\Transaction;
 use Magento\Braintree\Gateway\Response\PayPalDetailsHandler;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
-use Magento\Braintree\Gateway\SubjectReader;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PaymentDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PaymentDetailsHandlerTest.php
index f941b8d7245d1..d6b53ee4a3f1a 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PaymentDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PaymentDetailsHandlerTest.php
@@ -7,10 +7,10 @@
 
 use Braintree\Transaction;
 use Magento\Braintree\Gateway\Response\PaymentDetailsHandler;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
-use Magento\Braintree\Gateway\SubjectReader;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php
index 374925b7339c0..3c70e6f5e79ec 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Braintree\Test\Unit\Gateway\Response;
 
 use Braintree\Transaction;
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Response\RiskDataHandler;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Model\Order\Payment;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/ThreeDSecureDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/ThreeDSecureDetailsHandlerTest.php
index 6cffc00a89c41..13bb49efc91f1 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/ThreeDSecureDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/ThreeDSecureDetailsHandlerTest.php
@@ -7,10 +7,10 @@
 
 use Braintree\Transaction;
 use Magento\Braintree\Gateway\Response\ThreeDSecureDetailsHandler;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
-use Magento\Braintree\Gateway\SubjectReader;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
@@ -18,7 +18,6 @@
  */
 class ThreeDSecureDetailsHandlerTest extends \PHPUnit\Framework\TestCase
 {
-
     const TRANSACTION_ID = '432er5ww3e';
 
     /**
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/TransactionIdHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/TransactionIdHandlerTest.php
index 6cbca707242f1..bf32bf13097d5 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/TransactionIdHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/TransactionIdHandlerTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Response;
 
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Response\TransactionIdHandler;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Model\Order\Payment;
 
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
index 568593273c58c..68b8607f211cd 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
@@ -8,9 +8,8 @@
 use Braintree\Transaction;
 use Braintree\Transaction\CreditCardDetails;
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Response\VaultDetailsHandler;
-use Magento\Framework\DataObject;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VoidHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VoidHandlerTest.php
index a541b0115fe63..6ea5fb01fa1a6 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VoidHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VoidHandlerTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Response;
 
-use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Response\VoidHandler;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Model\Order\Payment;
 
diff --git a/app/code/Magento/Braintree/Test/Unit/Helper/CountryTest.php b/app/code/Magento/Braintree/Test/Unit/Helper/CountryTest.php
index 692eae643dc29..5eee2cf4b77da 100644
--- a/app/code/Magento/Braintree/Test/Unit/Helper/CountryTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Helper/CountryTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Braintree\Test\Unit\Helper;
 
 use Magento\Braintree\Helper\Country;
-use Magento\Directory\Model\ResourceModel\Country\CollectionFactory;
 use Magento\Directory\Model\ResourceModel\Country\Collection;
+use Magento\Directory\Model\ResourceModel\Country\CollectionFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
index 39863e6561c43..578e172c20335 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Braintree\Test\Unit\Model\Paypal\Helper;
 
+use Magento\Braintree\Gateway\Config\PayPal\Config;
+use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
+use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
+use Magento\Braintree\Observer\DataAssignObserver;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Payment;
-use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Braintree\Model\Ui\PayPal\ConfigProvider;
-use Magento\Braintree\Observer\DataAssignObserver;
-use Magento\Braintree\Gateway\Config\PayPal\Config;
-use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
 
 /**
  * Class QuoteUpdaterTest
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
index c850a34cbdb95..e84af4a9f9f4b 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/ShippingMethodUpdaterTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Braintree\Test\Unit\Model\Paypal\Helper;
 
-use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\Quote\Address;
-use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Braintree\Gateway\Config\PayPal\Config;
 use Magento\Braintree\Model\Paypal\Helper\ShippingMethodUpdater;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
 
 /**
  * Class ShippingMethodUpdaterTest
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionMapTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionMapTest.php
index ee3114ae6da63..13c2793fd8a21 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionMapTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionMapTest.php
@@ -7,13 +7,11 @@
 
 use Braintree\Transaction;
 use Braintree\Transaction\PayPalDetails;
-use DateTime;
 use Magento\Braintree\Model\Report\Row\TransactionMap;
 use Magento\Framework\Api\AttributeValue;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Phrase;
 use Magento\Framework\Phrase\RendererInterface;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class TransactionMapTest
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
index 22f7f46bd98f1..e3b119265e61e 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/ConfigProviderTest.php
@@ -85,6 +85,8 @@ public function testGetConfig($expected)
      */
     public function getConfigDataProvider()
     {
+        $paymentAcceptanceMarkSrc = 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png';
+
         return [
             [
                 'expected' => [
@@ -95,8 +97,7 @@ public function getConfigDataProvider()
                             'isAllowShippingAddressOverride' => true,
                             'merchantName' => 'Test',
                             'locale' => 'en_US',
-                            'paymentAcceptanceMarkSrc' =>
-                                'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png',
+                            'paymentAcceptanceMarkSrc' => $paymentAcceptanceMarkSrc,
                             'vaultCode' => ConfigProvider::PAYPAL_VAULT_CODE,
                             'skipOrderReview' => false,
                             'paymentIcon' => [
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/TokenUiComponentProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/TokenUiComponentProviderTest.php
index 962cd56a7c5ac..555d05a638097 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/TokenUiComponentProviderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/PayPal/TokenUiComponentProviderTest.php
@@ -7,9 +7,9 @@
 
 use Magento\Braintree\Model\Ui\PayPal\TokenUiComponentProvider;
 use Magento\Framework\UrlInterface;
-use Magento\Vault\Model\Ui\TokenUiComponentInterfaceFactory;
-use Magento\Vault\Model\Ui\TokenUiComponentInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Model\Ui\TokenUiComponentInterface;
+use Magento\Vault\Model\Ui\TokenUiComponentInterfaceFactory;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
@@ -52,7 +52,7 @@ protected function setUp()
         $this->tokenComponent = $this->getMockForAbstractClass(TokenUiComponentInterface::class);
 
         $this->urlBuilder = $this->getMockForAbstractClass(UrlInterface::class);
-        
+
         $this->paymentToken = $this->getMockForAbstractClass(PaymentTokenInterface::class);
 
         $this->componentProvider = new TokenUiComponentProvider(
@@ -78,11 +78,11 @@ public function testGetComponentForToken()
         $this->componentFactory->expects(static::once())
             ->method('create')
             ->willReturn($this->tokenComponent);
-        
+
         $this->paymentToken->expects(static::once())
             ->method('getPublicHash')
             ->willReturn($hash);
-        
+
         $this->urlBuilder->expects(static::once())
             ->method('getUrl');
 
diff --git a/app/code/Magento/Braintree/Test/Unit/Observer/AddPaypalShortcutsTest.php b/app/code/Magento/Braintree/Test/Unit/Observer/AddPaypalShortcutsTest.php
index 377b4d3c650ae..620790328c141 100644
--- a/app/code/Magento/Braintree/Test/Unit/Observer/AddPaypalShortcutsTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Observer/AddPaypalShortcutsTest.php
@@ -6,10 +6,10 @@
 namespace Magento\Braintree\Test\Unit\Observer;
 
 use Magento\Braintree\Block\Paypal\Button;
+use Magento\Braintree\Observer\AddPaypalShortcuts;
 use Magento\Catalog\Block\ShortcutButtons;
 use Magento\Framework\Event;
 use Magento\Framework\Event\Observer;
-use Magento\Braintree\Observer\AddPaypalShortcuts;
 use Magento\Framework\View\LayoutInterface;
 
 /**
diff --git a/app/code/Magento/Braintree/Test/Unit/Observer/DataAssignObserverTest.php b/app/code/Magento/Braintree/Test/Unit/Observer/DataAssignObserverTest.php
index d4c7a3e19656e..106a766922c55 100644
--- a/app/code/Magento/Braintree/Test/Unit/Observer/DataAssignObserverTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Observer/DataAssignObserverTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Braintree\Test\Unit\Observer;
 
+use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Framework\DataObject;
 use Magento\Framework\Event;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
-use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Quote\Api\Data\PaymentInterface;
 
 /**
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
index 13249cd8e0e80..c198cf269f183 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
@@ -24,7 +24,7 @@ $ccType = $block->getInfoData('cc_type');
                     class="required-entry select admin__control-select validate-cc-type-select">
                 <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
                     <option value="<?= $block->escapeHtml($typeCode) ?>"
-                        <?php if($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
+                        <?php if ($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
                         <?= $block->escapeHtml($typeName) ?>
                     </option>
                 <?php endforeach; ?>
@@ -61,7 +61,7 @@ $ccType = $block->getInfoData('cc_type');
             </div>
         </div>
     </div>
-    <?php if($block->hasVerification()): ?>
+    <?php if ($block->hasVerification()): ?>
         <div class="admin__field _required">
             <label class="label admin__field-label">
                 <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
@@ -77,7 +77,7 @@ $ccType = $block->getInfoData('cc_type');
         </div>
     <?php endif; ?>
 
-    <?php if($block->isVaultEnabled()): ?>
+    <?php if ($block->isVaultEnabled()): ?>
         <div class="field-tooltip-content">
             <input type="checkbox"
                    id="<?= /* @noEscape */ $code ?>_vault"
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml
index 22a0f8d8c987d..2e28fd8a50e3a 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml
@@ -1,5 +1,6 @@
 <?php
 use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml
index 77d08dbc5273c..fb834c1a7b198 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml
@@ -1,5 +1,6 @@
 <?php
 use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
diff --git a/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php b/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
index 7f21d9e69c6e0..5a6e85e3a8c8d 100644
--- a/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
+++ b/app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Bundle\Controller\Adminhtml\Product\Initialization\Helper\Plugin;
 
-use Magento\Bundle\Api\Data\OptionInterfaceFactory as OptionFactory;
 use Magento\Bundle\Api\Data\LinkInterfaceFactory as LinkFactory;
+use Magento\Bundle\Api\Data\OptionInterfaceFactory as OptionFactory;
 use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface as ProductRepository;
-use Magento\Store\Model\StoreManagerInterface as StoreManager;
 use Magento\Framework\App\RequestInterface;
+use Magento\Store\Model\StoreManagerInterface as StoreManager;
 
 /**
  * Class Bundle
diff --git a/app/code/Magento/Bundle/Model/BundleOption.php b/app/code/Magento/Bundle/Model/BundleOption.php
index dda5963a51be4..4ed8ad9323b4a 100644
--- a/app/code/Magento/Bundle/Model/BundleOption.php
+++ b/app/code/Magento/Bundle/Model/BundleOption.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Bundle\Model;
 
-use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Bundle\Api\Data\BundleOptionInterface;
+use Magento\Framework\Model\AbstractExtensibleModel;
 
 class BundleOption extends AbstractExtensibleModel implements BundleOptionInterface
 {
diff --git a/app/code/Magento/Bundle/Model/CartItemProcessor.php b/app/code/Magento/Bundle/Model/CartItemProcessor.php
index dc51f3e3969b4..2e7bab5c75117 100644
--- a/app/code/Magento/Bundle/Model/CartItemProcessor.php
+++ b/app/code/Magento/Bundle/Model/CartItemProcessor.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Bundle\Model;
 
-use Magento\Quote\Model\Quote\Item\CartItemProcessorInterface;
-use Magento\Quote\Api\Data\CartItemInterface;
 use Magento\Bundle\Api\Data\BundleOptionInterfaceFactory;
 use Magento\Quote\Api\Data as QuoteApi;
+use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Quote\Model\Quote\Item\CartItemProcessorInterface;
 
 class CartItemProcessor implements CartItemProcessorInterface
 {
diff --git a/app/code/Magento/Bundle/Model/LinkManagement.php b/app/code/Magento/Bundle/Model/LinkManagement.php
index 1a533f5d24990..1cb0c92799469 100644
--- a/app/code/Magento/Bundle/Model/LinkManagement.php
+++ b/app/code/Magento/Bundle/Model/LinkManagement.php
@@ -9,9 +9,9 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Bundle/Model/Plugin/QuoteItem.php b/app/code/Magento/Bundle/Model/Plugin/QuoteItem.php
index e3cf50189e65b..baca388506eea 100644
--- a/app/code/Magento/Bundle/Model/Plugin/QuoteItem.php
+++ b/app/code/Magento/Bundle/Model/Plugin/QuoteItem.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Bundle\Model\Plugin;
 
+use Magento\Quote\Model\Quote\Item\AbstractItem;
 use Magento\Quote\Model\Quote\Item\ToOrderItem;
 use Magento\Sales\Api\Data\OrderItemInterface;
-use Magento\Quote\Model\Quote\Item\AbstractItem;
 
 /**
  * Plugin for Magento\Quote\Model\Quote\Item\ToOrderItem
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index 00b6b2d7a3f5a..b41b3d44cf764 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Bundle\Model\Product;
 
+use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
 use Magento\Customer\Api\GroupManagementInterface;
-use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
  * @api
diff --git a/app/code/Magento/Bundle/Model/Product/SaveHandler.php b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
index de11df62cbb05..8dcc21a1e7190 100644
--- a/app/code/Magento/Bundle/Model/Product/SaveHandler.php
+++ b/app/code/Magento/Bundle/Model/Product/SaveHandler.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Bundle\Model\Product;
 
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Bundle\Api\ProductOptionRepositoryInterface as OptionRepository;
 use Magento\Bundle\Api\ProductLinkManagementInterface;
+use Magento\Bundle\Api\ProductOptionRepositoryInterface as OptionRepository;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index bd261d287273e..6193f4b04ab09 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -8,12 +8,12 @@
 
 namespace Magento\Bundle\Model\Product;
 
-use Magento\Framework\App\ObjectManager;
+use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
 
 /**
  * Bundle Type Model
diff --git a/app/code/Magento/Bundle/Model/ProductOptionProcessor.php b/app/code/Magento/Bundle/Model/ProductOptionProcessor.php
index 43e6d7f55bf34..43a96658bb18c 100644
--- a/app/code/Magento/Bundle/Model/ProductOptionProcessor.php
+++ b/app/code/Magento/Bundle/Model/ProductOptionProcessor.php
@@ -8,7 +8,6 @@
 use Magento\Bundle\Api\Data\BundleOptionInterface;
 use Magento\Bundle\Api\Data\BundleOptionInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductOptionInterface;
-use Magento\Catalog\Model\Product\Type as ProductType;
 use Magento\Catalog\Model\ProductOptionProcessorInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\DataObject\Factory as DataObjectFactory;
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/StockStatusSelectBuilder.php b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/StockStatusSelectBuilder.php
index a4685fc3630a4..97c0a9d93ad9c 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/StockStatusSelectBuilder.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/StockStatusSelectBuilder.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Bundle\Model\ResourceModel\Indexer;
 
-use Magento\Framework\DB\Select;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
+use Magento\Framework\DB\Select;
 
 /**
  * Class StockStatusSelectBuilder
@@ -76,7 +76,7 @@ public function buildSelect(Select $select)
                 []
             )->joinInner(
                 ['cpei' => $this->resourceConnection->getTableName('catalog_product_entity_int')],
-                'cpel.'. $linkField . ' = cpei.' . $linkField
+                'cpel.' . $linkField . ' = cpei.' . $linkField
                 . ' AND cpei.attribute_id = ' . $this->getAttribute('status')->getId()
                 . ' AND cpei.value = ' . ProductStatus::STATUS_ENABLED,
                 []
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Option.php b/app/code/Magento/Bundle/Model/ResourceModel/Option.php
index 46fd8b910f6f1..fb906c149a718 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Option.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Option.php
@@ -6,9 +6,9 @@
 namespace Magento\Bundle\Model\ResourceModel;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * Bundle Option Resource Model
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php b/app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php
index e701b4cf9cc1d..472c6d607b8bd 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php
@@ -98,7 +98,7 @@ public function setProductIdFilter($productId)
         $linkField = $this->getConnection()->getAutoIncrementField($productTable);
         $this->getSelect()->join(
             ['cpe' => $productTable],
-            'cpe.'.$linkField.' = main_table.parent_id',
+            'cpe.' . $linkField . ' = main_table.parent_id',
             []
         )->where(
             "cpe.entity_id = ?",
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Selection.php b/app/code/Magento/Bundle/Model/ResourceModel/Selection.php
index ead687faff7bc..e1df9724e02d0 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Selection.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Selection.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Bundle\Model\ResourceModel;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 
 /**
@@ -141,7 +141,7 @@ public function getParentIdsByChild($childId)
             ''
         )->join(
             ['e' => $this->metadataPool->getMetadata(ProductInterface::class)->getEntityTable()],
-            'e.' . $metadata->getLinkField() . ' = ' .  $this->getMainTable() . '.parent_product_id',
+            'e.' . $metadata->getLinkField() . ' = ' . $this->getMainTable() . '.parent_product_id',
             ['e.entity_id as parent_product_id']
         )->where(
             $this->getMainTable() . '.product_id IN(?)',
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
index 0216812199b50..c0c9a1085e6da 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
@@ -5,12 +5,8 @@
  */
 namespace Magento\Bundle\Model\ResourceModel\Selection;
 
-use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\DB\Select;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Bundle Selections Resource Collection
@@ -240,10 +236,10 @@ public function addPriceFilter($product, $searchMin, $useRegularPrice = false)
             }
             $price = $connection->getCheckSql(
                 $priceType . ' = 1',
-                (float) $product->getPrice() . ' * '. $priceValue . ' / 100',
+                (float) $product->getPrice() . ' * ' . $priceValue . ' / 100',
                 $priceValue
             );
-            $orderByValue = new \Zend_Db_Expr('('. $price. ' * '. 'selection.selection_qty)');
+            $orderByValue = new \Zend_Db_Expr('(' . $price . ' * ' . 'selection.selection_qty)');
         }
 
         $this->getSelect()->reset(Select::ORDER);
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
index 3d7d05396e0fc..f3f90d6c7777d 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Bundle\Model\Sales\Order\Pdf\Items;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
 
 /**
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
index e9a1a8d276a15..7ae6479572906 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Bundle\Model\Sales\Order\Pdf\Items;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
 
 /**
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
index 08ccf0618d03e..e45967021c4c2 100644
--- a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
+++ b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Bundle\Model\Sales\Order\Pdf\Items;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
 
 /**
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
index 9d035aece57bc..fcea6071d73ab 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -11,8 +11,8 @@
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Pricing\Adjustment\Calculator as CalculatorBase;
 use Magento\Framework\Pricing\Amount\AmountFactory;
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Store\Model\Store;
 use Magento\Tax\Api\TaxCalculationInterface;
 use Magento\Tax\Helper\Data as TaxHelper;
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php b/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php
index 56c403ad9960c..b78dd290bc0e0 100644
--- a/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php
+++ b/app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php
@@ -7,9 +7,9 @@
 namespace Magento\Bundle\Pricing\Adjustment;
 
 use Magento\Bundle\Model\Option;
+use Magento\Bundle\Model\Product\Price;
 use Magento\Bundle\Pricing\Price\BundleSelectionFactory;
 use Magento\Catalog\Model\Product;
-use Magento\Bundle\Model\Product\Price;
 
 /**
  * Provide lightweight implementation which uses price index
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php
index 034b735764011..ef8db9764d540 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleRegularPrice.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Bundle\Pricing\Price;
 
+use Magento\Bundle\Model\Product\Price;
 use Magento\Bundle\Pricing\Adjustment\BundleCalculatorInterface;
 use Magento\Catalog\Model\Product;
-use Magento\Framework\Pricing\Amount\AmountInterface;
 use Magento\Catalog\Pricing\Price\CustomOptionPrice;
-use Magento\Bundle\Model\Product\Price;
+use Magento\Framework\Pricing\Amount\AmountInterface;
 
 /**
  * Bundle product regular price model
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
index 71c1b5c5e98cb..f4be1f753cfd4 100644
--- a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
@@ -11,8 +11,8 @@
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Price\AbstractPrice;
+use Magento\Framework\Pricing\SaleableInterface;
 
 /**
  * Bundle option price
diff --git a/app/code/Magento/Bundle/Pricing/Price/DiscountCalculator.php b/app/code/Magento/Bundle/Pricing/Price/DiscountCalculator.php
index 6990149efc373..c11f247fe68ef 100644
--- a/app/code/Magento/Bundle/Pricing/Price/DiscountCalculator.php
+++ b/app/code/Magento/Bundle/Pricing/Price/DiscountCalculator.php
@@ -32,6 +32,6 @@ public function calculateDiscount(Product $product, $value = null)
                 $discount = min($price->getDiscountPercent(), $discount ?: $price->getDiscountPercent());
             }
         }
-        return (null !== $discount) ?  $discount/100 * $value : $value;
+        return (null !== $discount) ? $discount/100 * $value : $value;
     }
 }
diff --git a/app/code/Magento/Bundle/Pricing/Price/FinalPrice.php b/app/code/Magento/Bundle/Pricing/Price/FinalPrice.php
index c41f6a4868ab1..6774c005113f6 100644
--- a/app/code/Magento/Bundle/Pricing/Price/FinalPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/FinalPrice.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Bundle\Pricing\Price;
 
+use Magento\Bundle\Model\Product\Price;
+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
 use Magento\Catalog\Model\Product;
-use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 use Magento\Catalog\Pricing\Price\CustomOptionPrice;
-use Magento\Bundle\Model\Product\Price;
 use Magento\Framework\App\ObjectManager;
-use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
+use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 
 /**
  * Final price model
diff --git a/app/code/Magento/Bundle/Pricing/Price/TierPrice.php b/app/code/Magento/Bundle/Pricing/Price/TierPrice.php
index 121b43bc0428a..7ba587d70b5a6 100644
--- a/app/code/Magento/Bundle/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/TierPrice.php
@@ -7,7 +7,6 @@
 namespace Magento\Bundle\Pricing\Price;
 
 use Magento\Catalog\Pricing\Price\RegularPrice;
-use Magento\Framework\Pricing\Amount\AmountInterface;
 use Magento\Framework\Pricing\PriceInfoInterface;
 
 /**
diff --git a/app/code/Magento/Bundle/Setup/Recurring.php b/app/code/Magento/Bundle/Setup/Recurring.php
index 4459c980a9027..cc79fa42a0c38 100644
--- a/app/code/Magento/Bundle/Setup/Recurring.php
+++ b/app/code/Magento/Bundle/Setup/Recurring.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Bundle\Setup;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Setup\ExternalFKSetup;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Bundle/Setup/UpgradeData.php b/app/code/Magento/Bundle/Setup/UpgradeData.php
index 750bc79d84801..0cb56c2a8c6c1 100644
--- a/app/code/Magento/Bundle/Setup/UpgradeData.php
+++ b/app/code/Magento/Bundle/Setup/UpgradeData.php
@@ -6,11 +6,11 @@
 namespace Magento\Bundle\Setup;
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Eav\Setup\EavSetup;
 
 class UpgradeData implements UpgradeDataInterface
 {
diff --git a/app/code/Magento/Bundle/Test/Unit/Helper/DataTest.php b/app/code/Magento/Bundle/Test/Unit/Helper/DataTest.php
index 48e574aebc205..679ea002e170c 100644
--- a/app/code/Magento/Bundle/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Helper/DataTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Bundle\Test\Unit\Helper;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-
 class DataTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Option/ValidatorTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Option/ValidatorTest.php
index f47c978190a2c..bb0de17cc8b8d 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Option/ValidatorTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Option/ValidatorTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Bundle\Test\Unit\Model\Option;
 
-use Magento\Framework\Validator\NotEmpty;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Validator\NotEmpty;
 
 class ValidatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/OptionManagementTest.php b/app/code/Magento/Bundle/Test/Unit/Model/OptionManagementTest.php
index f0a69bd4fb28b..126881d51dbb9 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/OptionManagementTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/OptionManagementTest.php
@@ -7,7 +7,7 @@
 
 namespace Magento\Bundle\Test\Unit\Model;
 
-use \Magento\Bundle\Model\OptionManagement;
+use Magento\Bundle\Model\OptionManagement;
 
 class OptionManagementTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php b/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
index 45d0208c1d575..d2c41f07501ee 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
@@ -292,7 +292,6 @@ public function testSaveExistingOption()
         );
         $optionCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
 
-
         $metadataMock = $this->createMock(\Magento\Framework\EntityManager\EntityMetadata::class);
         $metadataMock->expects($this->once())->method('getLinkField')->willReturn('product_option');
 
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Plugin/PriceBackendTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Plugin/PriceBackendTest.php
index 4ffcca954c6b9..4bf5bec1ad950 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Plugin/PriceBackendTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Plugin/PriceBackendTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Bundle\Test\Unit\Model\Plugin;
 
-use \Magento\Bundle\Model\Plugin\PriceBackend;
+use Magento\Bundle\Model\Plugin\PriceBackend;
 
 use Magento\Bundle\Model\Product\Price;
 use Magento\Catalog\Model\Product\Type;
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Plugin/QuoteItemTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Plugin/QuoteItemTest.php
index 8e08a6845198f..5d91058babcf0 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Plugin/QuoteItemTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Plugin/QuoteItemTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Bundle\Test\Unit\Model\Plugin;
 
+use Magento\Catalog\Model\Product;
+use Magento\Quote\Model\Quote\Item\AbstractItem;
 use Magento\Quote\Model\Quote\Item\ToOrderItem;
 use Magento\Sales\Api\Data\OrderItemInterface;
-use Magento\Quote\Model\Quote\Item\AbstractItem;
-use Magento\Catalog\Model\Product;
 
 class QuoteItemTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/LinksListTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/LinksListTest.php
index 6ac3cc11957a6..877efaa44beac 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Product/LinksListTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/LinksListTest.php
@@ -7,7 +7,7 @@
 
 namespace Magento\Bundle\Test\Unit\Model\Product;
 
-use \Magento\Bundle\Model\Product\LinksList;
+use Magento\Bundle\Model\Product\LinksList;
 
 class LinksListTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/Selection/CollectionTest.php b/app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/Selection/CollectionTest.php
index cbe34639e8267..263dc34bfc1a2 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/Selection/CollectionTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/Selection/CollectionTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Bundle\Test\Unit\Model\ResourceModel\Selection;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Api\Data\StoreInterface;
-use Magento\Framework\Validator\UniversalFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 use Magento\Eav\Model\Entity\AbstractEntity;
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Validator\UniversalFactory;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class CollectionTest.
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php
index f7f6b30daa300..9c41d5cf84936 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php
@@ -8,9 +8,8 @@
 
 namespace Magento\Bundle\Test\Unit\Pricing\Adjustment;
 
-use Magento\Bundle\Model\ResourceModel\Selection\Collection;
-use \Magento\Bundle\Pricing\Adjustment\Calculator;
 use Magento\Bundle\Model\Product\Price as ProductPrice;
+use Magento\Bundle\Pricing\Adjustment\Calculator;
 use Magento\Bundle\Pricing\Price;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleRegularPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleRegularPriceTest.php
index 0b81b83bcb0f3..d1d752578c70d 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleRegularPriceTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleRegularPriceTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Bundle\Test\Unit\Pricing\Price;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Catalog\Pricing\Price\CustomOptionPrice;
 use Magento\Bundle\Model\Product\Price;
+use Magento\Catalog\Pricing\Price\CustomOptionPrice;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class BundleRegularPriceTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionFactoryTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionFactoryTest.php
index c836a733286e4..b7649ddfb796a 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionFactoryTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionFactoryTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Bundle\Test\Unit\Pricing\Price;
 
-use \Magento\Bundle\Pricing\Price\BundleSelectionFactory;
+use Magento\Bundle\Pricing\Price\BundleSelectionFactory;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/FinalPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/FinalPriceTest.php
index 4463709391102..8f645e98da6cd 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/FinalPriceTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/FinalPriceTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Bundle\Test\Unit\Pricing\Price;
 
-use Magento\Bundle\Pricing\Price\BundleOptionPrice;
-use Magento\Catalog\Pricing\Price\CustomOptionPrice;
 use Magento\Bundle\Model\Product\Price;
+use Magento\Bundle\Pricing\Price\BundleOptionPrice;
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
+use Magento\Catalog\Pricing\Price\CustomOptionPrice;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php
index f38dfc5538cf3..e8bff2298d4f9 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/SpecialPriceTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Bundle\Test\Unit\Pricing\Price;
 
-use \Magento\Bundle\Pricing\Price\SpecialPrice;
+use Magento\Bundle\Pricing\Price\SpecialPrice;
 
 class SpecialPriceTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/TierPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/TierPriceTest.php
index 8d7b7c68ff279..97624fe17bf0f 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/TierPriceTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/TierPriceTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Bundle\Test\Unit\Pricing\Price;
 
-use \Magento\Bundle\Pricing\Price\TierPrice;
+use Magento\Bundle\Pricing\Price\TierPrice;
 
 use Magento\Customer\Model\Group;
 
diff --git a/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/BundleDataProviderTest.php b/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/BundleDataProviderTest.php
index 7b4d42568f686..98b92dc3f1430 100644
--- a/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/BundleDataProviderTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/BundleDataProviderTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Bundle\Test\Unit\Ui\DataProvider\Product;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Bundle\Helper\Data;
 use Magento\Bundle\Ui\DataProvider\Product\BundleDataProvider;
-use Magento\Framework\App\RequestInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-use Magento\Bundle\Helper\Data;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class BundleDataProviderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php b/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php
index ccb6226ccd833..c952802c2f128 100644
--- a/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php
@@ -7,9 +7,9 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Ui\DataProvider\Modifier\ModifierInterface;
-use Magento\Framework\Stdlib\ArrayManager;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 abstract class AbstractModifierTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php b/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
index a76b53bf6c71b..18f0ed26c6cf4 100644
--- a/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Bundle\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Bundle\Model\Product\Type;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class CompositeTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/BundleDataProvider.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/BundleDataProvider.php
index 5f1ffc3c26823..857975ab762ba 100644
--- a/app/code/Magento/Bundle/Ui/DataProvider/Product/BundleDataProvider.php
+++ b/app/code/Magento/Bundle/Ui/DataProvider/Product/BundleDataProvider.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Bundle\Ui\DataProvider\Product;
 
+use Magento\Bundle\Helper\Data;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider;
-use Magento\Bundle\Helper\Data;
 
 class BundleDataProvider extends ProductDataProvider
 {
diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePrice.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePrice.php
index f431012dc3fa5..1be09ad85e620 100644
--- a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePrice.php
+++ b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePrice.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Bundle\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
-use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\Framework\Stdlib\ArrayManager;
 
 /**
  * Customize Price field
diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundleWeight.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundleWeight.php
index 83e045d3562cf..620d183a3d706 100644
--- a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundleWeight.php
+++ b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundleWeight.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Bundle\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Framework\Stdlib\ArrayManager;
 
 /**
@@ -76,7 +76,7 @@ public function modifyMeta(array $meta)
                 ]
             ]
         );
-        
+
         return $meta;
     }
 
diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/Composite.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/Composite.php
index 4abc72f1f3f97..4b851e12981dc 100644
--- a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/Composite.php
+++ b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/Composite.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Bundle\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Bundle\Api\ProductOptionRepositoryInterface;
+use Magento\Bundle\Model\Product\Type;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Ui\DataProvider\Modifier\ModifierInterface;
-use Magento\Bundle\Model\Product\Type;
-use Magento\Bundle\Api\ProductOptionRepositoryInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 
 /**
  * Class Bundle customizes Bundle product creation flow
diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/StockData.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/StockData.php
index 232807208047c..50962930aeb95 100644
--- a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/StockData.php
+++ b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/StockData.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Bundle\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Bundle\Model\Product\Type;
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
-use Magento\Bundle\Model\Product\Type;
 
 /**
  * Class StockData hides unnecessary fields in Advanced Inventory Modal
diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Listing/Collector/BundlePrice.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Listing/Collector/BundlePrice.php
index 5870a59b594ea..117d1e075ea47 100644
--- a/app/code/Magento/Bundle/Ui/DataProvider/Product/Listing/Collector/BundlePrice.php
+++ b/app/code/Magento/Bundle/Ui/DataProvider/Product/Listing/Collector/BundlePrice.php
@@ -10,9 +10,9 @@
 use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface;
 use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductRenderInterface;
+use Magento\Catalog\Model\ProductRender\FormattedPriceInfoBuilder;
 use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Catalog\Model\ProductRender\FormattedPriceInfoBuilder;
 
 /**
  * Collect information about bundle price
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
index 224cd71538b7b..23031a68b36e7 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
@@ -20,13 +20,16 @@ $isElementReadonly = $block->getElement()
     ->getReadonly();
 ?>
 
-<?php if (!($attributeCode === 'price' && $block->getCanReadPrice() === false)) { ?>
+<?php if (!($attributeCode === 'price' && $block->getCanReadPrice() === false)) {
+    ?>
     <div class="<?= /* @escapeNotVerified */  $attributeCode ?> "><?= /* @escapeNotVerified */  $elementHtml ?></div>
-<?php } ?>
+<?php
+} ?>
 
 <?= $block->getExtendedElement($switchAttributeCode)->toHtml() ?>
 
-<?php if (!$isElementReadonly && $block->getDisableChild()) { ?>
+<?php if (!$isElementReadonly && $block->getDisableChild()) {
+        ?>
     <script>
         require(['prototype'], function () {
             function <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change() {
@@ -43,13 +46,17 @@ $isElementReadonly = $block->getElement()
                 } else {
                     if ($attribute) {
                         <?php if ($attributeCode === 'price' && !$block->getCanEditPrice() && $block->getCanReadPrice()
-                                && $block->getProduct()->isObjectNew()) { ?>
+                                && $block->getProduct()->isObjectNew()) {
+            ?>
                             <?php $defaultProductPrice = $block->getDefaultProductPrice() ?: "''"; ?>
                             $attribute.value = <?= /* @escapeNotVerified */ $defaultProductPrice ?>;
-                        <?php } else { ?>
+                        <?php
+        } else {
+            ?>
                             $attribute.disabled = false;
                             $attribute.addClassName('required-entry');
-                        <?php } ?>
+                        <?php
+        } ?>
                     }
                     if ($('dynamic-price-warning')) {
                         $('dynamic-price-warning').hide();
@@ -58,12 +65,15 @@ $isElementReadonly = $block->getElement()
             }
 
             <?php if (!($attributeCode === 'price' && !$block->getCanEditPrice()
-                    && !$block->getProduct()->isObjectNew())) { ?>
+                    && !$block->getProduct()->isObjectNew())) {
+            ?>
                 $('<?= /* @escapeNotVerified */ $switchAttributeCode ?>').observe('change', <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change);
-            <?php } ?>
+            <?php
+        } ?>
             Event.observe(window, 'load', function(){
                 <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change();
             });
         });
     </script>
-<?php } ?>
+<?php
+    } ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
index 44ed02f2758d0..0a0a5e1a01741 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
@@ -12,7 +12,9 @@
 <?php $_selections = $_option->getSelections(); ?>
 <?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
 
-<div class="field admin__field options<?php if ($_option->getRequired()) echo ' required _required' ?>">
+<div class="field admin__field options<?php if ($_option->getRequired()) {
+    echo ' required _required';
+} ?>">
     <label class="label admin__field-label">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
@@ -31,7 +33,9 @@
                 <?php foreach ($_selections as $_selection): ?>
                     <div class="field choice admin__field admin__field-option">
                         <input
-                            class="change-container-classname admin__control-checkbox checkbox bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> <?php if ($_option->getRequired()) echo 'validate-one-required-by-name' ?>"
+                            class="change-container-classname admin__control-checkbox checkbox bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> <?php if ($_option->getRequired()) {
+    echo 'validate-one-required-by-name';
+} ?>"
                             id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
                             type="checkbox"
                             name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][<?= /* @escapeNotVerified */ $_selection->getId() ?>]"
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
index 8c13dd6479d4d..ea10e319895b1 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
@@ -11,7 +11,9 @@
 <?php $_option = $block->getOption(); ?>
 <?php $_selections = $_option->getSelections(); ?>
 <?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
-<div class="field admin__field <?php if ($_option->getRequired()) echo ' required' ?><?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?>">
+<div class="field admin__field <?php if ($_option->getRequired()) {
+    echo ' required';
+} ?><?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?>">
     <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
@@ -22,13 +24,19 @@
         <?php else: ?>
             <select multiple="multiple" size="5" id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
                     name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][]"
-                    class="admin__control-multiselect bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> multiselect change-container-classname"
+                    class="admin__control-multiselect bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?><?php if ($_option->getRequired()) {
+    echo ' required-entry';
+} ?> multiselect change-container-classname"
                     onchange="ProductConfigure.bundleControl.changeSelection(this)">
-            <?php if(!$_option->getRequired()): ?>
+            <?php if (!$_option->getRequired()): ?>
                 <option value=""><?= /* @escapeNotVerified */ __('None') ?></option>
             <?php endif; ?>
             <?php foreach ($_selections as $_selection): ?>
-                <option value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>"><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection, false) ?></option>
+                <option value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) {
+    echo ' selected="selected"';
+} ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) {
+    echo ' disabled="disabled"';
+} ?> price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>"><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection, false) ?></option>
             <?php endforeach; ?>
             </select>
         <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
index f0912979a9248..4e223a3a553cb 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
@@ -14,7 +14,9 @@
 <?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
 
-<div class="field admin__field options<?php if ($_option->getRequired()) echo ' required' ?>">
+<div class="field admin__field options<?php if ($_option->getRequired()) {
+    echo ' required';
+} ?>">
     <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <div class="nested<?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?>">
@@ -44,7 +46,11 @@
                            class="radio admin__control-radio <?= $_option->getRequired() ? ' validate-one-required-by-name' : '' ?> change-container-classname"
                            id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
                            name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                           <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>
+                           <?php if ($block->isSelected($_selection)) {
+    echo ' checked="checked"';
+} ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) {
+    echo ' disabled="disabled"';
+} ?>
                            value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
                            onclick="ProductConfigure.bundleControl.changeSelection(this)"
                            price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>"
@@ -52,7 +58,7 @@
                     <label class="admin__field-label"
                            for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"><span><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection) ?></span></label>
                 <?php if ($_option->getRequired()): ?>
-                    <?= /* @escapeNotVerified */ $block->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
+                    <?= /* @escapeNotVerified */ $block->setValidationContainer('bundle-option-' . $_option->getId() . '-' . $_selection->getSelectionId(), 'bundle-option-' . $_option->getId() . '-container') ?>
                 <?php endif; ?>
                 </div>
             <?php endforeach; ?>
@@ -61,9 +67,13 @@
             <div class="field admin__field qty">
                 <label class="label admin__field-label"
                        for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"><span><?= /* @escapeNotVerified */ __('Quantity:') ?></span></label>
-                <div class="control admin__field-control"><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
+                <div class="control admin__field-control"><input <?php if (!$_canChangeQty) {
+    echo ' disabled="disabled"';
+} ?>
                         id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
-                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
+                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) {
+    echo ' qty-disabled';
+} ?>"
                         type="text"
                         name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]" value="<?= /* @escapeNotVerified */ $_defaultQty ?>" />
                 </div>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
index 32766f62163ed..847661aa7c2d6 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
@@ -14,7 +14,9 @@
 <?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
 
-<div class="field admin__field option<?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?><?php if ($_option->getRequired()) echo ' required _required' ?>">
+<div class="field admin__field option<?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?><?php if ($_option->getRequired()) {
+    echo ' required _required';
+} ?>">
     <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <?php if ($block->showSingle()): ?>
@@ -25,12 +27,18 @@
         <?php else:?>
             <select id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
                     name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> select admin__control-select change-container-classname"
+                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?><?php if ($_option->getRequired()) {
+    echo ' required-entry';
+} ?> select admin__control-select change-container-classname"
                     onchange="ProductConfigure.bundleControl.changeSelection(this)">
                 <option value=""><?= /* @escapeNotVerified */ __('Choose a selection...') ?></option>
                 <?php foreach ($_selections as $_selection): ?>
                     <option
-                        value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>
+                        value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) {
+    echo ' selected="selected"';
+} ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) {
+    echo ' disabled="disabled"';
+} ?>
                         price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>"
                         qtyId="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection, false) ?></option>
                 <?php endforeach; ?>
@@ -42,9 +50,13 @@
                 <label class="label admin__field-label"
                        for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"><span><?= /* @escapeNotVerified */ __('Quantity:') ?></span></label>
                 <div class="control admin__field-control">
-                    <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
+                    <input <?php if (!$_canChangeQty) {
+    echo ' disabled="disabled"';
+} ?>
                         id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
-                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text"
+                        class="input-text admin__control-text qty<?php if (!$_canChangeQty) {
+    echo ' qty-disabled';
+} ?>" type="text"
                         name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]" value="<?= /* @escapeNotVerified */ $_defaultQty ?>" />
                 </div>
             </div>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
index bb0857a80d689..be42829599761 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
@@ -16,12 +16,12 @@
 
 <?php $_item = $block->getItem() ?>
 <?php $items = array_merge([$_item], $_item->getChildrenItems()); ?>
-<?php $_count = count ($items) ?>
+<?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 
 <?php $_prevOptionId = '' ?>
 
-<?php if($block->getOrderOptions() || $_item->getDescription() || $block->canDisplayGiftmessage()): ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription() || $block->canDisplayGiftmessage()): ?>
     <?php $_showlastRow = true ?>
 <?php else: ?>
     <?php $_showlastRow = false ?>
@@ -47,7 +47,7 @@
         <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr<?= (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
+    <tr<?= (++$_index==$_count && !$_showlastRow) ? ' class="border"' : '' ?>>
         <?php if (!$_item->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title" id="order_item_<?= /* @escapeNotVerified */ $_item->getId() ?>_title">
@@ -170,8 +170,10 @@
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if($_showlastRow): ?>
-    <tr<?php if (!$block->canDisplayGiftmessage()) echo ' class="border"' ?>>
+<?php if ($_showlastRow): ?>
+    <tr<?php if (!$block->canDisplayGiftmessage()) {
+    echo ' class="border"';
+} ?>>
         <td class="col-product">
             <?php if ($block->getOrderOptions()): ?>
                 <dl class="item-options">
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
index bda649eb603e6..8f087a7b5a8ec 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
@@ -11,7 +11,7 @@
 <?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox */ ?>
 <?php $_option = $block->getOption() ?>
 <?php $_selections = $_option->getSelections() ?>
-<div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
+<div class="field option <?= ($_option->getRequired()) ? ' required' : '' ?>">
     <label class="label">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
@@ -24,16 +24,21 @@
                        name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                        value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"/>
             <?php else:?>
-                <?php foreach($_selections as $_selection): ?>
+                <?php foreach ($_selections as $_selection): ?>
                     <div class="field choice">
                         <input class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> checkbox product bundle option change-container-classname"
                                id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
                                type="checkbox"
-                               <?php if ($_option->getRequired()) /* @escapeNotVerified */ echo 'data-validate="{\'validate-one-required-by-name\':\'input[name^=&quot;bundle_option[' . $_option->getId() . ']&quot;]:checked\'}"'?>
+                               <?php if ($_option->getRequired()) { /* @escapeNotVerified */ echo 'data-validate="{\'validate-one-required-by-name\':\'input[name^=&quot;bundle_option[' . $_option->getId() . ']&quot;]:checked\'}"';
+}?>
                                name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][<?= /* @escapeNotVerified */ $_selection->getId() ?>]"
                                data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][<?= /* @escapeNotVerified */ $_selection->getId() ?>]"
-                               <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?>
-                               <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
+                               <?php if ($block->isSelected($_selection)) {
+    echo ' checked="checked"';
+} ?>
+                               <?php if (!$_selection->isSaleable()) {
+    echo ' disabled="disabled"';
+} ?>
                                value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"/>
                         <label class="label"
                                for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
index 718d43070a5fd..2d1329580d003 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
@@ -10,7 +10,7 @@
 <?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi */ ?>
 <?php $_option = $block->getOption() ?>
 <?php $_selections = $_option->getSelections() ?>
-<div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
+<div class="field option <?= ($_option->getRequired()) ? ' required' : '' ?>">
     <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
@@ -27,14 +27,20 @@
                     name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][]"
                     data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][]"
                     class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> multiselect product bundle option change-container-classname"
-                    <?php if ($_option->getRequired()) echo 'data-validate={required:true}' ?>>
-                <?php if(!$_option->getRequired()): ?>
+                    <?php if ($_option->getRequired()) {
+    echo 'data-validate={required:true}';
+} ?>>
+                <?php if (!$_option->getRequired()): ?>
                     <option value=""><?= /* @escapeNotVerified */ __('None') ?></option>
                 <?php endif; ?>
                 <?php foreach ($_selections as $_selection): ?>
                     <option value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
-                            <?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?>
-                            <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
+                            <?php if ($block->isSelected($_selection)) {
+    echo ' selected="selected"';
+} ?>
+                            <?php if (!$_selection->isSaleable()) {
+    echo ' disabled="disabled"';
+} ?>>
                         <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection, false) ?>
                     </option>
                 <?php endforeach; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
index 7ea89e8609818..ecd2f8c8dffe5 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
@@ -13,7 +13,7 @@
 <?php $_default     = $_option->getDefaultSelection(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
 
-<div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
+<div class="field option <?= ($_option->getRequired()) ? ' required' : '' ?>">
     <label class="label">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
@@ -36,7 +36,7 @@
                                id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
                                name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                                data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                               <?= ($_default && $_default->isSalable())?'':' checked="checked" ' ?>
+                               <?= ($_default && $_default->isSalable()) ? '' : ' checked="checked" ' ?>
                                value=""/>
                         <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>">
                             <span><?= /* @escapeNotVerified */ __('None') ?></span>
@@ -48,11 +48,17 @@
                         <input type="radio"
                                class="radio product bundle option change-container-classname"
                                id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
-                               <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?>
+                               <?php if ($_option->getRequired()) {
+    echo 'data-validate="{\'validate-one-required-by-name\':true}"';
+}?>
                                name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                                data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
-                               <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?>
-                               <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
+                               <?php if ($block->isSelected($_selection)) {
+    echo ' checked="checked"';
+} ?>
+                               <?php if (!$_selection->isSaleable()) {
+    echo ' disabled="disabled"';
+} ?>
                                value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"/>
                         <label class="label"
                                for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
@@ -67,9 +73,13 @@
                     <span><?= /* @escapeNotVerified */ __('Quantity') ?></span>
                 </label>
                 <div class="control">
-                    <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
+                    <input <?php if (!$_canChangeQty) {
+    echo ' disabled="disabled"';
+} ?>
                            id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
-                           class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
+                           class="input-text qty<?php if (!$_canChangeQty) {
+    echo ' qty-disabled';
+} ?>"
                            type="number"
                            name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                            data-selector="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
index 977daa2b2a446..65bfda073f834 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
@@ -13,7 +13,7 @@
 <?php $_selections  = $_option->getSelections(); ?>
 <?php $_default     = $_option->getDefaultSelection(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
-<div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
+<div class="field option <?= ($_option->getRequired()) ? ' required' : '' ?>">
     <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
@@ -29,12 +29,18 @@
                     name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                     data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                     class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> product bundle option bundle-option-select change-container-classname"
-                <?php if ($_option->getRequired()) echo 'data-validate = {required:true}' ?>>
+                <?php if ($_option->getRequired()) {
+    echo 'data-validate = {required:true}';
+} ?>>
                 <option value=""><?= /* @escapeNotVerified */ __('Choose a selection...') ?></option>
                 <?php foreach ($_selections as $_selection): ?>
                     <option value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
-                        <?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?>
-                        <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
+                        <?php if ($block->isSelected($_selection)) {
+    echo ' selected="selected"';
+} ?>
+                        <?php if (!$_selection->isSaleable()) {
+    echo ' disabled="disabled"';
+} ?>>
                         <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection, false) ?>
                     </option>
                 <?php endforeach; ?>
@@ -46,9 +52,13 @@
                     <span><?= /* @escapeNotVerified */ __('Quantity') ?></span>
                 </label>
                 <div class="control">
-                    <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
+                    <input <?php if (!$_canChangeQty) {
+    echo ' disabled="disabled"';
+} ?>
                            id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
-                           class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
+                           class="input-text qty<?php if (!$_canChangeQty) {
+    echo ' qty-disabled';
+} ?>"
                            type="number"
                            name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                            data-selector="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
diff --git a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
index 9b8518a41ffff..1bf2af6d19a86 100644
--- a/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
+++ b/app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php
@@ -5,13 +5,12 @@
  */
 namespace Magento\BundleImportExport\Model\Export;
 
+use Magento\Bundle\Model\ResourceModel\Selection\Collection as SelectionCollection;
+use Magento\Catalog\Model\Product\Type\AbstractType;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
 use Magento\CatalogImportExport\Model\Import\Product as ImportProductModel;
-use Magento\Bundle\Model\ResourceModel\Selection\Collection as SelectionCollection;
-use Magento\ImportExport\Controller\Adminhtml\Import;
 use Magento\ImportExport\Model\Import as ImportModel;
-use \Magento\Catalog\Model\Product\Type\AbstractType;
 
 /**
  * Class RowCustomizer
diff --git a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
index 96b7c7b1430b0..d0756f05f4fdc 100644
--- a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
+++ b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
@@ -8,10 +8,10 @@
  */
 namespace Magento\BundleImportExport\Model\Import\Product\Type;
 
-use \Magento\Framework\App\ObjectManager;
-use \Magento\Bundle\Model\Product\Price as BundlePrice;
-use \Magento\Catalog\Model\Product\Type\AbstractType;
+use Magento\Bundle\Model\Product\Price as BundlePrice;
+use Magento\Catalog\Model\Product\Type\AbstractType;
 use Magento\CatalogImportExport\Model\Import\Product;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Bundle
diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php
index b333fcaaa678a..12b5f6ef84bd4 100644
--- a/app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\CacheInvalidate\Test\Unit\Observer;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-
 class InvalidateVarnishObserverTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\CacheInvalidate\Observer\InvalidateVarnishObserver */
diff --git a/app/code/Magento/Captcha/Helper/Data.php b/app/code/Magento/Captcha/Helper/Data.php
index 9a14f9ae9a21d..dcb5e708e0b0c 100644
--- a/app/code/Magento/Captcha/Helper/Data.php
+++ b/app/code/Magento/Captcha/Helper/Data.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * Captcha image model
diff --git a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
index e496c36f4de75..cc1b02e89ac40 100644
--- a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
+++ b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
@@ -6,8 +6,8 @@
 namespace Magento\Captcha\Model\Customer\Plugin;
 
 use Magento\Captcha\Helper\Data as CaptchaHelper;
-use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Session\SessionManagerInterface;
 
 class AjaxLogin
 {
diff --git a/app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php b/app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php
index 91737c1a3d779..b1bdcfce1229c 100644
--- a/app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckContactUsFormObserver.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Captcha\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
-use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Framework\Event\ObserverInterface;
 
 class CheckContactUsFormObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/Captcha/Observer/CheckUserEditObserver.php b/app/code/Magento/Captcha/Observer/CheckUserEditObserver.php
index 9d3cd8d367093..3cb6a4abac70c 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserEditObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserEditObserver.php
@@ -6,9 +6,9 @@
 namespace Magento\Captcha\Observer;
 
 use Magento\Customer\Model\AuthenticationInterface;
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php b/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php
index bdc8dfa218972..2df6b791f0e3c 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserLoginObserver.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Captcha\Observer;
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -90,7 +90,6 @@ public function __construct(
      */
     private function getCustomerRepository()
     {
-
         if (!($this->customerRepository instanceof \Magento\Customer\Api\CustomerRepositoryInterface)) {
             return \Magento\Framework\App\ObjectManager::getInstance()->get(
                 \Magento\Customer\Api\CustomerRepositoryInterface::class
@@ -107,7 +106,6 @@ private function getCustomerRepository()
      */
     private function getAuthentication()
     {
-
         if (!($this->authentication instanceof AuthenticationInterface)) {
             return \Magento\Framework\App\ObjectManager::getInstance()->get(
                 AuthenticationInterface::class
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
index 20411a4c4d767..9b662b1f2ae81 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/DeleteButton.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Edit;
 
-use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 use Magento\Catalog\Block\Adminhtml\Category\AbstractCategory;
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 /**
  * Class DeleteButton
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/SaveButton.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/SaveButton.php
index 937b6e2a8ac77..9a1fbc90f1b85 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/SaveButton.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/SaveButton.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Edit;
 
-use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 use Magento\Catalog\Block\Adminhtml\Category\AbstractCategory;
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 /**
  * Class SaveButton
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
index b77a5e2e95241..dd02ddf0c0b6d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
@@ -54,13 +54,13 @@ public function getElementHtml()
 
         $html .= ' <label for="' . $htmlId . '" class="normal">' . __('Use Config Settings') . '</label>';
         $html .= '<script>' .
-            'require(["prototype"], function(){'.
+            'require(["prototype"], function(){' .
             'toggleValueElements($(\'' .
             $htmlId .
             '\'), $(\'' .
             $htmlId .
             '\').parentNode);' .
-            '});'.
+            '});' .
             '</script>';
 
         return $html;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Button/Generic.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Button/Generic.php
index 2361a21f38826..0b9dc22fcfd6d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Button/Generic.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Button/Generic.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Attribute\Button;
 
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\View\Element\UiComponent\Context;
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
index ce802e04509ef..ebad735f64cc8 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php
@@ -14,8 +14,8 @@
 use Magento\Backend\Block\Template\Context;
 use Magento\Backend\Block\Widget\Form;
 use Magento\Backend\Block\Widget\Form\Generic;
-use Magento\Config\Model\Config\Source\Yesno;
 use Magento\Catalog\Model\Entity\Attribute;
+use Magento\Config\Model\Config\Source\Yesno;
 use Magento\Eav\Block\Adminhtml\Attribute\PropertyLocker;
 use Magento\Framework\Data\FormFactory;
 use Magento\Framework\Registry;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index 339239ea491e0..38d864e42ad1a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -12,8 +12,8 @@
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options;
 
 use Magento\Backend\Block\Widget;
-use Magento\Catalog\Model\Product;
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Model\Product;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
index 04c3a208b97f9..90553fa113682 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tabs.php
@@ -7,7 +7,6 @@
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
 
 use Magento\Backend\Block\Template\Context;
-use Magento\Backend\Block\Widget\Accordion;
 use Magento\Backend\Block\Widget\Tabs as WigetTabs;
 use Magento\Backend\Model\Auth\Session;
 use Magento\Catalog\Helper\Catalog;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
index 49a75990ec0d2..00548335351d2 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
@@ -13,10 +13,10 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
 
-use Magento\Framework\Registry;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Eav\Model\Entity\Attribute;
-use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Registry;
 
 class Gallery extends \Magento\Framework\View\Element\AbstractBlock
 {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index 5188bf365e5e9..eb7d3e9429f50 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -14,9 +14,9 @@
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery;
 
 use Magento\Backend\Block\Media\Uploader;
-use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\View\Element\AbstractBlock;
 
 class Content extends \Magento\Backend\Block\Widget
 {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
index fec3daeeacd13..cd9a5bda7b223 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
@@ -9,8 +9,8 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
 
-use Magento\Framework\Data\Form;
 use Magento\Catalog\Model\Product\Edit\WeightResolver;
+use Magento\Framework\Data\Form;
 
 class Weight extends \Magento\Framework\Data\Form\Element\Text
 {
diff --git a/app/code/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php b/app/code/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php
index 03932151358ab..dd1c77a22558a 100644
--- a/app/code/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php
+++ b/app/code/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Catalog\Block\Category\Plugin;
 
-use Magento\Catalog\Model\Product;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
@@ -30,7 +29,7 @@ class PriceBoxTags
      * @var PriceCurrencyInterface
      */
     private $priceCurrency;
-    
+
     /**
      * @var ScopeResolverInterface
      */
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index 33488ee1c93c4..ee63d3400ade5 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -463,7 +463,7 @@ private function initializeProductCollection()
         if ($origCategory) {
             $layer->setCurrentCategory($origCategory);
         }
-        
+
         $this->addToolbarBlock($collection);
 
         $this->_eventManager->dispatch(
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
index 3f9dac98033aa..1146e1f6f7fe8 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
@@ -9,7 +9,6 @@
 namespace Magento\Catalog\Block\Product\ProductList;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
-use Magento\Framework\View\Element\AbstractBlock;
 
 /**
  * Catalog product related items block
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
index 40afd44305262..f657f02e5e64b 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
@@ -9,7 +9,6 @@
 namespace Magento\Catalog\Block\Product\ProductList;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
-use Magento\Framework\View\Element\AbstractBlock;
 
 /**
  * Catalog product upsell items block
diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
index 661132457b97e..3ddf629aeb080 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -11,9 +11,9 @@
  */
 namespace Magento\Catalog\Block\Product\View;
 
+use Magento\Catalog\Helper\Image;
 use Magento\Framework\Data\Collection;
 use Magento\Framework\Json\EncoderInterface;
-use Magento\Catalog\Helper\Image;
 
 /**
  * @api
diff --git a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
index 704271b58f483..22419bccc161d 100644
--- a/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
+++ b/app/code/Magento/Catalog/Block/Product/Widget/NewWidget.php
@@ -268,7 +268,7 @@ public function getProductPriceHtml(
             ? $arguments['display_minimal_price']
             : true;
 
-            /** @var \Magento\Framework\Pricing\Render $priceRender */
+        /** @var \Magento\Framework\Pricing\Render $priceRender */
         $priceRender = $this->getLayout()->getBlock('product.price.render.default');
 
         $price = '';
diff --git a/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php b/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php
index da35b566d7e71..e5b45c5daf1ff 100644
--- a/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php
+++ b/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php
@@ -6,15 +6,15 @@
 namespace Magento\Catalog\Block\Ui;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ProductRenderFactory;
+use Magento\Catalog\Model\ProductRepository;
 use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorComposite;
+use Magento\Framework\EntityManager\Hydrator;
 use Magento\Framework\Registry;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Url;
 use Magento\Framework\View\Element\Template;
 use Magento\Store\Model\Store;
-use Magento\Catalog\Model\ProductRenderFactory;
-use Magento\Catalog\Model\ProductRepository;
-use Magento\Framework\EntityManager\Hydrator;
 use Magento\Store\Model\StoreManager;
 
 /**
diff --git a/app/code/Magento/Catalog/Console/Command/ProductAttributesCleanUp.php b/app/code/Magento/Catalog/Console/Command/ProductAttributesCleanUp.php
index 4fc63d1d662c0..aeb5ad67cf036 100644
--- a/app/code/Magento/Catalog/Console/Command/ProductAttributesCleanUp.php
+++ b/app/code/Magento/Catalog/Console/Command/ProductAttributesCleanUp.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Catalog\Console\Command;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * Class ProductAttributesCleanUp
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php
index 921fdb6198d4e..4cfff5a5a44cc 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Validate.php
@@ -41,7 +41,7 @@ public function execute()
 
         $resultJson = $this->resultJsonFactory->create();
         $resultJson->setData($response);
-        
+
         return $resultJson;
     }
 }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AbstractProductGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AbstractProductGrid.php
index 32e0d2e5650f9..d70873fc905de 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AbstractProductGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AbstractProductGrid.php
@@ -6,9 +6,7 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
-use Magento\Framework\Controller\Result;
 
 abstract class AbstractProductGrid extends Product
 {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
index 7eb391dedf81c..f0d48b735572c 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Edit.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
 
-use Magento\Ui\Component\MassAction\Filter;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 class Edit extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute
 {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
index 174f06c2ea030..9a67dcd13a6ed 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AddAttributeToTemplate.php
@@ -14,10 +14,10 @@
 use Magento\Eav\Api\Data\AttributeGroupInterfaceFactory;
 use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Eav\Api\Data\AttributeSetInterface;
+use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\LocalizedException;
 use Psr\Log\LoggerInterface;
-use Magento\Framework\Api\ExtensionAttributesFactory;
 
 /**
  * Class AddAttributeToTemplate
@@ -123,7 +123,7 @@ public function execute()
                     ->getItems();
 
                 if (!$attributeGroupItems) {
-                    throw new \Magento\Framework\Exception\NoSuchEntityException;
+                    throw new \Magento\Framework\Exception\NoSuchEntityException();
                 }
 
                 /** @var AttributeGroupInterface $attributeGroup */
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsStockGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsStockGrid.php
index 17ffa579ddb35..68f3a589a6c0b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsStockGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsStockGrid.php
@@ -8,7 +8,6 @@
 
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
-use Magento\Framework\Controller\Result;
 use Magento\Framework\View\Result\LayoutFactory;
 
 class AlertsStockGrid extends \Magento\Catalog\Controller\Adminhtml\Product
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
index d5fed1782bc62..268d81dc22707 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute.php
@@ -9,7 +9,6 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-use Magento\Framework\Controller\Result;
 use Magento\Framework\View\Result\PageFactory;
 
 abstract class Attribute extends \Magento\Backend\App\Action
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index 98d5182bbadb2..e1d6ccdafc6ef 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -9,18 +9,18 @@
 
 use Magento\Backend\App\Action\Context;
 use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Controller\Adminhtml\Product\Attribute;
-use Magento\Catalog\Model\Product\AttributeSet\BuildFactory;
 use Magento\Catalog\Helper\Product;
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Model\Product\AttributeSet\BuildFactory;
 use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
-use Magento\Eav\Model\Entity\Attribute\Set;
 use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\Validator;
 use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory;
+use Magento\Eav\Model\Entity\Attribute\Set;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
 use Magento\Framework\Cache\FrontendInterface;
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filter\FilterManager;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
index 4fa61b2b372c2..6a7ff1887fa30 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php
@@ -8,9 +8,9 @@
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Cms\Model\Wysiwyg as WysiwygModel;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Registry;
 use Magento\Store\Model\StoreFactory;
 use Psr\Log\LoggerInterface as Logger;
-use Magento\Framework\Registry;
 
 class Builder
 {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index beb6f2b13bcfe..3ac4fe6087afe 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -8,11 +8,11 @@
 use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory as CustomOptionFactory;
 use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory as ProductLinkFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface\Proxy as ProductRepository;
+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks;
 use Magento\Catalog\Model\Product\Link\Resolver as LinkResolver;
 use Magento\Framework\App\ObjectManager;
-use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter;
 
 /**
  * @api
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
index 237168282afae..68fc8be2aca1f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
 
-use \Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product;
 
 /**
  * Class provides functionality to check and filter data came with product form.
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
index 2402fb213cda0..6215e04485af7 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassDelete.php
@@ -6,11 +6,11 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
-use Magento\Ui\Component\MassAction\Filter;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 class MassDelete extends \Magento\Catalog\Controller\Adminhtml\Product
 {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
index ec5eb9de3fe35..d5df8c6c9e655 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php
@@ -8,9 +8,9 @@
 
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Ui\Component\MassAction\Filter;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php
index abd07b8aadc68..0a695fbc499c3 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php
@@ -8,7 +8,6 @@
 
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
-use Magento\Framework\App\ObjectManager;
 
 class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product
 {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
index d34f4bedd80e4..a8e970baea5d5 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php
@@ -8,8 +8,8 @@
 
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\Request\DataPersistorInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class Save
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php
index 93bdaaf359bd3..fc62801f671b2 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/ShowUpdateResult.php
@@ -6,9 +6,8 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-use Magento\Catalog\Helper\Product\Composite;
-use Magento\Backend\Model\Session;
 use Magento\Backend\App\Action\Context;
+use Magento\Catalog\Helper\Product\Composite;
 
 class ShowUpdateResult extends \Magento\Catalog\Controller\Adminhtml\Product
 {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php
index 42e1dbf3fbdf7..2e93bb540ed3d 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/SuggestAttributeSets.php
@@ -14,7 +14,7 @@ class SuggestAttributeSets extends \Magento\Backend\App\Action
      * @see _isAllowed()
      */
     const ADMIN_RESOURCE = 'Magento_Catalog::sets';
-    
+
     /**
      * @var \Magento\Framework\Controller\Result\JsonFactory
      */
diff --git a/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php b/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
index e1ff39575f3ca..1335456c2114d 100644
--- a/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
+++ b/app/code/Magento/Catalog/Cron/DeleteOutdatedPriceValues.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Catalog\Cron;
 
-use Magento\Framework\App\ResourceConnection;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Eav\Api\AttributeRepositoryInterface as AttributeRepository;
 use Magento\Framework\App\Config\MutableScopeConfigInterface as ScopeConfig;
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Store\Model\Store;
 
 /**
diff --git a/app/code/Magento/Catalog/CustomerData/ProductsRenderInfoSection.php b/app/code/Magento/Catalog/CustomerData/ProductsRenderInfoSection.php
index 3caae4424163d..56e2e3710285d 100644
--- a/app/code/Magento/Catalog/CustomerData/ProductsRenderInfoSection.php
+++ b/app/code/Magento/Catalog/CustomerData/ProductsRenderInfoSection.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\CustomerData;
 
-use Magento\Catalog\Api\Data\ProductRenderInterface;
 use Magento\Catalog\Api\Data\ProductFrontendActionInterface;
+use Magento\Catalog\Api\Data\ProductRenderInterface;
 use Magento\Catalog\Model\Product\ProductFrontendAction\Synchronizer;
 use Magento\Catalog\Model\ProductRenderList;
 use Magento\Catalog\Model\ResourceModel\ProductFrontendAction\Collection;
diff --git a/app/code/Magento/Catalog/Helper/Product/Composite.php b/app/code/Magento/Catalog/Helper/Product/Composite.php
index 75b37107ee9c4..af4d1e5fbd14e 100644
--- a/app/code/Magento/Catalog/Helper/Product/Composite.php
+++ b/app/code/Magento/Catalog/Helper/Product/Composite.php
@@ -6,13 +6,12 @@
 namespace Magento\Catalog\Helper\Product;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\App\Helper\Context;
-use Magento\Framework\View\Result\LayoutFactory;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Catalog\Helper\Product;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Controller\RegistryConstants;
+use Magento\Framework\App\Helper\Context;
 use Magento\Framework\Registry;
+use Magento\Framework\View\Result\LayoutFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Adminhtml catalog product composite helper
diff --git a/app/code/Magento/Catalog/Helper/Product/Configuration.php b/app/code/Magento/Catalog/Helper/Product/Configuration.php
index f732f9a4371cc..0fcc5aef902af 100644
--- a/app/code/Magento/Catalog/Helper/Product/Configuration.php
+++ b/app/code/Magento/Catalog/Helper/Product/Configuration.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Catalog\Helper\Product;
 
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Catalog\Helper\Product\Configuration\ConfigurationInterface;
 use Magento\Framework\App\Helper\AbstractHelper;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Helper for fetching properties by product configurational item
diff --git a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
index 93eaa23b89f16..c2c3fea79f2b8 100644
--- a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
+++ b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Helper\Product\Flat;
 
-use Magento\Framework\App\ResourceConnection;
-
 /**
  * Catalog Product Flat Indexer Helper
  *
diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index ae948a362ab5a..487cad315f396 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -126,7 +126,7 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
                 $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
             }
         }
-    
+
         $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
         $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
 
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
index a994446881189..80e8b33496df3 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Model\Attribute\Backend;
 
-use Magento\Framework\View\Model\Layout\Update\ValidatorFactory;
 use Magento\Eav\Model\Entity\Attribute\Exception;
+use Magento\Framework\View\Model\Layout\Update\ValidatorFactory;
 
 /**
  * Layout update attribute backend
diff --git a/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php b/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php
index 0940ca7a234a3..39f3b823af210 100644
--- a/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php
+++ b/app/code/Magento/Catalog/Model/Attribute/ScopeOverriddenValue.php
@@ -6,13 +6,13 @@
 
 namespace Magento\Catalog\Model\Attribute;
 
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Eav\Api\AttributeRepositoryInterface as AttributeRepository;
-use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Framework\Api\FilterBuilder;
 use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
-use Magento\Store\Model\Store;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Store\Model\Store;
 
 /**
  * Class ScopeOverriddenValue
diff --git a/app/code/Magento/Catalog/Model/Attribute/Source/Scopes.php b/app/code/Magento/Catalog/Model/Attribute/Source/Scopes.php
index d8b9d496e9710..23292df58adc2 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Source/Scopes.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Source/Scopes.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Catalog\Model\Attribute\Source;
 
-use \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
+use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
 
 class Scopes implements \Magento\Framework\Data\OptionSourceInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php b/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
index f22c6903a230c..5af421b5bc34c 100644
--- a/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/Category/Link/SaveHandler.php
@@ -60,7 +60,7 @@ public function execute($entity, $arguments = [])
         if ($dtoCategoryLinks !== null) {
             $hydrator = $this->hydratorPool->getHydrator(CategoryLinkInterface::class);
             $dtoCategoryLinks = array_map(function ($categoryLink) use ($hydrator) {
-                return $hydrator->extract($categoryLink) ;
+                return $hydrator->extract($categoryLink);
             }, $dtoCategoryLinks);
             $processLinks = $this->mergeCategoryLinks($dtoCategoryLinks, $modelCategoryLinks);
         } else {
diff --git a/app/code/Magento/Catalog/Model/CategoryLinkRepository.php b/app/code/Magento/Catalog/Model/CategoryLinkRepository.php
index 6c3d84d5f5eb4..55b31ca5b484d 100644
--- a/app/code/Magento/Catalog/Model/CategoryLinkRepository.php
+++ b/app/code/Magento/Catalog/Model/CategoryLinkRepository.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Model;
 
-use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\InputException;
 
 class CategoryLinkRepository implements \Magento\Catalog\Api\CategoryLinkRepositoryInterface
 {
diff --git a/app/code/Magento/Catalog/Model/CategoryList.php b/app/code/Magento/Catalog/Model/CategoryList.php
index 790ea6b921fbe..95464a8493182 100644
--- a/app/code/Magento/Catalog/Model/CategoryList.php
+++ b/app/code/Magento/Catalog/Model/CategoryList.php
@@ -12,8 +12,8 @@
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
-use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
 
 class CategoryList implements CategoryListInterface
 {
diff --git a/app/code/Magento/Catalog/Model/CategoryManagement.php b/app/code/Magento/Catalog/Model/CategoryManagement.php
index fadb4c0c84745..d34594a8c10bf 100644
--- a/app/code/Magento/Catalog/Model/CategoryManagement.php
+++ b/app/code/Magento/Catalog/Model/CategoryManagement.php
@@ -7,8 +7,6 @@
 
 namespace Magento\Catalog\Model;
 
-use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
-
 class CategoryManagement implements \Magento\Catalog\Api\CategoryManagementInterface
 {
     /**
@@ -30,7 +28,7 @@ class CategoryManagement implements \Magento\Catalog\Api\CategoryManagementInter
      * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
      */
     private $categoriesFactory;
-    
+
     /**
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
      * @param Category\Tree $categoryTree
diff --git a/app/code/Magento/Catalog/Model/CategoryRepository.php b/app/code/Magento/Catalog/Model/CategoryRepository.php
index 505c729ac1001..5fa9a76b0b288 100644
--- a/app/code/Magento/Catalog/Model/CategoryRepository.php
+++ b/app/code/Magento/Catalog/Model/CategoryRepository.php
@@ -7,10 +7,10 @@
 
 namespace Magento\Catalog\Model;
 
+use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
-use Magento\Catalog\Api\Data\CategoryInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
index b3b5204887ea1..26dcb2e1d70d9 100644
--- a/app/code/Magento/Catalog/Model/Config.php
+++ b/app/code/Magento/Catalog/Model/Config.php
@@ -7,6 +7,7 @@
 // @codingStandardsIgnoreFile
 
 namespace Magento\Catalog\Model;
+
 use Magento\Framework\Serialize\SerializerInterface;
 
 /**
diff --git a/app/code/Magento/Catalog/Model/CustomOptions/CustomOption.php b/app/code/Magento/Catalog/Model/CustomOptions/CustomOption.php
index df9961518f479..85fede6f80d2d 100644
--- a/app/code/Magento/Catalog/Model/CustomOptions/CustomOption.php
+++ b/app/code/Magento/Catalog/Model/CustomOptions/CustomOption.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Catalog\Model\CustomOptions;
 
-use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Catalog\Api\Data\CustomOptionInterface;
+use Magento\Catalog\Model\Webapi\Product\Option\Type\File\Processor as FileProcessor;
 use Magento\Framework\Api\AttributeValueFactory;
-use Magento\Framework\Model\Context;
-use Magento\Framework\Registry;
 use Magento\Framework\Api\ExtensionAttributesFactory;
-use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Data\Collection\AbstractDb;
-use Magento\Catalog\Model\Webapi\Product\Option\Type\File\Processor as FileProcessor;
+use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
 
 class CustomOption extends AbstractExtensibleModel implements CustomOptionInterface
 {
diff --git a/app/code/Magento/Catalog/Model/CustomOptions/CustomOptionProcessor.php b/app/code/Magento/Catalog/Model/CustomOptions/CustomOptionProcessor.php
index 61e82e6ca4bc4..6dbaf9dbb3475 100644
--- a/app/code/Magento/Catalog/Model/CustomOptions/CustomOptionProcessor.php
+++ b/app/code/Magento/Catalog/Model/CustomOptions/CustomOptionProcessor.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\DataObject;
 use Magento\Quote\Api\Data\CartItemInterface;
-use Magento\Quote\Model\Quote\Item\CartItemProcessorInterface;
 use Magento\Quote\Api\Data\ProductOptionExtensionFactory;
+use Magento\Quote\Model\Quote\Item\CartItemProcessorInterface;
 use Magento\Quote\Model\Quote\ProductOptionFactory;
 
 class CustomOptionProcessor implements CartItemProcessorInterface
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
index 8f0e6e9c0cdb5..1618a90d01b77 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
@@ -9,7 +9,6 @@
 namespace Magento\Catalog\Model\Indexer\Category\Flat;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\EntityManager\MetadataPool;
 
 class AbstractAction
 {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/IndexerConfigData.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/IndexerConfigData.php
index 9e8c569d28451..2b58cb97417fa 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/IndexerConfigData.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/IndexerConfigData.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Flat\Plugin;
 
-use Magento\Indexer\Model\Config\Data;
 use Magento\Catalog\Model\Indexer\Category\Flat\State;
+use Magento\Indexer\Model\Config\Data;
 
 class IndexerConfigData
 {
@@ -41,7 +41,7 @@ public function afterGet(Data $subject, $data, $path = null, $default = null)
             if (!$path && isset($data[$indexerId])) {
                 unset($data[$indexerId]);
             } elseif ($path) {
-                list($firstKey,) = explode('/', $path);
+                list($firstKey, ) = explode('/', $path);
                 if ($firstKey == $indexerId) {
                     $data = $default;
                 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreGroup.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreGroup.php
index 670f19db725f7..d47e89af66ea9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreGroup.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Flat\Plugin;
 
-use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-use Magento\Framework\Model\AbstractModel;
-use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Catalog\Model\Indexer\Category\Flat\State;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
 class StoreGroup
 {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index 78fe3042b5f71..6356e2e08109c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -348,13 +348,13 @@ private function addFilteringByChildProductsToSelect(Select $select, Store $stor
             []
         )->joinLeft(
             ['child_cpsd' => $this->getTable('catalog_product_entity_int')],
-            'child_cpsd.' . $linkField . ' = '. 'relation_product_entity.' . $linkField
+            'child_cpsd.' . $linkField . ' = ' . 'relation_product_entity.' . $linkField
             . ' AND child_cpsd.store_id = 0'
             . ' AND child_cpsd.attribute_id = ' . $statusAttributeId,
             []
         )->joinLeft(
             ['child_cpss' => $this->getTable('catalog_product_entity_int')],
-            'child_cpss.' . $linkField . ' = '. 'relation_product_entity.' . $linkField . ''
+            'child_cpss.' . $linkField . ' = ' . 'relation_product_entity.' . $linkField . ''
             . ' AND child_cpss.attribute_id = child_cpsd.attribute_id'
             . ' AND child_cpss.store_id = ' . $store->getId(),
             []
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
index e61acc2aa09e5..9b9cfbc22f909 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
@@ -6,8 +6,8 @@
 namespace Magento\Catalog\Model\Indexer\Category\Product\Action;
 
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Query\Generator as QueryGenerator;
 
 /**
  * Class Full reindex action
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
index 2ee46b3a6096b..7c1577d90de1e 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Product\Plugin;
 
+use Magento\Catalog\Model\Indexer\Category\Product;
 use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Framework\Model\AbstractModel;
-use Magento\Catalog\Model\Indexer\Category\Product;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
 class StoreGroup
 {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet.php
index bf8fc0d2189cb..d38f55c459fe9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/AttributeSet.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Eav\Plugin;
 
-use Magento\Eav\Model\Entity\Attribute\Set as EavAttributeSet;
 use Magento\Catalog\Model\Indexer\Product\Eav\Processor;
+use Magento\Eav\Model\Entity\Attribute\Set as EavAttributeSet;
 use Magento\Eav\Model\Entity\Attribute\SetFactory;
-use Magento\Framework\App\ObjectManager;
 
 class AttributeSet
 {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
index 3b63a90d4c3ae..feb84530982a9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
@@ -6,7 +6,6 @@
 namespace Magento\Catalog\Model\Indexer\Product\Flat;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
 
 /**
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
index 8182e6f07fab1..c3f1dd3689b45 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
@@ -7,8 +7,6 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Flat\Action;
 
-use Magento\Framework\App\ResourceConnection;
-
 class Eraser
 {
     /**
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows/TableData.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows/TableData.php
index 54f06463dc8a1..4731f2f7d1004 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows/TableData.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows/TableData.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Flat\Action\Rows;
 
-use Magento\Framework\App\ResourceConnection;
-
 /**
  * Class TableData
  */
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/IndexerConfigData.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/IndexerConfigData.php
index ff3f069a84db0..87522a0a3a3bd 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/IndexerConfigData.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/IndexerConfigData.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Flat\Plugin;
 
+use Magento\Catalog\Model\Indexer\Product\Flat\Processor as ProductFlatIndexerProcessor;
 use Magento\Catalog\Model\Indexer\Product\Flat\State as ProductFlatIndexerState;
 use Magento\Indexer\Model\Config\Data as ConfigData;
-use Magento\Catalog\Model\Indexer\Product\Flat\Processor as ProductFlatIndexerProcessor;
 
 /**
  * Plugin for Magento\Indexer\Model\Config\Data
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableData.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableData.php
index 81cacc4660d6c..10534bd381e06 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableData.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableData.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Flat;
 
-use Magento\Framework\App\ResourceConnection;
-
 /**
  * Class TableData
  */
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
index 6db52f969d273..a07cecd81b4fd 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -229,7 +229,7 @@ protected function _prepareTierPriceIndex($entityIds = null)
         ];
         if ($linkField !== 'entity_id') {
             $baseColumns[] = 'cpe.' . $linkField;
-        };
+        }
         $subSelect = $this->_connection->select()->from(
             ['cpe' => $this->_defaultIndexerResource->getTable('catalog_product_entity')],
             array_merge_recursive(
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php
index 32b2db8a7008c..698da510fd59d 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Plugin/CustomerGroup.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Price\Plugin;
 
-use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface;
 use Magento\Customer\Api\Data\GroupInterface;
-use \Magento\Catalog\Model\Indexer\Product\Price\UpdateIndexInterface;
+use Magento\Customer\Api\GroupRepositoryInterface;
 
 class CustomerGroup
 {
diff --git a/app/code/Magento/Catalog/Model/Layer.php b/app/code/Magento/Catalog/Model/Layer.php
index 28e8343c6d051..9a90eb6cef8ee 100644
--- a/app/code/Magento/Catalog/Model/Layer.php
+++ b/app/code/Magento/Catalog/Model/Layer.php
@@ -6,8 +6,8 @@
 namespace Magento\Catalog\Model;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory as AttributeCollectionFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Catalog view layer model
diff --git a/app/code/Magento/Catalog/Model/Layer/Category.php b/app/code/Magento/Catalog/Model/Layer/Category.php
index 8f5fef8ef959b..5fcb5f4b1fe13 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category.php
@@ -7,7 +7,6 @@
 namespace Magento\Catalog\Model\Layer;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
-use Magento\Catalog\Model\ResourceModel;
 
 class Category extends \Magento\Catalog\Model\Layer
 {
diff --git a/app/code/Magento/Catalog/Model/Layer/Search.php b/app/code/Magento/Catalog/Model/Layer/Search.php
index da3022529acfa..dffe9773601a5 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search.php
@@ -7,8 +7,6 @@
 namespace Magento\Catalog\Model\Layer;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
-use Magento\Catalog\Model\Layer;
-use Magento\Catalog\Model\ResourceModel;
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory as AttributeCollectionFactory;
 
 class Search extends \Magento\Catalog\Model\Layer
diff --git a/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php b/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
index 2cf29f1f239b9..09ddfc3dd779e 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
@@ -8,7 +8,6 @@
 use Magento\Catalog\Model\Config;
 use Magento\Catalog\Model\Layer\CollectionFilterInterface;
 use Magento\Catalog\Model\Product\Visibility;
-use Magento\Framework\DB\Select;
 use Magento\Store\Model\StoreManagerInterface;
 
 class CollectionFilter implements CollectionFilterInterface
diff --git a/app/code/Magento/Catalog/Model/Layer/State.php b/app/code/Magento/Catalog/Model/Layer/State.php
index 25f0caddd987b..5492b22597695 100644
--- a/app/code/Magento/Catalog/Model/Layer/State.php
+++ b/app/code/Magento/Catalog/Model/Layer/State.php
@@ -6,8 +6,8 @@
 namespace Magento\Catalog\Model\Layer;
 
 use Magento\Catalog\Model\Layer\Filter\Item;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Layered navigation state model
diff --git a/app/code/Magento/Catalog/Model/Plugin/QuoteItemProductOption.php b/app/code/Magento/Catalog/Model/Plugin/QuoteItemProductOption.php
index 516dfebe93481..a1846693f23e7 100644
--- a/app/code/Magento/Catalog/Model/Plugin/QuoteItemProductOption.php
+++ b/app/code/Magento/Catalog/Model/Plugin/QuoteItemProductOption.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Model\Plugin;
 
-use Magento\Quote\Model\Quote\Item\ToOrderItem as QuoteToOrderItem;
-use Magento\Quote\Model\Quote\Item\AbstractItem as AbstractQuoteItem;
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface as ProductOption;
+use Magento\Quote\Model\Quote\Item\AbstractItem as AbstractQuoteItem;
+use Magento\Quote\Model\Quote\Item\ToOrderItem as QuoteToOrderItem;
 
 /**
  * Plugin for Magento\Quote\Model\Quote\Item\ToOrderItem
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php b/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
index 4df67d1c01f16..d0b46713c4aec 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Catalog\Model\Product\Attribute;
 
+use Magento\Catalog\Api\AttributeSetFinderInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-use Magento\Catalog\Api\AttributeSetFinderInterface;
 use Magento\Framework\DB\Select;
 
 class AttributeSetFinder implements AttributeSetFinderInterface
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
index 0ce29234e52ed..514419e2b1cf3 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Model\Product\Attribute\Backend;
 
-use \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
 use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
+use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
 
 /**
  * Backend model for set of EAV attributes with 'frontend_input' equals 'price'.
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/DataProvider.php b/app/code/Magento/Catalog/Model/Product/Attribute/DataProvider.php
index 2bb10d3b31a24..da50cb7de1e93 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/DataProvider.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/DataProvider.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Catalog\Model\Product\Attribute;
 
-use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
 use Magento\Eav\Model\Entity\Attribute as EavAttribute;
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Model\Store;
+use Magento\Ui\Component\Form\Element\DataType\Text;
 use Magento\Ui\Component\Form\Element\Input;
 use Magento\Ui\Component\Form\Field;
-use Magento\Ui\Component\Form\Element\DataType\Text;
-use Magento\Store\Model\Store;
 
 /**
  * Data provider for the form of adding new product attribute.
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
index f2039a5002dcc..558debfd3e140 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
@@ -45,7 +45,7 @@ public function add($attributeCode, $option)
         if (is_array($currentOptions)) {
             array_walk($currentOptions, function (&$attributeOption) {
                 /** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */
-                    $attributeOption = $attributeOption->getLabel();
+                $attributeOption = $attributeOption->getLabel();
             });
             if (in_array($option->getLabel(), $currentOptions)) {
                 return false;
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php b/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php
index 14774103b8cd2..d8a8db83714ec 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php
@@ -6,8 +6,6 @@
  */
 namespace Magento\Catalog\Model\Product\Attribute;
 
-use Magento\Framework\Exception\InputException;
-
 class SetRepository implements \Magento\Catalog\Api\AttributeSetRepositoryInterface
 {
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/AttributeSet/Build.php b/app/code/Magento/Catalog/Model/Product/AttributeSet/Build.php
index c3024dee83d97..9a470157f9bb1 100644
--- a/app/code/Magento/Catalog/Model/Product/AttributeSet/Build.php
+++ b/app/code/Magento/Catalog/Model/Product/AttributeSet/Build.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Catalog\Model\Product\AttributeSet;
 
-use \Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Exception\AlreadyExistsException;
 
 class Build
 {
diff --git a/app/code/Magento/Catalog/Model/Product/Copier.php b/app/code/Magento/Catalog/Model/Product/Copier.php
index a7941ba5c0a79..2e1515206dfbe 100644
--- a/app/code/Magento/Catalog/Model/Product/Copier.php
+++ b/app/code/Magento/Catalog/Model/Product/Copier.php
@@ -7,10 +7,10 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Option\Repository as OptionRepository;
+use Magento\Catalog\Model\ProductFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Model\ProductFactory;
-use Magento\Catalog\Model\Product\Option\Repository as OptionRepository;
 
 /**
  * Catalog product copier. Creates product duplicate
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/Entry.php b/app/code/Magento/Catalog/Model/Product/Gallery/Entry.php
index 6df27bbba60d5..305c9b056c519 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/Entry.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/Entry.php
@@ -6,9 +6,9 @@
  */
 namespace Magento\Catalog\Model\Product\Gallery;
 
-use Magento\Framework\Model\AbstractExtensibleModel;
-use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryExtensionInterface;
+use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
+use Magento\Framework\Model\AbstractExtensibleModel;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
index 1b5f96baeaf9f..8f08ecf100ae6 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
@@ -8,10 +8,10 @@
 
 use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Catalog\Api\Data\ProductInterface as Product;
+use Magento\Framework\Api\ImageContentValidatorInterface;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
-use Magento\Framework\Api\ImageContentValidatorInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
index ac2a01f9c5a84..ec6bf1e0966c5 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/Processor.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * Catalog product Media Gallery attribute processor.
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
index c785d08e64b7f..6f95e6e8f7d35 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Model\Product\Gallery;
 
-use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
 /**
  * Read handler for catalog product gallery.
@@ -67,7 +67,7 @@ public function execute($entity, $arguments = [])
             $entity,
             $mediaEntries
         );
-        
+
         return $entity;
     }
 
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
index 0dbad386f8b2f..64c865a516fc5 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Model\Product\Gallery;
 
-use Magento\Framework\EntityManager\Operation\ExtensionInterface;
-
 /**
  * Update handler for catalog product gallery.
  *
diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index 971f34e02f9e5..3135496e478ad 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -896,7 +896,7 @@ private function getImageSize($imagePath)
      */
     private function saveImageInfoToCache(array $imageInfo, string $imagePath)
     {
-        $imagePath = $this->cachePrefix  . $imagePath;
+        $imagePath = $this->cachePrefix . $imagePath;
         $this->_cacheManager->save(
             $this->serializer->serialize($imageInfo),
             $imagePath,
@@ -912,7 +912,7 @@ private function saveImageInfoToCache(array $imageInfo, string $imagePath)
      */
     private function loadImageInfoFromCache(string $imagePath)
     {
-        $imagePath = $this->cachePrefix  . $imagePath;
+        $imagePath = $this->cachePrefix . $imagePath;
         $cacheData = $this->_cacheManager->load($imagePath);
         if (!$cacheData) {
             return false;
diff --git a/app/code/Magento/Catalog/Model/Product/Image/Cache.php b/app/code/Magento/Catalog/Model/Product/Image/Cache.php
index cd66257657cb1..25211971d1603 100644
--- a/app/code/Magento/Catalog/Model/Product/Image/Cache.php
+++ b/app/code/Magento/Catalog/Model/Product/Image/Cache.php
@@ -7,9 +7,9 @@
 
 use Magento\Catalog\Helper\Image as ImageHelper;
 use Magento\Catalog\Model\Product;
-use Magento\Theme\Model\ResourceModel\Theme\Collection as ThemeCollection;
 use Magento\Framework\App\Area;
 use Magento\Framework\View\ConfigInterface;
+use Magento\Theme\Model\ResourceModel\Theme\Collection as ThemeCollection;
 use Psr\Log\LoggerInterface;
 
 class Cache
diff --git a/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php b/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
index 455dfb01c028e..ffe22da0bea9d 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
@@ -6,8 +6,8 @@
 namespace Magento\Catalog\Model\Product\Media;
 
 use Magento\Catalog\Api\ProductMediaAttributeManagementInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Store\Model\StoreManagerInterface;
 
 class AttributeManagement implements ProductMediaAttributeManagementInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/ReadHandler.php b/app/code/Magento/Catalog/Model/Product/Option/ReadHandler.php
index 211c458500c73..89e5075240a01 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/ReadHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/ReadHandler.php
@@ -7,8 +7,6 @@
 namespace Magento\Catalog\Model\Product\Option;
 
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
-use Magento\Catalog\Model\Product\OptionFactory;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
 /**
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Repository.php b/app/code/Magento/Catalog/Model/Product/Option/Repository.php
index c2d7781b37ad8..a993cf034b3eb 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Repository.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Repository.php
@@ -6,11 +6,11 @@
 namespace Magento\Catalog\Model\Product\Option;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\HydratorPool;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\EntityManager\HydratorPool;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index 690809332de4a..2560296aa9f83 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -8,8 +8,8 @@
 
 namespace Magento\Catalog\Model\Product\Option\Type;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Catalog product option default type
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
index a7304c9b67bb2..9aee56bc834fb 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Catalog\Model\Product\Option\Type;
 
+use Magento\Catalog\Model\Product\Exception as ProductException;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Catalog\Model\Product\Exception as ProductException;
+use Magento\Framework\Filesystem;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Catalog product option file type
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
index b54c66d75a058..5d6208bd786a9 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Model\Product\Option\Type\File;
 
 use Magento\Catalog\Model\Product;
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Catalog\Model\Product\Exception as ProductException;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
 
 /**
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Product/Option/Value.php
index 10aae63ed349c..d633f7c5e6ebf 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Value.php
@@ -10,8 +10,8 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Option;
-use Magento\Framework\Model\AbstractModel;
 use Magento\Catalog\Pricing\Price\BasePrice;
+use Magento\Framework\Model\AbstractModel;
 
 /**
  * Catalog product option select type model
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index aa28a3478ebf7..28a00a7713904 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Catalog\Model\Product\Type;
 
+use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
 use Magento\Catalog\Model\Product;
 use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Store\Model\Store;
-use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Product type price model
diff --git a/app/code/Magento/Catalog/Model/Product/TypeTransitionManager.php b/app/code/Magento/Catalog/Model/Product/TypeTransitionManager.php
index 65fbdb9dc1f0c..d79d4e2f7be1e 100644
--- a/app/code/Magento/Catalog/Model/Product/TypeTransitionManager.php
+++ b/app/code/Magento/Catalog/Model/Product/TypeTransitionManager.php
@@ -11,7 +11,6 @@
 namespace Magento\Catalog\Model\Product;
 
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\Type;
 
 class TypeTransitionManager
 {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Management.php b/app/code/Magento/Catalog/Model/ProductLink/Management.php
index 18950b74eca65..a4a9ed0ec7dce 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Management.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Management.php
@@ -8,8 +8,8 @@
 
 use Magento\Catalog\Api\Data;
 use Magento\Framework\Exception\CouldNotSaveException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 class Management implements \Magento\Catalog\Api\ProductLinkManagementInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Repository.php b/app/code/Magento/Catalog/Model/ProductLink/Repository.php
index f8dee9216ddcf..c3f336c49edaa 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Repository.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Repository.php
@@ -6,14 +6,14 @@
 namespace Magento\Catalog\Model\ProductLink;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductLinkExtensionFactory;
+use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
 use Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks as LinksInitializer;
 use Magento\Catalog\Model\Product\LinkTypeProvider;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -170,7 +170,7 @@ public function getList(\Magento\Catalog\Api\Data\ProductInterface $product)
                     foreach ($item['custom_attributes'] as $option) {
                         $name = $option['attribute_code'];
                         $value = $option['value'];
-                        $setterName = 'set'.ucfirst($name);
+                        $setterName = 'set' . ucfirst($name);
                         // Check if setter exists
                         if (method_exists($productLinkExtension, $setterName)) {
                             call_user_func([$productLinkExtension, $setterName], $value);
diff --git a/app/code/Magento/Catalog/Model/ProductOptionProcessor.php b/app/code/Magento/Catalog/Model/ProductOptionProcessor.php
index a5e1d05409e43..b8077ea7ed585 100644
--- a/app/code/Magento/Catalog/Model/ProductOptionProcessor.php
+++ b/app/code/Magento/Catalog/Model/ProductOptionProcessor.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Model;
 
-use Magento\Catalog\Api\Data\ProductOptionExtensionFactory;
 use Magento\Catalog\Api\Data\ProductOptionInterface;
 use Magento\Catalog\Model\CustomOptions\CustomOption;
 use Magento\Catalog\Model\CustomOptions\CustomOptionFactory;
diff --git a/app/code/Magento/Catalog/Model/ProductRender/Button.php b/app/code/Magento/Catalog/Model/ProductRender/Button.php
index eb662078fcf32..8dd5bcb8bf03a 100644
--- a/app/code/Magento/Catalog/Model/ProductRender/Button.php
+++ b/app/code/Magento/Catalog/Model/ProductRender/Button.php
@@ -6,9 +6,8 @@
 
 namespace Magento\Catalog\Model\ProductRender;
 
-use Magento\Catalog\Api\Data\ProductRender\AddToCartInterface;
-use Magento\Catalog\Api\Data\ProductRender\ButtonInterface;
 use Magento\Catalog\Api\Data\ProductRender\ButtonExtensionInterface;
+use Magento\Catalog\Api\Data\ProductRender\ButtonInterface;
 
 /**
  * @inheritdoc
diff --git a/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php b/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php
index 24af29b34e42d..8b5c6579ebea7 100644
--- a/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php
+++ b/app/code/Magento/Catalog/Model/ProductWebsiteLinkRepository.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Model;
 
-use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Catalog\Api\Data\ProductWebsiteLinkInterface;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\InputException;
 
 class ProductWebsiteLinkRepository implements \Magento\Catalog\Api\ProductWebsiteLinkRepositoryInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Attribute/ConditionBuilder.php b/app/code/Magento/Catalog/Model/ResourceModel/Attribute/ConditionBuilder.php
index d6bc3ed1d86dc..e83e03ea9ab8d 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Attribute/ConditionBuilder.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Attribute/ConditionBuilder.php
@@ -8,12 +8,11 @@
 
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\Model\Entity\ScopeInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute as CatalogEavAttribute;
 use Magento\Store\Model\Website;
-use Magento\Framework\Model\Entity\ScopeInterface;
 
 /**
  * Builds scope-related conditions for catalog attributes
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AttributePersistor.php b/app/code/Magento/Catalog/Model/ResourceModel/AttributePersistor.php
index 063d4c84eddbe..4c9eced7a8e67 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AttributePersistor.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AttributePersistor.php
@@ -7,14 +7,14 @@
 namespace Magento\Catalog\Model\ResourceModel;
 
 use Magento\Catalog\Model\ResourceModel\Attribute\ConditionBuilder;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute as CatalogEavAttribute;
 use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Locale\FormatInterface;
 use Magento\Framework\Model\Entity\ScopeInterface;
-use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute as CatalogEavAttribute;
 
 class AttributePersistor extends \Magento\Eav\Model\ResourceModel\AttributePersistor
 {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php
index 3b3005f1ce65a..39cc7ab94cf26 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat/Collection.php
@@ -6,12 +6,12 @@
 namespace Magento\Catalog\Model\ResourceModel\Category\Flat;
 
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
 use Magento\Framework\Data\Collection\EntityFactory;
 use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-use Psr\Log\LoggerInterface as Logger;
 use Magento\Store\Model\StoreManagerInterface;
+use Psr\Log\LoggerInterface as Logger;
 
 /**
  * Catalog category flat collection
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php
index 972f11db7aae3..b54fc79fcbb7d 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Category;
 
-use Magento\Framework\Data\Tree\Dbp;
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Framework\Data\Tree\Dbp;
 use Magento\Framework\EntityManager\MetadataPool;
 
 /**
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/CategoryProduct.php b/app/code/Magento/Catalog/Model/ResourceModel/CategoryProduct.php
index 5fbc2ddf94bb5..01706771b0209 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/CategoryProduct.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/CategoryProduct.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Model\ResourceModel;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
 /**
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php
index 58dde2d0cf4b5..cb2431273b5d8 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Flat.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
-use Magento\Store\Model\Store;
 use Magento\Eav\Model\ResourceModel\Attribute\DefaultEntityAttributes\ProviderInterface as DefaultAttributesProvider;
+use Magento\Store\Model\Store;
 
 /**
  * Catalog Product Flat resource model
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
index c4e3fb1bf1e70..96e16519eaf8f 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/AbstractEav.php
@@ -6,7 +6,6 @@
 namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Catalog Product Eav Attributes abstract indexer resource model
@@ -169,7 +168,7 @@ protected function _prepareRelationIndexSelect($parentIds = null)
             []
         )->joinLeft(
             ['e' => $this->getTable('catalog_product_entity')],
-            'e.' . $linkField .' = l.parent_id',
+            'e.' . $linkField . ' = l.parent_id',
             []
         )->join(
             ['cs' => $this->getTable('store')],
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php
index fee2463828e52..f5aa0d8f6807c 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Decimal.php
@@ -59,7 +59,7 @@ protected function _prepareIndex($entityIds = null, $attributeId = null)
         )->joinLeft(
             ['pds' => $this->getTable('catalog_product_entity_decimal')],
             sprintf(
-                'pds.%s = pdd.%s AND pds.attribute_id = pdd.attribute_id'.' AND pds.store_id=cs.store_id',
+                'pds.%s = pdd.%s AND pds.attribute_id = pdd.attribute_id' . ' AND pds.store_id=cs.store_id',
                 $productIdField,
                 $productIdField
             ),
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/DecimalRowSizeEstimator.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/DecimalRowSizeEstimator.php
index 0c8c3a9c0b133..da9a65f3a59bc 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/DecimalRowSizeEstimator.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/DecimalRowSizeEstimator.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav;
 
-use Magento\Store\Api\StoreManagementInterface;
-use Magento\Framework\Indexer\IndexTableRowSizeEstimatorInterface;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Indexer\IndexTableRowSizeEstimatorInterface;
+use Magento\Store\Api\StoreManagementInterface;
 
 /**
  * Estimator of the EAV decimal index table row size.
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
index 5b68730209b40..2084b45357cca 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/Source.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav;
 
-use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 
 /**
  * Catalog Product Eav Select and Multiply Select Attributes Indexer resource model
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceRowSizeEstimator.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceRowSizeEstimator.php
index d212337ae7c64..d8b8c3f1201fb 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceRowSizeEstimator.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceRowSizeEstimator.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav;
 
-use Magento\Store\Api\StoreManagementInterface;
-use Magento\Framework\Indexer\IndexTableRowSizeEstimatorInterface;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Indexer\IndexTableRowSizeEstimatorInterface;
+use Magento\Store\Api\StoreManagementInterface;
 
 /**
  * Estimator of the EAV index table row size.
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
index ee1df8f23424d..831a25367ccd0 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
@@ -7,9 +7,9 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
+use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Select;
-use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
 
 class LinkedProductSelectBuilderByIndexPrice implements LinkedProductSelectBuilderInterface
 {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php
index a499777df871a..26b20e9eb7c92 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Model\ResourceModel\Product\Indexer\Price;
 
+use Magento\Customer\Model\ResourceModel\Group\CollectionFactory;
 use Magento\Framework\Indexer\IndexTableRowSizeEstimatorInterface;
 use Magento\Store\Api\WebsiteManagementInterface;
-use Magento\Customer\Model\ResourceModel\Group\CollectionFactory;
 
 /**
  * Estimate index memory size for largest composite product in catalog.
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php
index 4b420329eef99..60436b8f33e2b 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link.php
@@ -110,7 +110,7 @@ public function hasProductLinks($parentId)
             ['count' => new \Zend_Db_Expr('COUNT(*)')]
         )->where(
             'product_id = :product_id'
-        ) ;
+        );
 
         return $connection->fetchOne(
             $select,
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
index 600b05e39fc68..22e24f1d1b088 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/DeleteHandler.php
@@ -11,8 +11,8 @@
 use Magento\Catalog\Model\Product\LinkTypeProvider;
 use Magento\Catalog\Model\ResourceModel\Product\Link;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Class DeleteHandler
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/SaveHandler.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/SaveHandler.php
index 5dc8a89465255..9758b3e741257 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/SaveHandler.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/SaveHandler.php
@@ -11,8 +11,8 @@
 use Magento\Catalog\Model\Product\LinkTypeProvider;
 use Magento\Catalog\Model\ResourceModel\Product\Link;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Reflection\DataObjectProcessor;
 
 /**
  * Class SaveHandler
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
index 5c47185a85bf4..23ae9f4efa67e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
@@ -133,10 +133,10 @@ public function build($productId)
             ->where('t.attribute_id = ?', $specialPriceAttribute->getAttributeId())
             ->where('t.value IS NOT NULL')
             ->where(
-                'special_from.value IS NULL OR ' . $connection->getDatePartSql('special_from.value') .' <= ?',
+                'special_from.value IS NULL OR ' . $connection->getDatePartSql('special_from.value') . ' <= ?',
                 $currentDate
             )->where(
-                'special_to.value IS NULL OR ' . $connection->getDatePartSql('special_to.value') .' >= ?',
+                'special_to.value IS NULL OR ' . $connection->getDatePartSql('special_to.value') . ' >= ?',
                 $currentDate
             )->order('t.value ' . Select::SQL_ASC)
             ->order(BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS . '.' . $linkField . ' ' . Select::SQL_ASC)
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Website/Link.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Website/Link.php
index de4ffc5d862f9..432a840a5d1a1 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Website/Link.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Website/Link.php
@@ -7,7 +7,6 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\EntityManager\MetadataPool;
 
 class Link
 {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Website/SelectProcessor.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Website/SelectProcessor.php
index ad15702c45572..6ee1e9abe182a 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Website/SelectProcessor.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Website/SelectProcessor.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product\Website;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Url.php b/app/code/Magento/Catalog/Model/ResourceModel/Url.php
index 1cb2fed839dde..2bd1f3e02d1a6 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Url.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Url.php
@@ -10,10 +10,9 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Url
@@ -220,7 +219,7 @@ protected function _getCategoryAttribute($attributeCode, $categoryIds, $storeId)
             $valueExpr = $connection->getCheckSql('t2.value_id > 0', 't2.value', 't1.value');
             $select->from(
                 ['t1' => $attributeTable],
-                [$identifierFiled => 'e.'.$identifierFiled, 'value' => $valueExpr]
+                [$identifierFiled => 'e.' . $identifierFiled, 'value' => $valueExpr]
             )->joinLeft(
                 ['t2' => $attributeTable],
                 "t1.{$linkField} = t2.{$linkField} AND t1.attribute_id = t2.attribute_id AND t2.store_id = :store_id",
diff --git a/app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/File/Processor.php b/app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/File/Processor.php
index 92302dd9ccf47..f1f85c3dbf958 100644
--- a/app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/File/Processor.php
+++ b/app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/File/Processor.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Model\Webapi\Product\Option\Type\File;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\ImageProcessor;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 
 class Processor
diff --git a/app/code/Magento/Catalog/Observer/Compare/BindCustomerLoginObserver.php b/app/code/Magento/Catalog/Observer/Compare/BindCustomerLoginObserver.php
index 27e1b44704156..a13da18f84b48 100644
--- a/app/code/Magento/Catalog/Observer/Compare/BindCustomerLoginObserver.php
+++ b/app/code/Magento/Catalog/Observer/Compare/BindCustomerLoginObserver.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Observer\Compare;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Catalog\Model\Product\Compare\Item;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * Catalog Compare Item Model
@@ -14,12 +14,16 @@
  */
 class BindCustomerLoginObserver implements ObserverInterface
 {
+    /**
+     * @var Item
+     */
+    private $item;
+
     /**
      * @param Item $item
      */
-    public function __construct(
-        Item $item
-    ) {
+    public function __construct(Item $item)
+    {
         $this->item = $item;
     }
 
@@ -28,7 +32,7 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
      *
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Catalog/Observer/Compare/BindCustomerLogoutObserver.php b/app/code/Magento/Catalog/Observer/Compare/BindCustomerLogoutObserver.php
index 11b8d3f854f65..1c61076ff4058 100644
--- a/app/code/Magento/Catalog/Observer/Compare/BindCustomerLogoutObserver.php
+++ b/app/code/Magento/Catalog/Observer/Compare/BindCustomerLogoutObserver.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Observer\Compare;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Catalog\Model\Product\Compare\Item;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * Catalog Compare Item Model
@@ -14,12 +14,16 @@
  */
 class BindCustomerLogoutObserver implements ObserverInterface
 {
+    /**
+     * @var Item
+     */
+    private $item;
+
     /**
      * @param Item $item
      */
-    public function __construct(
-        Item $item
-    ) {
+    public function __construct(Item $item)
+    {
         $this->item = $item;
     }
 
@@ -28,7 +32,7 @@ public function __construct(
      * @param \Magento\Framework\Event\Observer $observer
      * @return $this
      *
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Catalog/Observer/SwitchPriceAttributeScopeOnConfigChange.php b/app/code/Magento/Catalog/Observer/SwitchPriceAttributeScopeOnConfigChange.php
index 7d7eb54ac1f7b..78220ca0c1f16 100644
--- a/app/code/Magento/Catalog/Observer/SwitchPriceAttributeScopeOnConfigChange.php
+++ b/app/code/Magento/Catalog/Observer/SwitchPriceAttributeScopeOnConfigChange.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Catalog\Observer;
 
-use Magento\Framework\Event\Observer as EventObserver;
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-use Magento\Store\Model\Store;
-use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Store\Model\Store;
 
 /**
  * Observer is responsible for changing scope for all price attributes in system
diff --git a/app/code/Magento/Catalog/Plugin/Model/Product/Action/UpdateAttributesFlushCache.php b/app/code/Magento/Catalog/Plugin/Model/Product/Action/UpdateAttributesFlushCache.php
index 185f93568c9fe..32d308ffbab16 100644
--- a/app/code/Magento/Catalog/Plugin/Model/Product/Action/UpdateAttributesFlushCache.php
+++ b/app/code/Magento/Catalog/Plugin/Model/Product/Action/UpdateAttributesFlushCache.php
@@ -6,8 +6,8 @@
 namespace Magento\Catalog\Plugin\Model\Product\Action;
 
 use Magento\Catalog\Model\Product\Action;
-use Magento\Framework\Indexer\CacheContext;
 use Magento\Framework\Event\ManagerInterface as EventManager;
+use Magento\Framework\Indexer\CacheContext;
 
 class UpdateAttributesFlushCache
 {
diff --git a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Attribute/Save.php b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Attribute/Save.php
index 3573c879f9af5..f965f5ff08cac 100644
--- a/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Plugin/Model/ResourceModel/Attribute/Save.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Plugin\Model\ResourceModel\Attribute;
 
 use Magento\Catalog\Model\ResourceModel\Attribute;
-use Magento\PageCache\Model\Config;
 use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\PageCache\Model\Config;
 
 class Save
 {
diff --git a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php
index 5026286610118..6947d7e4dcfd8 100644
--- a/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/CustomOptionPrice.php
@@ -7,10 +7,10 @@
 
 use Magento\Catalog\Model\Product\Option\Value;
 use Magento\Catalog\Pricing\Price;
-use Magento\Framework\Pricing\Price\AbstractPrice;
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\Price\AbstractPrice;
+use Magento\Framework\Pricing\SaleableInterface;
 
 /**
  * Class OptionPrice
diff --git a/app/code/Magento/Catalog/Pricing/Price/FinalPrice.php b/app/code/Magento/Catalog/Pricing/Price/FinalPrice.php
index 5aea8a7381936..ed07d51a5abf1 100644
--- a/app/code/Magento/Catalog/Pricing/Price/FinalPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/FinalPrice.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Catalog\Pricing\Price;
 
-use Magento\Catalog\Model\Product;
 use Magento\Framework\Pricing\Price\AbstractPrice;
 
 /**
diff --git a/app/code/Magento/Catalog/Pricing/Price/MinimalPriceCalculatorInterface.php b/app/code/Magento/Catalog/Pricing/Price/MinimalPriceCalculatorInterface.php
index 6c493947919da..5f88eb7051bb1 100644
--- a/app/code/Magento/Catalog/Pricing/Price/MinimalPriceCalculatorInterface.php
+++ b/app/code/Magento/Catalog/Pricing/Price/MinimalPriceCalculatorInterface.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Pricing\Price;
 
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\SaleableInterface;
 
 /**
  * Interface define methods which control display of "As low as" price
diff --git a/app/code/Magento/Catalog/Pricing/Price/MinimalTierPriceCalculator.php b/app/code/Magento/Catalog/Pricing/Price/MinimalTierPriceCalculator.php
index 387ef9416ef68..8001978e8f2b0 100644
--- a/app/code/Magento/Catalog/Pricing/Price/MinimalTierPriceCalculator.php
+++ b/app/code/Magento/Catalog/Pricing/Price/MinimalTierPriceCalculator.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Pricing\Price;
 
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\SaleableInterface;
 
 /**
  * As Low As shows minimal value of Tier Prices
diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
index 893978a3b6b3b..e5cd703256f62 100644
--- a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
@@ -10,13 +10,13 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Customer\Model\Group\RetrieverInterface as CustomerGroupRetrieverInterface;
 use Magento\Customer\Model\Session;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
 use Magento\Framework\Pricing\Price\AbstractPrice;
 use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
 use Magento\Framework\Pricing\PriceInfoInterface;
-use Magento\Customer\Model\Group\RetrieverInterface as CustomerGroupRetrieverInterface;
 
 /**
  * @api
diff --git a/app/code/Magento/Catalog/Pricing/Render.php b/app/code/Magento/Catalog/Pricing/Render.php
index d0513b4dd9003..a78b4ef0876bd 100644
--- a/app/code/Magento/Catalog/Pricing/Render.php
+++ b/app/code/Magento/Catalog/Pricing/Render.php
@@ -7,8 +7,8 @@
 namespace Magento\Catalog\Pricing;
 
 use Magento\Catalog\Model\Product;
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Render as PricingRender;
+use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\View\Element\Template;
 
diff --git a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
index f370c49cdfa20..52dbecb0ba4cb 100644
--- a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
+++ b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
@@ -6,16 +6,16 @@
 
 namespace Magento\Catalog\Pricing\Render;
 
-use Magento\Catalog\Pricing\Price;
-use Magento\Framework\Pricing\Render\PriceBox as BasePriceBox;
-use Magento\Msrp\Pricing\Price\MsrpPrice;
 use Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolverInterface;
-use Magento\Framework\View\Element\Template\Context;
-use Magento\Framework\Pricing\SaleableInterface;
+use Magento\Catalog\Pricing\Price;
+use Magento\Catalog\Pricing\Price\MinimalPriceCalculatorInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Framework\Pricing\Render\PriceBox as BasePriceBox;
 use Magento\Framework\Pricing\Render\RendererPool;
-use Magento\Framework\App\ObjectManager;
-use Magento\Catalog\Pricing\Price\MinimalPriceCalculatorInterface;
+use Magento\Framework\Pricing\SaleableInterface;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Msrp\Pricing\Price\MsrpPrice;
 
 /**
  * Class for final_price rendering
@@ -181,7 +181,7 @@ public function showMinimalPrice()
      */
     public function getCacheKey()
     {
-        return parent::getCacheKey() . ($this->getData('list_category_page') ? '-list-category-page': '');
+        return parent::getCacheKey() . ($this->getData('list_category_page') ? '-list-category-page' : '');
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Setup/CategorySetup.php b/app/code/Magento/Catalog/Setup/CategorySetup.php
index f85407a9a9d7a..a938a59d98a22 100644
--- a/app/code/Magento/Catalog/Setup/CategorySetup.php
+++ b/app/code/Magento/Catalog/Setup/CategorySetup.php
@@ -7,13 +7,16 @@
  */
 namespace Magento\Catalog\Setup;
 
+use Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\DefaultSortby;
 use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\ResourceModel\Category\Attribute\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as ProductAttributeCollection;
 use Magento\Eav\Model\Entity\Setup\Context;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
 use Magento\Eav\Setup\EavSetup;
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Catalog\Model\Product\Type;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -84,8 +87,7 @@ public function getDefaultEntities()
                 'attribute_model' => \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
                 'table' => 'catalog_category_entity',
                 'additional_attribute_table' => 'catalog_eav_attribute',
-                'entity_attribute_collection' =>
-                    \Magento\Catalog\Model\ResourceModel\Category\Attribute\Collection::class,
+                'entity_attribute_collection' => Collection::class,
                 'attributes' => [
                     'name' => [
                         'type' => 'varchar',
@@ -302,8 +304,7 @@ public function getDefaultEntities()
                         'source' => \Magento\Catalog\Model\Category\Attribute\Source\Sortby::class,
                         'backend' => \Magento\Catalog\Model\Category\Attribute\Backend\Sortby::class,
                         'sort_order' => 50,
-                        'input_renderer' =>
-                            \Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\DefaultSortby::class,
+                        'input_renderer' => DefaultSortby::class,
                         'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Display Settings',
                     ],
@@ -355,8 +356,7 @@ public function getDefaultEntities()
                 'attribute_model' => \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
                 'table' => 'catalog_product_entity',
                 'additional_attribute_table' => 'catalog_eav_attribute',
-                'entity_attribute_collection' =>
-                    \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection::class,
+                'entity_attribute_collection' => ProductAttributeCollection::class,
                 'attributes' => [
                     'name' => [
                         'type' => 'varchar',
diff --git a/app/code/Magento/Catalog/Setup/InstallData.php b/app/code/Magento/Catalog/Setup/InstallData.php
index 5b1a10b098eb5..a0217fc52dc11 100644
--- a/app/code/Magento/Catalog/Setup/InstallData.php
+++ b/app/code/Magento/Catalog/Setup/InstallData.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Catalog\Setup;
 
+use Magento\Catalog\Helper\DefaultCategory;
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Catalog\Helper\DefaultCategory;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Catalog/Setup/UpgradeSchema.php b/app/code/Magento/Catalog/Setup/UpgradeSchema.php
index d08108d1fc22b..6f4f31d3390b0 100755
--- a/app/code/Magento/Catalog/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Catalog/Setup/UpgradeSchema.php
@@ -8,10 +8,10 @@
 
 use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter;
 use Magento\Catalog\Model\ResourceModel\Product\Gallery;
+use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\DB\Ddl\Table;
 
 /**
  * Upgrade the Catalog module DB scheme
diff --git a/app/code/Magento/Catalog/Setup/UpgradeWidgetData.php b/app/code/Magento/Catalog/Setup/UpgradeWidgetData.php
index f9eba413f5416..6af6d7e1718a9 100644
--- a/app/code/Magento/Catalog/Setup/UpgradeWidgetData.php
+++ b/app/code/Magento/Catalog/Setup/UpgradeWidgetData.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Catalog\Setup;
 
-use Magento\Framework\DB\Select\QueryModifierFactory;
-use Magento\Widget\Setup\LayoutUpdateConverter;
 use Magento\Eav\Setup\EavSetup;
-use Magento\Framework\DB\FieldToConvert;
 use Magento\Framework\DB\AggregatedFieldDataConverter;
+use Magento\Framework\DB\FieldToConvert;
+use Magento\Framework\DB\Select\QueryModifierFactory;
+use Magento\Widget\Setup\LayoutUpdateConverter;
 
 /**
  * Convert serialized widget data for categories and products tables to JSON
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Button/GenericTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Button/GenericTest.php
index e5ab23d59572d..3a47064a91935 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Button/GenericTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Button/GenericTest.php
@@ -6,10 +6,10 @@
 namespace Magento\Catalog\Test\Unit\Block\Adminhtml\Product\Edit\Button;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Block\Adminhtml\Product\Edit\Button\Generic;
 use Magento\Framework\Registry;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\Context;
-use Magento\Catalog\Block\Adminhtml\Product\Edit\Button\Generic;
 
 /**
  * Class GenericTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/Compare/ListCompareTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/Compare/ListCompareTest.php
index ec472e0a3366d..9cfa7f1905129 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/Compare/ListCompareTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/Compare/ListCompareTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Catalog\Test\Unit\Block\Product\Compare;
 
-use \Magento\Catalog\Block\Product\Compare\ListCompare;
+use Magento\Catalog\Block\Product\Compare\ListCompare;
 
 /**
  * Class ListCompareTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php
index fe07f69e8046f..8de39a4b5e526 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php
@@ -9,7 +9,6 @@
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Pricing\Render;
 use Magento\Framework\Url\Helper\Data;
-use Magento\Framework\View\LayoutInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/AttributesTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/AttributesTest.php
index 4602a0d99f6f1..3b24ea955cb6d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/View/AttributesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/View/AttributesTest.php
@@ -6,15 +6,15 @@
 
 namespace Magento\Catalog\Test\Unit\Block\Product\View;
 
-use \PHPUnit\Framework\TestCase;
-use \Magento\Framework\Phrase;
-use \Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-use \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
-use \Magento\Catalog\Model\Product;
-use \Magento\Framework\View\Element\Template\Context;
-use \Magento\Framework\Registry;
-use \Magento\Framework\Pricing\PriceCurrencyInterface;
-use \Magento\Catalog\Block\Product\View\Attributes as AttributesBlock;
+use Magento\Catalog\Block\Product\View\Attributes as AttributesBlock;
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
+use Magento\Framework\Phrase;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\View\Element\Template\Context;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test class for \Magento\Catalog\Block\Product\View\Attributes
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Ui/ProductViewCounterTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Ui/ProductViewCounterTest.php
index e7e8ab5ea91a7..c8d2f5757081c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Ui/ProductViewCounterTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Ui/ProductViewCounterTest.php
@@ -6,19 +6,19 @@
 
 namespace Magento\Catalog\Test\Unit\Block\Ui;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductRenderInterface;
+use Magento\Catalog\Block\Ui\ProductViewCounter;
+use Magento\Catalog\Model\ProductRenderFactory;
 use Magento\Catalog\Model\ProductRepository;
 use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorComposite;
-use Magento\Catalog\Model\ProductRenderFactory;
 use Magento\Framework\EntityManager\Hydrator;
+use Magento\Framework\Registry;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Url;
 use Magento\Framework\View\Element\Template\Context;
-use Magento\Store\Model\StoreManager;
 use Magento\Store\Model\Store;
-use Magento\Framework\Registry;
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Api\Data\ProductRenderInterface;
-use Magento\Catalog\Block\Ui\ProductViewCounter;
+use Magento\Store\Model\StoreManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Test/Unit/Console/Command/ImagesResizeCommandTest.php b/app/code/Magento/Catalog/Test/Unit/Console/Command/ImagesResizeCommandTest.php
index b4687e18daf8d..8fb8ca2d7a09a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Console/Command/ImagesResizeCommandTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Console/Command/ImagesResizeCommandTest.php
@@ -11,10 +11,10 @@
 use Magento\Catalog\Model\Product\Image\CacheFactory as ImageCacheFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+use Magento\Framework\App\Area;
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Symfony\Component\Console\Tester\CommandTester;
-use \Magento\Framework\App\Area;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php
index 07dacae7298cf..319494b4c9679 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Category\Image;
 
 use Magento\Catalog\Controller\Adminhtml\Category\Image\Upload as Model;
-use Magento\Framework\App\Request\Http as Request;
 use Magento\Catalog\Model\ImageUploader;
+use Magento\Framework\App\Request\Http as Request;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\DataObject;
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AddAttributeToTemplateTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AddAttributeToTemplateTest.php
index a29336a8dca54..93208360b6482 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AddAttributeToTemplateTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AddAttributeToTemplateTest.php
@@ -5,22 +5,22 @@
  */
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product;
 
-use Magento\Catalog\Controller\Adminhtml\Product\AddAttributeToTemplate;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Backend\App\Action\Context;
-use Magento\Catalog\Controller\Adminhtml\Product\Builder as ProductBuilder;
-use Magento\Framework\Controller\Result\JsonFactory;
-use Magento\Framework\App\RequestInterface;
 use Magento\Catalog\Api\AttributeSetRepositoryInterface;
-use Magento\Eav\Api\Data\AttributeSetInterface;
-use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Framework\Api\SearchCriteria;
+use Magento\Catalog\Controller\Adminhtml\Product\AddAttributeToTemplate;
+use Magento\Catalog\Controller\Adminhtml\Product\Builder as ProductBuilder;
 use Magento\Eav\Api\AttributeGroupRepositoryInterface;
-use Magento\Eav\Api\Data\AttributeGroupSearchResultsInterface;
-use Magento\Eav\Api\Data\AttributeGroupInterfaceFactory;
 use Magento\Eav\Api\Data\AttributeGroupInterface;
+use Magento\Eav\Api\Data\AttributeGroupInterfaceFactory;
+use Magento\Eav\Api\Data\AttributeGroupSearchResultsInterface;
+use Magento\Eav\Api\Data\AttributeSetInterface;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
index f493cbc88f18e..a43281ba54ff0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/SaveTest.php
@@ -5,19 +5,19 @@
  */
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Attribute;
 
+use Magento\Backend\Model\View\Result\Redirect as ResultRedirect;
 use Magento\Catalog\Controller\Adminhtml\Product\Attribute\Save;
-use Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\AttributeTest;
-use Magento\Catalog\Model\Product\AttributeSet\BuildFactory;
+use Magento\Catalog\Helper\Product as ProductHelper;
 use Magento\Catalog\Model\Product\AttributeSet\Build;
+use Magento\Catalog\Model\Product\AttributeSet\BuildFactory;
 use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
+use Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\AttributeTest;
 use Magento\Eav\Api\Data\AttributeSetInterface;
+use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\Validator as InputTypeValidator;
 use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
 use Magento\Framework\Filter\FilterManager;
-use Magento\Catalog\Helper\Product as ProductHelper;
 use Magento\Framework\View\LayoutFactory;
-use Magento\Backend\Model\View\Result\Redirect as ResultRedirect;
-use Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\Validator as InputTypeValidator;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php
index b85b03852b621..e4e868bbb83be 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/AttributeTest.php
@@ -9,10 +9,10 @@
 use Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Cache\FrontendInterface;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Registry;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Result\PageFactory;
-use Magento\Framework\Controller\ResultFactory;
 
 /**
  * Class AttributeTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php
index 4113ce636d66b..627db4b50735c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/BuilderTest.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product;
 
-use \Magento\Catalog\Controller\Adminhtml\Product\Builder;
+use Magento\Catalog\Controller\Adminhtml\Product\Builder;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Cms\Model\Wysiwyg\Config as WysiwygConfig;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\Registry;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreFactory;
 use Psr\Log\LoggerInterface;
-use Magento\Catalog\Model\ProductFactory;
-use Magento\Framework\Registry;
-use Magento\Cms\Model\Wysiwyg\Config as WysiwygConfig;
-use Magento\Framework\App\Request\Http;
 
 /**
  * Class BuilderTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactoryTest.php
index 9d0ab628a6450..7d6a1b3054342 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/HandlerFactoryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Initialization\Helper;
 
-use \Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\HandlerFactory;
+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\HandlerFactory;
 
 class HandlerFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
index dce3f5886d1a8..3747476212c9b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php
@@ -5,22 +5,22 @@
  */
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product\Initialization;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductLinkTypeInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface as ProductRepository;
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter;
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks;
+use Magento\Catalog\Model\Product\LinkTypeProvider;
 use Magento\Catalog\Model\Product\Option;
+use Magento\Catalog\Model\ProductLink\Link as ProductLink;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
-use Magento\Catalog\Api\Data\ProductLinkInterfaceFactory;
-use Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks;
-use Magento\Catalog\Model\Product\LinkTypeProvider;
-use Magento\Catalog\Api\Data\ProductLinkTypeInterface;
-use Magento\Catalog\Model\ProductLink\Link as ProductLink;
-use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php
index d41de5f67503c..4c70c8bfa5a4d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php
@@ -6,12 +6,12 @@
  */
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Product;
 
-use Magento\Ui\Component\MassAction\Filter;
 use Magento\Backend\Model\View\Result\Redirect;
-use Magento\Catalog\Model\Indexer\Product\Price\Processor;
 use Magento\Catalog\Controller\Adminhtml\Product\Builder;
-use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Catalog\Model\Indexer\Product\Price\Processor;
 use Magento\Catalog\Model\Product\Action;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * Class MassStatusTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ReloadTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ReloadTest.php
index 16bda2c39ab85..100c0deba096e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ReloadTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ReloadTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Backend\App\Action\Context;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Controller\Adminhtml\Product\Builder;
 use Magento\Catalog\Controller\Adminhtml\Product\Reload;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\ResultFactory;
@@ -14,7 +15,6 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Layout\ProcessorInterface;
 use Magento\Framework\View\LayoutInterface;
-use Magento\Catalog\Controller\Adminhtml\Product\Builder;
 use Magento\Ui\Component\Wrapper\UiComponent;
 
 /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Product/Frontend/Action/SynchronizeTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Product/Frontend/Action/SynchronizeTest.php
index bae370c7dd79f..cfee6f3f1e337 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Product/Frontend/Action/SynchronizeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Product/Frontend/Action/SynchronizeTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Catalog\Test\Unit\Controller\Product\Frontend\Action;
 
-use Magento\Framework\App\Action\Context;
+use Magento\Catalog\Controller\Product\Frontend\Action\Synchronize;
 use Magento\Catalog\Model\Product\ProductFrontendAction\Synchronizer;
-use Magento\Framework\Controller\Result\JsonFactory;
-use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\RequestInterface;
-use Magento\Catalog\Controller\Product\Frontend\Action\Synchronize;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\Result\JsonFactory;
 
 class SynchronizeTest extends \PHPUnit\Framework\TestCase
 {
@@ -101,7 +101,7 @@ public function testExecuteAction()
 
         $this->synchronize->execute();
     }
-    
+
     public function testExecuteActionException()
     {
         $data = [
@@ -128,7 +128,7 @@ public function testExecuteActionException()
 
         $this->synchronizerMock->expects($this->once())
             ->method('syncActions')
-            ->willThrowException(new \Exception);
+            ->willThrowException(new \Exception());
 
         $jsonObject->expects($this->once())
             ->method('setStatusHeader')
diff --git a/app/code/Magento/Catalog/Test/Unit/Cron/RefreshSpecialPricesTest.php b/app/code/Magento/Catalog/Test/Unit/Cron/RefreshSpecialPricesTest.php
index 458ed98ecf946..d22cfc1740cfe 100644
--- a/app/code/Magento/Catalog/Test/Unit/Cron/RefreshSpecialPricesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Cron/RefreshSpecialPricesTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Cron;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
 
 /**
diff --git a/app/code/Magento/Catalog/Test/Unit/CustomerData/ProductFrontendActionSectionTest.php b/app/code/Magento/Catalog/Test/Unit/CustomerData/ProductFrontendActionSectionTest.php
index ffc82d002afcb..0547b6ac9c466 100644
--- a/app/code/Magento/Catalog/Test/Unit/CustomerData/ProductFrontendActionSectionTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/CustomerData/ProductFrontendActionSectionTest.php
@@ -6,10 +6,10 @@
 namespace Magento\Catalog\Test\Unit\CustomerData;
 
 use Magento\Catalog\Api\Data\ProductFrontendActionInterface;
+use Magento\Catalog\CustomerData\ProductFrontendActionSection;
 use Magento\Catalog\Model\Product\ProductFrontendAction\Synchronizer;
 use Magento\Framework\App\Config;
 use Psr\Log\LoggerInterface;
-use Magento\Catalog\CustomerData\ProductFrontendActionSection;
 
 class ProductFrontendActionSectionTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php
index 3b99f2697f6b8..8343ba4227e0a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php
@@ -271,8 +271,8 @@ public function validateDefaultSortDataProvider()
             [
                 'default_sort_by',
                 [
-                    'available_sort_by' => NULL,
-                    'default_sort_by' => NULL,
+                    'available_sort_by' => null,
+                    'default_sort_by' => null,
                     'use_post_data_config' => ['available_sort_by', 'default_sort_by', 'filter_price_range']
                 ]
             ],
@@ -299,14 +299,14 @@ public function validateDefaultSortException()
             [
                 'default_sort_by',
                 [
-                    'available_sort_by' => NULL,
+                    'available_sort_by' => null,
                     'use_post_data_config' => ['default_sort_by']
                 ],
             ],
             [
                 'default_sort_by',
                 [
-                    'available_sort_by' => NULL,
+                    'available_sort_by' => null,
                     'use_post_data_config' => []
                 ]
             ],
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Source/PageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Source/PageTest.php
index 4558f39d752c6..1a834d24efc6d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Source/PageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Source/PageTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Category\Attribute\Source;
 
-use Magento\Cms\Model\ResourceModel\Block\CollectionFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class PageTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
index 0e8777b5c6f9e..ea59d9576215d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php
@@ -67,7 +67,7 @@ public function testGetMimeType()
 
         $this->mediaDirectory->expects($this->once())
             ->method('getAbsolutePath')
-            ->with($mediaPath. '/' . ltrim($fileName, '/'))
+            ->with($mediaPath . '/' . ltrim($fileName, '/'))
             ->willReturn($absoluteFilePath);
 
         $this->mime->expects($this->once())
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/ReadHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/ReadHandlerTest.php
index 5879c38cada9e..b70258861433d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/ReadHandlerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/ReadHandlerTest.php
@@ -9,9 +9,9 @@
 use Magento\Catalog\Api\Data\CategoryLinkInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Model\Category\Link\ReadHandler;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Product\CategoryLink;
 use Magento\Framework\Api\DataObjectHelper;
-use Magento\Catalog\Model\Product;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php
index 0b85ef38387fa..d523bb7379aeb 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Link/SaveHandlerTest.php
@@ -7,11 +7,10 @@
 
 use Magento\Catalog\Api\Data\CategoryLinkInterface;
 use Magento\Catalog\Model\Category\Link\SaveHandler;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Product\CategoryLink;
 use Magento\Framework\EntityManager\HydratorInterface;
 use Magento\Framework\EntityManager\HydratorPool;
-use Magento\Catalog\Model\Product;
-use Magento\Framework\Indexer\IndexerRegistry;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php
index 9545e5eb4b37d..8d1a4d7ad38ed 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Product/PositionResolverTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Category\Product;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Catalog\Model\Category\Product\PositionResolver;
-use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class PositionResolverTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php
index b8b76524099f4..e37f9e27768d0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryListTest.php
@@ -7,15 +7,15 @@
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\Data\CategorySearchResultsInterface;
+use Magento\Catalog\Api\Data\CategorySearchResultsInterfaceFactory;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryList;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
-use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Catalog\Api\Data\CategorySearchResultsInterfaceFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
index b9e9bd14d6924..4b6f804bd97dd 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
@@ -8,8 +8,8 @@
 
 namespace Magento\Catalog\Test\Unit\Model;
 
-use Magento\Catalog\Model\Indexer;
 use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Indexer;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
index 9df0a6bc1eac0..e98579624094b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CollectionProviderTest.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Catalog\Test\Unit\Model;
 
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductLink\CollectionProvider;
 use Magento\Catalog\Model\ProductLink\CollectionProviderInterface;
 use Magento\Catalog\Model\ProductLink\Converter\ConverterInterface;
 use Magento\Catalog\Model\ProductLink\Converter\ConverterPool;
-use Magento\Catalog\Model\Product;
 
 class CollectionProviderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/FactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/FactoryTest.php
index a22068136dd85..0d30acc78f9aa 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/FactoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/FactoryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Catalog\Test\Unit\Model;
 
-use \Magento\Catalog\Model\Factory;
+use Magento\Catalog\Model\Factory;
 
 class FactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ImageExtractorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ImageExtractorTest.php
index 3b0262aa99e4f..573e9c5dde325 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ImageExtractorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ImageExtractorTest.php
@@ -22,7 +22,7 @@ protected function setUp()
 
     public function testProcess()
     {
-        $expectedArray = include(__DIR__ . '/_files/converted_view.php');
+        $expectedArray = include __DIR__ . '/_files/converted_view.php';
         $this->assertSame($expectedArray, $this->model->process($this->getDomElement(), 'media'));
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Plugin/AttributeSetTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Plugin/AttributeSetTest.php
index de27dfed4fb30..7c9b2cb0a54f9 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Plugin/AttributeSetTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Plugin/AttributeSetTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Eav\Plugin;
 
+use Magento\Catalog\Model\Indexer\Product\Eav\Plugin\AttributeSet;
 use Magento\Catalog\Model\Indexer\Product\Eav\Plugin\AttributeSet\IndexableAttributeFilter;
+use Magento\Catalog\Model\Indexer\Product\Eav\Processor;
 use Magento\Eav\Model\Entity\Attribute\Set as EavAttributeSet;
 use Magento\Eav\Model\Entity\Attribute\SetFactory;
-use Magento\Catalog\Model\Indexer\Product\Eav\Processor;
-use Magento\Catalog\Model\Indexer\Product\Eav\Plugin\AttributeSet;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class AttributeSetTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
index 41b3d36227431..7e78ddcec429e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
@@ -118,4 +118,3 @@ public function testExecuteWithExistingFlatTablesCreatesTables()
         $this->model->execute('product_id_1');
     }
 }
-
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/Rows/TableDataTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/Rows/TableDataTest.php
index cdb3403d850aa..b89306920fd2a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/Rows/TableDataTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/Rows/TableDataTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Flat\Action\Rows;
 
-use Magento\Framework\App\ResourceConnection;
-
 class TableDataTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Plugin/IndexerConfigDataTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Plugin/IndexerConfigDataTest.php
index 2f80f813f9a6e..d78401d22aed2 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Plugin/IndexerConfigDataTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Plugin/IndexerConfigDataTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Flat\Plugin;
 
 use Magento\Catalog\Model\Indexer\Product\Flat\Plugin\IndexerConfigData as IndexerConfigDataPlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Catalog\Model\Indexer\Product\Flat\State as ProductFlatIndexerState;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Indexer\Model\Config\Data as ConfigData;
 
 class IndexerConfigDataTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/TableDataTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/TableDataTest.php
index 5717c2f419cab..d4ceffdbd3f35 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/TableDataTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/TableDataTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Flat;
 
-use Magento\Framework\App\ResourceConnection;
-
 class TableDataTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/FullTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/FullTest.php
index de2c4eaf7dc67..d843315a5d968 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/FullTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/FullTest.php
@@ -8,8 +8,8 @@
 
 use Magento\Catalog\Model\Indexer\Product\Full;
 use Magento\Framework\Indexer\IndexerInterface;
-use PHPUnit\Framework\TestCase;
 use Magento\Framework\Indexer\IndexerRegistry;
+use PHPUnit\Framework\TestCase;
 
 class FullTest extends TestCase
 {
@@ -27,7 +27,7 @@ class FullTest extends TestCase
      * @var Full
      */
     private $full;
-    
+
     public function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/AvailabilityFlagTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/AvailabilityFlagTest.php
index 7ba217317c88f..bc285306a9541 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/AvailabilityFlagTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/AvailabilityFlagTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Layer\Category;
 
-use \Magento\Catalog\Model\Layer\Category\AvailabilityFlag;
+use Magento\Catalog\Model\Layer\Category\AvailabilityFlag;
 
 class AvailabilityFlagTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/CollectionFilterTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/CollectionFilterTest.php
index 8f489995004c9..9e1e2d92e051d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/CollectionFilterTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/CollectionFilterTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Layer\Category;
 
-use \Magento\Catalog\Model\Layer\Category\CollectionFilter;
+use Magento\Catalog\Model\Layer\Category\CollectionFilter;
 
 class CollectionFilterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/FilterableAttributeListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/FilterableAttributeListTest.php
index f7ec16e06ef22..cc6cd0adaef1d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/FilterableAttributeListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/FilterableAttributeListTest.php
@@ -35,7 +35,6 @@ protected function setUp()
             $this->collectionFactoryMock,
             $this->storeManagerMock
         );
-
     }
 
     public function testGetList()
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/StateKeyTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/StateKeyTest.php
index 1f260475cd9db..a1f7c037d2e79 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/StateKeyTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/StateKeyTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Layer\Category;
 
-use \Magento\Catalog\Model\Layer\Category\StateKey;
+use Magento\Catalog\Model\Layer\Category\StateKey;
 
 class StateKeyTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php
index 3a23ebcdf4518..f64555f38a32a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Layer\Filter\DataProvider;
 
-use \Magento\Catalog\Model\Layer\Filter\DataProvider\Price;
+use Magento\Catalog\Model\Layer\Filter\DataProvider\Price;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php
index db810e2f5c0f4..73415d4b18390 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Layer;
 
-use \Magento\Catalog\Model\Layer\FilterList;
+use Magento\Catalog\Model\Layer\FilterList;
 
 class FilterListTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/FilterableAttributeListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/FilterableAttributeListTest.php
index 75af901edc98e..22571497d1966 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/FilterableAttributeListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/FilterableAttributeListTest.php
@@ -35,7 +35,6 @@ protected function setUp()
             $this->collectionFactoryMock,
             $this->storeManagerMock
         );
-
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Plugin/QuoteItemProductOptionTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Plugin/QuoteItemProductOptionTest.php
index 89f848750de65..7517f1de00a1e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Plugin/QuoteItemProductOptionTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Plugin/QuoteItemProductOptionTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Plugin;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface as ProductOption;
 use Magento\Catalog\Model\Plugin\QuoteItemProductOption as QuoteItemProductOptionPlugin;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\DataObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Quote\Model\Quote\Item\ToOrderItem as QuoteToOrderItem;
 use Magento\Quote\Model\Quote\Item\AbstractItem as AbstractQuoteItem;
 use Magento\Quote\Model\Quote\Item\Option as QuoteItemOption;
-use Magento\Catalog\Model\Product;
-use Magento\Framework\DataObject;
-use Magento\Catalog\Api\Data\ProductCustomOptionInterface as ProductOption;
+use Magento\Quote\Model\Quote\Item\ToOrderItem as QuoteToOrderItem;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/PriceTest.php
index 432251f361484..773dc66df4f6c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/PriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/PriceTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Product\Attribute\Backend;
 
-use Magento\Store\Model\Store;
-
 /**
  * Class PriceTest
  */
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
index 31fd0696db320..950116646119d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Unit\Model\Product;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use \Magento\Catalog\Model\Product\Copier;
+use Magento\Catalog\Model\Product\Copier;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -157,7 +157,8 @@ public function testCopy()
 
         $duplicateMock->expects($this->any())->method('getData')->willReturnMap([
             ['linkField', null, '2'],
-        ]);        $this->optionRepositoryMock->expects($this->once())
+        ]);
+        $this->optionRepositoryMock->expects($this->once())
             ->method('duplicate')
             ->with($this->productMock, $duplicateMock);
         $resourceMock->expects($this->once())->method('duplicate')->with(1, 2);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopyConstructorFactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopyConstructorFactoryTest.php
index a01e9814b0579..b2b7cd1eca6ad 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/CopyConstructorFactoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/CopyConstructorFactoryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Product;
 
-use \Magento\Catalog\Model\Product\CopyConstructorFactory;
+use Magento\Catalog\Model\Product\CopyConstructorFactory;
 
 class CopyConstructorFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
index 627aa1848506e..60b58a7b414e6 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php
@@ -7,8 +7,8 @@
 
 use Magento\Catalog\Model\View\Asset\ImageFactory;
 use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Initialization/Helper/ProductLinksTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Initialization/Helper/ProductLinksTest.php
index ff0e82abe1d47..849c3204ef364 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Initialization/Helper/ProductLinksTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Initialization/Helper/ProductLinksTest.php
@@ -6,7 +6,6 @@
 namespace Magento\Catalog\Test\Unit\Model\Product\Initialization\Helper;
 
 use Magento\Catalog\Model\Product;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class ProductLinksTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Link/ConverterTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Link/ConverterTest.php
index c0d7c63ee7cfa..60abb5f727a99 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Link/ConverterTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Link/ConverterTest.php
@@ -79,7 +79,7 @@ public function testConvertLinksToGroupedArray()
         $attributeMock->expects($this->once())
             ->method('__toArray')
             ->willReturn(['qty' => 33]);
-        
+
         $this->assertEquals($linksAsArray, $this->converter->convertLinksToGroupedArray($productMock));
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTest.php
index a8e1e7602afd6..60237ea24b22b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Product;
 
-use \Magento\Catalog\Model\Product\Link;
+use Magento\Catalog\Model\Product\Link;
 
 class LinkTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php
index ec6aa9d8db83a..459549aa0fdbf 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/RepositoryTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Product\Option;
 
-use \Magento\Catalog\Model\Product\Option\Repository;
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-use \Magento\Catalog\Model\ResourceModel\Product\Option\CollectionFactory;
+use Magento\Catalog\Model\Product\Option\Repository;
+use Magento\Catalog\Model\ResourceModel\Product\Option\CollectionFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/SaveHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/SaveHandlerTest.php
index 6fe0594be08f2..fe855cdbaffa1 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/SaveHandlerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/SaveHandlerTest.php
@@ -8,8 +8,8 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Option;
-use \Magento\Catalog\Model\Product\Option\Repository;
-use \Magento\Catalog\Model\Product\Option\SaveHandler;
+use Magento\Catalog\Model\Product\Option\Repository;
+use Magento\Catalog\Model\Product\Option\SaveHandler;
 
 class SaveHandlerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
index 3f0df9bcd5556..999dd6cdfa9f2 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Product\Option;
 
-use \Magento\Catalog\Model\Product\Option\Value;
-
 use Magento\Catalog\Model\Product;
+
 use Magento\Catalog\Model\Product\Option;
+use Magento\Catalog\Model\Product\Option\Value;
 use Magento\Framework\Model\ActionValidator\RemoveAction;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/OptionTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/OptionTest.php
index cd0af47180974..6b0f50b6e647c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/OptionTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/OptionTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Product;
 
-use \Magento\Catalog\Model\Product\Option;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class OptionTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/BasePriceStorageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/BasePriceStorageTest.php
index 7f1044dfcc51e..07ef18bfeeba4 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/BasePriceStorageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/BasePriceStorageTest.php
@@ -184,8 +184,7 @@ public function testUpdate()
             ->getMockForAbstractClass();
         $sku = 'sku_1';
         $idsBySku = [
-            'sku_1' =>
-                [
+            'sku_1' => [
                     1 => [
                         $this->basePriceInterface
                     ]
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/CostStorageTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/CostStorageTest.php
index 410a11165018b..0e2f0dc6f8a63 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/CostStorageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/CostStorageTest.php
@@ -181,8 +181,7 @@ public function testUpdate()
             ->getMockForAbstractClass();
         $sku = 'sku_1';
         $idsBySku = [
-            'sku_1' =>
-                [
+            'sku_1' => [
                     1 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
                 ]
         ];
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductList/ToolbarTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductList/ToolbarTest.php
index 84a9e9ded094b..e57f5467ab3a4 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductList/ToolbarTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/ProductList/ToolbarTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Product\ProductList;
 
-use \Magento\Catalog\Model\Product\ProductList\Toolbar;
+use Magento\Catalog\Model\Product\ProductList\Toolbar;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
index 995aac371e598..26c17bc3f699e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
@@ -10,8 +10,8 @@
 
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Customer\Model\GroupManagement;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * Price Test
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php
index 9fa820d64bae1..b53e47d74b066 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Product;
 
-use \Magento\Catalog\Model\Product\Url;
+use Magento\Catalog\Model\Product\Url;
 
 class UrlTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Website/SaveHandlerTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Website/SaveHandlerTest.php
index b2c9a182648ca..801e721b866bc 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Website/SaveHandlerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Website/SaveHandlerTest.php
@@ -6,12 +6,10 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Product\Website;
 
-use Magento\Catalog\Api\Data\ProductExtension;
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Model\ResourceModel\Product\Website\Link;
 use Magento\Catalog\Model\Product\Website\SaveHandler;
-use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Product as ResourceModel;
+use Magento\Catalog\Model\ResourceModel\Product\Website\Link;
 use Magento\Framework\Api\ExtensionAttributesInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/ManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/ManagementTest.php
index 0365e44b7f800..baf37c86d7393 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/ManagementTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/ManagementTest.php
@@ -8,8 +8,6 @@
 
 namespace Magento\Catalog\Test\Unit\Model\ProductLink;
 
-use Magento\Framework\Exception\NoSuchEntityException;
-
 class ManagementTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRender/FormattedPriceInfoBuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRender/FormattedPriceInfoBuilderTest.php
index 65fe12130de68..b044ae3093860 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductRender/FormattedPriceInfoBuilderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductRender/FormattedPriceInfoBuilderTest.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Catalog\Test\Unit\Model\ProductRender;
 
-use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface;
 use Magento\Catalog\Api\Data\ProductRender\FormattedPriceInfoInterface;
 use Magento\Catalog\Api\Data\ProductRender\FormattedPriceInfoInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface;
 use Magento\Catalog\Model\ProductRender\FormattedPriceInfoBuilder;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 class FormattedPriceInfoBuilderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
index 92e5b8c7ecb21..d97c45fcda68c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -8,14 +8,13 @@
 
 namespace Magento\Catalog\Test\Unit\Model;
 
-use Magento\Catalog\Api\Data\ProductExtensionFactory;
 use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as Status;
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Catalog\Model\Product\Attribute\Source\Status as Status;
 
 /**
  * Product Test
@@ -614,11 +613,11 @@ public function testReindex($productChanged, $isScheduled, $productFlatCount, $c
 
     public function getProductReindexProvider()
     {
-        return array(
+        return [
             'set 1' => [true, false, 1, 1],
             'set 2' => [true, true, 1, 0],
             'set 3' => [false, false, 1, 0]
-        );
+        ];
     }
 
     public function testPriceReindexCallback()
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Attribute/ConditionBuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Attribute/ConditionBuilderTest.php
index d687495756ccc..f6aafa2324377 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Attribute/ConditionBuilderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Attribute/ConditionBuilderTest.php
@@ -10,17 +10,17 @@
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Attribute;
 
 use Magento\Catalog\Model\Entity\Attribute;
-use Magento\Framework\DB\Adapter\Pdo\Mysql;
-use Magento\Store\Model\Website;
 use Magento\Catalog\Model\ResourceModel\Attribute\ConditionBuilder;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute as CatalogEavAttribute;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\EntityManager\EntityMetadata;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
-use Magento\Store\Api\Data\StoreInterface;
 use Magento\Framework\Model\Entity\ScopeInterface;
+use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManager;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute as CatalogEavAttribute;
+use Magento\Store\Model\Website;
 
 /**
  * Class AttributeConditionsBuilderTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/FlatTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/FlatTest.php
index da6ed255d60ee..cd7b924f73550 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/FlatTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/FlatTest.php
@@ -6,14 +6,14 @@
 
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Category;
 
-use Magento\Catalog\Model\ResourceModel\Category\Flat\CollectionFactory;
-use Magento\Catalog\Model\ResourceModel\Category\Flat\Collection;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Catalog\Model\ResourceModel\Category\Flat;
-use Magento\Framework\DB\Select;
-use Magento\Framework\DB\Adapter\AdapterInterface as Adapter;
+use Magento\Catalog\Model\ResourceModel\Category\Flat\Collection;
+use Magento\Catalog\Model\ResourceModel\Category\Flat\CollectionFactory;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface as Adapter;
+use Magento\Framework\DB\Select;
 use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CategoryLinkTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CategoryLinkTest.php
index 9e2b196602993..c56698206b58f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CategoryLinkTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CategoryLinkTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Product;
 
 use Magento\Catalog\Model\ResourceModel\Product\CategoryLink;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class CategoryLinkTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Collection/ProductLimitationTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Collection/ProductLimitationTest.php
index 2123e8a904415..06e83d96de618 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Collection/ProductLimitationTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Collection/ProductLimitationTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Product\Collection;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitation;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class ProductLimitationTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Eav/BatchSizeCalculatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Eav/BatchSizeCalculatorTest.php
index fb44b65b0ee11..c9deac0cd015e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Eav/BatchSizeCalculatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Eav/BatchSizeCalculatorTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Product\Indexer\Eav;
 
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Indexer\BatchSizeManagement;
-use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator;
 
 class BatchSizeCalculatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Eav/DecimalRowSizeEstimatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Eav/DecimalRowSizeEstimatorTest.php
index 643d0ae3899ca..7d53e3e41ffeb 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Eav/DecimalRowSizeEstimatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Eav/DecimalRowSizeEstimatorTest.php
@@ -6,14 +6,14 @@
 
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Product\Indexer\Eav;
 
-use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalRowSizeEstimator;
-use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Decimal;
-use Magento\Store\Api\StoreManagementInterface;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\Decimal;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalRowSizeEstimator;
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Framework\DB\Select;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Store\Api\StoreManagementInterface;
 
 class DecimalRowSizeEstimatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRelationsCalculatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRelationsCalculatorTest.php
index 3eda8616275a1..58466a36ca61a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRelationsCalculatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRelationsCalculatorTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Product\Indexer\Price;
 
-use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CompositeProductRelationsCalculator;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice;
 
 class CompositeProductRelationsCalculatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Option/CollectionTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Option/CollectionTest.php
index 4055149103d4a..1262e637f03e3 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Option/CollectionTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Option/CollectionTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Product\Option;
 
-use \Magento\Catalog\Model\ResourceModel\Product\Option\Collection;
-use \Magento\Catalog\Model\ResourceModel\Product\Option\Value;
+use Magento\Catalog\Model\ResourceModel\Product\Option\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\Option\Value;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/System/Config/Backend/Catalog/Url/Rewrite/SuffixTest.php b/app/code/Magento/Catalog/Test/Unit/Model/System/Config/Backend/Catalog/Url/Rewrite/SuffixTest.php
index db3f0f6960944..5e5c30e5ae432 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/System/Config/Backend/Catalog/Url/Rewrite/SuffixTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/System/Config/Backend/Catalog/Url/Rewrite/SuffixTest.php
@@ -20,37 +20,37 @@ class SuffixTest extends \PHPUnit\Framework\TestCase
      * @var \Magento\Framework\Event\ManagerInterface
      */
     protected $eventDispatcher;
-    
+
     /**
      * @var \Magento\Framework\Registry
      */
     protected $registry;
-    
+
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      */
     protected $config;
-    
+
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
      */
     protected $cacheTypeList;
-    
+
     /**
      * @var \Magento\UrlRewrite\Helper\UrlRewrite
      */
     protected $urlRewriteHelper;
-    
+
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
-    
+
     /**
      * @var \Magento\Framework\App\ResourceConnection
      */
     protected $appResource;
-    
+
     /**
      * @var \Magento\UrlRewrite\Model\UrlFinderInterface
      */
@@ -73,7 +73,7 @@ public function setUp()
             ->setMethods(['getEventDispatcher'])
             ->getMock();
         $this->context->method('getEventDispatcher')->willReturn($this->eventDispatcher);
-        
+
         $this->registry = $this->createMock(\Magento\Framework\Registry::class);
         $this->config = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $this->cacheTypeList = $this->getMockBuilder(\Magento\Framework\App\Cache\TypeList::class)
@@ -89,7 +89,7 @@ public function setUp()
             ->setMethods(['getStores'])
             ->getMock();
         $this->storeManager->method('getStores')->willReturn([]);
-        
+
         $this->appResource =$this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -97,7 +97,7 @@ public function setUp()
             ->setMethods(['findAllByData', 'findOneByData'])
             ->getMock();
         $this->urlFinder->method('findAllByData')->willReturn([]);
-        
+
         $this->suffixModel = new \Magento\Catalog\Model\System\Config\Backend\Catalog\Url\Rewrite\Suffix(
             $this->context,
             $this->registry,
@@ -125,7 +125,7 @@ public function testAfterSaveCleanCache()
         );
         $this->suffixModel->afterSave();
     }
-    
+
     public function testAfterSaveWithoutChanges()
     {
         $this->suffixModel->setValue('');
@@ -135,7 +135,7 @@ public function testAfterSaveWithoutChanges()
         $this->cacheTypeList->expects($this->never())->method('invalidate');
         $this->suffixModel->afterSave();
     }
-    
+
     public function testAfterSaveProduct()
     {
         $this->suffixModel->setValue('new');
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/View/Asset/PlaceholderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/View/Asset/PlaceholderTest.php
index 96a6c15e35651..0ad07eadd6f53 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/View/Asset/PlaceholderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/View/Asset/PlaceholderTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\View\Asset;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Catalog\Model\View\Asset\Placeholder;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\View\Asset\ContextInterface;
 use Magento\Framework\View\Asset\Repository;
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Indexer/Category/Product/ExecuteTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Indexer/Category/Product/ExecuteTest.php
index a0c2f8c483fd0..1489cfa19071e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Indexer/Category/Product/ExecuteTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Indexer/Category/Product/ExecuteTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Unit\Plugin\Model\Indexer\Category\Product;
 
-use \Magento\Catalog\Plugin\Model\Indexer\Category\Product\Execute;
+use Magento\Catalog\Plugin\Model\Indexer\Category\Product\Execute;
 
 class ExecuteTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Product/Action/UpdateAttributesFlushCacheTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Product/Action/UpdateAttributesFlushCacheTest.php
index 8b44a072a777b..4cab26145d316 100644
--- a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Product/Action/UpdateAttributesFlushCacheTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/Product/Action/UpdateAttributesFlushCacheTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Plugin\Model\Product\Action;
 
-use Magento\Catalog\Model\Product;
-
 class UpdateAttributesFlushCacheTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/ResourceModel/Attribute/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/ResourceModel/Attribute/SaveTest.php
index bb64981d4d7db..8cf703cae9495 100644
--- a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/ResourceModel/Attribute/SaveTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/ResourceModel/Attribute/SaveTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Catalog\Test\Unit\Plugin\Model\ResourceModel\Attribute;
 
+use Magento\Catalog\Model\ResourceModel\Attribute;
 use Magento\Catalog\Plugin\Model\ResourceModel\Attribute\Save;
-use Magento\PageCache\Model\Config;
 use Magento\Framework\App\Cache\TypeListInterface;
-use Magento\Catalog\Model\ResourceModel\Attribute;
+use Magento\PageCache\Model\Config;
 
 class SaveTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/ResourceModel/ConfigTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/ResourceModel/ConfigTest.php
index f36c934ca9acf..99752d3c9f0d0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Plugin/Model/ResourceModel/ConfigTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Model/ResourceModel/ConfigTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Catalog\Test\Unit\Plugin\Model\ResourceModel;
 
-use Magento\Catalog\Plugin\Model\ResourceModel\Config;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/MinimalTierPriceCalculatorTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/MinimalTierPriceCalculatorTest.php
index d04bb4c681e67..5348ab328e0e1 100644
--- a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/MinimalTierPriceCalculatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/MinimalTierPriceCalculatorTest.php
@@ -6,13 +6,13 @@
 
 namespace Magento\Catalog\Test\Unit\Pricing\Price;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Catalog\Pricing\Price\MinimalTierPriceCalculator;
-use Magento\Framework\Pricing\SaleableInterface;
-use Magento\Framework\Pricing\PriceInfoInterface;
 use Magento\Catalog\Pricing\Price\TierPrice;
-use Magento\Framework\Pricing\Amount\AmountInterface;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
+use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\PriceInfoInterface;
+use Magento\Framework\Pricing\SaleableInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class MinimalTierPriceCalculatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/RegularPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/RegularPriceTest.php
index 970331cc70963..33855d8ac0af0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/RegularPriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/RegularPriceTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Catalog\Test\Unit\Pricing\Price;
 
-use \Magento\Catalog\Pricing\Price\RegularPrice;
+use Magento\Catalog\Pricing\Price\RegularPrice;
 
 /**
  * Class RegularPriceTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
index fd13439d7d34c..688529e4db38e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
@@ -8,12 +8,12 @@
 
 namespace Magento\Catalog\Test\Unit\Pricing\Price;
 
-use Magento\Catalog\Pricing\Price\TierPrice;
 use Magento\Catalog\Pricing\Price\FinalPrice;
-use Magento\Framework\Pricing\Amount\AmountInterface;
-use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Catalog\Pricing\Price\TierPrice;
 use Magento\Customer\Model\Group;
 use Magento\Customer\Model\GroupManagement;
+use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\Price\PriceInterface;
 
 /**
  * Test for \Magento\Catalog\Pricing\Price\TierPrice
@@ -422,6 +422,5 @@ public function getQuantityDataProvider()
             ['0.7', 0.7],
             ['0.0000000', 1]
         ];
-
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/AllowedProductTypesTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/AllowedProductTypesTest.php
index d7230e6fa80c3..39bbfdcfb4ee2 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/AllowedProductTypesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/AllowedProductTypesTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Catalog\Ui\AllowedProductTypes;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Ui\AllowedProductTypes;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class AllowedProductTypesTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/Component/Listing/Columns/AbstractColumnTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/Component/Listing/Columns/AbstractColumnTest.php
index c07c96e4a8162..19dc15e457aed 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/Component/Listing/Columns/AbstractColumnTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/Component/Listing/Columns/AbstractColumnTest.php
@@ -7,9 +7,9 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponent\Processor;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Framework\View\Element\UiComponent\Processor;
 
 /**
  * Class AbstractColumnTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/Component/Listing/Columns/StatusTextTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/Component/Listing/Columns/StatusTextTest.php
index 0beef4d913091..ddc7105a1de83 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/Component/Listing/Columns/StatusTextTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/Component/Listing/Columns/StatusTextTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\Component\Listing\Columns;
 
-use Magento\Catalog\Ui\Component\Listing\Columns\StatusText;
-use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Ui\Component\Listing\Columns\StatusText;
 
 /**
  * Class StatusTextTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/Form/Categories/OptionsTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/Form/Categories/OptionsTest.php
index c2c3a63bafae8..211543ca2c054 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/Form/Categories/OptionsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/Component/Product/Form/Categories/OptionsTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\Component\Product\Form\Categories;
 
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\Catalog\Ui\Component\Product\Form\Categories\Options as CategoriesOptions;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
-use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
-use Magento\Catalog\Model\Category;
 
 class OptionsTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/CatalogEavValidationRulesTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/CatalogEavValidationRulesTest.php
index 9b0ade2b1288f..a25734a4a3d32 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/CatalogEavValidationRulesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/CatalogEavValidationRulesTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Catalog\Ui\DataProvider\CatalogEavValidationRules;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class CatalogEavValidationRulesTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php
index af10eeea42fd3..3bd8b8daeda59 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AbstractModifierTest.php
@@ -7,10 +7,10 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Ui\DataProvider\Modifier\ModifierInterface;
-use Magento\Framework\Stdlib\ArrayManager;
 
 /**
  * Class AbstractDataProviderTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedPricingTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedPricingTest.php
index 1a23aaace6e0f..8b2e92c13bef9 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedPricingTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedPricingTest.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AdvancedPricing;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\Data\GroupInterface as CustomerGroupInterface;
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Module\Manager as ModuleManager;
-use Magento\Directory\Helper\Data as DirectoryHelper;
-use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class AdvancedPricingTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AttributeSetTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AttributeSetTest.php
index c22dde0b456ac..179f9750f5be0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AttributeSetTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AttributeSetTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AttributeSet;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory;
 use Magento\Framework\UrlInterface;
-use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 
 /**
  * Class AttributeSetTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php
index 4daff7e7930e3..340427e611613 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Categories;
-use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Categories;
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\DB\Helper as DbHelper;
 use Magento\Framework\UrlInterface;
@@ -126,7 +126,7 @@ public function testModifyMetaWithCaching()
             ->with(Categories::CATEGORY_TREE_ID . '_');
         $cacheManager->expects($this->once())
             ->method('save');
-        
+
         $modifier = $this->createModel();
         $cacheContextProperty = new \ReflectionProperty(
             Categories::class,
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php
index dd9819cdbc5ab..7ccc49b95d96a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CustomOptionsTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\CustomOptions;
-use Magento\Catalog\Model\ProductOptions\ConfigInterface;
 use Magento\Catalog\Model\Config\Source\Product\Options\Price as ProductOptionsPrice;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Api\Data\StoreInterface;
-use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Catalog\Model\Product\Option as ProductOption;
+use Magento\Catalog\Model\ProductOptions\ConfigInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\CustomOptions;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class CustomOptionsTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
index d2adf50035cc8..814a46cdf7deb 100755
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
@@ -5,38 +5,36 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeGroupRepositoryInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
+use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory as EavAttributeFactory;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav;
+use Magento\Eav\Api\Data\AttributeGroupInterface;
 use Magento\Eav\Model\Config;
-use Magento\Framework\App\RequestInterface;
-use Magento\Framework\EntityManager\EventManager;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Api\Data\StoreInterface;
-use Magento\Ui\DataProvider\EavValidationRules;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection as GroupCollection;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory as GroupCollectionFactory;
 use Magento\Eav\Model\Entity\Attribute\Group;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
 use Magento\Eav\Model\Entity\Type as EntityType;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection as AttributeCollection;
-use Magento\Ui\DataProvider\Mapper\FormElement as FormElementMapper;
-use Magento\Ui\DataProvider\Mapper\MetaProperties as MetaPropertiesMapper;
-use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Catalog\Api\ProductAttributeGroupRepositoryInterface;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\Collection as GroupCollection;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory as GroupCollectionFactory;
+use Magento\Framework\Api\AttributeInterface;
 use Magento\Framework\Api\SearchCriteria;
-use Magento\Framework\Api\SortOrderBuilder;
-use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SearchResultsInterface;
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
-use Magento\Framework\Api\AttributeInterface;
-use Magento\Eav\Api\Data\AttributeGroupInterface;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Framework\Api\SortOrderBuilder;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Currency;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Locale\Currency as CurrencyLocale;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory as EavAttributeFactory;
-use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Ui\DataProvider\EavValidationRules;
+use Magento\Ui\DataProvider\Mapper\FormElement as FormElementMapper;
+use Magento\Ui\DataProvider\Mapper\MetaProperties as MetaPropertiesMapper;
 
 /**
  * Class EavTest
@@ -186,7 +184,7 @@ class EavTest extends AbstractModifierTest
      * @var ObjectManager
      */
     protected $objectManager;
-    
+
     /**
      * @var Eav
      */
@@ -323,7 +321,7 @@ protected function setUp()
         $this->eavAttributeMock->expects($this->any())
             ->method('load')
             ->willReturnSelf();
-        
+
         $this->eav =$this->getModel();
         $this->objectManager->setBackwardCompatibleProperty(
             $this->eav,
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/FactoryTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/FactoryTest.php
index 64a6a8b73b6b4..62448199b2b92 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/FactoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/FactoryTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Ui\DataProvider\Modifier\ModifierFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Ui\DataProvider\Modifier\ModifierFactory;
 use Magento\Ui\DataProvider\Modifier\ModifierInterface;
 
 /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GeneralTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GeneralTest.php
index b4460b314513b..671d96d71e65f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GeneralTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GeneralTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\General;
 
 /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ImagesTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ImagesTest.php
index 16bff55900c95..e537881d17108 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ImagesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ImagesTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Model\Product\Type;
-
 /**
  * @method \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Images getModel
  */
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/TierPriceTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/TierPriceTest.php
index f12ba0e88fc7a..cd6ef28916264 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/TierPriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/TierPriceTest.php
@@ -7,9 +7,9 @@
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\TierPrice;
 use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\TierPrice;
 
 /**
  * Class TierPriceTest.
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
index 997b66861c21b..a2b3e7c28ef32 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WebsitesTest.php
@@ -6,14 +6,14 @@
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Websites;
-use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Api\GroupRepositoryInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\Group;
+use Magento\Store\Model\Store as StoreView;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\Website;
-use Magento\Store\Model\Store as StoreView;
-use Magento\Store\Model\Group;
 
 /**
  * Class WebsitesTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/NewCategoryDataProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/NewCategoryDataProviderTest.php
index 2f5525978b3a5..2068f23cf840f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/NewCategoryDataProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/NewCategoryDataProviderTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form;
 
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Ui\DataProvider\Product\Form\NewCategoryDataProvider;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
 class NewCategoryDataProviderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/ProductDataProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/ProductDataProviderTest.php
index 0360901095402..0bc4c1656f357 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/ProductDataProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/ProductDataProviderTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Catalog\Ui\DataProvider\Product\Form\ProductDataProvider;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
-use Magento\Ui\DataProvider\Modifier\Pool;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Catalog\Ui\DataProvider\Product\Form\ProductDataProvider;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Ui\DataProvider\Modifier\ModifierInterface;
+use Magento\Ui\DataProvider\Modifier\Pool;
 
 /**
  * Class ProductDataProviderTest
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php
index 12bc9acfa4c51..cffdd475325c0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/ImageTest.php
@@ -6,15 +6,15 @@
 
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Listing\Collector;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductRender\ImageInterface;
 use Magento\Catalog\Api\Data\ProductRenderInterface;
+use Magento\Catalog\Helper\Image as ImageHelper;
+use Magento\Catalog\Helper\ImageFactory;
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Ui\DataProvider\Product\Listing\Collector\Image;
 use Magento\Framework\View\DesignInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Catalog\Helper\ImageFactory;
-use Magento\Catalog\Api\Data\ProductRender\ImageInterface;
-use Magento\Catalog\Helper\Image as ImageHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/PriceTest.php
index 218c90bc3a691..255dfffdc3b28 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/PriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/PriceTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Listing\Collector;
 
+use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface;
+use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductRenderInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Pricing\Amount\AmountInterface;
-use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface;
-use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterfaceFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class PriceTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/UrlTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/UrlTest.php
index 7f0ee3856c275..fee2446658659 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/UrlTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/UrlTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Listing\Collector;
 
+use Magento\Catalog\Api\Data\ProductRender\ButtonInterface;
+use Magento\Catalog\Api\Data\ProductRender\ButtonInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductRenderInterface;
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Api\Data\ProductRender\ButtonInterfaceFactory;
-use Magento\Catalog\Api\Data\ProductRender\ButtonInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class UrlTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
index 6d7c8814bd474..b5a2f977ac44e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/ProductCustomOptionsDataProviderTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Catalog\Ui\DataProvider\Product\ProductCustomOptionsDataProvider;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Catalog\Ui\DataProvider\Product\ProductCustomOptionsDataProvider;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Framework\DB\Select as DbSelect;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class ProductCustomOptionsDataProviderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Related/AbstractDataProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Related/AbstractDataProviderTest.php
index c73f9cb481f48..769185ac97f4e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Related/AbstractDataProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Related/AbstractDataProviderTest.php
@@ -8,11 +8,11 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductLinkRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Ui\DataProvider\Product\Related\AbstractDataProvider;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Catalog\Model\ResourceModel\Product\Collection;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
 /**
  * Class AbstractDataProviderTest
diff --git a/app/code/Magento/Catalog/Ui/Component/Category/Form/Element/Wysiwyg.php b/app/code/Magento/Catalog/Ui/Component/Category/Form/Element/Wysiwyg.php
index a5ec97a788762..908157987cac8 100644
--- a/app/code/Magento/Catalog/Ui/Component/Category/Form/Element/Wysiwyg.php
+++ b/app/code/Magento/Catalog/Ui/Component/Category/Form/Element/Wysiwyg.php
@@ -8,11 +8,10 @@
 use Magento\Backend\Block\Widget\Button;
 use Magento\Backend\Helper\Data as DataHelper;
 use Magento\Catalog\Api\CategoryAttributeRepositoryInterface;
-use Magento\Catalog\Model\Category;
 use Magento\Framework\Data\FormFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Ui\Component\Wysiwyg\ConfigInterface;
 use Magento\Framework\View\LayoutInterface;
+use Magento\Ui\Component\Wysiwyg\ConfigInterface;
 
 /**
  * Catalog Wysiwyg
diff --git a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
index cbc67fee8a5a3..2b7f6a2b8f165 100644
--- a/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
+++ b/app/code/Magento/Catalog/Ui/Component/ColumnFactory.php
@@ -68,16 +68,16 @@ public function create($attribute, $context, array $config = [])
         if ($attribute->usesSource()) {
             $config['options'] = $attribute->getSource()->getAllOptions();
         }
-        
+
         $config['component'] = $this->getJsComponent($config['dataType']);
-        
+
         $arguments = [
             'data' => [
                 'config' => $config,
             ],
             'context' => $context,
         ];
-        
+
         return $this->componentFactory->create($columnName, 'column', $arguments);
     }
 
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/AttributeSetText.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/AttributeSetText.php
index 1cb1027775709..00ed0e28fcf4f 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/AttributeSetText.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/AttributeSetText.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Ui\Component\Listing\Columns;
 
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Eav\Api\AttributeSetRepositoryInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
 
 /**
  * @api
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Price.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Price.php
index 53347db23f5a1..1e2b7d1d68487 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Price.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Price.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Ui\Component\Listing\Columns;
 
-use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
 
 /**
  * @api
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/ProductActions.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/ProductActions.php
index 0c4efa87c1a32..e9892226f933f 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/ProductActions.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/ProductActions.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Catalog\Ui\Component\Listing\Columns;
 
+use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Framework\UrlInterface;
 
 /**
  * Class ProductActions
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/StatusText.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/StatusText.php
index 751ac34b2004d..4c35c526fd757 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/StatusText.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/StatusText.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Catalog\Ui\Component\Listing\Columns;
 
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
 
 /**
  * @api
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
index d4dc9ddd7ca3b..b27f69cc03fdf 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Thumbnail.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Ui\Component\Listing\Columns;
 
-use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
 
 /**
  * @api
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
index 5af0d71dc246c..a7fbf296fa5a3 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Catalog\Ui\Component\Listing\Columns;
 
-use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -71,7 +71,7 @@ public function prepareDataSource(array $dataSource)
 
         return $dataSource;
     }
-    
+
     /**
      * Prepare component configuration
      * @return void
diff --git a/app/code/Magento/Catalog/Ui/Component/Product/Form/Categories/Options.php b/app/code/Magento/Catalog/Ui/Component/Product/Form/Categories/Options.php
index 3c83bcb079cbe..f5d73b44fae62 100644
--- a/app/code/Magento/Catalog/Ui/Component/Product/Form/Categories/Options.php
+++ b/app/code/Magento/Catalog/Ui/Component/Product/Form/Categories/Options.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Catalog\Ui\Component\Product\Form\Categories;
 
-use Magento\Framework\Data\OptionSourceInterface;
+use Magento\Catalog\Model\Category as CategoryModel;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\Framework\App\RequestInterface;
-use Magento\Catalog\Model\Category as CategoryModel;
+use Magento\Framework\Data\OptionSourceInterface;
 
 /**
  * Options tree for "Categories" field
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Attributes/Listing.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Attributes/Listing.php
index 8967147968f15..643068baf465d 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Attributes/Listing.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Attributes/Listing.php
@@ -6,9 +6,8 @@
 
 namespace Magento\Catalog\Ui\DataProvider\Product\Attributes;
 
-use Magento\Catalog\Model\AttributeHandler;
-use Magento\Framework\App\RequestInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
+use Magento\Framework\App\RequestInterface;
 
 /**
  * DataProvider for product attributes listing
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
index c8ee83ee36f97..43196180ee682 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
@@ -396,8 +396,8 @@ private function addAdvancedPriceLink()
                 'additionalForGroup' => true,
                 'provider' => false,
                 'source' => 'product_details',
-                'sortOrder' =>
-                    $this->arrayManager->get($pricePath . '/arguments/data/config/sortOrder', $this->meta) + 1,
+                'sortOrder' => $this->arrayManager
+                        ->get($pricePath . '/arguments/data/config/sortOrder', $this->meta) + 1,
             ];
 
             $this->meta = $this->arrayManager->set(
@@ -434,8 +434,8 @@ private function getTierPriceStructure($tierPricePath)
                         ],
                         'disabled' => false,
                         'required' => false,
-                        'sortOrder' =>
-                            $this->arrayManager->get($tierPricePath . '/arguments/data/config/sortOrder', $this->meta),
+                        'sortOrder' => $this->arrayManager
+                            ->get($tierPricePath . '/arguments/data/config/sortOrder', $this->meta),
                     ],
                 ],
             ],
@@ -569,8 +569,8 @@ private function specialPriceDataToInline()
                     'additionalClasses' => 'admin__control-grouped-date',
                     'breakLine' => false,
                     'component' => 'Magento_Ui/js/form/components/group',
-                    'scopeLabel' =>
-                        $this->arrayManager->get($pathFrom . '/arguments/data/config/scopeLabel', $this->meta),
+                    'scopeLabel' => $this->arrayManager
+                        ->get($pathFrom . '/arguments/data/config/scopeLabel', $this->meta),
                 ]
             );
             $this->meta = $this->arrayManager->merge(
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Alerts.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Alerts.php
index 1f154d3204454..086d368f211c0 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Alerts.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Alerts.php
@@ -38,7 +38,7 @@ class Alerts extends AbstractModifier
      * @var LayoutFactory
      */
     private $layoutFactory;
-    
+
     /**
      * Alerts constructor.
      * @param ScopeConfigInterface $scopeConfig
@@ -83,12 +83,11 @@ public function modifyMeta(array $meta)
                                 'collapsible' => true,
                                 'componentType' => Fieldset::NAME,
                                 'dataScope' => static::DATA_SCOPE,
-                                'sortOrder' =>
-                                    $this->getNextGroupSortOrder(
-                                        $meta,
-                                        self::$previousGroup,
-                                        self::$sortOrder
-                                    ),
+                                'sortOrder' => $this->getNextGroupSortOrder(
+                                    $meta,
+                                    self::$previousGroup,
+                                    self::$sortOrder
+                                ),
                             ],
                         ],
                     ],
@@ -134,8 +133,7 @@ private function getAlertStockFieldset()
                         'componentType' => 'container',
                         'component' => 'Magento_Ui/js/form/components/html',
                         'additionalClasses' => 'admin__fieldset-note',
-                        'content' =>
-                            '<h4>' . __('Alert Stock') . '</h4>' .
+                        'content' => '<h4>' . __('Alert Stock') . '</h4>' .
                             $this->layoutFactory->create()->createBlock(
                                 Stock::class
                             )->toHtml(),
@@ -159,8 +157,7 @@ private function getAlertPriceFieldset()
                         'componentType' => 'container',
                         'component' => 'Magento_Ui/js/form/components/html',
                         'additionalClasses' => 'admin__fieldset-note',
-                        'content' =>
-                            '<h4>' . __('Alert Price') . '</h4>' .
+                        'content' => '<h4>' . __('Alert Price') . '</h4>' .
                             $this->layoutFactory->create()->createBlock(
                                 Price::class
                             )->toHtml(),
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php
index a1aacc91f2e47..32414f5658034 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php
@@ -8,7 +8,6 @@
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Ui\Component\Form\Field;
 
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
index 683a96133ad30..2391b7388aa4a 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Framework\UrlInterface;
-use Magento\Framework\Registry;
+use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\UrlInterface;
 use Magento\Ui\Component;
-use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Ui\Component\Container;
 
 /**
@@ -188,8 +188,7 @@ private function customizeAddAttributeModal(array $meta)
                                             'actionName' => 'destroyInserted'
                                         ],
                                         [
-                                            'targetName'
-                                            => 'product_form.product_form.add_attribute_modal'
+                                            'targetName' => 'product_form.product_form.add_attribute_modal'
                                                 . '.create_new_attribute_modal.product_attribute_add_form',
                                             'actionName' => 'render'
                                         ]
@@ -314,8 +313,7 @@ private function customizeAttributesGrid(array $meta)
                         'groupCode' => static::GROUP_CODE,
                         'groupName' => static::GROUP_NAME,
                         'groupSortOrder' => static::GROUP_SORT_ORDER,
-                        'addAttributeUrl' =>
-                            $this->urlBuilder->getUrl('catalog/product/addAttributeToTemplate'),
+                        'addAttributeUrl' => $this->urlBuilder->getUrl('catalog/product/addAttributeToTemplate'),
                         'productId' => $this->locator->getProduct()->getId(),
                         'productType' => $this->locator->getProduct()->getTypeId(),
                         'loading' => false,
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
index 7456c1bfef91f..1eacd1fa173c7 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Model\Category as CategoryModel;
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Helper as DbHelper;
-use Magento\Catalog\Model\Category as CategoryModel;
 use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\UrlInterface;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Framework\UrlInterface;
 
 /**
  * Data provider for categories field of product page
@@ -269,19 +269,20 @@ protected function customizeCategoriesField(array $meta)
                                     'template' => 'ui/form/components/button/container',
                                     'actions' => [
                                         [
-                                            'targetName' => 'product_form.product_form.create_category_modal',
+                                            'targetName' =>
+                                                'product_form.product_form.create_category_modal',
                                             'actionName' => 'toggleModal',
                                         ],
                                         [
                                             'targetName' =>
                                                 'product_form.product_form.create_category_modal.create_category',
-                                            'actionName' => 'render'
+                                            'actionName' => 'render',
                                         ],
                                         [
                                             'targetName' =>
                                                 'product_form.product_form.create_category_modal.create_category',
-                                            'actionName' => 'resetForm'
-                                        ]
+                                            'actionName' => 'resetForm',
+                                        ],
                                     ],
                                     'additionalForGroup' => true,
                                     'provider' => false,
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
index 7995926d27de5..aec07f4eb2342 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -5,24 +5,24 @@
  */
 namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Model\Config\Source\Product\Options\Price as ProductOptionsPrice;
 use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Model\ProductOptions\ConfigInterface;
-use Magento\Catalog\Model\Config\Source\Product\Options\Price as ProductOptionsPrice;
-use Magento\Framework\UrlInterface;
+use Magento\Framework\Locale\CurrencyInterface;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Ui\Component\Modal;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Container;
 use Magento\Ui\Component\DynamicRows;
-use Magento\Ui\Component\Form\Fieldset;
-use Magento\Ui\Component\Form\Field;
-use Magento\Ui\Component\Form\Element\Input;
-use Magento\Ui\Component\Form\Element\Select;
-use Magento\Ui\Component\Form\Element\Checkbox;
 use Magento\Ui\Component\Form\Element\ActionDelete;
-use Magento\Ui\Component\Form\Element\DataType\Text;
+use Magento\Ui\Component\Form\Element\Checkbox;
 use Magento\Ui\Component\Form\Element\DataType\Number;
-use Magento\Framework\Locale\CurrencyInterface;
+use Magento\Ui\Component\Form\Element\DataType\Text;
+use Magento\Ui\Component\Form\Element\Input;
+use Magento\Ui\Component\Form\Element\Select;
+use Magento\Ui\Component\Form\Field;
+use Magento\Ui\Component\Form\Fieldset;
+use Magento\Ui\Component\Modal;
 
 /**
  * Data provider for "Customizable Options" panel
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
index ea69ebf4dda24..13a2e06a7eb5e 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php
@@ -7,8 +7,8 @@
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Ui\Component\Form;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Ui\Component\Form;
 
 /**
  * Data provider for main panel of product page
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Related.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Related.php
index b4acb93dcd14f..eb49327c6f153 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Related.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Related.php
@@ -9,7 +9,9 @@
 use Magento\Catalog\Api\Data\ProductLinkInterface;
 use Magento\Catalog\Api\ProductLinkRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Helper\Image as ImageHelper;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Eav\Api\AttributeSetRepositoryInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Phrase;
@@ -21,8 +23,6 @@
 use Magento\Ui\Component\Form\Field;
 use Magento\Ui\Component\Form\Fieldset;
 use Magento\Ui\Component\Modal;
-use Magento\Catalog\Helper\Image as ImageHelper;
-use Magento\Catalog\Model\Product\Attribute\Source\Status;
 
 /**
  * Class Related
@@ -164,12 +164,11 @@ public function modifyMeta(array $meta)
                                 'collapsible' => true,
                                 'componentType' => Fieldset::NAME,
                                 'dataScope' => static::DATA_SCOPE,
-                                'sortOrder' =>
-                                    $this->getNextGroupSortOrder(
-                                        $meta,
-                                        self::$previousGroup,
-                                        self::$sortOrder
-                                    ),
+                                'sortOrder' => $this->getNextGroupSortOrder(
+                                    $meta,
+                                    self::$previousGroup,
+                                    self::$sortOrder
+                                ),
                             ],
                         ],
 
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
index 298da3d5cd6f2..9cd4b34f81091 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php
@@ -6,12 +6,12 @@
 namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\Store\Api\GroupRepositoryInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\Ui\Component\Form;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\DynamicRows;
+use Magento\Ui\Component\Form;
 
 /**
  * Class Websites customizes websites panel
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/NewCategoryDataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/NewCategoryDataProvider.php
index b6251037e1e33..d941faddc330d 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/NewCategoryDataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/NewCategoryDataProvider.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Catalog\Ui\DataProvider\Product\Form;
 
-use Magento\Ui\DataProvider\AbstractDataProvider;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Framework\UrlInterface;
+use Magento\Ui\DataProvider\AbstractDataProvider;
 
 /**
  * DataProvider for new category form
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCustomOptionsDataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCustomOptionsDataProvider.php
index b8e9155b8eab1..ba004aac38748 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCustomOptionsDataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCustomOptionsDataProvider.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Catalog\Ui\DataProvider\Product;
 
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-use Magento\Framework\App\RequestInterface;
-use Magento\Catalog\Model\Product\Option\Repository as ProductOptionRepository;
-use Magento\Catalog\Model\Product\Option\Value as ProductOptionValueModel;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product\Option as ProductOption;
+use Magento\Catalog\Model\Product\Option\Repository as ProductOptionRepository;
+use Magento\Catalog\Model\Product\Option\Value as ProductOptionValueModel;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\DataObject;
 
 /**
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Related/AbstractDataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Related/AbstractDataProvider.php
index 8154cab3d9068..a2625ecddd348 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Related/AbstractDataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Related/AbstractDataProvider.php
@@ -7,12 +7,12 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\ProductLinkInterface;
-use Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider;
+use Magento\Catalog\Api\ProductLinkRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider;
 use Magento\Framework\App\RequestInterface;
-use Magento\Catalog\Api\ProductLinkRepositoryInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
index 9865589556e7b..8d892ce6f10d6 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
@@ -16,8 +16,8 @@
     </div>
     <div class="tree-actions">
         <?php if ($block->getRoot()): ?>
-            <?php //echo $block->getCollapseButtonHtml() ?>
-            <?php //echo $block->getExpandButtonHtml() ?>
+            <?php //echo $block->getCollapseButtonHtml()?>
+            <?php //echo $block->getExpandButtonHtml()?>
             <a href="#"
                onclick="tree.collapseTree(); return false;"><?= /* @escapeNotVerified */ __('Collapse All') ?></a>
             <span class="separator">|</span> <a href="#"
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
index f812a27f87ad9..0920e413babaf 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
@@ -86,9 +86,9 @@ $stores = $block->getStoresSortedBySortOrder();
     </script>
     <?php
     $values = [];
-    foreach($block->getOptionValues() as $value) {
+    foreach ($block->getOptionValues() as $value) {
         $value = $value->getData();
-        $values[] = is_array($value) ? array_map(function($str) {
+        $values[] = is_array($value) ? array_map(function ($str) {
             return htmlspecialchars_decode($str, ENT_QUOTES);
         }, $value) : $value;
     }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/attribute.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/attribute.phtml
index 223b3e9888eea..75f04eae82159 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/attribute.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/attribute.phtml
@@ -2,4 +2,4 @@
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
- */;
+ */
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
index 8e5583a6699b7..0bed93a3cd73d 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
@@ -10,7 +10,9 @@
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_optionId = $_option->getId(); ?>
-<div class="admin__field field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
+<div class="admin__field field<?php if ($_option->getIsRequire()) {
+    echo ' required _required';
+} ?>">
   <label class="label admin__field-label">
       <?= $block->escapeHtml($_option->getTitle()) ?>
       <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
index edf4f68afded7..8f5e4450c38e9 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
@@ -61,7 +61,9 @@ require(['prototype'], function(){
 });
 </script>
 
-<div class="admin__field <?php if ($_option->getIsRequire()) echo ' required _required' ?>">
+<div class="admin__field <?php if ($_option->getIsRequire()) {
+    echo ' required _required';
+} ?>">
     <label class="admin__field-label label">
         <?= $block->escapeHtml($_option->getTitle()) ?>
         <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
index af09bbe0acd9d..aacb448906d36 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
@@ -9,7 +9,9 @@
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
 <?php $_option = $block->getOption(); ?>
-<div class="admin__field field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
+<div class="admin__field field<?php if ($_option->getIsRequire()) {
+    echo ' required _required';
+} ?>">
     <label class="label admin__field-label">
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
index 14e485c6445e0..17996edfa9052 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/text.phtml
@@ -9,7 +9,9 @@
 ?>
 <?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Text */ ?>
 <?php $_option = $block->getOption(); ?>
-<div class="field admin__field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
+<div class="field admin__field<?php if ($_option->getIsRequire()) {
+    echo ' required _required';
+} ?>">
     <label class="admin__field-label label">
         <?= $block->escapeHtml($_option->getTitle()) ?>
         <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
index 574c9ee81af7d..f903bc118534e 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
@@ -19,7 +19,8 @@ $formName = $block->getFormName();
          $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
      ) ?>"
     >
-    <?php if (!$block->getElement()->getReadonly()) {?>
+    <?php if (!$block->getElement()->getReadonly()) {
+         ?>
         <div class="image image-placeholder">
             <?= $block->getUploaderHtml() ?>
             <div class="product-image-wrapper">
@@ -28,17 +29,17 @@ $formName = $block->getFormName();
                 </p>
             </div>
         </div>
-    <?php } ?>
+    <?php
+     } ?>
     <?php foreach ($block->getImageTypes() as $typeData) {
-    ?>
+         ?>
         <input name="<?= $block->escapeHtml($typeData['name']) ?>"
                data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                class="image-<?= $block->escapeHtml($typeData['code']) ?>"
                type="hidden"
                value="<?= $block->escapeHtml($typeData['value']) ?>"/>
     <?php
-
-} ?>
+     } ?>
 
     <script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template">
         <div class="image item<% if (data.disabled == 1) { %> hidden-for-front<% } %>"
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index baf849a295e0b..fd341d7ad1196 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -55,7 +55,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                             . 'top:' . $productImage->getHeight() . 'px;"';
                     }
                     ?>
-                    <?php // Product Image ?>
+                    <?php // Product Image?>
                     <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product photo product-item-photo" tabindex="-1">
                         <?= $productImage->toHtml() ?>
                     </a>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
index 02a6e999ad51f..a4b34e1133bed 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
@@ -14,21 +14,22 @@
  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
 use Magento\Catalog\Model\Product\ProductList\Toolbar;
+
 ?>
 <?php if ($block->getCollection()->getSize()): ?>
     <div class="toolbar toolbar-products" data-mage-init='<?= /* @escapeNotVerified */ $block->getWidgetOptionsJson() ?>'>
         <?php if ($block->isExpanded()): ?>
-            <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/viewmode.phtml')) ?>
+            <?php include $block->getTemplateFile('Magento_Catalog::product/list/toolbar/viewmode.phtml')?>
         <?php endif; ?>
 
-        <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/amount.phtml')) ?>
+        <?php include $block->getTemplateFile('Magento_Catalog::product/list/toolbar/amount.phtml')?>
 
         <?= $block->getPagerHtml() ?>
 
-        <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/limiter.phtml')) ?>
+        <?php include $block->getTemplateFile('Magento_Catalog::product/list/toolbar/limiter.phtml')?>
 
         <?php if ($block->isExpanded()): ?>
-            <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/sorter.phtml')) ?>
+            <?php include $block->getTemplateFile('Magento_Catalog::product/list/toolbar/sorter.phtml')?>
         <?php endif; ?>
     </div>
 <?php endif ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
index b4ff1afa1c606..a8eceff22c3ab 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
@@ -14,6 +14,7 @@
  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
 use Magento\Catalog\Model\Product\ProductList\Toolbar;
+
 ?>
 <p class="toolbar-amount" id="toolbar-amount">
     <?php if ($block->getLastPageNum() > 1): ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
index ec4541bde5ca6..c8515a9572a0e 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
@@ -14,6 +14,7 @@
  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
 use Magento\Catalog\Model\Product\ProductList\Toolbar;
+
 ?>
 <div class="field limiter">
     <label class="label" for="limiter">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
index 92514c5b8ea50..bec2ccd18c1df 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/sorter.phtml
@@ -14,6 +14,7 @@
  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
 use Magento\Catalog\Model\Product\ProductList\Toolbar;
+
 ?>
 <div class="toolbar-sorter sorter">
     <label class="sorter-label" for="sorter"><?= /* @escapeNotVerified */ __('Sort By') ?></label>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
index 366dfba71b0d1..1acb0d1c617e4 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/viewmode.phtml
@@ -14,6 +14,7 @@
  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
 use Magento\Catalog\Model\Product\ProductList\Toolbar;
+
 ?>
 <?php if ($block->isEnabledViewSwitcher()): ?>
 <div class="modes">
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
index 5f437cc484ed4..b086dfe0039dd 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
@@ -43,7 +43,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
         <?php foreach ($_productCollection as $_product): ?>
         <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product">' : '</li><li class="item product">' ?>
             <div class="product">
-                <?php // Product Image ?>
+                <?php // Product Image?>
                 <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product photo">
                     <?= $block->getImage($_product, $image)->toHtml() ?>
                 </a>
@@ -64,7 +64,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                                         . ' data-mage-init=\'{ "redirectUrl": { "event": "click", url: "' . $block->getAddToCartUrl($_product) . '"} }\'>'
                                         . '<span>' . __('Add to Cart') . '</span></button>';
                     } else {
-                        $info['button'] = $_product->getIsSalable() ?   '<div class="stock available"><span>' . __('In stock') . '</span></div>' :
+                        $info['button'] = $_product->getIsSalable() ? '<div class="stock available"><span>' . __('In stock') . '</span></div>' :
                                                                         '<div class="stock unavailable"><span>' . __('Out of stock') . '</span></div>';
                     }
 
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
index 11aedc33c2d42..99d5e767bb37d 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/text.phtml
@@ -34,9 +34,11 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
             <input type="text"
                    id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text"
                    class="input-text product-custom-option"
-                   <?php if (!empty($_textValidate)) {?>
+                   <?php if (!empty($_textValidate)) {
+                ?>
                    data-validate="<?= $block->escapeHtml(json_encode($_textValidate)) ?>"
-                   <?php } ?>
+                   <?php
+            } ?>
                    name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                    data-selector="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                    value="<?= $block->escapeHtml($block->getDefaultValue()) ?>"/>
@@ -52,9 +54,11 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
             ?>
             <textarea id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text"
                       class="product-custom-option"
-                    <?php if (!empty($_textAreaValidate)) {?>
+                    <?php if (!empty($_textAreaValidate)) {
+                ?>
                         data-validate="<?= $block->escapeHtml(json_encode($_textAreaValidate)) ?>"
-                    <?php } ?>
+                    <?php
+            } ?>
                       name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                       data-selector="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                       rows="5"
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml
index e0550cc7d4414..e0a1573be0e3a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/compared/grid.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index 45530ed6d7bae..3feb4fc5fb804 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\CatalogImportExport\Model\Export;
 
-use Magento\ImportExport\Model\Import;
-use \Magento\Store\Model\Store;
-use \Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
 use Magento\Catalog\Model\Product as ProductEntity;
+use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
+use Magento\ImportExport\Model\Import;
+use Magento\Store\Model\Store;
 
 /**
  * Export entity product model
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index aa3f46a433a4d..049ac552dd92f 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -8,12 +8,12 @@
 
 namespace Magento\CatalogImportExport\Model\Import\Product;
 
-use Magento\CatalogImportExport\Model\Import\Product;
-use Magento\Framework\App\ResourceConnection;
-use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection as ProductOptionValueCollection;
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory as ProductOptionValueCollectionFactory;
+use Magento\CatalogImportExport\Model\Import\Product;
+use Magento\Framework\App\ResourceConnection;
+use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
 /**
  * Entity class which provide possibility to import product custom options
@@ -947,7 +947,6 @@ public function validateRow(array $rowData, $rowNumber)
         $multiRowData = $this->_getMultiRowFormat($rowData);
 
         foreach ($multiRowData as $optionData) {
-
             $combinedData = array_merge($rowData, $optionData);
 
             if ($this->_isRowWithCustomOption($combinedData)) {
@@ -1202,11 +1201,9 @@ protected function _importData()
             $childCount = [];
 
             foreach ($bunch as $rowNumber => $rowData) {
-
                 $multiRowData = $this->_getMultiRowFormat($rowData);
 
                 foreach ($multiRowData as $optionData) {
-
                     $combinedData = array_merge($rowData, $optionData);
 
                     if (!$this->isRowAllowedToImport($combinedData, $rowNumber)) {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index 939d6b2de67ee..fd0e9fa8ffc57 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\CatalogImportExport\Model\Import\Product\Type;
 
-use Magento\Framework\App\ResourceConnection;
-use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
 use Magento\CatalogImportExport\Model\Import\Product;
+use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
 
 /**
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/AbstractImportValidator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/AbstractImportValidator.php
index 88e662453df0b..17e8bd5e02ef9 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/AbstractImportValidator.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/AbstractImportValidator.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogImportExport\Model\Import\Product\Validator;
 
-use Magento\Framework\Validator\AbstractValidator;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
+use Magento\Framework\Validator\AbstractValidator;
 
 abstract class AbstractImportValidator extends AbstractValidator implements RowValidatorInterface
 {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Website.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Website.php
index 4e48eafcbc673..b87b08fe4e17c 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Website.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/Website.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogImportExport\Model\Import\Product\Validator;
 
-use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
 use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
+use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
 
 class Website extends AbstractImportValidator implements RowValidatorInterface
 {
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php
index 439ffb99190bc..bb7a9cab33ee6 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Validator/MediaTest.php
@@ -9,8 +9,8 @@
 use Magento\CatalogImportExport\Model\Import\Product;
 use Magento\CatalogImportExport\Model\Import\Product\Validator\Media;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\ImportExport\Model\Import;
 use Magento\Framework\Url\Validator;
+use Magento\ImportExport\Model\Import;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class MediaTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php b/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php
index 2c52b49c1a039..12a5edeb4e9d4 100644
--- a/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php
+++ b/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php
@@ -17,7 +17,7 @@ class AddStockStatusToCollection
      * @var \Magento\CatalogInventory\Helper\Stock
      */
     protected $stockHelper;
-    
+
     /**
      * @param \Magento\CatalogInventory\Model\Configuration $configuration
      * @param \Magento\CatalogInventory\Helper\Stock $stockHelper
diff --git a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
index 36721db874887..68d02992d9eac 100644
--- a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\CatalogInventory\Model\Adminhtml\Stock;
 
+use Magento\Catalog\Model\Product;
 use Magento\CatalogInventory\Api\StockConfigurationInterface as StockConfigurationInterface;
 use Magento\CatalogInventory\Api\StockItemRepositoryInterface as StockItemRepositoryInterface;
 use Magento\CatalogInventory\Api\StockRegistryInterface;
@@ -12,7 +13,6 @@
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Framework\DataObject\IdentityInterface;
-use Magento\Catalog\Model\Product;
 
 /**
  * Catalog Inventory Stock Model for adminhtml area
diff --git a/app/code/Magento/CatalogInventory/Model/Configuration.php b/app/code/Magento/CatalogInventory/Model/Configuration.php
index 06cfde0b7d247..55d48278bbbad 100644
--- a/app/code/Magento/CatalogInventory/Model/Configuration.php
+++ b/app/code/Magento/CatalogInventory/Model/Configuration.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\CatalogInventory\Model;
 
+use Magento\Catalog\Model\ProductTypes\ConfigInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Helper\Minsaleqty as MinsaleqtyHelper;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Catalog\Model\ProductTypes\ConfigInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
index bc10d38173b4d..e8f75ad32dbd6 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
@@ -8,19 +8,19 @@
 
 namespace Magento\CatalogInventory\Model\Indexer\Stock\Action;
 
+use Magento\Catalog\Model\Product\Type as ProductType;
 use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
-use Magento\Framework\App\ResourceConnection;
+use Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction;
+use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\StockInterface;
 use Magento\CatalogInventory\Model\ResourceModel\Indexer\StockFactory;
-use Magento\Catalog\Model\Product\Type as ProductType;
-use Magento\Framework\Indexer\CacheContext;
-use Magento\Framework\Event\ManagerInterface as EventManager;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Indexer\BatchSizeManagementInterface;
-use Magento\Framework\Indexer\BatchProviderInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction;
-use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\StockInterface;
+use Magento\Framework\Indexer\BatchProviderInterface;
+use Magento\Framework\Indexer\BatchSizeManagementInterface;
+use Magento\Framework\Indexer\CacheContext;
 
 /**
  * Class Full reindex action
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
index a32faa4640a86..c0b54a01f2e13 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
@@ -8,13 +8,13 @@
 
 namespace Magento\CatalogInventory\Model\Indexer\Stock;
 
+use Magento\Catalog\Model\Product;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Model\Stock;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Indexer\CacheContext;
-use Magento\CatalogInventory\Model\Stock;
-use Magento\Catalog\Model\Product;
 
 /**
  * Clean product cache only when stock status was updated
diff --git a/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php b/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php
index 8de5f9821d143..99d2f55335be4 100644
--- a/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php
+++ b/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\CatalogInventory\Model;
 
-use Magento\Catalog\Model\CollectionConditionInterface;
-use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Framework\Data\CollectionModifierInterface;
 
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
index 366cb1c3902a3..55d6b9d10a4d7 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
@@ -6,12 +6,12 @@
 
 namespace Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock;
 
+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\AbstractIndexer;
-use Magento\CatalogInventory\Model\Stock;
-use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Model\Indexer\Stock\Action\Full;
-use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
+use Magento\CatalogInventory\Model\Stock;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 
 /**
  * CatalogInventory Default Stock Status Indexer Resource Model
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
index 895fffaa4f80b..f8786f9a907e9 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php
@@ -7,9 +7,7 @@
 
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
-use Magento\Framework\App\ResourceConnection as AppResource;
 use Magento\Framework\Model\AbstractModel;
-use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
 
 /**
  * Stock item resource model
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteriaMapper.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteriaMapper.php
index 43e7a6f7861ea..932ac97afce56 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteriaMapper.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteriaMapper.php
@@ -6,14 +6,14 @@
 
 namespace Magento\CatalogInventory\Model\ResourceModel\Stock\Item;
 
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
+use Magento\Framework\Data\ObjectFactory;
 use Magento\Framework\DB\GenericMapper;
 use Magento\Framework\DB\MapperFactory;
 use Magento\Framework\DB\Select;
-use Magento\Framework\Data\ObjectFactory;
 use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface as Logger;
-use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
-use Magento\CatalogInventory\Api\StockConfigurationInterface;
 
 /**
  * Interface StockItemCriteriaMapper
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
index e9f3cd59af0bb..0a8cf21c0029a 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
@@ -5,9 +5,8 @@
  */
 namespace Magento\CatalogInventory\Model\ResourceModel\Stock;
 
-use Magento\CatalogInventory\Model\Stock;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\Framework\App\ObjectManager;
+use Magento\CatalogInventory\Model\Stock;
 
 /**
  * CatalogInventory Stock Status per website Resource Model
diff --git a/app/code/Magento/CatalogInventory/Model/Source/StockConfiguration.php b/app/code/Magento/CatalogInventory/Model/Source/StockConfiguration.php
index b5ce04ffde2af..6520460c13cde 100644
--- a/app/code/Magento/CatalogInventory/Model/Source/StockConfiguration.php
+++ b/app/code/Magento/CatalogInventory/Model/Source/StockConfiguration.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogInventory\Model\Source;
 
-use Magento\Framework\Data\ValueSourceInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\Framework\Data\ValueSourceInterface;
 
 /**
  * Class StockConfiguration
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php b/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
index e5154a10f0a19..7720f594bd5ab 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php
@@ -6,6 +6,7 @@
 namespace Magento\CatalogInventory\Model\Stock;
 
 use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogInventory\Api\Data\StockItemCollectionInterfaceFactory;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory;
@@ -23,7 +24,6 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogInventory/Model/StockIndex.php b/app/code/Magento/CatalogInventory/Model/StockIndex.php
index 6081ef20efd64..ed1934be1af8e 100644
--- a/app/code/Magento/CatalogInventory/Model/StockIndex.php
+++ b/app/code/Magento/CatalogInventory/Model/StockIndex.php
@@ -8,12 +8,11 @@
 
 namespace Magento\CatalogInventory\Model;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Type as ProductType;
 use Magento\Catalog\Model\Product\Website as ProductWebsite;
-use Magento\Catalog\Model\ProductFactory;
 use Magento\CatalogInventory\Api\StockIndexInterface;
 use Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 
 /**
  * Class StockIndex
diff --git a/app/code/Magento/CatalogInventory/Model/StockManagement.php b/app/code/Magento/CatalogInventory/Model/StockManagement.php
index 06599446a9ea9..f13187c9a07e6 100644
--- a/app/code/Magento/CatalogInventory/Model/StockManagement.php
+++ b/app/code/Magento/CatalogInventory/Model/StockManagement.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\CatalogInventory\Model;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Api\StockManagementInterface;
 use Magento\CatalogInventory\Model\ResourceModel\QtyCounterInterface;
-use Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\CatalogInventory\Model\ResourceModel\Stock as ResourceStock;
+use Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface;
 
 /**
  * Class StockManagement
@@ -85,7 +85,7 @@ public function __construct(
     public function registerProductsSale($items, $websiteId = null)
     {
         //if (!$websiteId) {
-            $websiteId = $this->stockConfiguration->getDefaultScopeId();
+        $websiteId = $this->stockConfiguration->getDefaultScopeId();
         //}
         $this->getResource()->beginTransaction();
         $lockedItems = $this->getResource()->lockProductsStock(array_keys($items), $websiteId);
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistry.php b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
index d688132fdb916..0850c068eef65 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistry.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
@@ -6,7 +6,6 @@
 namespace Magento\CatalogInventory\Model;
 
 use Magento\Catalog\Model\ProductFactory;
-use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
 use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
index 8bdc4288445c1..22cee928964a9 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
@@ -5,17 +5,16 @@
  */
 namespace Magento\CatalogInventory\Model;
 
-use Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface;
-use Magento\CatalogInventory\Api\StockRepositoryInterface;
-use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
-use Magento\CatalogInventory\Api\StockStatusRepositoryInterface;
 use Magento\CatalogInventory\Api\Data\StockInterfaceFactory;
 use Magento\CatalogInventory\Api\Data\StockItemInterfaceFactory;
 use Magento\CatalogInventory\Api\Data\StockStatusInterfaceFactory;
 use Magento\CatalogInventory\Api\StockCriteriaInterfaceFactory;
 use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
+use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
+use Magento\CatalogInventory\Api\StockRepositoryInterface;
 use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\CatalogInventory\Api\StockStatusRepositoryInterface;
+use Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface;
 
 /**
  * Class StockRegistryProvider
diff --git a/app/code/Magento/CatalogInventory/Model/StockState.php b/app/code/Magento/CatalogInventory/Model/StockState.php
index ac6dc16366798..233f6562aff56 100644
--- a/app/code/Magento/CatalogInventory/Model/StockState.php
+++ b/app/code/Magento/CatalogInventory/Model/StockState.php
@@ -53,7 +53,7 @@ public function __construct(
     public function verifyStock($productId, $scopeId = null)
     {
         // if ($scopeId === null) {
-            $scopeId = $this->stockConfiguration->getDefaultScopeId();
+        $scopeId = $this->stockConfiguration->getDefaultScopeId();
         // }
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
         return $this->stockStateProvider->verifyStock($stockItem);
@@ -67,7 +67,7 @@ public function verifyStock($productId, $scopeId = null)
     public function verifyNotification($productId, $scopeId = null)
     {
         // if ($scopeId === null) {
-            $scopeId = $this->stockConfiguration->getDefaultScopeId();
+        $scopeId = $this->stockConfiguration->getDefaultScopeId();
         // }
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
         return $this->stockStateProvider->verifyNotification($stockItem);
@@ -85,7 +85,7 @@ public function verifyNotification($productId, $scopeId = null)
     public function checkQty($productId, $qty, $scopeId = null)
     {
         // if ($scopeId === null) {
-            $scopeId = $this->stockConfiguration->getDefaultScopeId();
+        $scopeId = $this->stockConfiguration->getDefaultScopeId();
         // }
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
         return $this->stockStateProvider->checkQty($stockItem, $qty);
@@ -103,7 +103,7 @@ public function checkQty($productId, $qty, $scopeId = null)
     public function suggestQty($productId, $qty, $scopeId = null)
     {
         // if ($scopeId === null) {
-            $scopeId = $this->stockConfiguration->getDefaultScopeId();
+        $scopeId = $this->stockConfiguration->getDefaultScopeId();
         // }
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
         return $this->stockStateProvider->suggestQty($stockItem, $qty);
@@ -119,7 +119,7 @@ public function suggestQty($productId, $qty, $scopeId = null)
     public function getStockQty($productId, $scopeId = null)
     {
         // if ($scopeId === null) {
-            $scopeId = $this->stockConfiguration->getDefaultScopeId();
+        $scopeId = $this->stockConfiguration->getDefaultScopeId();
         // }
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
         return $this->stockStateProvider->getStockQty($stockItem);
@@ -134,7 +134,7 @@ public function getStockQty($productId, $scopeId = null)
     public function checkQtyIncrements($productId, $qty, $websiteId = null)
     {
         // if ($websiteId === null) {
-            $websiteId = $this->stockConfiguration->getDefaultScopeId();
+        $websiteId = $this->stockConfiguration->getDefaultScopeId();
         // }
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $websiteId);
         return $this->stockStateProvider->checkQtyIncrements($stockItem, $qty);
@@ -151,7 +151,7 @@ public function checkQtyIncrements($productId, $qty, $websiteId = null)
     public function checkQuoteItemQty($productId, $itemQty, $qtyToCheck, $origQty, $scopeId = null)
     {
         // if ($scopeId === null) {
-            $scopeId = $this->stockConfiguration->getDefaultScopeId();
+        $scopeId = $this->stockConfiguration->getDefaultScopeId();
         // }
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
         return $this->stockStateProvider->checkQuoteItemQty($stockItem, $itemQty, $qtyToCheck, $origQty);
diff --git a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
index 4cffc678314b2..8f03d7c4760fc 100644
--- a/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockStateProvider.php
@@ -11,9 +11,9 @@
 use Magento\Catalog\Model\ProductFactory;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Model\Spi\StockStateProviderInterface;
+use Magento\Framework\DataObject\Factory as ObjectFactory;
 use Magento\Framework\Locale\FormatInterface;
 use Magento\Framework\Math\Division as MathDivision;
-use Magento\Framework\DataObject\Factory as ObjectFactory;
 
 /**
  * Interface StockStateProvider
diff --git a/app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php b/app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php
index 23dd56b567324..59937a3fa66c7 100644
--- a/app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/AddInventoryDataObserver.php
@@ -6,8 +6,8 @@
 
 namespace Magento\CatalogInventory\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 class AddInventoryDataObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
index 1e99794d68a40..1ac14b53d154e 100644
--- a/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/CancelOrderItemObserver.php
@@ -6,9 +6,9 @@
 
 namespace Magento\CatalogInventory\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\CatalogInventory\Api\StockManagementInterface;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * Catalog inventory module observer
diff --git a/app/code/Magento/CatalogInventory/Observer/CheckoutAllSubmitAfterObserver.php b/app/code/Magento/CatalogInventory/Observer/CheckoutAllSubmitAfterObserver.php
index 0b8c68f0a3011..36c968966f847 100644
--- a/app/code/Magento/CatalogInventory/Observer/CheckoutAllSubmitAfterObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/CheckoutAllSubmitAfterObserver.php
@@ -6,8 +6,8 @@
 
 namespace Magento\CatalogInventory\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 class CheckoutAllSubmitAfterObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php b/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
index e473f714bd21d..f2a9d61f21c69 100644
--- a/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
@@ -8,8 +8,8 @@
 use Magento\Catalog\Model\Product;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Model\Stock\Item;
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * This observer prepares stock data for saving by combining stock data from the stock data property
diff --git a/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php b/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
index 93a50cc9a7a4d..69cddbf37b7a5 100644
--- a/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/RevertQuoteInventoryObserver.php
@@ -6,9 +6,9 @@
 
 namespace Magento\CatalogInventory\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\CatalogInventory\Api\StockManagementInterface;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * Catalog inventory module observer
diff --git a/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php b/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php
index 03ba58d3f4987..9a0256950b438 100644
--- a/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/SaveInventoryDataObserver.php
@@ -6,13 +6,13 @@
 namespace Magento\CatalogInventory\Observer;
 
 use Magento\Catalog\Model\Product;
-use Magento\CatalogInventory\Model\Stock\Item;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Event\ObserverInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\CatalogInventory\Model\Stock\Item;
 use Magento\CatalogInventory\Model\StockItemValidator;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * Saves stock data from a product to the Stock Item
diff --git a/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php b/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php
index 6fbec08e4805b..f34090da7251e 100644
--- a/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php
@@ -6,9 +6,9 @@
 
 namespace Magento\CatalogInventory\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\CatalogInventory\Api\StockManagementInterface;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * Catalog inventory module observer
diff --git a/app/code/Magento/CatalogInventory/Setup/Recurring.php b/app/code/Magento/CatalogInventory/Setup/Recurring.php
index 44d4f447502b5..daae8bb386fd7 100644
--- a/app/code/Magento/CatalogInventory/Setup/Recurring.php
+++ b/app/code/Magento/CatalogInventory/Setup/Recurring.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\CatalogInventory\Setup;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Setup\ExternalFKSetup;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/CatalogInventory/Setup/UpgradeData.php b/app/code/Magento/CatalogInventory/Setup/UpgradeData.php
index 8c99861308ba1..3f1e5c5369f0f 100644
--- a/app/code/Magento/CatalogInventory/Setup/UpgradeData.php
+++ b/app/code/Magento/CatalogInventory/Setup/UpgradeData.php
@@ -10,9 +10,9 @@
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\Select\QueryModifierFactory;
 use Magento\Framework\Indexer\AbstractProcessor;
-use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
diff --git a/app/code/Magento/CatalogInventory/Setup/UpgradeSchema.php b/app/code/Magento/CatalogInventory/Setup/UpgradeSchema.php
index e8f6de22cbfc8..8b616f987acb3 100644
--- a/app/code/Magento/CatalogInventory/Setup/UpgradeSchema.php
+++ b/app/code/Magento/CatalogInventory/Setup/UpgradeSchema.php
@@ -6,10 +6,10 @@
 
 namespace Magento\CatalogInventory\Setup;
 
-use Magento\Framework\Setup\UpgradeSchemaInterface;
+use Magento\CatalogInventory\Model\Stock\Item as StockItem;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\CatalogInventory\Model\Stock\Item as StockItem;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
 
 class UpgradeSchema implements UpgradeSchemaInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php
index 4ef2e78e590fb..9375b970a6557 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Block/Plugin/ProductViewTest.php
@@ -45,8 +45,7 @@ protected function setUp()
     public function testAfterGetQuantityValidators()
     {
         $result = [
-            'validate-item-quantity' =>
-                [
+            'validate-item-quantity' => [
                     'minAllowed' => 0.5,
                     'maxAllowed' => 5,
                     'qtyIncrements' => 3
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Helper/StockTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Helper/StockTest.php
index 2fe40c118b06a..74b1a1838393d 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Helper/StockTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Helper/StockTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\CatalogInventory\Test\Unit\Helper;
 
-use \Magento\CatalogInventory\Helper\Stock;
+use Magento\CatalogInventory\Helper\Stock;
 
 /**
  * Class StockTest
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php
index d2779b79b30d7..9b6d1b395a11a 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/ConfigurationTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\CatalogInventory\Test\Unit\Model;
 
-use \Magento\CatalogInventory\Model\Configuration;
+use Magento\CatalogInventory\Model\Configuration;
 
 /**
  * Class ConfigurationTest
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/CacheCleanerTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/CacheCleanerTest.php
index 5e4249685f8d3..fd7ac8fabcfa7 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/CacheCleanerTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/CacheCleanerTest.php
@@ -6,6 +6,7 @@
 
 namespace Magento\CatalogInventory\Test\Unit\Model\Indexer\Stock;
 
+use Magento\Catalog\Model\Product;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Model\Indexer\Stock\CacheCleaner;
 use Magento\Framework\App\ResourceConnection;
@@ -14,7 +15,6 @@
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Indexer\CacheContext;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Catalog\Model\Product;
 
 class CacheCleanerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QtyProcessorTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QtyProcessorTest.php
index ea36283fabe46..7d65198650245 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QtyProcessorTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QtyProcessorTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\CatalogInventory\Test\Unit\Model\Quote\Item\QuantityValidator\Initializer;
 
-use \Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer\QtyProcessor;
+use Magento\CatalogInventory\Model\Quote\Item\QuantityValidator\Initializer\QtyProcessor;
 
 class QtyProcessorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockStatusRepositoryTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockStatusRepositoryTest.php
index b8616e37a31c8..c36cc76694c18 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockStatusRepositoryTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Stock/StockStatusRepositoryTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogInventory\Test\Unit\Model\Stock;
 
-use Magento\CatalogInventory\Model\Stock\StockStatusRepository;
 use Magento\CatalogInventory\Api\Data as InventoryApiData;
+use Magento\CatalogInventory\Model\Stock\StockStatusRepository;
 use Magento\CatalogInventory\Model\StockRegistryStorage;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/StockTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/StockTest.php
index c3abad50ef9f4..612880f0d7c23 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/StockTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/StockTest.php
@@ -57,30 +57,30 @@ public function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['dispatch'])
             ->getMock();
-        
+
         $this->context = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
             ->disableOriginalConstructor()
             ->setMethods(['getEventDispatcher'])
             ->getMock();
         $this->context->expects($this->any())->method('getEventDispatcher')->willReturn($this->eventDispatcher);
-        
+
         $this->registry = $this->getMockBuilder(\Magento\Framework\Registry::class)
             ->disableOriginalConstructor()
             ->getMock();
-        
+
         $this->extensionFactory = $this->getMockBuilder(\Magento\Framework\Api\ExtensionAttributesFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        
+
         $this->customAttributeFactory = $this->getMockBuilder(\Magento\Framework\Api\AttributeValueFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        
+
         $this->resource = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\AbstractResource::class)
             ->disableOriginalConstructor()
             ->setMethods(['getIdFieldName'])
             ->getMockForAbstractClass();
-        
+
         $this->resourceCollection = $this->getMockBuilder(\Magento\Framework\Data\Collection\AbstractDb::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -118,14 +118,14 @@ public function testDispatchEvents($eventName, $methodName, $objectName)
                 return true;
             })
         );
-            
+
         $this->stockModel->$methodName();
         $this->assertTrue(
             ($isCalledWithRightPrefix && $isObjectNameRight),
             sprintf('Event "%s" with object name "%s" doesn\'t dispatched properly', $eventName, $objectName)
         );
     }
-    
+
     public function eventsDataProvider()
     {
         return [
diff --git a/app/code/Magento/CatalogInventory/Ui/Component/Product/Form/Element/UseConfigSettings.php b/app/code/Magento/CatalogInventory/Ui/Component/Product/Form/Element/UseConfigSettings.php
index 67b5699c17bd6..59d384f3451cd 100644
--- a/app/code/Magento/CatalogInventory/Ui/Component/Product/Form/Element/UseConfigSettings.php
+++ b/app/code/Magento/CatalogInventory/Ui/Component/Product/Form/Element/UseConfigSettings.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\CatalogInventory\Ui\Component\Product\Form\Element;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\ValueSourceInterface;
+use Magento\Framework\Serialize\JsonValidator;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Component\Form\Element\Checkbox;
-use Magento\Framework\Serialize\JsonValidator;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class UseConfigSettings sets default value from configuration
diff --git a/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php
index c5d18ea727534..3ae95bc019c41 100644
--- a/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php
+++ b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php
@@ -11,10 +11,10 @@
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Api\StockRegistryInterface;
-use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\JsonValidator;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Stdlib\ArrayManager;
 
 /**
  * Data provider for advanced inventory form
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
index 0b4748c933a3c..f9ab0c40438fd 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
@@ -7,8 +7,8 @@
 
 use Magento\Backend\Block\Widget\Form;
 use Magento\Backend\Block\Widget\Form\Generic;
-use Magento\Ui\Component\Layout\Tabs\TabInterface;
 use Magento\Rule\Model\Condition\AbstractCondition;
+use Magento\Ui\Component\Layout\Tabs\TabInterface;
 
 class Conditions extends Generic implements TabInterface
 {
diff --git a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
index 0170fc76b6aab..b795eb16be83a 100644
--- a/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
+++ b/app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
@@ -7,10 +7,10 @@
 namespace Magento\CatalogRule\Controller\Adminhtml\Promo\Catalog;
 
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
 use Magento\Framework\Stdlib\DateTime\Filter\Date;
-use Magento\Framework\App\Request\DataPersistorInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
index 5d93e6f216866..f2ee176cf1da9 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\CatalogRule\Model\Indexer;
 
-use Magento\Framework\Mview\ActionInterface as MviewActionInterface;
-use Magento\Framework\Indexer\ActionInterface as IndexerActionInterface;
 use Magento\Framework\DataObject\IdentityInterface;
+use Magento\Framework\Indexer\ActionInterface as IndexerActionInterface;
 use Magento\Framework\Indexer\CacheContext;
+use Magento\Framework\Mview\ActionInterface as MviewActionInterface;
 
 abstract class AbstractIndexer implements IndexerActionInterface, MviewActionInterface, IdentityInterface
 {
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
index f2dd8968a903d..233f007c4666e 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
@@ -7,11 +7,11 @@
 namespace Magento\CatalogRule\Model\Indexer;
 
 use Magento\Catalog\Model\Product;
+use Magento\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
 use Magento\CatalogRule\Model\ResourceModel\Rule\CollectionFactory as RuleCollectionFactory;
 use Magento\CatalogRule\Model\Rule;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
 
 /**
  * @api
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder/ProductLoader.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder/ProductLoader.php
index bce2bea2fd952..44587cacd65ef 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder/ProductLoader.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder/ProductLoader.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\CatalogRule\Model\Indexer\IndexBuilder;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * Product loader that gets products by ids via product repository
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php
index 3f396cacd37da..9be338ffe7e71 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php
@@ -7,9 +7,9 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
+use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Select;
-use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
 
 class LinkedProductSelectBuilderByCatalogRulePrice implements LinkedProductSelectBuilderInterface
 {
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/ReadHandler.php b/app/code/Magento/CatalogRule/Model/ResourceModel/ReadHandler.php
index ef3eb1ce674eb..eb6bdbf464605 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/ReadHandler.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\CatalogRule\Model\ResourceModel;
 
-use Magento\CatalogRule\Model\ResourceModel\Rule;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
 
@@ -42,6 +41,7 @@ public function __construct(
      * @param array $arguments
      * @return array
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
     {
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Collection.php
index fdc039067cc3d..865e22013e9b4 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Collection.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/Rule/Collection.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogRule\Model\ResourceModel\Rule;
 
-use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
 
 class Collection extends \Magento\Rule\Model\ResourceModel\Rule\Collection\AbstractCollection
 {
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/SaveHandler.php b/app/code/Magento/CatalogRule/Model/ResourceModel/SaveHandler.php
index 57e99f7a2ae01..adfcfcaf8684f 100644
--- a/app/code/Magento/CatalogRule/Model/ResourceModel/SaveHandler.php
+++ b/app/code/Magento/CatalogRule/Model/ResourceModel/SaveHandler.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\CatalogRule\Model\ResourceModel;
 
-use Magento\CatalogRule\Model\ResourceModel\Rule;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
 
@@ -42,6 +41,7 @@ public function __construct(
      * @param array $arguments
      * @return array
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
     {
diff --git a/app/code/Magento/CatalogRule/Observer/PrepareCatalogProductCollectionPricesObserver.php b/app/code/Magento/CatalogRule/Observer/PrepareCatalogProductCollectionPricesObserver.php
index 75a208e87100b..af354d7ce26d1 100644
--- a/app/code/Magento/CatalogRule/Observer/PrepareCatalogProductCollectionPricesObserver.php
+++ b/app/code/Magento/CatalogRule/Observer/PrepareCatalogProductCollectionPricesObserver.php
@@ -10,13 +10,11 @@
 namespace Magento\CatalogRule\Observer;
 
 use Magento\Catalog\Model\Product;
-use Magento\CatalogRule\Model\Rule;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\Customer\Model\Session as CustomerModelSession;
-use Magento\Framework\Event\Observer as EventObserver;
 use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Customer\Model\Session as CustomerModelSession;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogRule/Observer/ProcessAdminFinalPriceObserver.php b/app/code/Magento/CatalogRule/Observer/ProcessAdminFinalPriceObserver.php
index 2dce2cb2f5b1c..2cba6cd003c59 100644
--- a/app/code/Magento/CatalogRule/Observer/ProcessAdminFinalPriceObserver.php
+++ b/app/code/Magento/CatalogRule/Observer/ProcessAdminFinalPriceObserver.php
@@ -10,12 +10,9 @@
 namespace Magento\CatalogRule\Observer;
 
 use Magento\Catalog\Model\Product;
-use Magento\CatalogRule\Model\Rule;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\Customer\Model\Session as CustomerModelSession;
-use Magento\Framework\Event\Observer as EventObserver;
-use Magento\Framework\Registry;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 class ProcessAdminFinalPriceObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/CatalogRule/Observer/ProcessFrontFinalPriceObserver.php b/app/code/Magento/CatalogRule/Observer/ProcessFrontFinalPriceObserver.php
index 2d4042f691502..a40a34f970b41 100644
--- a/app/code/Magento/CatalogRule/Observer/ProcessFrontFinalPriceObserver.php
+++ b/app/code/Magento/CatalogRule/Observer/ProcessFrontFinalPriceObserver.php
@@ -9,13 +9,11 @@
  */
 namespace Magento\CatalogRule\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Catalog\Model\Product;
-use Magento\CatalogRule\Model\Rule;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Customer\Model\Session as CustomerModelSession;
-use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class ProcessFrontFinalPriceObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Save/ApplyRulesAfterReindex.php b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Save/ApplyRulesAfterReindex.php
index 1b9fedf76f11a..413be2d714dfd 100644
--- a/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Save/ApplyRulesAfterReindex.php
+++ b/app/code/Magento/CatalogRule/Plugin/Indexer/Product/Save/ApplyRulesAfterReindex.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogRule\Plugin\Indexer\Product\Save;
 
-use Magento\CatalogRule\Model\Indexer\Product\ProductRuleProcessor;
 use Magento\Catalog\Model\Product;
+use Magento\CatalogRule\Model\Indexer\Product\ProductRuleProcessor;
 
 /**
  * Plugin for Magento\Catalog\Model\Product
diff --git a/app/code/Magento/CatalogRule/Setup/UpgradeData.php b/app/code/Magento/CatalogRule/Setup/UpgradeData.php
index 7f75b7e41dfac..4d7f1f24b0fc1 100644
--- a/app/code/Magento/CatalogRule/Setup/UpgradeData.php
+++ b/app/code/Magento/CatalogRule/Setup/UpgradeData.php
@@ -6,14 +6,14 @@
 
 namespace Magento\CatalogRule\Setup;
 
+use Magento\CatalogRule\Api\Data\RuleInterface;
 use Magento\Framework\DB\AggregatedFieldDataConverter;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\DB\FieldToConvert;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\CatalogRule\Api\Data\RuleInterface;
 
 class UpgradeData implements UpgradeDataInterface
 {
diff --git a/app/code/Magento/CatalogRule/Setup/UpgradeSchema.php b/app/code/Magento/CatalogRule/Setup/UpgradeSchema.php
index b75e5ea61fe6e..161e1fc1905a2 100644
--- a/app/code/Magento/CatalogRule/Setup/UpgradeSchema.php
+++ b/app/code/Magento/CatalogRule/Setup/UpgradeSchema.php
@@ -6,9 +6,9 @@
 
 namespace Magento\CatalogRule\Setup;
 
-use Magento\Framework\Setup\UpgradeSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
 
 /**
  * Upgrade the CatalogRule module DB scheme
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilder/ProductLoaderTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilder/ProductLoaderTest.php
index 3509128da79da..5e309ee1ceaa6 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilder/ProductLoaderTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/IndexBuilder/ProductLoaderTest.php
@@ -6,12 +6,12 @@
 
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer\IndexBuilder;
 
-use Magento\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Catalog\Api\Data\ProductSearchResultsInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
+use Magento\CatalogRule\Model\Indexer\IndexBuilder\ProductLoader;
 use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 
 class ProductLoaderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductPriceTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductPriceTest.php
index 6d7f0673ed281..15ab8c5301cb5 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductPriceTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductPriceTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
-use Magento\CatalogRule\Model\Indexer\IndexBuilder;
-
 class ReindexRuleProductPriceTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php
index 92b4bb353f046..2d277f314ce04 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/RuleProductsSelectBuilderTest.php
@@ -7,10 +7,10 @@
 namespace Magento\CatalogRule\Test\Unit\Model\Indexer;
 
 use Magento\Catalog\Model\Product;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\DB\Select;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Store\Api\Data\WebsiteInterface;
 
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Plugin/Indexer/Product/Save/ApplyRulesAfterReindexTest.php b/app/code/Magento/CatalogRule/Test/Unit/Plugin/Indexer/Product/Save/ApplyRulesAfterReindexTest.php
index fe79c455ec1cd..ede2d0886920f 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Plugin/Indexer/Product/Save/ApplyRulesAfterReindexTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Plugin/Indexer/Product/Save/ApplyRulesAfterReindexTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\CatalogRule\Test\Unit\Plugin\Indexer\Product\Save;
 
+use Magento\Catalog\Model\Product;
+use Magento\CatalogRule\Model\Indexer\Product\ProductRuleProcessor;
 use Magento\CatalogRule\Plugin\Indexer\Product\Save\ApplyRulesAfterReindex;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\CatalogRule\Model\Indexer\Product\ProductRuleProcessor;
-use Magento\Catalog\Model\Product;
 
 class ApplyRulesAfterReindexTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogRule/Test/Unit/Plugin/Model/Product/ActionTest.php b/app/code/Magento/CatalogRule/Test/Unit/Plugin/Model/Product/ActionTest.php
index 549d3e493d121..a9212189dbbf2 100644
--- a/app/code/Magento/CatalogRule/Test/Unit/Plugin/Model/Product/ActionTest.php
+++ b/app/code/Magento/CatalogRule/Test/Unit/Plugin/Model/Product/ActionTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\CatalogRule\Test\Unit\Plugin\Model\Product;
 
-use \Magento\CatalogRule\Plugin\Model\Product\Action;
+use Magento\CatalogRule\Plugin\Model\Product\Action;
 
 class ActionTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Indexer/ProductRuleReindex.php b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Indexer/ProductRuleReindex.php
index 9c66719334639..d63432279331d 100644
--- a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Indexer/ProductRuleReindex.php
+++ b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Indexer/ProductRuleReindex.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\CatalogRuleConfigurable\Plugin\CatalogRule\Model\Indexer;
 
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\CatalogRuleConfigurable\Plugin\CatalogRule\Model\ConfigurableProductsProvider;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 /**
  * Class ReindexProduct. Add configurable sub-products to reindex
diff --git a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandler.php b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandler.php
index d27c424ed9ea3..ca197407d7e5e 100644
--- a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandler.php
+++ b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandler.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\CatalogRuleConfigurable\Plugin\CatalogRule\Model\Rule;
 
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\CatalogRuleConfigurable\Plugin\CatalogRule\Model\ConfigurableProductsProvider;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 /**
  * Add configurable sub products to catalog rule indexer on full reindex
diff --git a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/Validation.php b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/Validation.php
index a4be621ad513e..48100ed018661 100644
--- a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/Validation.php
+++ b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/Validation.php
@@ -6,10 +6,10 @@
  */
 namespace Magento\CatalogRuleConfigurable\Plugin\CatalogRule\Model\Rule;
 
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Catalog\Model\Product;
 use Magento\CatalogRule\Model\Rule;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\DataObject;
-use Magento\Catalog\Model\Product;
 
 /**
  * Class Validation. Call validate method for configurable product instead simple product
diff --git a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
index 86195aa31f0e4..01103c51d9f0e 100644
--- a/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
+++ b/app/code/Magento/CatalogSearch/Controller/Advanced/Result.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\CatalogSearch\Controller\Advanced;
 
-use Magento\Catalog\Model\Layer\Resolver;
 use Magento\CatalogSearch\Model\Advanced as ModelAdvanced;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\UrlFactory;
diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
index f3990da3a325e..2ed170ba3c12d 100644
--- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php
+++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
@@ -9,9 +9,8 @@
 use Magento\Catalog\Model\Layer\Resolver;
 use Magento\Catalog\Model\Session;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\ResourceConnection;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Search\Model\QueryFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 class Index extends \Magento\Framework\App\Action\Action
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php
index 8ca0c0eeddf1b..b3b3bb32025a5 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php
@@ -7,12 +7,12 @@
 
 use Magento\Catalog\Api\AttributeSetFinderInterface;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as AttributeCollection;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Search\Adapter\Aggregation\AggregationResolverInterface;
 use Magento\Framework\Search\Request\BucketInterface;
 use Magento\Framework\Search\Request\Config;
 use Magento\Framework\Search\RequestInterface;
-use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as AttributeCollection;
 
 class AggregationResolver implements AggregationResolverInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php
index 01e95c4676af4..7ca9e00f333ab 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/Checker/Query/CatalogView.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\CatalogSearch\Model\Adapter\Aggregation\Checker\Query;
 
-use Magento\Framework\Search\RequestInterface;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\Search\Request\QueryInterface;
-use Magento\Framework\Search\Request\Query\BoolExpression;
 use Magento\CatalogSearch\Model\Adapter\Aggregation\RequestCheckerInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Search\Request\Query\BoolExpression;
+use Magento\Framework\Search\Request\QueryInterface;
+use Magento\Framework\Search\RequestInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Request checker for catalog view.
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php
index 9e4f93b45985c..a62859cc9594c 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/RequestCheckerComposite.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogSearch\Model\Adapter\Aggregation;
 
-use Magento\Framework\Search\RequestInterface;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Framework\Search\RequestInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 class RequestCheckerComposite implements RequestCheckerInterface
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
index 5887c76e8ddc2..0fa0c2cb7a60b 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
@@ -10,6 +10,7 @@
 use Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\QueryBuilder;
 use Magento\Customer\Model\Session;
 use Magento\Eav\Model\Config;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
@@ -17,7 +18,6 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface;
 use Magento\Framework\Search\Request\BucketInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * DataProvider for Catalog search Mysql.
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php
index ca077ef7227d5..65175672ad03d 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/QueryBuilder.php
@@ -11,7 +11,6 @@
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\ScopeResolverInterface;
-use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Request\BucketInterface;
 
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php
index 87fc896f50956..6919870a0a220 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php
@@ -7,10 +7,10 @@
 namespace Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy;
 
 use Magento\CatalogSearch\Model\Search\BaseSelectStrategy\BaseSelectStrategyInterface;
+use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
-use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class BaseSelectAttributesSearchStrategy
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php
index 0732df7bd9f57..480040ea88dd5 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php
@@ -8,8 +8,8 @@
 
 use Magento\CatalogSearch\Model\Search\BaseSelectStrategy\BaseSelectStrategyInterface;
 use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
-use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 
 /**
  * Class BaseSelectFullTextSearchStrategy
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
index 8b7a7ed214e36..b3393fac0a13d 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Model\Layer\Filter\Price\Range;
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Ddl\Table;
@@ -15,7 +16,6 @@
 use Magento\Framework\Search\Dynamic\DataProviderInterface;
 use Magento\Framework\Search\Dynamic\IntervalFactory;
 use Magento\Framework\Search\Request\BucketInterface;
-use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManager;
 
 /**
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
index 35addc3fafd4f..5bf49fc15a8e9 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
@@ -8,7 +8,9 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\CatalogSearch\Model\Search\FilterMapper\VisibilityFilter;
 use Magento\CatalogSearch\Model\Search\TableMapper;
+use Magento\Customer\Model\Session;
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
@@ -20,8 +22,6 @@
 use Magento\Framework\Search\Adapter\Mysql\Filter\PreprocessorInterface;
 use Magento\Framework\Search\Request\FilterInterface;
 use Magento\Store\Model\Store;
-use Magento\Customer\Model\Session;
-use Magento\CatalogSearch\Model\Search\FilterMapper\VisibilityFilter;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index d158bdf40b421..17ccad39aede0 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -15,8 +15,8 @@
 use Magento\CatalogSearch\Model\ResourceModel\AdvancedFactory;
 use Magento\Directory\Model\CurrencyFactory;
 use Magento\Eav\Model\Entity\Attribute as EntityAttribute;
-use Magento\Framework\Model\Context;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Model\Context;
 use Magento\Framework\Registry;
 use Magento\Store\Model\StoreManagerInterface;
 
diff --git a/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
index c4413d002e19c..0791d61dd86df 100644
--- a/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Autocomplete/DataProvider.php
@@ -6,10 +6,10 @@
 
 namespace Magento\CatalogSearch\Model\Autocomplete;
 
-use Magento\Search\Model\ResourceModel\Query\Collection;
-use Magento\Search\Model\QueryFactory;
 use Magento\Search\Model\Autocomplete\DataProviderInterface;
 use Magento\Search\Model\Autocomplete\ItemFactory;
+use Magento\Search\Model\QueryFactory;
+use Magento\Search\Model\ResourceModel\Query\Collection;
 
 class DataProvider implements DataProviderInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
index 5abcd5e7592e1..0c35b9329b7a3 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -395,7 +395,7 @@ public function rebuildStoreIndex($storeId, $productIds = null)
             }
             $products = $this->dataProvider
                 ->getSearchableProducts($storeId, $staticFields, $productIds, $lastProductId);
-        };
+        }
     }
 
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/AbstractPlugin.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/AbstractPlugin.php
index 5d4096a3afab0..52e2d151d2e88 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/AbstractPlugin.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/AbstractPlugin.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin;
 
-use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
+use Magento\Framework\Indexer\IndexerRegistry;
 
 /**
  * Abstract plugin for indexers
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product/Action.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product/Action.php
index 75bf4cbd0f3f6..694e7994247c4 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product/Action.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Product/Action.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Product;
 
-use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\AbstractPlugin as AbstractIndexerPlugin;
 use Magento\Catalog\Model\Product\Action as ProductAction;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\AbstractPlugin as AbstractIndexerPlugin;
 
 /**
  * Plugin for Magento\Catalog\Model\Product\Action
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php
index 73a79f7c87239..8f928dc3e6cb4 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Store;
 
+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\AbstractPlugin as AbstractIndexerPlugin;
-use Magento\Store\Model\ResourceModel\Group as StoreGroupResourceModel;
 use Magento\Framework\Model\AbstractModel;
-use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
+use Magento\Store\Model\ResourceModel\Group as StoreGroupResourceModel;
 
 /**
  * Plugin for Magento\Store\Model\ResourceModel\Group
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php
index 7f0c5fdae6d42..374caaaf0e3f7 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Store;
 
+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\AbstractPlugin as AbstractIndexerPlugin;
-use Magento\Store\Model\ResourceModel\Store as StoreResourceModel;
 use Magento\Framework\Model\AbstractModel;
-use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
+use Magento\Store\Model\ResourceModel\Store as StoreResourceModel;
 
 /**
  * Plugin for Magento\Store\Model\ResourceModel\Store
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Processor.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Processor.php
index cd3ff62d53682..91bff1fdae04b 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Processor.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Processor.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer\Fulltext;
 
-use Magento\Framework\Indexer\AbstractProcessor;
 use Magento\CatalogSearch\Model\Indexer\Fulltext;
+use Magento\Framework\Indexer\AbstractProcessor;
 
 /**
  * Class Processor
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php
index e971f59cf10f2..10b05d6a385bf 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Store.php
@@ -7,9 +7,9 @@
 
 use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
 use Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory;
-use Magento\Framework\Search\Request\DimensionFactory;
-use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Indexer\ConfigInterface;
+use Magento\Framework\Search\Request\DimensionFactory;
 
 class Store implements ObserverInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
index c46f062c1e6d8..aafe2cb37fa30 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexStructure.php
@@ -9,9 +9,9 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Search\Request\Dimension;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
+use Magento\Framework\Search\Request\Dimension;
 use Magento\Framework\Search\Request\IndexScopeResolverInterface;
 
 /**
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
index ea5bb8be17c74..34cd4958bf389 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php
@@ -7,11 +7,11 @@
 
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Framework\Indexer\IndexStructureInterface;
+use Magento\Framework\Indexer\SaveHandler\Batch;
+use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Framework\Search\Request\Dimension;
 use Magento\Framework\Search\Request\IndexScopeResolverInterface;
-use Magento\Framework\Indexer\SaveHandler\Batch;
 
 /**
  * @api
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php b/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
index 47a8681a73c60..c9b98c1683cb2 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Mview/Action.php
@@ -6,8 +6,8 @@
 namespace Magento\CatalogSearch\Model\Indexer\Mview;
 
 use Magento\CatalogSearch\Model\Indexer\Fulltext;
-use Magento\Framework\Mview\ActionInterface;
 use Magento\Framework\Indexer\IndexerInterfaceFactory;
+use Magento\Framework\Mview\ActionInterface;
 
 class Action implements ActionInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php b/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php
index 343dc50d604bc..3fea1bbbade18 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/ProductFieldset.php
@@ -30,7 +30,7 @@ class ProductFieldset implements \Magento\Framework\Indexer\FieldsetInterface
      * @var Attribute[]
      */
     private $searchableAttributes;
-    
+
     /**
      * @param Config $eavConfig
      * @param CollectionFactory $collectionFactory
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
index 02bc3e2bc2400..49a812d7699a9 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
@@ -6,6 +6,7 @@
 namespace Magento\CatalogSearch\Model\ResourceModel\Advanced;
 
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
 use Magento\Framework\Api\Search\SearchResultFactory;
@@ -14,7 +15,6 @@
 use Magento\Framework\Search\Adapter\Mysql\TemporaryStorage;
 use Magento\Framework\Search\Request\EmptyRequestDataException;
 use Magento\Framework\Search\Request\NonExistingRequestNameException;
-use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 
 /**
  * Collection Advanced
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
index e9737d0aa0599..0dc9395451927 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
@@ -44,7 +44,7 @@ public function __construct(
         MetadataPool $metadataPool = null
     ) {
         $this->_eventManager = $eventManager;
-        $this->metadataPool = $metadataPool ? : ObjectManager::getInstance()->get(MetadataPool::class);
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
         parent::__construct($context, $connectionName);
     }
 
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
index 379b21813860a..391e2eb64bcb2 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
@@ -5,18 +5,18 @@
  */
 namespace Magento\CatalogSearch\Model\ResourceModel\Fulltext;
 
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 use Magento\CatalogSearch\Model\Search\RequestGenerator;
+use Magento\Framework\Api\Search\SearchResultFactory;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Search\Adapter\Mysql\TemporaryStorage;
-use Magento\Framework\Search\Response\QueryResponse;
 use Magento\Framework\Search\Request\EmptyRequestDataException;
 use Magento\Framework\Search\Request\NonExistingRequestNameException;
-use Magento\Framework\Api\Search\SearchResultFactory;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\App\ObjectManager;
-use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\Framework\Search\Response\QueryResponse;
 
 /**
  * Fulltext Collection
@@ -363,7 +363,7 @@ protected function _renderFiltersBefore()
 
         if ($this->relevanceOrderDirection) {
             $this->getSelect()->order(
-                'search_result.'. TemporaryStorage::FIELD_SCORE . ' ' . $this->relevanceOrderDirection
+                'search_result.' . TemporaryStorage::FIELD_SCORE . ' ' . $this->relevanceOrderDirection
             );
         }
 
diff --git a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
index 65759685c2b62..96c8ef112aa0d 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\CatalogSearch\Model\Search\BaseSelectStrategy;
 
-use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
-use Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy\BaseSelectFullTextSearchStrategy;
 use Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy\BaseSelectAttributesSearchStrategy;
+use Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy\BaseSelectFullTextSearchStrategy;
+use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
 
 /**
  * Class StrategyMapper
diff --git a/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php b/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php
index 98bf1e5984a74..48910da66e2d3 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/CustomAttributeFilterCheck.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\CatalogSearch\Model\Search;
 
-use Magento\Framework\Search\Request\FilterInterface;
-use Magento\Eav\Model\Config as EavConfig;
 use Magento\Catalog\Model\Product;
+use Magento\Eav\Model\Config as EavConfig;
+use Magento\Framework\Search\Request\FilterInterface;
 
 /**
  * Class CustomAttributeFilterSelector
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php
index fc93b86f5da5e..ab805be1822c2 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php
@@ -6,14 +6,14 @@
 
 namespace Magento\CatalogSearch\Model\Search\FilterMapper;
 
+use Magento\Catalog\Model\Product;
+use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
+use Magento\Eav\Model\Config as EavConfig;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
 use Magento\Framework\DB\Select;
-use Magento\Eav\Model\Config as EavConfig;
+use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
 use Magento\Framework\Search\Request\FilterInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
-use Magento\Catalog\Model\Product;
 
 /**
  * Class CustomAttributeFilter
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/DimensionsProcessor.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/DimensionsProcessor.php
index 67f427d4be471..b88ea403111f8 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/DimensionsProcessor.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/DimensionsProcessor.php
@@ -6,12 +6,11 @@
 
 namespace Magento\CatalogSearch\Model\Search\FilterMapper;
 
-use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
+use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\DB\Select;
-use Magento\Framework\Search\RequestInterface;
+use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
 use Magento\Framework\Search\Request\Dimension;
-use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
 
 /**
  * Class DimensionsProcessor
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterMapper.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterMapper.php
index 27128327554d2..7a1c73432e7fd 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterMapper.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterMapper.php
@@ -6,9 +6,9 @@
 
 namespace Magento\CatalogSearch\Model\Search\FilterMapper;
 
-use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
-use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
 use Magento\CatalogInventory\Model\Stock;
+use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
+use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
 
 /**
  * Class FilterMapper
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilter.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilter.php
index 1cd9d1a3dd771..63273976a533f 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilter.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilter.php
@@ -6,11 +6,11 @@
 
 namespace Magento\CatalogSearch\Model\Search\FilterMapper;
 
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
-use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\CatalogInventory\Api\StockRegistryInterface;
 
 /**
  * Class StockStatusFilter
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php
index a615d76bef4d2..e00e09db4fa8c 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php
@@ -6,12 +6,12 @@
 
 namespace Magento\CatalogSearch\Model\Search\FilterMapper;
 
+use Magento\Eav\Model\Config as EavConfig;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\DB\Select;
+use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
 use Magento\Framework\Search\Request\FilterInterface;
-use Magento\Eav\Model\Config as EavConfig;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class VisibilityFilter
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FiltersExtractor.php b/app/code/Magento/CatalogSearch/Model/Search/FiltersExtractor.php
index 53c27eb66f6ae..ec6ce3f3a55de 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FiltersExtractor.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FiltersExtractor.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\CatalogSearch\Model\Search;
 
-use Magento\Framework\Search\Request\QueryInterface;
-use Magento\Framework\Search\Request\FilterInterface;
 use Magento\Framework\Search\Request\Filter\BoolExpression;
+use Magento\Framework\Search\Request\FilterInterface;
+use Magento\Framework\Search\Request\QueryInterface;
 
 /**
  * Class FiltersExtractor
diff --git a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
index 890a0d4000140..b6e5059cf9885 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
@@ -6,22 +6,22 @@
 
 namespace Magento\CatalogSearch\Model\Search;
 
+use Magento\CatalogSearch\Model\Search\BaseSelectStrategy\BaseSelectStrategyInterface;
+use Magento\CatalogSearch\Model\Search\BaseSelectStrategy\StrategyMapper as BaseSelectStrategyMapper;
+use Magento\CatalogSearch\Model\Search\FilterMapper\DimensionsProcessor;
+use Magento\CatalogSearch\Model\Search\FilterMapper\FilterMapper;
+use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
+use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainerBuilder;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\DB\Select;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
 use Magento\Framework\Search\Adapter\Mysql\IndexBuilderInterface;
 use Magento\Framework\Search\RequestInterface;
-use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\App\ScopeResolverInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\CatalogSearch\Model\Search\FilterMapper\DimensionsProcessor;
-use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
-use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainerBuilder;
-use Magento\CatalogSearch\Model\Search\BaseSelectStrategy\StrategyMapper as BaseSelectStrategyMapper;
-use Magento\CatalogSearch\Model\Search\BaseSelectStrategy\BaseSelectStrategyInterface;
-use Magento\CatalogSearch\Model\Search\FilterMapper\FilterMapper;
 
 /**
  * Build base Query for Index
diff --git a/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php b/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php
index f6c2ac0a4f55a..aee997be55595 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/QueryChecker/FullTextSearchCheck.php
@@ -6,9 +6,9 @@
 
 namespace Magento\CatalogSearch\Model\Search\QueryChecker;
 
-use Magento\Framework\Search\Request\QueryInterface;
 use Magento\Framework\Search\Request\Query\BoolExpression;
 use Magento\Framework\Search\Request\Query\Filter;
+use Magento\Framework\Search\Request\QueryInterface;
 
 /**
  * Class is responsible for checking if fulltext search is required for search query
diff --git a/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php
index a18ef8e91d7f7..c99e0fb1b7f60 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\CatalogSearch\Model\Search\SelectContainer;
 
-use Magento\CatalogSearch\Model\Search\QueryChecker\FullTextSearchCheck;
 use Magento\CatalogSearch\Model\Search\CustomAttributeFilterCheck;
+use Magento\CatalogSearch\Model\Search\FilterMapper\VisibilityFilter;
 use Magento\CatalogSearch\Model\Search\FiltersExtractor;
+use Magento\CatalogSearch\Model\Search\QueryChecker\FullTextSearchCheck;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Search\RequestInterface;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Search\RequestInterface;
 use Magento\Store\Model\ScopeInterface;
-use Magento\CatalogSearch\Model\Search\FilterMapper\VisibilityFilter;
 
 /**
  * Class SelectContainerBuilder
diff --git a/app/code/Magento/CatalogSearch/Setup/InstallData.php b/app/code/Magento/CatalogSearch/Setup/InstallData.php
index 89ac6f91270a4..ec64324cd7baf 100644
--- a/app/code/Magento/CatalogSearch/Setup/InstallData.php
+++ b/app/code/Magento/CatalogSearch/Setup/InstallData.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\CatalogSearch\Setup;
 
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Framework\Indexer\IndexerInterfaceFactory;
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Indexer\IndexerInterfaceFactory;
-use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 
 class InstallData implements InstallDataInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Block/Plugin/FrontTabPluginTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Block/Plugin/FrontTabPluginTest.php
index 18e96171de5a1..6e168e8aec45b 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Block/Plugin/FrontTabPluginTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Block/Plugin/FrontTabPluginTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\CatalogSearch\Test\Unit\Block\Plugin;
 
+use Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front as ProductAttributeFrontTabBlock;
 use Magento\CatalogSearch\Block\Plugin\FrontTabPlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\CatalogSearch\Model\Source\Weight as WeightSource;
-use Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Front as ProductAttributeFrontTabBlock;
 use Magento\Framework\Data\Form;
-use Magento\Framework\Data\Form\Element\Fieldset;
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Fieldset;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\Element\AbstractBlock;
 
 /**
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Block/ResultTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Block/ResultTest.php
index c912b118c440e..e0caa16886880 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Block/ResultTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Block/ResultTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\CatalogSearch\Test\Unit\Block;
 
-use \Magento\CatalogSearch\Block\Result;
+use Magento\CatalogSearch\Block\Result;
 
 /**
  * Unit test for \Magento\CatalogSearch\Block\Result
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/AggregationResolverTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/AggregationResolverTest.php
index 2bceaca068b8b..193f2377e0ff7 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/AggregationResolverTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/AggregationResolverTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\CatalogSearch\Test\Unit\Model\Adapter\Aggregation;
 
+use Magento\Catalog\Api\AttributeSetFinderInterface;
 use Magento\CatalogSearch\Model\Adapter\Aggregation\AggregationResolver;
 use Magento\CatalogSearch\Model\Adapter\Aggregation\RequestCheckerInterface;
-use Magento\Catalog\Api\AttributeSetFinderInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Search\Request\BucketInterface;
 use Magento\Framework\Search\Request\Config;
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/Checker/Query/CatalogViewTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/Checker/Query/CatalogViewTest.php
index 817dfd7e08280..8226314e1b479 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/Checker/Query/CatalogViewTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/Checker/Query/CatalogViewTest.php
@@ -6,14 +6,14 @@
 namespace Magento\CatalogSearch\Test\Unit\Model\Adapter\Aggregation\Checker\Query;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\CatalogSearch\Model\Adapter\Aggregation\Checker\Query\CatalogView;
-use Magento\Framework\Search\RequestInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\Search\Request\QueryInterface;
-use Magento\Framework\Search\Request\Query\Filter;
 use Magento\Framework\Search\Request\Filter\Term;
+use Magento\Framework\Search\Request\Query\Filter;
+use Magento\Framework\Search\Request\QueryInterface;
+use Magento\Framework\Search\RequestInterface;
 use Magento\Store\Api\Data\StoreInterface;
-use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class CatalogViewTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php
index 7c558f60b7433..65aaa63ae0312 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php
@@ -6,20 +6,20 @@
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Adapter\Mysql\Aggregation;
 
+use Magento\Catalog\Model\Product;
 use Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider;
 use Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\QueryBuilder;
-use Magento\Eav\Model\Config;
 use Magento\Customer\Model\Session;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\DB\Select;
-use Magento\Store\Model\Store;
 use Magento\Framework\Search\Request\BucketInterface;
-use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Search\Request\Dimension;
-use Magento\Eav\Model\Entity\Attribute;
-use Magento\Catalog\Model\Product;
-use Magento\Framework\DB\Ddl\Table;
+use Magento\Store\Model\Store;
 
 /**
  * Test for Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider.
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Dynamic/DataProviderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Dynamic/DataProviderTest.php
index 1aeeb0d9bd731..fcb1e81a85c25 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Dynamic/DataProviderTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Dynamic/DataProviderTest.php
@@ -6,16 +6,16 @@
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Adapter\Mysql\Dynamic;
 
+use Magento\Catalog\Model\Layer\Filter\Price\Range;
 use Magento\CatalogSearch\Model\Adapter\Mysql\Dynamic\DataProvider;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Search\Dynamic\IntervalFactory;
-use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Ddl\Table;
-use Magento\Catalog\Model\Layer\Filter\Price\Range;
+use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface;
 use Magento\Framework\Search\Dynamic\EntityStorage;
+use Magento\Framework\Search\Dynamic\IntervalFactory;
 use Magento\Store\Model\StoreManager;
 
 /**
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/OptionsTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/OptionsTest.php
index de89114218e4f..db56406fce23e 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/OptionsTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/OptionsTest.php
@@ -6,8 +6,8 @@
 namespace Magento\CatalogSearch\Test\Unit\Model\Adapter;
 
 use Magento\CatalogSearch\Model\Adapter\Options;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ScopeInterface;
 
 class OptionsTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php
index 75daf438f7bf2..983c7eac94db5 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Autocomplete/DataProviderTest.php
@@ -85,7 +85,7 @@ public function testGetItems()
             ->method('getQueryText')
             ->willReturn($queryString);
 
-         $itemMock =  $this->getMockBuilder(\Magento\Search\Model\Autocomplete\Item::class)
+        $itemMock =  $this->getMockBuilder(\Magento\Search\Model\Autocomplete\Item::class)
             ->disableOriginalConstructor()
             ->setMethods(['getTitle', 'toArray'])
             ->getMock();
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Product/ActionTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Product/ActionTest.php
index 4cb7571f2a156..115f5aff1dffe 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Product/ActionTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Product/ActionTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\CatalogSearch\Test\Unit\Model\Indexer\Fulltext\Plugin\Product;
 
-use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Product\Action as ProductActionIndexerPlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Catalog\Model\Product\Action as ProductAction;
 use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Product\Action as ProductActionIndexerPlugin;
+use Magento\Framework\Indexer\IndexerInterface;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class ActionTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/ProductTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/ProductTest.php
index 8158424bf4224..1632d9b5fe361 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/ProductTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/ProductTest.php
@@ -8,7 +8,7 @@
 
 use Magento\Catalog\Model\Product as ProductModel;
 use Magento\Catalog\Model\ResourceModel\Product as ProductResourceModel;
-use \Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Product;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Product;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/ViewTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/ViewTest.php
index 070c9b46f6067..071c13f35cd09 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/ViewTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/ViewTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\CatalogSearch\Test\Unit\Model\Indexer\Fulltext\Plugin\Store;
 
+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Store\View as StoreViewIndexerPlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Framework\Indexer\IndexerInterface;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Store\Model\ResourceModel\Store as StoreResourceModel;
 use Magento\Store\Model\Store;
-use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
 
 class ViewTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Scope/IndexSwitcherTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Scope/IndexSwitcherTest.php
index ea684bbb53c15..3066ce53a4848 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Scope/IndexSwitcherTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Scope/IndexSwitcherTest.php
@@ -5,13 +5,12 @@
  */
 namespace Magento\CatalogSearch\Test\Unit\Model\Indexer\Scope;
 
+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
 use Magento\CatalogSearch\Model\Indexer\Scope\IndexSwitcher;
 use Magento\CatalogSearch\Model\Indexer\Scope\State;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
-use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Search\Request\Dimension;
-use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class IndexSwitcherTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Search/Plugin/CollectionFilterTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Search/Plugin/CollectionFilterTest.php
index 9df750f429c79..0fa5329957e9d 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Search/Plugin/CollectionFilterTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Search/Plugin/CollectionFilterTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\CatalogSearch\Test\Unit\Model\Layer\Search\Plugin;
 
-use Magento\CatalogSearch\Model\Layer\Search\Plugin\CollectionFilter as CollectionFilterPlugin;
-use Magento\Catalog\Model\Layer\Search\CollectionFilter;
 use Magento\Catalog\Model\Category;
-use Magento\Search\Model\QueryFactory;
+use Magento\Catalog\Model\Layer\Search\CollectionFilter;
+use Magento\CatalogSearch\Model\Layer\Search\Plugin\CollectionFilter as CollectionFilterPlugin;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Search\Model\Query;
+use Magento\Search\Model\QueryFactory;
 
 class CollectionFilterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/AdvancedTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/AdvancedTest.php
index 5029a43e3bfe1..e24a6fc2c16ca 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/AdvancedTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/AdvancedTest.php
@@ -6,7 +6,6 @@
 namespace Magento\CatalogSearch\Test\Unit\Model\ResourceModel;
 
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-use PHPUnit\Framework\TestCase;
 
 class AdvancedTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
index c0f1f3fcaa5e6..07c568fc89de5 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\CatalogSearch\Test\Unit\Model\ResourceModel\Fulltext;
 
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 use Magento\CatalogSearch\Test\Unit\Model\ResourceModel\BaseCollection;
 use Magento\Framework\Search\Adapter\Mysql\TemporaryStorageFactory;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/BaseSelectStrategy/StrategyMapperTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/BaseSelectStrategy/StrategyMapperTest.php
index 1ff1131e5f002..bc042681ea2b4 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/BaseSelectStrategy/StrategyMapperTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/BaseSelectStrategy/StrategyMapperTest.php
@@ -8,8 +8,8 @@
 
 use Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy\BaseSelectAttributesSearchStrategy;
 use Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy\BaseSelectFullTextSearchStrategy;
-use \Magento\CatalogSearch\Model\Search\BaseSelectStrategy\StrategyMapper;
-use \Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
+use Magento\CatalogSearch\Model\Search\BaseSelectStrategy\StrategyMapper;
+use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
 
 class StrategyMapperTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/CustomAttributeFilterCheckTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/CustomAttributeFilterCheckTest.php
index 2022492ed1c86..a1419426b5cfd 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/CustomAttributeFilterCheckTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/CustomAttributeFilterCheckTest.php
@@ -6,12 +6,12 @@
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Search;
 
-use Magento\Eav\Model\Config;
+use Magento\Catalog\Model\Product;
 use Magento\CatalogSearch\Model\Search\CustomAttributeFilterCheck;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\Search\Request\Filter\Term;
-use Magento\Catalog\Model\Product;
 use Magento\Framework\Search\Request\FilterInterface;
-use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 
 class CustomAttributeFilterCheckTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/ExclusionStrategyTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/ExclusionStrategyTest.php
index 7c6cafd7e9924..a835cc624f5ba 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/ExclusionStrategyTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/ExclusionStrategyTest.php
@@ -6,14 +6,14 @@
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Search\FilterMapper;
 
+use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
 use Magento\CatalogSearch\Model\Search\FilterMapper\ExclusionStrategy;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
-use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Request\Filter\Term;
 use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class ExclusionStrategyTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/TermDropdownStrategyTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/TermDropdownStrategyTest.php
index af13f96f78d25..6a0e7c3f4f155 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/TermDropdownStrategyTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/TermDropdownStrategyTest.php
@@ -6,14 +6,14 @@
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Search\FilterMapper;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\Search\Request\FilterInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Eav\Model\Config as EavConfig;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Api\Data\StoreInterface;
 use Magento\Framework\DB\Select;
-use Magento\Eav\Model\Config as EavConfig;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Framework\Search\Request\FilterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class TermDropdownStrategyTest.
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php
index da7cfa1ea9821..6fd29a1df6306 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php
@@ -6,22 +6,22 @@
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Search;
 
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
-use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
-use Magento\CatalogSearch\Model\Search\TableMapper;
-use Magento\Framework\App\ScopeResolverInterface;
-use Magento\CatalogSearch\Model\Search\FilterMapper\DimensionsProcessor;
-use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
-use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainerBuilder;
-use Magento\CatalogSearch\Model\Search\BaseSelectStrategy\StrategyMapper as BaseSelectStrategyMapper;
 use Magento\CatalogSearch\Model\Search\BaseSelectStrategy\BaseSelectStrategyInterface;
+use Magento\CatalogSearch\Model\Search\BaseSelectStrategy\StrategyMapper as BaseSelectStrategyMapper;
+use Magento\CatalogSearch\Model\Search\FilterMapper\DimensionsProcessor;
 use Magento\CatalogSearch\Model\Search\FilterMapper\FilterMapper;
 use Magento\CatalogSearch\Model\Search\IndexBuilder;
-use Magento\Framework\Search\RequestInterface;
+use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
+use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainerBuilder;
+use Magento\CatalogSearch\Model\Search\TableMapper;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\DB\Select;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
+use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
+use Magento\Framework\Search\RequestInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Test for \Magento\CatalogSearch\Model\Search\IndexBuilder
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php
index c393f91f21fe1..f55ec08c1efcf 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Indexer/IndexStructureTest.php
@@ -8,7 +8,7 @@
 
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Ddl\Table;
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Test for \Magento\Framework\Indexer\IndexStructure
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php
index 259c8e5d7f897..51ad94b4d4b20 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGeneratorTest.php
@@ -6,8 +6,8 @@
 namespace Magento\CatalogSearch\Test\Unit\Model\Search;
 
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
-use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorResolver;
 use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorInterface;
+use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorResolver;
 
 class RequestGeneratorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/SelectContainer/SelectContainerBuilderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/SelectContainer/SelectContainerBuilderTest.php
index ef4d8d314825b..2d7785c9f6140 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/SelectContainer/SelectContainerBuilderTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/SelectContainer/SelectContainerBuilderTest.php
@@ -6,20 +6,20 @@
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Search\SelectContainer;
 
-use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainerBuilder;
-use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
-use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainerFactory;
-use Magento\Framework\Search\RequestInterface;
-use Magento\CatalogSearch\Model\Search\QueryChecker\FullTextSearchCheck;
 use Magento\CatalogSearch\Model\Search\CustomAttributeFilterCheck;
 use Magento\CatalogSearch\Model\Search\FiltersExtractor;
+use Magento\CatalogSearch\Model\Search\QueryChecker\FullTextSearchCheck;
+use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
+use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainerBuilder;
+use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainerFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Search\Request\QueryInterface;
-use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Request\Filter\Term;
+use Magento\Framework\Search\Request\QueryInterface;
+use Magento\Framework\Search\RequestInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/TableMapperTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/TableMapperTest.php
index 1521b38d8c298..d04cc73440f9f 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/TableMapperTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/TableMapperTest.php
@@ -8,13 +8,13 @@
 
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
 use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
-use Magento\Framework\Search\Request\FilterInterface;
-use Magento\Framework\Search\Request\QueryInterface;
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\CatalogSearch\Model\Search\FiltersExtractor;
 use Magento\CatalogSearch\Model\Search\FilterMapper\FilterStrategyInterface;
+use Magento\CatalogSearch\Model\Search\FiltersExtractor;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Search\Request\Filter\Term;
+use Magento\Framework\Search\Request\FilterInterface;
+use Magento\Framework\Search\Request\QueryInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Test for \Magento\CatalogSearch\Model\Search\TableMapper
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
index 6aa33f37cd31f..44b9270b1348f 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/ChildrenUrlRewriteGenerator.php
@@ -6,10 +6,10 @@
 namespace Magento\CatalogUrlRewrite\Model\Category;
 
 use Magento\Catalog\Model\Category;
-use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGeneratorFactory;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
-use Magento\UrlRewrite\Model\MergeDataProviderFactory;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGeneratorFactory;
 use Magento\Framework\App\ObjectManager;
+use Magento\UrlRewrite\Model\MergeDataProviderFactory;
 
 class ChildrenUrlRewriteGenerator
 {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php
index 17d12ba563ebd..cfac834e42f2b 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Move.php
@@ -6,8 +6,8 @@
 namespace Magento\CatalogUrlRewrite\Model\Category\Plugin\Category;
 
 use Magento\Catalog\Model\Category;
-use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
 
 class Move
 {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php
index 572152e84b2d7..606d787704196 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Storage.php
@@ -6,10 +6,10 @@
 namespace Magento\CatalogUrlRewrite\Model\Category\Plugin;
 
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
 use Magento\UrlRewrite\Model\StorageInterface;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
 
 class Storage
 {
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
index 1dbfad6cf5219..c214a19358d5a 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\CatalogUrlRewrite\Model\Category\Plugin\Store;
 
-use Magento\UrlRewrite\Model\UrlPersistInterface;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\Catalog\Model\CategoryFactory;
 use Magento\Catalog\Model\ProductFactory;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-use Magento\Store\Model\Store;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php
index f8bf00b16cf37..1f05ee99e4d4e 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\CatalogUrlRewrite\Model\Category\Plugin\Store;
 
-use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryFactory;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
index b2da0ab39f31f..efb992b66af5f 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\CatalogUrlRewrite\Model;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Category;
 use Magento\CatalogUrlRewrite\Model\Category\CanonicalUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\Category\ChildrenUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\Category\CurrentUrlRewritesRegenerator;
 use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
-use Magento\Store\Model\Store;
-use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\Store;
 use Magento\UrlRewrite\Model\MergeDataProviderFactory;
 
 class CategoryUrlRewriteGenerator
@@ -155,12 +155,12 @@ protected function isOverrideUrlsForStore($storeId, $categoryId, $overrideStoreU
     protected function updateCategoryUrlForStore($storeId, Category $category = null)
     {
         $categoryFromRepository = $this->categoryRepository->get($category->getId(), $storeId);
-            $category->addData(
-                [
-                    'url_key' => $categoryFromRepository->getUrlKey(),
-                    'url_path' => $categoryFromRepository->getUrlPath()
-                ]
-            );
+        $category->addData(
+            [
+                'url_key' => $categoryFromRepository->getUrlKey(),
+                'url_path' => $categoryFromRepository->getUrlPath()
+            ]
+        );
     }
 
     /**
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Map/DataCategoryHashMap.php b/app/code/Magento/CatalogUrlRewrite/Model/Map/DataCategoryHashMap.php
index cb9f3fecb4bca..22cb93ac3a2aa 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Map/DataCategoryHashMap.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Map/DataCategoryHashMap.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\CatalogUrlRewrite\Model\Map;
 
-use Magento\Catalog\Model\ResourceModel\CategoryFactory;
-use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\CategoryRepository;
+use Magento\Catalog\Model\ResourceModel\CategoryFactory;
 
 /**
  * Map that holds data for category ids and its subcategories ids
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Map/DataCategoryUrlRewriteDatabaseMap.php b/app/code/Magento/CatalogUrlRewrite/Model/Map/DataCategoryUrlRewriteDatabaseMap.php
index 6e28b831e1059..b13288a6170e9 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Map/DataCategoryUrlRewriteDatabaseMap.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Map/DataCategoryUrlRewriteDatabaseMap.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\TemporaryTableService;
-use Magento\Framework\DB\Select;
 use Magento\UrlRewrite\Model\MergeDataProvider;
 
 /**
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Map/DataProductUrlRewriteDatabaseMap.php b/app/code/Magento/CatalogUrlRewrite/Model/Map/DataProductUrlRewriteDatabaseMap.php
index fe6bb065b0808..245dada936993 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Map/DataProductUrlRewriteDatabaseMap.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Map/DataProductUrlRewriteDatabaseMap.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\TemporaryTableService;
-use Magento\Framework\DB\Select;
 use Magento\UrlRewrite\Model\MergeDataProvider;
 
 /**
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Map/HashMapInterface.php b/app/code/Magento/CatalogUrlRewrite/Model/Map/HashMapInterface.php
index 69595c82d8655..31f8f9cc40bd3 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Map/HashMapInterface.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Map/HashMapInterface.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\CatalogUrlRewrite\Model\Map;
 
-use Magento\Framework\DB\Select;
-
 /**
  * Interface for a hash data map
  *
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php
index a7cc894c9a022..bbb9066b1b18d 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Product/AnchorUrlRewriteGenerator.php
@@ -10,7 +10,6 @@
 use Magento\CatalogUrlRewrite\Model\ObjectRegistry;
 use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
index 42d3fd9cb40e1..01579013ba2cd 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
@@ -8,16 +8,16 @@
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Model\Product;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\UrlRewrite\Model\OptionProvider;
+use Magento\CatalogUrlRewrite\Model\Map\UrlRewriteFinder;
 use Magento\CatalogUrlRewrite\Model\ObjectRegistry;
-use Magento\UrlRewrite\Model\UrlFinderInterface;
-use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
-use Magento\CatalogUrlRewrite\Model\Map\UrlRewriteFinder;
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\App\ObjectManager;
 use Magento\UrlRewrite\Model\MergeDataProviderFactory;
+use Magento\UrlRewrite\Model\OptionProvider;
+use Magento\UrlRewrite\Model\UrlFinderInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
index 868c417b5ff52..f8b074eab5346 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
@@ -6,12 +6,12 @@
 namespace Magento\CatalogUrlRewrite\Model;
 
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Visibility;
 use Magento\CatalogUrlRewrite\Model\Product\CanonicalUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\Product\CategoriesUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\Product\CurrentUrlRewritesRegenerator;
 use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
 use Magento\Framework\App\ObjectManager;
-use Magento\Catalog\Model\Product\Visibility;
 
 /**
  * Class ProductUrlRewriteGenerator
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteMovingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteMovingObserver.php
index 0afdf774c7eb1..1784639cb103e 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteMovingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteMovingObserver.php
@@ -8,14 +8,14 @@
 use Magento\Catalog\Model\Category;
 use Magento\CatalogUrlRewrite\Block\UrlKeyRenderer;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\CatalogUrlRewrite\Model\Map\DatabaseMapPool;
+use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUrlRewriteDatabaseMap;
+use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
 use Magento\CatalogUrlRewrite\Model\UrlRewriteBunchReplacer;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Event\ObserverInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
-use Magento\Framework\Event\ObserverInterface;
-use Magento\CatalogUrlRewrite\Model\Map\DatabaseMapPool;
-use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUrlRewriteDatabaseMap;
-use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
 
 /**
  * Generates Category Url Rewrites after move/save and Products Url Rewrites assigned to the category that's being saved
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategorySaveRewritesHistorySetterObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategorySaveRewritesHistorySetterObserver.php
index ef6083fa8b6ba..69b9817aae4b9 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategorySaveRewritesHistorySetterObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategorySaveRewritesHistorySetterObserver.php
@@ -6,7 +6,6 @@
 namespace Magento\CatalogUrlRewrite\Observer;
 
 use Magento\Catalog\Model\Category;
-use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 
 class CategorySaveRewritesHistorySetterObserver implements ObserverInterface
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
index eb54f0427c11a..d700a8b17a2c0 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryUrlPathAutogeneratorObserver.php
@@ -6,10 +6,9 @@
 namespace Magento\CatalogUrlRewrite\Observer;
 
 use Magento\Catalog\Model\Category;
+use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
-use Magento\Framework\Event\Observer;
-use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Store\Model\Store;
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ClearProductUrlsObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ClearProductUrlsObserver.php
index 33c75cc609486..f6fdf2dda41ac 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ClearProductUrlsObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ClearProductUrlsObserver.php
@@ -6,11 +6,10 @@
 namespace Magento\CatalogUrlRewrite\Observer;
 
 use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
-use Magento\Framework\App\ResourceConnection;
-use Magento\UrlRewrite\Model\UrlPersistInterface;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
  * Class ClearProductUrlsObserver
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteRemovingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteRemovingObserver.php
index 51e695d96de2c..2a429ab062dc7 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteRemovingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteRemovingObserver.php
@@ -6,9 +6,9 @@
 namespace Magento\CatalogUrlRewrite\Observer;
 
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\Framework\Event\ObserverInterface;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\Framework\Event\ObserverInterface;
 
 class ProductProcessUrlRewriteRemovingObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
index e4ccd0b869db7..3194f5a05dbeb 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php
@@ -7,9 +7,9 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\Framework\Event\ObserverInterface;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\Framework\Event\ObserverInterface;
 
 class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
index b201ae31b680a..58cfa7385c88c 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/ProductUrlKeyAutogeneratorObserver.php
@@ -7,7 +7,6 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
-use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 
 class ProductUrlKeyAutogeneratorObserver implements ObserverInterface
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
index 9892465d1538a..24c474cc4967a 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\CatalogUrlRewrite\Observer;
 
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+
 class UrlRewriteHandler
 {
     /**
@@ -13,12 +17,12 @@ class UrlRewriteHandler
     protected $childrenCategoriesProvider;
 
     /**
-     * @var \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator
+     * @var CategoryUrlRewriteGenerator
      */
     protected $categoryUrlRewriteGenerator;
 
     /**
-     * @var \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator
+     * @var ProductUrlRewriteGenerator
      */
     protected $productUrlRewriteGenerator;
 
@@ -54,8 +58,8 @@ class UrlRewriteHandler
 
     /**
      * @param \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider $childrenCategoriesProvider
-     * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator
-     * @param \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator $productUrlRewriteGenerator
+     * @param CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator
+     * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
      * @param \Magento\UrlRewrite\Model\UrlPersistInterface $urlPersist
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
      * @param \Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator
@@ -64,8 +68,8 @@ class UrlRewriteHandler
      */
     public function __construct(
         \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider $childrenCategoriesProvider,
-        \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator,
-        \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator $productUrlRewriteGenerator,
+        CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator,
+        ProductUrlRewriteGenerator $productUrlRewriteGenerator,
         \Magento\UrlRewrite\Model\UrlPersistInterface $urlPersist,
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
         \Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator,
@@ -209,18 +213,14 @@ public function deleteCategoryRewritesForChildren(\Magento\Catalog\Model\Categor
         foreach ($categoryIds as $categoryId) {
             $this->urlPersist->deleteByData(
                 [
-                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::ENTITY_ID =>
-                        $categoryId,
-                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::ENTITY_TYPE =>
-                        \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator::ENTITY_TYPE,
+                    UrlRewrite::ENTITY_ID => $categoryId,
+                    UrlRewrite::ENTITY_TYPE => CategoryUrlRewriteGenerator::ENTITY_TYPE,
                 ]
             );
             $this->urlPersist->deleteByData(
                 [
-                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::METADATA =>
-                        $this->serializer->serialize(['category_id' => $categoryId]),
-                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::ENTITY_TYPE =>
-                        \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator::ENTITY_TYPE,
+                    UrlRewrite::METADATA => $this->serializer->serialize(['category_id' => $categoryId]),
+                    UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
                 ]
             );
         }
diff --git a/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php b/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php
index b4a74b6795eed..c7ff6adabb0a3 100644
--- a/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php
+++ b/app/code/Magento/CatalogUrlRewrite/Service/V1/StoreViewService.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\CatalogUrlRewrite\Service\V1;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * Store view service
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CurrentUrlRewritesRegeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CurrentUrlRewritesRegeneratorTest.php
index 2ee2473290306..2410cacf8659d 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CurrentUrlRewritesRegeneratorTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CurrentUrlRewritesRegeneratorTest.php
@@ -51,10 +51,10 @@ protected function setUp()
         $this->urlRewriteFactory->expects($this->once())->method('create')
             ->willReturn($this->urlRewrite);
         $mergeDataProviderFactory = $this->createPartialMock(\Magento\UrlRewrite\Model\MergeDataProviderFactory::class, ['create']);
-        $this->mergeDataProvider = new \Magento\UrlRewrite\Model\MergeDataProvider;
+        $this->mergeDataProvider = new \Magento\UrlRewrite\Model\MergeDataProvider();
         $mergeDataProviderFactory->expects($this->once())->method('create')->willReturn($this->mergeDataProvider);
 
-        $this->currentUrlRewritesRegenerator = (new ObjectManager($this))->getObject(   
+        $this->currentUrlRewritesRegenerator = (new ObjectManager($this))->getObject(
             \Magento\CatalogUrlRewrite\Model\Category\CurrentUrlRewritesRegenerator::class,
             [
                 'categoryUrlPathGenerator' => $this->categoryUrlPathGenerator,
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php
index f91a55c11b974..caae661aa8bb5 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/MoveTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category\Plugin\Category;
 
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResourceModel;
+use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
 use Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Move as CategoryMovePlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
-use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
-use Magento\Catalog\Model\ResourceModel\Category as CategoryResourceModel;
-use Magento\Catalog\Model\Category;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class MoveTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/RemoveTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/RemoveTest.php
index 9189f77453d59..33dd6824c0324 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/RemoveTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Category/RemoveTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category\Plugin\Category;
 
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResourceModel;
+use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
 use Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Remove as CategoryRemovePlugin;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
-use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
-use Magento\Catalog\Model\ResourceModel\Category as CategoryResourceModel;
-use Magento\Catalog\Model\Category;
 
 class RemoveTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/StorageTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/StorageTest.php
index e4216841bce25..0257f9a9e1bde 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/StorageTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/StorageTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category\Plugin;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\UrlRewrite\Model\StorageInterface;
 use Magento\CatalogUrlRewrite\Model\Category\Plugin\Storage as CategoryStoragePlugin;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\CatalogUrlRewrite\Model\Category\Product;
 use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product as ProductResourceModel;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\UrlRewrite\Model\StorageInterface;
+use Magento\UrlRewrite\Model\UrlFinderInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Store/GroupTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Store/GroupTest.php
index c843ef44c97de..ce797b4b097c0 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Store/GroupTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Store/GroupTest.php
@@ -5,17 +5,17 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category\Plugin\Store;
 
-use Magento\CatalogUrlRewrite\Model\Category\Plugin\Store\Group as GroupPlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\Model\AbstractModel;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Model\ResourceModel\Group;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryFactory;
-use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Catalog\Model\Product as Product;
-use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\CatalogUrlRewrite\Model\Category\Plugin\Store\Group as GroupPlugin;
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ResourceModel\Group;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Store/ViewTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Store/ViewTest.php
index d68fcfddde227..f0ffca46fd244 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Store/ViewTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Store/ViewTest.php
@@ -5,18 +5,18 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category\Plugin\Store;
 
-use Magento\CatalogUrlRewrite\Model\Category\Plugin\Store\View as StoreViewPlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\Model\AbstractModel;
-use Magento\Store\Model\ResourceModel\Store;
-use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryFactory;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\CatalogUrlRewrite\Model\Category\Plugin\Store\View as StoreViewPlugin;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-use Magento\Catalog\Model\Category;
-use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
-use Magento\Catalog\Model\Product;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ResourceModel\Store;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryProductUrlPathGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryProductUrlPathGeneratorTest.php
index 8ba5e68041249..0ab625d7e253b 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryProductUrlPathGeneratorTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryProductUrlPathGeneratorTest.php
@@ -5,11 +5,10 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model;
 
-use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductScopeRewriteGenerator;
-use Magento\Catalog\Model\ResourceModel\Category\Collection;
 
 /**
  * Class CategoryProductUrlPathGeneratorTest
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php
index 7297d150a8e6f..a32d7ff2fb50e 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlPathGeneratorTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model;
 
-use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
 use Magento\Catalog\Model\Category;
-use Magento\Store\Model\ScopeInterface;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ScopeInterface;
 
 class CategoryUrlPathGeneratorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlRewriteGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlRewriteGeneratorTest.php
index 2a6c81f26b1b8..d68034b994541 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlRewriteGeneratorTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryUrlRewriteGeneratorTest.php
@@ -64,7 +64,7 @@ function ($value) {
                     return json_decode($value, true);
                 }
             );
-        
+
         $this->currentUrlRewritesRegenerator = $this->getMockBuilder(
             \Magento\CatalogUrlRewrite\Model\Category\CurrentUrlRewritesRegenerator::class
         )->disableOriginalConstructor()->getMock();
@@ -79,7 +79,7 @@ function ($value) {
         $this->category = $this->createMock(\Magento\Catalog\Model\Category::class);
         $this->categoryRepository = $this->createMock(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
         $mergeDataProviderFactory = $this->createPartialMock(\Magento\UrlRewrite\Model\MergeDataProviderFactory::class, ['create']);
-        $this->mergeDataProvider = new \Magento\UrlRewrite\Model\MergeDataProvider;
+        $this->mergeDataProvider = new \Magento\UrlRewrite\Model\MergeDataProvider();
         $mergeDataProviderFactory->expects($this->once())->method('create')->willReturn($this->mergeDataProvider);
 
         $this->categoryUrlRewriteGenerator = (new ObjectManager($this))->getObject(
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryHashMapTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryHashMapTest.php
index dd78c04d2eed8..c5bffcb256e8d 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryHashMapTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryHashMapTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Map;
 
-use Magento\Catalog\Model\ResourceModel\CategoryFactory;
-use Magento\Catalog\Model\ResourceModel\Category;
-use Magento\Framework\DB\Select;
-use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\CategoryRepository;
+use Magento\Catalog\Model\ResourceModel\Category;
+use Magento\Catalog\Model\ResourceModel\CategoryFactory;
 use Magento\CatalogUrlRewrite\Model\Map\DataCategoryHashMap;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class DataCategoryHashMapTest
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryUrlRewriteDatabaseMapTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryUrlRewriteDatabaseMapTest.php
index 23406c567accc..7b86e6ef7422f 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryUrlRewriteDatabaseMapTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryUrlRewriteDatabaseMapTest.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Map;
 
-use Magento\Framework\DB\Select;
-use Magento\CatalogUrlRewrite\Model\Map\HashMapPool;
-use Magento\CatalogUrlRewrite\Model\Map\DataProductHashMap;
 use Magento\CatalogUrlRewrite\Model\Map\DataCategoryHashMap;
-use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUsedInProductsHashMap;
 use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUrlRewriteDatabaseMap;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUsedInProductsHashMap;
+use Magento\CatalogUrlRewrite\Model\Map\DataProductHashMap;
+use Magento\CatalogUrlRewrite\Model\Map\HashMapPool;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
 use Magento\Framework\DB\TemporaryTableService;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class DataCategoryUrlRewriteDatabaseMapTest
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryUsedInProductsHashMapTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryUsedInProductsHashMapTest.php
index 21fa6942975c0..44bc0efcecbdb 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryUsedInProductsHashMapTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryUsedInProductsHashMapTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Map;
 
-use Magento\Framework\DB\Select;
-use Magento\CatalogUrlRewrite\Model\Map\HashMapPool;
-use Magento\CatalogUrlRewrite\Model\Map\DataProductHashMap;
 use Magento\CatalogUrlRewrite\Model\Map\DataCategoryHashMap;
 use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUsedInProductsHashMap;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\CatalogUrlRewrite\Model\Map\DataProductHashMap;
+use Magento\CatalogUrlRewrite\Model\Map\HashMapPool;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class DataCategoryUsedInProductsHashMapTest
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataProductUrlRewriteDatabaseMapTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataProductUrlRewriteDatabaseMapTest.php
index c55204893f69f..ce243c1cac29e 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataProductUrlRewriteDatabaseMapTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataProductUrlRewriteDatabaseMapTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Map;
 
-use Magento\Framework\DB\Select;
-use Magento\CatalogUrlRewrite\Model\Map\HashMapPool;
 use Magento\CatalogUrlRewrite\Model\Map\DataProductHashMap;
 use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\CatalogUrlRewrite\Model\Map\HashMapPool;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
 use Magento\Framework\DB\TemporaryTableService;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class DataProductUrlRewriteDatabaseMapTest
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/UrlRewriteFinderTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/UrlRewriteFinderTest.php
index 388f9a7950c20..0581b71d854e2 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/UrlRewriteFinderTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/UrlRewriteFinderTest.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Map;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\CatalogUrlRewrite\Model\Map\UrlRewriteFinder;
 use Magento\CatalogUrlRewrite\Model\Map\DatabaseMapPool;
-use Magento\UrlRewrite\Model\UrlFinderInterface;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUrlRewriteDatabaseMap;
 use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
+use Magento\CatalogUrlRewrite\Model\Map\UrlRewriteFinder;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\UrlRewrite\Model\UrlFinderInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
 
 /**
  * Class UrlRewriteFinderTest
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ObjectRegistryTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ObjectRegistryTest.php
index ea24a05830e8e..ffce16fb590b1 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ObjectRegistryTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ObjectRegistryTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model;
 
-use Magento\Framework\DataObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class ObjectRegistryTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlRewriteGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlRewriteGeneratorTest.php
index 83957214f69fc..aca51d6a91264 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlRewriteGeneratorTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/ProductUrlRewriteGeneratorTest.php
@@ -8,7 +8,6 @@
 
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model;
 
-use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
 use Magento\CatalogUrlRewrite\Model\ProductScopeRewriteGenerator;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
index d00b0c87fa5ad..421142a7962c4 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Storage;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\CatalogUrlRewrite\Model\Storage\DbStorage;
-use PHPUnit\Framework\TestCase;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
-use PHPUnit_Framework_MockObject_MockObject as Mock;
 use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
-use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
 
 class DbStorageTest extends TestCase
 {
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php
index b18597a42bf94..9810c5a2bd4a4 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php
@@ -6,17 +6,16 @@
 namespace Magento\CatalogUrlRewrite\Test\Unit\Observer;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
-use Magento\CatalogUrlRewrite\Observer\UrlRewriteHandler;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider;
-use Magento\CatalogUrlRewrite\Model\CategoryBasedProductRewriteGenerator;
+use Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\CatalogUrlRewrite\Observer\UrlRewriteHandler;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\UrlRewrite\Model\MergeDataProviderFactory;
 use Magento\UrlRewrite\Model\MergeDataProvider;
-use Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator;
+use Magento\UrlRewrite\Model\MergeDataProviderFactory;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogUrlRewrite/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewrite.php b/app/code/Magento/CatalogUrlRewrite/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewrite.php
index bcb5154e35501..00cc53c39403d 100644
--- a/app/code/Magento/CatalogUrlRewrite/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewrite.php
+++ b/app/code/Magento/CatalogUrlRewrite/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewrite.php
@@ -6,14 +6,14 @@
 namespace Magento\CatalogUrlRewrite\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Ui\Component\Form\Element\Checkbox;
 use Magento\Ui\Component\Form\Element\DataType\Text;
 use Magento\Ui\Component\Form\Field;
-use Magento\Framework\Stdlib\ArrayManager;
 
 /**
  * Class adds a checkbox "url_key_create_redirect" after input "url_key" for product form
diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index 373b88049c7b5..027a2dd687121 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -194,7 +194,7 @@ public function getProductPriceHtml(
             ? $arguments['display_minimal_price']
             : true;
 
-            /** @var \Magento\Framework\Pricing\Render $priceRender */
+        /** @var \Magento\Framework\Pricing\Render $priceRender */
         $priceRender = $this->getLayout()->getBlock('product.price.render.default');
 
         $price = '';
diff --git a/app/code/Magento/Checkout/Block/Cart/CartTotalsProcessor.php b/app/code/Magento/Checkout/Block/Cart/CartTotalsProcessor.php
index dd151a045c69a..2b9e06e25036d 100644
--- a/app/code/Magento/Checkout/Block/Cart/CartTotalsProcessor.php
+++ b/app/code/Magento/Checkout/Block/Cart/CartTotalsProcessor.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Checkout\Block\Cart;
 
-use Magento\Checkout\Model\Layout\AbstractTotalsProcessor;
 use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
+use Magento\Checkout\Model\Layout\AbstractTotalsProcessor;
 
 class CartTotalsProcessor extends AbstractTotalsProcessor implements LayoutProcessorInterface
 {
diff --git a/app/code/Magento/Checkout/Block/Cart/Totals.php b/app/code/Magento/Checkout/Block/Cart/Totals.php
index d3d3adbe40f38..f9b0dc337c36d 100644
--- a/app/code/Magento/Checkout/Block/Cart/Totals.php
+++ b/app/code/Magento/Checkout/Block/Cart/Totals.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Checkout\Block\Cart;
 
-use Magento\Framework\View\Element\BlockInterface;
 use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
+use Magento\Framework\View\Element\BlockInterface;
 
 /**
  * @api
diff --git a/app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php b/app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php
index 1d5bb5bb07d81..3b8456f3a7cee 100644
--- a/app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php
+++ b/app/code/Magento/Checkout/Block/Checkout/DirectoryDataProcessor.php
@@ -6,9 +6,9 @@
 namespace Magento\Checkout\Block\Checkout;
 
 use Magento\Directory\Helper\Data as DirectoryHelper;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Api\StoreResolverInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Store\Api\StoreResolverInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Directory data processor.
diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php
index f6c59562ee942..f244fe310af27 100644
--- a/app/code/Magento/Checkout/Controller/Cart.php
+++ b/app/code/Magento/Checkout/Controller/Cart.php
@@ -77,7 +77,7 @@ protected function _goBack($backUrl = null)
         if ($backUrl || $backUrl = $this->getBackUrl($this->_redirect->getRefererUrl())) {
             $resultRedirect->setUrl($backUrl);
         }
-        
+
         return $resultRedirect;
     }
 
diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
index 581b9180e91d8..ffb5001bac45c 100644
--- a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Checkout\Controller\Cart;
 
-use Magento\Framework;
 use Magento\Checkout\Model\Cart as CustomerCart;
+use Magento\Framework;
 
 class EstimatePost extends \Magento\Checkout\Controller\Cart
 {
diff --git a/app/code/Magento/Checkout/Controller/Noroute/Index.php b/app/code/Magento/Checkout/Controller/Noroute/Index.php
index db182db331d3c..3144870ffd777 100644
--- a/app/code/Magento/Checkout/Controller/Noroute/Index.php
+++ b/app/code/Magento/Checkout/Controller/Noroute/Index.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Checkout\Controller\Noroute;
 
-use \Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\Exception\NotFoundException;
 
 class Index extends \Magento\Framework\App\Action\Action
 {
diff --git a/app/code/Magento/Checkout/Controller/Onepage.php b/app/code/Magento/Checkout/Controller/Onepage.php
index 49deeed7fb9ca..d06738a445fbe 100644
--- a/app/code/Magento/Checkout/Controller/Onepage.php
+++ b/app/code/Magento/Checkout/Controller/Onepage.php
@@ -7,8 +7,8 @@
 
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\NotFoundException;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Checkout/Controller/ShippingRates/Index.php b/app/code/Magento/Checkout/Controller/ShippingRates/Index.php
index 4a63ac6bf5300..97a12eaa9f67a 100644
--- a/app/code/Magento/Checkout/Controller/ShippingRates/Index.php
+++ b/app/code/Magento/Checkout/Controller/ShippingRates/Index.php
@@ -7,8 +7,6 @@
 
 use Magento\Framework\App\Action;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\RequestInterface;
-use Magento\Framework\App\ResponseInterface;
 
 class Index extends \Magento\Framework\App\Action\Action
 {
diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php
index b3c2e17e5d678..7840d5ba15ed4 100644
--- a/app/code/Magento/Checkout/Helper/Data.php
+++ b/app/code/Magento/Checkout/Helper/Data.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Quote\Model\Quote\Item\AbstractItem;
-use Magento\Store\Model\Store;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
 
 /**
  * Checkout default helper
diff --git a/app/code/Magento/Checkout/Model/Cart/CheckoutSummaryConfigProvider.php b/app/code/Magento/Checkout/Model/Cart/CheckoutSummaryConfigProvider.php
index 5f27322a11d92..abad3f1bbcc4d 100644
--- a/app/code/Magento/Checkout/Model/Cart/CheckoutSummaryConfigProvider.php
+++ b/app/code/Magento/Checkout/Model/Cart/CheckoutSummaryConfigProvider.php
@@ -7,8 +7,8 @@
 namespace Magento\Checkout\Model\Cart;
 
 use Magento\Checkout\Model\ConfigProviderInterface;
-use Magento\Framework\UrlInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\UrlInterface;
 use Magento\Store\Model\ScopeInterface;
 
 /**
diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
index 6779da354faf8..17f6f7d131d74 100644
--- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Checkout\Model;
 
-use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Quote\Api\CartRepositoryInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Checkout/Model/ShippingInformation.php b/app/code/Magento/Checkout/Model/ShippingInformation.php
index ee0cd3ecedf07..ca0ad119deadb 100644
--- a/app/code/Magento/Checkout/Model/ShippingInformation.php
+++ b/app/code/Magento/Checkout/Model/ShippingInformation.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Checkout\Model;
 
-use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Checkout\Api\Data\ShippingInformationInterface;
+use Magento\Framework\Model\AbstractExtensibleModel;
 
 /**
  * @codeCoverageIgnoreStart
diff --git a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
index d8142d033f78c..ac2c2e351f19d 100644
--- a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
@@ -5,17 +5,17 @@
  */
 namespace Magento\Checkout\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\StateException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\StateException;
 use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\CartExtensionFactory;
 use Magento\Quote\Api\Data\CartInterface;
-use Psr\Log\LoggerInterface as Logger;
 use Magento\Quote\Model\QuoteAddressValidator;
-use Magento\Quote\Api\Data\CartExtensionFactory;
 use Magento\Quote\Model\ShippingAssignmentFactory;
 use Magento\Quote\Model\ShippingFactory;
-use Magento\Framework\App\ObjectManager;
+use Psr\Log\LoggerInterface as Logger;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Checkout/Model/Sidebar.php b/app/code/Magento/Checkout/Model/Sidebar.php
index 1a0e3aa818351..3d8f37c7d4ace 100644
--- a/app/code/Magento/Checkout/Model/Sidebar.php
+++ b/app/code/Magento/Checkout/Model/Sidebar.php
@@ -6,7 +6,6 @@
 namespace Magento\Checkout\Model;
 
 use Magento\Checkout\Helper\Data as HelperData;
-use Magento\Checkout\Model\Cart;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Quote\Api\Data\CartItemInterface;
diff --git a/app/code/Magento/Checkout/Model/TotalsInformation.php b/app/code/Magento/Checkout/Model/TotalsInformation.php
index 49b118f499184..d419cc7919c8e 100644
--- a/app/code/Magento/Checkout/Model/TotalsInformation.php
+++ b/app/code/Magento/Checkout/Model/TotalsInformation.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Checkout\Model;
 
-use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Checkout\Api\Data\TotalsInformationInterface;
+use Magento\Framework\Model\AbstractExtensibleModel;
 
 /**
  * @codeCoverageIgnoreStart
diff --git a/app/code/Magento/Checkout/Setup/InstallData.php b/app/code/Magento/Checkout/Setup/InstallData.php
index 38879e06d65ac..50c37f36eac07 100644
--- a/app/code/Magento/Checkout/Setup/InstallData.php
+++ b/app/code/Magento/Checkout/Setup/InstallData.php
@@ -54,7 +54,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
     {
         /** @var EavSetup $eavSetup */
         $eavSetup = $this->eavSetupFactory->create(['setup' => $setup]);
-        
+
         $setup->startSetup();
 
         $connection = $setup->getConnection();
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/AbstractCartTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/AbstractCartTest.php
index aecaf0ec9f039..db9d7d6998749 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/AbstractCartTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/AbstractCartTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Checkout\Test\Unit\Block\Cart;
 
-use \Magento\Checkout\Block\Cart\AbstractCart;
+use Magento\Checkout\Block\Cart\AbstractCart;
 
 class AbstractCartTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Item/Price/RendererTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Item/Price/RendererTest.php
index 220e5c9bd4d1f..9a09fcf0f4df4 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Item/Price/RendererTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Item/Price/RendererTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Checkout\Test\Unit\Block\Item\Price;
 
-use \Magento\Checkout\Block\Item\Price\Renderer;
+use Magento\Checkout\Block\Item\Price\Renderer;
 
 class RendererTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/OnepageTest.php
index 1d4b1f92508f0..d361800656d3d 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/OnepageTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Checkout\Test\Unit\Controller;
 
-use \Magento\Checkout\Controller\Onepage;
+use Magento\Checkout\Controller\Onepage;
 
 /**
  * Class OnepageTest
@@ -85,7 +85,7 @@ protected function setUp()
         $context->expects($this->once())
             ->method('getEventManager')
             ->willReturn($this->eventManager);
-        
+
         $this->controller = $objectManager->getObject(
             \Magento\Checkout\Test\Unit\Controller\Stub\OnepageStub::class,
             [
diff --git a/app/code/Magento/Checkout/Test/Unit/Helper/CartTest.php b/app/code/Magento/Checkout/Test/Unit/Helper/CartTest.php
index 2614499d0916c..e9633d8b9c78c 100644
--- a/app/code/Magento/Checkout/Test/Unit/Helper/CartTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Helper/CartTest.php
@@ -8,11 +8,10 @@
 
 namespace Magento\Checkout\Test\Unit\Helper;
 
-use \Magento\Checkout\Helper\Cart;
+use Magento\Checkout\Helper\Cart;
 
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\DataObject;
-use Magento\Quote\Model\Quote\Item;
 
 class CartTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php b/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php
index 31203b63f854a..fe7ff762398b7 100644
--- a/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Helper/DataTest.php
@@ -8,10 +8,9 @@
 
 namespace Magento\Checkout\Test\Unit\Helper;
 
-use \Magento\Checkout\Helper\Data;
+use Magento\Checkout\Helper\Data;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -41,17 +40,17 @@ class DataTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected  $_checkoutSession;
+    protected $_checkoutSession;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected  $_scopeConfig;
+    protected $_scopeConfig;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected  $_collectionFactory;
+    protected $_collectionFactory;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Cart/CheckoutSummaryConfigProviderTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Cart/CheckoutSummaryConfigProviderTest.php
index 7f4437a9dce64..0c87bbc6f2df6 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Cart/CheckoutSummaryConfigProviderTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Cart/CheckoutSummaryConfigProviderTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Checkout\Test\Unit\Model\Cart;
 
+use Magento\Checkout\Model\Cart\CheckoutSummaryConfigProvider;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\UrlInterface;
-use Magento\Checkout\Model\Cart\CheckoutSummaryConfigProvider;
 use Magento\Store\Model\ScopeInterface;
 
 class CheckoutSummaryConfigProviderTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Config/Source/Cart/SummaryTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Config/Source/Cart/SummaryTest.php
index 04f98a114ed93..b83107011f041 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Config/Source/Cart/SummaryTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Config/Source/Cart/SummaryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Checkout\Test\Unit\Model\Config\Source\Cart;
 
-use \Magento\Checkout\Model\Config\Source\Cart\Summary;
+use Magento\Checkout\Model\Config\Source\Cart\Summary;
 
 class SummaryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php b/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php
index 8889927730302..67a69573aca90 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/SessionTest.php
@@ -11,7 +11,7 @@
  */
 namespace Magento\Checkout\Test\Unit\Model;
 
-use \Magento\Checkout\Model\Session;
+use Magento\Checkout\Model\Session;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php
index 684ad9264f77c..28f60af4a7bf4 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Type/OnepageTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Checkout\Test\Unit\Model\Type;
 
-use \Magento\Checkout\Model\Type\Onepage;
+use Magento\Checkout\Model\Type\Onepage;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
index 5c79b7f3091e0..af8f79090bcdf 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CheckoutAgreements\Model;
 
-use Magento\Store\Model\ScopeInterface;
 use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory as AgreementCollectionFactory;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Provide Agreements stored in db
diff --git a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
index 9fb4d4c59e200..d15515b307985 100644
--- a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
+++ b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
@@ -6,16 +6,16 @@
 
 namespace Magento\CheckoutAgreements\Model;
 
-use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory as AgreementCollectionFactory;
+use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
+use Magento\CheckoutAgreements\Model\ResourceModel\Agreement as AgreementResource;
 use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\Collection as AgreementCollection;
+use Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory as AgreementCollectionFactory;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
-use Magento\CheckoutAgreements\Model\ResourceModel\Agreement as AgreementResource;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Checkout agreement repository.
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
index b0c6384bcc9fe..2115e02acb39a 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
@@ -27,7 +27,7 @@
                 <?php endif; ?>
             </div>
             <form id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree required">
-                <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
+                <?php if ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
                 <input type="checkbox"
                        id="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>"
                        name="agreement[<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>]"
@@ -38,7 +38,7 @@
                 <label class="label" for="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>">
                     <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
                 </label>
-                <?php elseif($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?>
+                <?php elseif ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?>
                 <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree">
                     <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
                 </div>
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
index 3400770f5cee8..4371233625ca5 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
@@ -26,7 +26,7 @@
                     <?= nl2br($block->escapeHtml($agreement->getContent())) ?>
                 <?php endif; ?>
             </div>
-            <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
+            <?php if ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
             <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree required">
                 <input type="checkbox"
                        id="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>"
@@ -39,7 +39,7 @@
                     <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
                 </label>
             </div>
-            <?php elseif($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?>
+            <?php elseif ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?>
             <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree">
                 <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
             </div>
diff --git a/app/code/Magento/Cms/Api/BlockRepositoryInterface.php b/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
index 9b285051fc44b..b713ca91ea852 100644
--- a/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
+++ b/app/code/Magento/Cms/Api/BlockRepositoryInterface.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Cms\Api;
 
-use Magento\Framework\Api\SearchCriteriaInterface;
-
 /**
  * CMS block CRUD interface.
  * @api
diff --git a/app/code/Magento/Cms/Api/PageRepositoryInterface.php b/app/code/Magento/Cms/Api/PageRepositoryInterface.php
index 7849a57153055..01abfaed72ebb 100644
--- a/app/code/Magento/Cms/Api/PageRepositoryInterface.php
+++ b/app/code/Magento/Cms/Api/PageRepositoryInterface.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Cms\Api;
 
-use Magento\Framework\Api\SearchCriteriaInterface;
-
 /**
  * CMS page CRUD interface.
  * @api
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php
index e267c568fa9e5..4f69cad69bc0f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/InlineEdit.php
@@ -7,8 +7,8 @@
 
 use Magento\Backend\App\Action\Context;
 use Magento\Cms\Api\BlockRepositoryInterface as BlockRepository;
-use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
 
 class InlineEdit extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
index cff9c8a39b746..027295e94bf13 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php
@@ -6,10 +6,10 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Block;
 
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
-use Magento\Ui\Component\MassAction\Filter;
 use Magento\Cms\Model\ResourceModel\Block\CollectionFactory;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * Class MassDelete
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
index 3eb790c83ad69..2b7cfae6732c6 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
@@ -10,7 +10,6 @@
 use Magento\Cms\Model\Block;
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\TestFramework\Inspection\Exception;
 
 class Save extends \Magento\Cms\Controller\Adminhtml\Block
 {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php
index 8277aef781303..16720681a9e09 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php
@@ -7,8 +7,8 @@
 namespace Magento\Cms\Controller\Adminhtml\Block\Widget;
 
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\View\LayoutFactory;
 use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Framework\View\LayoutFactory;
 
 class Chooser extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
index 6d75f490d42dc..8d233a99e355a 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/InlineEdit.php
@@ -6,9 +6,9 @@
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
 use Magento\Backend\App\Action\Context;
+use Magento\Cms\Api\Data\PageInterface;
 use Magento\Cms\Api\PageRepositoryInterface as PageRepository;
 use Magento\Framework\Controller\Result\JsonFactory;
-use Magento\Cms\Api\Data\PageInterface;
 
 /**
  * Cms page grid inline edit controller
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
index a711f20d65639..59704483fe7ee 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
-use Magento\Ui\Component\MassAction\Filter;
 use Magento\Cms\Model\ResourceModel\Page\CollectionFactory;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * Class MassDelete
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
index e39c2115f961e..067437a82419f 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
-use Magento\Ui\Component\MassAction\Filter;
 use Magento\Cms\Model\ResourceModel\Page\CollectionFactory;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * Class MassDisable
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
index 8278c28a1e696..d0488310e7d09 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\App\Action\Context;
-use Magento\Ui\Component\MassAction\Filter;
 use Magento\Cms\Model\ResourceModel\Page\CollectionFactory;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * Class MassEnable
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
index 5644e25dd4c4a..6e647a5e9bc67 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
@@ -119,7 +119,7 @@ public function execute()
                 }
                 return $resultRedirect->setPath('*/*/');
             } catch (LocalizedException $e) {
-                $this->messageManager->addExceptionMessage($e->getPrevious() ?:$e);
+                $this->messageManager->addExceptionMessage($e->getPrevious() ?: $e);
             } catch (\Exception $e) {
                 $this->messageManager->addExceptionMessage($e, __('Something went wrong while saving the page.'));
             }
diff --git a/app/code/Magento/Cms/Model/PageRepository.php b/app/code/Magento/Cms/Model/PageRepository.php
index 9c9e18211aa86..4a21e2d250820 100644
--- a/app/code/Magento/Cms/Model/PageRepository.php
+++ b/app/code/Magento/Cms/Model/PageRepository.php
@@ -7,14 +7,14 @@
 
 use Magento\Cms\Api\Data;
 use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Cms\Model\ResourceModel\Page as ResourcePage;
+use Magento\Cms\Model\ResourceModel\Page\CollectionFactory as PageCollectionFactory;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Reflection\DataObjectProcessor;
-use Magento\Cms\Model\ResourceModel\Page as ResourcePage;
-use Magento\Cms\Model\ResourceModel\Page\CollectionFactory as PageCollectionFactory;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php
index f22367393030a..ef7e52bf01202 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Block/Collection.php
@@ -6,7 +6,7 @@
 namespace Magento\Cms\Model\ResourceModel\Block;
 
 use Magento\Cms\Api\Data\BlockInterface;
-use \Magento\Cms\Model\ResourceModel\AbstractCollection;
+use Magento\Cms\Model\ResourceModel\AbstractCollection;
 
 /**
  * CMS Block Collection
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php
index f45d9ee223106..e74c55cfe0735 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Cms\Model\ResourceModel\Block\Grid;
 
+use Magento\Cms\Model\ResourceModel\Block\Collection as BlockCollection;
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Search\AggregationInterface;
-use Magento\Cms\Model\ResourceModel\Block\Collection as BlockCollection;
 
 /**
  * Collection for displaying grid of cms blocks
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Block/Relation/Store/SaveHandler.php b/app/code/Magento/Cms/Model/ResourceModel/Block/Relation/Store/SaveHandler.php
index 5c36d9c6f889e..98a72f91652b2 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Block/Relation/Store/SaveHandler.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Block/Relation/Store/SaveHandler.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Cms\Model\ResourceModel\Block\Relation\Store;
 
-use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 use Magento\Cms\Api\Data\BlockInterface;
 use Magento\Cms\Model\ResourceModel\Block;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
 /**
  * Class SaveHandler
@@ -29,10 +29,8 @@ class SaveHandler implements ExtensionInterface
      * @param MetadataPool $metadataPool
      * @param Block $resourceBlock
      */
-    public function __construct(
-        MetadataPool $metadataPool,
-        Block $resourceBlock
-    ) {
+    public function __construct(MetadataPool $metadataPool, Block $resourceBlock)
+    {
         $this->metadataPool = $metadataPool;
         $this->resourceBlock = $resourceBlock;
     }
@@ -42,6 +40,7 @@ public function __construct(
      * @param array $arguments
      * @return object
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entity, $arguments = [])
     {
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php
index 98c071890be46..400f50d101480 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Page/Collection.php
@@ -6,7 +6,7 @@
 namespace Magento\Cms\Model\ResourceModel\Page;
 
 use Magento\Cms\Api\Data\PageInterface;
-use \Magento\Cms\Model\ResourceModel\AbstractCollection;
+use Magento\Cms\Model\ResourceModel\AbstractCollection;
 
 /**
  * CMS page collection
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php b/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php
index c5c43c3120dcc..9cc80adf52e68 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Page/Grid/Collection.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Cms\Model\ResourceModel\Page\Grid;
 
-use Magento\Framework\Api\Search\SearchResultInterface;
-use Magento\Framework\Api\Search\AggregationInterface;
 use Magento\Cms\Model\ResourceModel\Page\Collection as PageCollection;
+use Magento\Framework\Api\Search\AggregationInterface;
+use Magento\Framework\Api\Search\SearchResultInterface;
 
 /**
  * Class Collection
diff --git a/app/code/Magento/Cms/Model/ResourceModel/Page/Relation/Store/SaveHandler.php b/app/code/Magento/Cms/Model/ResourceModel/Page/Relation/Store/SaveHandler.php
index a59c9f6a798b6..e095c6db5354e 100644
--- a/app/code/Magento/Cms/Model/ResourceModel/Page/Relation/Store/SaveHandler.php
+++ b/app/code/Magento/Cms/Model/ResourceModel/Page/Relation/Store/SaveHandler.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Cms\Model\ResourceModel\Page\Relation\Store;
 
-use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 use Magento\Cms\Api\Data\PageInterface;
 use Magento\Cms\Model\ResourceModel\Page;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
 /**
  * Class SaveHandler
@@ -42,6 +42,7 @@ public function __construct(
      * @param array $arguments
      * @return object
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entity, $arguments = [])
     {
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index b95187f01271a..c61aa7d7409c7 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Cms\Model\Wysiwyg;
 
-use Magento\Framework\Filesystem;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
 use Magento\Ui\Component\Wysiwyg\ConfigInterface;
 
 /**
diff --git a/app/code/Magento/Cms/Setup/ContentConverter.php b/app/code/Magento/Cms/Setup/ContentConverter.php
index 705771dea64ff..98bc8a83725a4 100644
--- a/app/code/Magento/Cms/Setup/ContentConverter.php
+++ b/app/code/Magento/Cms/Setup/ContentConverter.php
@@ -8,9 +8,9 @@
 use Magento\Framework\Data\Wysiwyg\Normalizer;
 use Magento\Framework\DB\DataConverter\DataConversionException;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\Filter\Template\Tokenizer\ParameterFactory;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Serialize\Serializer\Serialize;
-use Magento\Framework\Filter\Template\Tokenizer\ParameterFactory;
 
 /**
  * Convert conditions_encoded part of cms block content data from serialized to JSON format
diff --git a/app/code/Magento/Cms/Setup/InstallSchema.php b/app/code/Magento/Cms/Setup/InstallSchema.php
index 038f1620963be..9d59897c57313 100644
--- a/app/code/Magento/Cms/Setup/InstallSchema.php
+++ b/app/code/Magento/Cms/Setup/InstallSchema.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Cms\Setup;
 
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\DB\Adapter\AdapterInterface;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Cms/Setup/UpgradeSchema.php b/app/code/Magento/Cms/Setup/UpgradeSchema.php
index b6fdc9f115809..abbe378c6b31a 100644
--- a/app/code/Magento/Cms/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Cms/Setup/UpgradeSchema.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Cms\Setup;
 
-use Magento\Framework\Setup\UpgradeSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
 
 /**
  * Upgrade the Cms module DB scheme
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php
index f6b709a5c96c9..6245edadc1859 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/SaveTest.php
@@ -180,7 +180,7 @@ public function testSaveAction()
             ->method('addSuccess')
             ->with(__('You saved the block.'));
 
-        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf();
+        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/')->willReturnSelf();
 
         $this->assertSame($this->resultRedirect, $this->saveController->execute());
     }
@@ -188,7 +188,7 @@ public function testSaveAction()
     public function testSaveActionWithoutData()
     {
         $this->requestMock->expects($this->any())->method('getPostValue')->willReturn(false);
-        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf();
+        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/')->willReturnSelf();
         $this->assertSame($this->resultRedirect, $this->saveController->execute());
     }
 
@@ -220,7 +220,7 @@ public function testSaveActionNoId()
             ->method('addError')
             ->with(__('This block no longer exists.'));
 
-        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf();
+        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/')->willReturnSelf();
 
         $this->assertSame($this->resultRedirect, $this->saveController->execute());
     }
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php
index 03a8fc0969064..7dd8179ddacc3 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/SaveTest.php
@@ -170,7 +170,7 @@ public function testSaveAction()
             ->method('addSuccessMessage')
             ->with(__('You saved the page.'));
 
-        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf();
+        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/')->willReturnSelf();
 
         $this->assertSame($this->resultRedirect, $this->saveController->execute());
     }
@@ -178,7 +178,7 @@ public function testSaveAction()
     public function testSaveActionWithoutData()
     {
         $this->requestMock->expects($this->any())->method('getPostValue')->willReturn(false);
-        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/') ->willReturnSelf();
+        $this->resultRedirect->expects($this->atLeastOnce())->method('setPath')->with('*/*/')->willReturnSelf();
         $this->assertSame($this->resultRedirect, $this->saveController->execute());
     }
 
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php
index 31d99df5f6289..bb420ad93ebd4 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Page/PostDataProcessorTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Cms\Test\Unit\Controller\Page;
 
 use Magento\Cms\Controller\Adminhtml\Page\PostDataProcessor;
-use Magento\Framework\Stdlib\DateTime\Filter\Date;
 use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Stdlib\DateTime\Filter\Date;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Model\Layout\Update\ValidatorFactory;
 
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Page/Source/CustomLayoutTest.php b/app/code/Magento/Cms/Test/Unit/Model/Page/Source/CustomLayoutTest.php
index 25d0a252c9bf2..ca21238812d96 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Page/Source/CustomLayoutTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Page/Source/CustomLayoutTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Cms\Test\Unit\Model\Page\Source;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-
 class CustomLayoutTest extends PageLayoutTest
 {
     /**
diff --git a/app/code/Magento/Cms/Test/Unit/Model/PageTest.php b/app/code/Magento/Cms/Test/Unit/Model/PageTest.php
index 9fdd394973265..6d8879010bdb1 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/PageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/PageTest.php
@@ -6,10 +6,10 @@
 namespace Magento\Cms\Test\Unit\Model;
 
 use Magento\Cms\Model\Page;
+use Magento\Cms\Model\ResourceModel\Page as PageResource;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Model\Context;
-use Magento\Cms\Model\ResourceModel\Page as PageResource;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
 
 /**
diff --git a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Block/Relation/Store/ReadHandlerTest.php b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Block/Relation/Store/ReadHandlerTest.php
index af9208bab2334..700e5bf28c8c2 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Block/Relation/Store/ReadHandlerTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Block/Relation/Store/ReadHandlerTest.php
@@ -7,7 +7,6 @@
 
 use Magento\Cms\Model\ResourceModel\Block;
 use Magento\Cms\Model\ResourceModel\Block\Relation\Store\ReadHandler;
-use Magento\Framework\EntityManager\MetadataPool;
 
 class ReadHandlerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Block/Relation/Store/SaveHandlerTest.php b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Block/Relation/Store/SaveHandlerTest.php
index a61bc92c6ca9f..9f715eb675f65 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Block/Relation/Store/SaveHandlerTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Block/Relation/Store/SaveHandlerTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Cms\Test\Unit\Model\ResourceModel\Block\Relation\Store;
 
+use Magento\Cms\Api\Data\BlockInterface;
 use Magento\Cms\Model\ResourceModel\Block;
 use Magento\Cms\Model\ResourceModel\Block\Relation\Store\SaveHandler;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Cms\Api\Data\BlockInterface;
 
 class SaveHandlerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Page/Grid/CollectionTest.php b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Page/Grid/CollectionTest.php
index e08da5c41e5fb..65686fd138c6b 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Page/Grid/CollectionTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Page/Grid/CollectionTest.php
@@ -10,13 +10,13 @@
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
 use Magento\Framework\Data\Collection\EntityFactoryInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface;
-use Magento\Framework\DB\Select;
 
 /**
  * Class CollectionTest
diff --git a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Page/Relation/Store/SaveHandlerTest.php b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Page/Relation/Store/SaveHandlerTest.php
index 154b9301751a1..48a52526690e7 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Page/Relation/Store/SaveHandlerTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/Page/Relation/Store/SaveHandlerTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Cms\Test\Unit\Model\ResourceModel\Page\Relation\Store;
 
+use Magento\Cms\Api\Data\PageInterface;
 use Magento\Cms\Model\ResourceModel\Page;
 use Magento\Cms\Model\ResourceModel\Page\Relation\Store\SaveHandler;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Cms\Api\Data\PageInterface;
 
 class SaveHandlerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/PageTest.php b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/PageTest.php
index cf129ba298194..9d255cee3589e 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/PageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/ResourceModel/PageTest.php
@@ -5,16 +5,15 @@
  */
 namespace Magento\Cms\Test\Unit\Model\ResourceModel;
 
-use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Model\Page;
 use Magento\Cms\Model\ResourceModel\Page as PageResourceModel;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\Stdlib\DateTime;
-use Magento\Framework\EntityManager\EntityManager;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Cms\Model\Page;
-use Magento\Framework\App\ResourceConnection;
 
 /**
  * Class PageTest
diff --git a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
index 60b9f34d29ae6..f2d09b122ddc6 100644
--- a/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
+++ b/app/code/Magento/Cms/Ui/Component/Listing/Column/BlockActions.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Cms\Ui\Component\Listing\Column;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Escaper;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Escaper;
 
 /**
  * Class BlockActions
diff --git a/app/code/Magento/CmsUrlRewrite/Observer/ProcessUrlRewriteSavingObserver.php b/app/code/Magento/CmsUrlRewrite/Observer/ProcessUrlRewriteSavingObserver.php
index 39ece93bc83b8..d5fe2cb345236 100644
--- a/app/code/Magento/CmsUrlRewrite/Observer/ProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CmsUrlRewrite/Observer/ProcessUrlRewriteSavingObserver.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\CmsUrlRewrite\Observer;
 
+use Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator;
 use Magento\Framework\Event\Observer as EventObserver;
-use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\Framework\Event\ObserverInterface;
-use Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 class ProcessUrlRewriteSavingObserver implements ObserverInterface
diff --git a/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/ResourceModel/Page.php b/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/ResourceModel/Page.php
index 5e989e8ac0e78..aa217ed0a9c2b 100644
--- a/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/ResourceModel/Page.php
+++ b/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/ResourceModel/Page.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\CmsUrlRewrite\Plugin\Cms\Model\ResourceModel;
 
-use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator;
 use Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
  * Before save and around delete plugin for \Magento\Cms\Model\ResourceModel\Page:
diff --git a/app/code/Magento/CmsUrlRewrite/Test/Unit/Observer/ProcessUrlRewriteSavingObserverTest.php b/app/code/Magento/CmsUrlRewrite/Test/Unit/Observer/ProcessUrlRewriteSavingObserverTest.php
index ba93d68648416..ebb76ed3e6fd7 100644
--- a/app/code/Magento/CmsUrlRewrite/Test/Unit/Observer/ProcessUrlRewriteSavingObserverTest.php
+++ b/app/code/Magento/CmsUrlRewrite/Test/Unit/Observer/ProcessUrlRewriteSavingObserverTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\CmsUrlRewrite\Test\Unit\Observer;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\CmsUrlRewrite\Observer\ProcessUrlRewriteSavingObserver;
-use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\Cms\Model\Page;
 use Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator;
-use Magento\Framework\Event\Observer as EventObserver;
+use Magento\CmsUrlRewrite\Observer\ProcessUrlRewriteSavingObserver;
 use Magento\Framework\Event;
-use Magento\Cms\Model\Page;
+use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
diff --git a/app/code/Magento/CmsUrlRewrite/Test/Unit/Plugin/Cms/Model/ResourceModel/PageTest.php b/app/code/Magento/CmsUrlRewrite/Test/Unit/Plugin/Cms/Model/ResourceModel/PageTest.php
index 8315b1ed75929..5641bbea76e85 100644
--- a/app/code/Magento/CmsUrlRewrite/Test/Unit/Plugin/Cms/Model/ResourceModel/PageTest.php
+++ b/app/code/Magento/CmsUrlRewrite/Test/Unit/Plugin/Cms/Model/ResourceModel/PageTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CmsUrlRewrite\Test\Unit\Plugin\Cms\Model\ResourceModel;
 
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 class PageTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Config/App/Config/Source/EnvironmentConfigSource.php b/app/code/Magento/Config/App/Config/Source/EnvironmentConfigSource.php
index d2b87b1ae2841..a5ff87b6ab9f6 100644
--- a/app/code/Magento/Config/App/Config/Source/EnvironmentConfigSource.php
+++ b/app/code/Magento/Config/App/Config/Source/EnvironmentConfigSource.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Config\App\Config\Source;
 
-use Magento\Framework\App\Config\ConfigSourceInterface;
-use Magento\Framework\DataObject;
 use Magento\Config\Model\Placeholder\PlaceholderFactory;
 use Magento\Config\Model\Placeholder\PlaceholderInterface;
+use Magento\Framework\App\Config\ConfigSourceInterface;
+use Magento\Framework\DataObject;
 use Magento\Framework\Stdlib\ArrayManager;
 
 /**
diff --git a/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php b/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
index 01cea0a8ee4e7..c6727526a35e2 100644
--- a/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
+++ b/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
@@ -6,8 +6,8 @@
 namespace Magento\Config\App\Config\Source;
 
 use Magento\Framework\App\Config\ConfigSourceInterface;
-use Magento\Framework\DataObject;
 use Magento\Framework\App\Config\Initial\Reader;
+use Magento\Framework\DataObject;
 
 /**
  * Class for retrieving initial configuration from modules
diff --git a/app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php b/app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php
index 7f2f771a8d0a6..32e3527f5686a 100644
--- a/app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php
+++ b/app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Config\App\Config\Source;
 
+use Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory;
 use Magento\Framework\App\Config\ConfigSourceInterface;
+use Magento\Framework\App\Config\Scope\Converter;
 use Magento\Framework\App\Config\ScopeCodeResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DataObject;
-use Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory;
-use Magento\Framework\App\Config\Scope\Converter;
 
 /**
  * Class for retrieving runtime configuration from database.
diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index 4f6d9c14346f0..dfe4f016a6ee8 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Config\App\Config\Type;
 
+use Magento\Config\App\Config\Type\System\Reader;
 use Magento\Framework\App\Config\ConfigTypeInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Config\App\Config\Type\System\Reader;
 
 /**
  * System configuration type
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
index 2f5c10037ef06..3d0eaec65f022 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
@@ -7,11 +7,11 @@
 
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSetCommand;
+use Magento\Config\Model\PreparedValueFactory;
 use Magento\Framework\App\Config\ConfigPathResolver;
+use Magento\Framework\App\Config\Value;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Exception\CouldNotSaveException;
-use Magento\Config\Model\PreparedValueFactory;
-use Magento\Framework\App\Config\Value;
 
 /**
  * Processes default flow of config:set command.
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php b/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php
index 06a01c6686bfd..3b616a0ff3acd 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php
@@ -5,17 +5,17 @@
  */
 namespace Magento\Config\Console\Command\ConfigSet;
 
+use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSetCommand;
+use Magento\Config\Model\Config\PathValidator;
+use Magento\Deploy\Model\DeploymentConfig\Hash;
+use Magento\Framework\App\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Scope\ValidatorInterface;
-use Magento\Config\Model\Config\PathValidator;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\ConfigurationMismatchException;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\ValidatorException;
-use Magento\Deploy\Model\DeploymentConfig\Hash;
-use Magento\Config\App\Config\Type\System;
-use Magento\Framework\App\Config;
 
 /**
  * Processor facade for config:set command.
diff --git a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
index 1df1b3c4bed14..19230f85e679e 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
@@ -8,8 +8,8 @@
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSet\ProcessorFacadeFactory;
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
-use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
diff --git a/app/code/Magento/Config/Model/Config/Backend/Baseurl.php b/app/code/Magento/Config/Model/Config/Backend/Baseurl.php
index a218d2b0d07e6..153bca028b821 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Baseurl.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Baseurl.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Config\Model\Config\Backend;
 
-use Magento\Framework\Validator\Url as UrlValidator;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Validator\Url as UrlValidator;
 
 /**
  * @api
diff --git a/app/code/Magento/Config/Model/Config/Compiler/IncludeElement.php b/app/code/Magento/Config/Model/Config/Compiler/IncludeElement.php
index 961931d6d28c1..fce5015f4e5a1 100644
--- a/app/code/Magento/Config/Model/Config/Compiler/IncludeElement.php
+++ b/app/code/Magento/Config/Model/Config/Compiler/IncludeElement.php
@@ -6,12 +6,12 @@
 namespace Magento\Config\Model\Config\Compiler;
 
 use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Module\Dir;
 use Magento\Framework\Module\Dir\Reader;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\View\TemplateEngine\Xhtml\CompilerInterface;
 use Magento\Framework\View\TemplateEngine\Xhtml\Compiler\Element\ElementInterface;
+use Magento\Framework\View\TemplateEngine\Xhtml\CompilerInterface;
 
 /**
  * Class IncludeElement
diff --git a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php b/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php
index 5f8dc3f7ab4a7..08678019c1e0e 100644
--- a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php
+++ b/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Config\Model\Config\Reader\Source\Deployed;
 
-use Magento\Framework\Config\ConfigOptionsListConstants;
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 
 /**
  * Class DocumentRoot
diff --git a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php b/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php
index e3561261d17c7..275b5437356e4 100644
--- a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php
+++ b/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php
@@ -5,12 +5,11 @@
  */
 namespace Magento\Config\Model\Config\Reader\Source\Deployed;
 
-use Magento\Config\Model\Config\Reader;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\DeploymentConfig;
-use Magento\Config\Model\Placeholder\PlaceholderInterface;
 use Magento\Config\Model\Placeholder\PlaceholderFactory;
+use Magento\Config\Model\Placeholder\PlaceholderInterface;
 use Magento\Framework\App\Config\ScopeCodeResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Class for checking settings that defined in config file
diff --git a/app/code/Magento/Config/Model/Config/SchemaLocator.php b/app/code/Magento/Config/Model/Config/SchemaLocator.php
index 6546d64b3bf6f..8954d94e73a73 100644
--- a/app/code/Magento/Config/Model/Config/SchemaLocator.php
+++ b/app/code/Magento/Config/Model/Config/SchemaLocator.php
@@ -7,8 +7,6 @@
  */
 namespace Magento\Config\Model\Config;
 
-use Magento\Framework\Module\Dir;
-
 /**
  * @api
  * @since 100.0.2
diff --git a/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php b/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
index 0f625ba9fff0e..25a5fd6922d4b 100644
--- a/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
+++ b/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
@@ -6,8 +6,8 @@
 namespace Magento\Config\Model\Config\Structure;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @api
diff --git a/app/code/Magento/Config/Model/Config/Structure/Mapper/Factory.php b/app/code/Magento/Config/Model/Config/Structure/Mapper/Factory.php
index e678d2126347f..53fcf8ef530e4 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Mapper/Factory.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Mapper/Factory.php
@@ -36,13 +36,12 @@ class Factory
      * @var array
      */
     protected $_typeMap = [
-        self::MAPPER_SORTING => \Magento\Config\Model\Config\Structure\Mapper\Sorting::class,
-        self::MAPPER_PATH => \Magento\Config\Model\Config\Structure\Mapper\Path::class,
-        self::MAPPER_IGNORE => \Magento\Config\Model\Config\Structure\Mapper\Ignore::class,
-        self::MAPPER_DEPENDENCIES => \Magento\Config\Model\Config\Structure\Mapper\Dependencies::class,
-        self::MAPPER_ATTRIBUTE_INHERITANCE =>
-            \Magento\Config\Model\Config\Structure\Mapper\Attribute\Inheritance::class,
-        self::MAPPER_EXTENDS => \Magento\Config\Model\Config\Structure\Mapper\ExtendsMapper::class,
+        self::MAPPER_SORTING => Sorting::class,
+        self::MAPPER_PATH => Path::class,
+        self::MAPPER_IGNORE => Ignore::class,
+        self::MAPPER_DEPENDENCIES => Dependencies::class,
+        self::MAPPER_ATTRIBUTE_INHERITANCE => Attribute\Inheritance::class,
+        self::MAPPER_EXTENDS => ExtendsMapper::class,
     ];
 
     /**
diff --git a/app/code/Magento/Config/Model/PreparedValueFactory.php b/app/code/Magento/Config/Model/PreparedValueFactory.php
index 19d607ad3dc1a..37c61a6872350 100644
--- a/app/code/Magento/Config/Model/PreparedValueFactory.php
+++ b/app/code/Magento/Config/Model/PreparedValueFactory.php
@@ -9,12 +9,12 @@
 use Magento\Config\Model\Config\Structure;
 use Magento\Config\Model\Config\StructureFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\Config\ValueInterface;
 use Magento\Framework\App\Config\Value;
+use Magento\Framework\App\Config\ValueInterface;
 use Magento\Framework\App\ScopeInterface;
-use Magento\Store\Model\ScopeTypeNormalizer;
 use Magento\Framework\App\ScopeResolverPool;
 use Magento\Framework\Exception\RuntimeException;
+use Magento\Store\Model\ScopeTypeNormalizer;
 
 /**
  * Creates a prepared instance of Value.
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php
index 9ec2d9bb9a1f4..d7287d4cec10c 100644
--- a/app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php
+++ b/app/code/Magento/Config/Test/Unit/App/Config/Type/System/ReaderTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Config\Test\Unit\App\Config\Type\System;
 
+use Magento\Config\App\Config\Type\System\Reader;
 use Magento\Framework\App\Config\ConfigSourceInterface;
-use Magento\Store\Model\Config\Processor\Fallback;
-use Magento\Framework\App\Config\Spi\PreProcessorInterface;
 use Magento\Framework\App\Config\Spi\PostProcessorInterface;
-use Magento\Config\App\Config\Type\System\Reader;
+use Magento\Framework\App\Config\Spi\PreProcessorInterface;
+use Magento\Store\Model\Config\Processor\Fallback;
 
 class ReaderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php
index 40aa110382ede..a8123ad6f251f 100644
--- a/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php
+++ b/app/code/Magento/Config/Test/Unit/App/Config/Type/SystemTest.php
@@ -7,13 +7,13 @@
 namespace Magento\Config\Test\Unit\App\Config\Type;
 
 use Magento\Config\App\Config\Type\System;
+use Magento\Config\App\Config\Type\System\Reader;
 use Magento\Framework\App\Config\ConfigSourceInterface;
 use Magento\Framework\App\Config\Spi\PostProcessorInterface;
 use Magento\Framework\App\Config\Spi\PreProcessorInterface;
 use Magento\Framework\Cache\FrontendInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Store\Model\Config\Processor\Fallback;
-use Magento\Config\App\Config\Type\System\Reader;
 
 /**
  * Test how Class process source, cache them and retrieve value by path
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/DwstreeTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/DwstreeTest.php
index d3750022d93de..aa8094a348d0a 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/DwstreeTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/DwstreeTest.php
@@ -115,7 +115,7 @@ public function testInitTabs($section, $website, $store)
             [
                 'default',
                 'website_' . $website['actual']['code'],
-                'store_'   . $store['actual']['code']
+                'store_' . $store['actual']['code']
             ],
             $this->object->getTabsIds()
         );
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
index 066b0fbe84b50..e041c32255ed6 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
@@ -7,14 +7,14 @@
 
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSet\DefaultProcessor;
+use Magento\Config\Model\PreparedValueFactory;
 use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\DeploymentConfig;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Config\Model\PreparedValueFactory;
 use Magento\Framework\App\Config\Value;
 use Magento\Framework\App\Config\ValueInterface;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Store\Model\ScopeInterface;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
 /**
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php
index 0f5852c322bdd..91c74e62a442b 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php
@@ -5,19 +5,19 @@
  */
 namespace Magento\Config\Test\Unit\Console\Command\ConfigSet;
 
+use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSet\ConfigSetProcessorFactory;
 use Magento\Config\Console\Command\ConfigSet\ConfigSetProcessorInterface;
 use Magento\Config\Console\Command\ConfigSet\ProcessorFacade;
+use Magento\Config\Model\Config\PathValidator;
+use Magento\Deploy\Model\DeploymentConfig\Hash;
+use Magento\Framework\App\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Scope\ValidatorInterface;
-use Magento\Config\Model\Config\PathValidator;
+use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\ValidatorException;
-use Magento\Framework\Exception\CouldNotSaveException;
-use Magento\Framework\Exception\ConfigurationMismatchException;
-use Magento\Deploy\Model\DeploymentConfig\Hash;
-use Magento\Config\App\Config\Type\System;
-use Magento\Framework\App\Config;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
 /**
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php
index 39f9c47361352..4622ddc202167 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Config\Test\Unit\Console\Command;
 
-use Magento\Config\Console\Command\ConfigSet\ProcessorFacadeFactory;
 use Magento\Config\Console\Command\ConfigSet\ProcessorFacade;
+use Magento\Config\Console\Command\ConfigSet\ProcessorFacadeFactory;
 use Magento\Config\Console\Command\ConfigSetCommand;
 use Magento\Config\Console\Command\EmulatedAdminhtmlAreaProcessor;
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShowCommandTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShowCommandTest.php
index f6c2c404cabbf..14f57939c3cdb 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShowCommandTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShowCommandTest.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Config\Test\Unit\Console\Command;
 
+use Magento\Config\Console\Command\ConfigShow\ValueProcessor;
 use Magento\Config\Console\Command\ConfigShowCommand;
+use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\Config\ConfigSourceInterface;
+use Magento\Framework\App\Scope\ValidatorInterface;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\LocalizedException;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Framework\App\Scope\ValidatorInterface;
 use Symfony\Component\Console\Tester\CommandTester;
-use Magento\Framework\App\Config\ConfigPathResolver;
-use Magento\Config\Console\Command\ConfigShow\ValueProcessor;
 
 class ConfigShowCommandTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Export/CommentTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Export/CommentTest.php
index 32f2929f4938b..4389fa3efafad 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Export/CommentTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Export/CommentTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Config\Test\Unit\Model\Config\Export;
 
-use Magento\Config\Model\Config\Export\Comment;
 use Magento\Config\App\Config\Source\DumpConfigSourceInterface;
+use Magento\Config\Model\Config\Export\Comment;
 use Magento\Config\Model\Config\TypePool;
 use Magento\Config\Model\Placeholder\PlaceholderFactory;
 use Magento\Config\Model\Placeholder\PlaceholderInterface;
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Export/TypePoolTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Export/TypePoolTest.php
index c57b4577df662..5648979d2ddd7 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Export/TypePoolTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Export/TypePoolTest.php
@@ -7,7 +7,7 @@
 
 use Magento\Config\Model\Config\Export\ExcludeList;
 use Magento\Config\Model\Config\TypePool;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class TypePoolTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Processor/EnvironmentPlaceholderTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Processor/EnvironmentPlaceholderTest.php
index 7b15a8deb638c..8622710b45137 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Processor/EnvironmentPlaceholderTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Processor/EnvironmentPlaceholderTest.php
@@ -9,7 +9,7 @@
 use Magento\Config\Model\Placeholder\PlaceholderFactory;
 use Magento\Config\Model\Placeholder\PlaceholderInterface;
 use Magento\Framework\Stdlib\ArrayManager;
-use \PHPUnit_Framework_MockObject_MockObject as Mock;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
 
 class EnvironmentPlaceholderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/DocumentRootTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/DocumentRootTest.php
index 3612848ec125e..c522069ae53e0 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/DocumentRootTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/DocumentRootTest.php
@@ -5,12 +5,11 @@
  */
 namespace Magento\Config\Test\Unit\Model\Config\Reader\Source\Deployed;
 
-use Magento\Config\Model\Config\Reader;
+use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
 use Magento\Framework\App\Config;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Config\ConfigOptionsListConstants;
-use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
 
 /**
  * Test class for checking settings that defined in config file
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/SettingCheckerTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/SettingCheckerTest.php
index dc3a9a3cfa4ef..6f37f397ebd48 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/SettingCheckerTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/SettingCheckerTest.php
@@ -5,12 +5,11 @@
  */
 namespace Magento\Config\Test\Unit\Model\Config\Reader\Source\Deployed;
 
-use Magento\Config\Model\Config\Reader;
 use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
+use Magento\Config\Model\Placeholder\PlaceholderFactory;
+use Magento\Config\Model\Placeholder\PlaceholderInterface;
 use Magento\Framework\App\Config;
 use Magento\Framework\App\DeploymentConfig;
-use Magento\Config\Model\Placeholder\PlaceholderInterface;
-use Magento\Config\Model\Placeholder\PlaceholderFactory;
 
 /**
  * Test class for checking settings that defined in config file
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/SectionTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/SectionTest.php
index e9be51722cbe0..527478cb96eb8 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/SectionTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/SectionTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Config\Test\Unit\Model\Config\Structure\Element;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Config\Model\Config\Structure\ElementVisibilityInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class SectionTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/TabTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/TabTest.php
index 898c458218e63..14b90156ae0d8 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/TabTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/TabTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Config\Test\Unit\Model\Config\Structure\Element;
 
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class TabTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Config/Test/Unit/Model/Placeholder/EnvironmentTest.php b/app/code/Magento/Config/Test/Unit/Model/Placeholder/EnvironmentTest.php
index 8217ff09c0541..4c940f80382c7 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Placeholder/EnvironmentTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Placeholder/EnvironmentTest.php
@@ -8,8 +8,7 @@
 use Magento\Config\Model\Placeholder\Environment;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\Config\ConfigOptionsListConstants;
-use \PHPUnit_Framework_MockObject_MockObject as Mock;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
 
 /**
  * Class EnvironmentTest
diff --git a/app/code/Magento/Config/Test/Unit/Model/PreparedValueFactoryTest.php b/app/code/Magento/Config/Test/Unit/Model/PreparedValueFactoryTest.php
index 1f786f8aca37e..5ff9e543ed9b8 100644
--- a/app/code/Magento/Config/Test/Unit/Model/PreparedValueFactoryTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/PreparedValueFactoryTest.php
@@ -6,17 +6,17 @@
 namespace Magento\Config\Test\Unit\Model;
 
 use Magento\Config\Model\Config\BackendFactory;
-use Magento\Config\Model\PreparedValueFactory;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Config\Model\Config\StructureFactory;
-use Magento\Framework\App\Config\Value;
 use Magento\Config\Model\Config\Structure;
 use Magento\Config\Model\Config\Structure\Element\Field;
 use Magento\Config\Model\Config\Structure\Element\Group;
+use Magento\Config\Model\Config\StructureFactory;
+use Magento\Config\Model\PreparedValueFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Value;
 use Magento\Framework\App\ScopeInterface;
-use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
 use Magento\Framework\App\ScopeResolver;
 use Magento\Framework\App\ScopeResolverPool;
+use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
 use Magento\Store\Model\ScopeTypeNormalizer;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
diff --git a/app/code/Magento/Config/Test/Unit/Model/_files/converted_config.php b/app/code/Magento/Config/Test/Unit/Model/_files/converted_config.php
index ef2447338dc07..1b673f2254871 100644
--- a/app/code/Magento/Config/Test/Unit/Model/_files/converted_config.php
+++ b/app/code/Magento/Config/Test/Unit/Model/_files/converted_config.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+use Magento\Config\Model\Config\Backend\Encrypted;
+
 return [
     'config' => [
         'noNamespaceSchemaLocation' => 'urn:magento:module:Magento_Config:etc/system_file.xsd',
@@ -34,7 +36,7 @@
                                     'showInWebsite' => '1',
                                     'type' => 'text',
                                     'label' => 'Field 2',
-                                    'backend_model' => \Magento\Config\Model\Config\Backend\Encrypted::class,
+                                    'backend_model' => Encrypted::class,
                                     '_elementType' => 'field',
                                 ],
                             ],
@@ -75,8 +77,7 @@
                                                     'id' => 'field_3_1_1',
                                                     'translate' => 'label',
                                                     'showInWebsite' => '1',
-                                                    'backend_model' =>
-                                                        \Magento\Config\Model\Config\Backend\Encrypted::class,
+                                                    'backend_model' => Encrypted::class,
                                                     'type' => 'text',
                                                     'label' => 'Field 3.1.1',
                                                     '_elementType' => 'field',
@@ -139,7 +140,7 @@
                                     'showInWebsite' => '1',
                                     'type' => 'text',
                                     'label' => 'Field 4',
-                                    'backend_model' => \Magento\Config\Model\Config\Backend\Encrypted::class,
+                                    'backend_model' => Encrypted::class,
                                     'attribute_1' => 'test_value_1',
                                     'attribute_2' => 'test_value_2',
                                     'attribute_text' => '<test_value>',
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
index 58462b873d8b1..7fbb8de3a729e 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Export/RowCustomizer.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\ConfigurableImportExport\Model\Export;
 
-use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
+use Magento\CatalogImportExport\Model\Export\RowCustomizerInterface;
 use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
 use Magento\ImportExport\Model\Import;
 
 class RowCustomizer implements RowCustomizerInterface
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
index 4ca21d554ccd9..0cc7aa7ab6639 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
@@ -43,16 +43,11 @@ class Configurable extends \Magento\CatalogImportExport\Model\Import\Product\Typ
      * @var array
      */
     protected $_messageTemplates = [
-        self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER =>
-            'Attribute with code "%s" is not super',
-        self::ERROR_INVALID_OPTION_VALUE =>
-            'Invalid option value for attribute "%s"',
-        self::ERROR_INVALID_WEBSITE =>
-            'Invalid website code for super attribute',
-        self::ERROR_DUPLICATED_VARIATIONS =>
-            'SKU %s contains duplicated variations',
-        self::ERROR_UNIDENTIFIABLE_VARIATION =>
-            'Configurable variation "%s" is unidentifiable',
+        self::ERROR_ATTRIBUTE_CODE_IS_NOT_SUPER => 'Attribute with code "%s" is not super',
+        self::ERROR_INVALID_OPTION_VALUE => 'Invalid option value for attribute "%s"',
+        self::ERROR_INVALID_WEBSITE => 'Invalid website code for super attribute',
+        self::ERROR_DUPLICATED_VARIATIONS => 'SKU %s contains duplicated variations',
+        self::ERROR_UNIDENTIFIABLE_VARIATION => 'Configurable variation "%s" is unidentifiable',
     ];
 
     /**
diff --git a/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Export/RowCustomizerTest.php b/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Export/RowCustomizerTest.php
index f877237a2ba66..53d5ac99b1cef 100644
--- a/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Export/RowCustomizerTest.php
+++ b/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Export/RowCustomizerTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\ConfigurableImportExport\Test\Unit\Model\Export;
 
-use Magento\ConfigurableImportExport\Model\Export\RowCustomizer as ExportRowCustomizer;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
+use Magento\ConfigurableImportExport\Model\Export\RowCustomizer as ExportRowCustomizer;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\ImportExport\Model\Import;
 
 class RowCustomizerTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php
index 54552364de13b..91c80dd58d053 100644
--- a/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableImportExport/Test/Unit/Model/Import/Product/Type/ConfigurableTest.php
@@ -447,26 +447,56 @@ protected function _getSuperAttributes()
     public function testSaveData()
     {
         $newSkus = array_change_key_case([
-            'configurableskuI22' =>
-                [$this->productEntityLinkField => 1, 'type_id' => 'configurable', 'attr_set_code' => 'Default'],
-            'testconf2-attr2val1-testattr3v1' =>
-                [$this->productEntityLinkField => 2, 'type_id' => 'simple', 'attr_set_code' => 'Default'],
-            'testconf2-attr2val1-testattr30v1' =>
-                [$this->productEntityLinkField => 20, 'type_id' => 'simple', 'attr_set_code' => 'Default'],
-            'testconf2-attr2val1-testattr3v2' =>
-                [$this->productEntityLinkField => 3, 'type_id' => 'simple', 'attr_set_code' => 'Default'],
-            'testSimple' =>
-                [$this->productEntityLinkField => 4, 'type_id' => 'simple', 'attr_set_code' => 'Default'],
-            'testSimpleToSkip' =>
-                [$this->productEntityLinkField => 5, 'type_id' => 'simple', 'attr_set_code' => 'Default'],
-            'configurableskuI22withoutLabels' =>
-                [$this->productEntityLinkField => 6, 'type_id' => 'configurable', 'attr_set_code' => 'Default'],
-            'configurableskuI22withoutVariations' =>
-                [$this->productEntityLinkField => 7, 'type_id' => 'configurable', 'attr_set_code' => 'Default'],
-            'configurableskuI22Duplicated' =>
-                [$this->productEntityLinkField => 8, 'type_id' => 'configurable', 'attr_set_code' => 'Default'],
-            'configurableskuI22BadPrice' =>
-                [$this->productEntityLinkField => 9, 'type_id' => 'configurable', 'attr_set_code' => 'Default'],
+            'configurableskuI22' => [
+                $this->productEntityLinkField => 1,
+                'type_id'                     => 'configurable',
+                'attr_set_code'               => 'Default',
+            ],
+            'testconf2-attr2val1-testattr3v1' => [
+                $this->productEntityLinkField => 2,
+                'type_id'                     => 'simple',
+                'attr_set_code'               => 'Default',
+            ],
+            'testconf2-attr2val1-testattr30v1' => [
+                $this->productEntityLinkField => 20,
+                'type_id'                     => 'simple',
+                'attr_set_code'               => 'Default',
+            ],
+            'testconf2-attr2val1-testattr3v2' => [
+                $this->productEntityLinkField => 3,
+                'type_id'                     => 'simple',
+                'attr_set_code'               => 'Default',
+            ],
+            'testSimple' => [
+                $this->productEntityLinkField => 4,
+                'type_id'                     => 'simple',
+                'attr_set_code'               => 'Default',
+            ],
+            'testSimpleToSkip' => [
+                $this->productEntityLinkField => 5,
+                'type_id'                     => 'simple',
+                'attr_set_code'               => 'Default',
+            ],
+            'configurableskuI22withoutLabels' => [
+                $this->productEntityLinkField => 6,
+                'type_id'                     => 'configurable',
+                'attr_set_code'               => 'Default',
+            ],
+            'configurableskuI22withoutVariations' => [
+                $this->productEntityLinkField => 7,
+                'type_id'                     => 'configurable',
+                'attr_set_code'               => 'Default',
+            ],
+            'configurableskuI22Duplicated' => [
+                $this->productEntityLinkField => 8,
+                'type_id'                     => 'configurable',
+                'attr_set_code'               => 'Default',
+            ],
+            'configurableskuI22BadPrice' => [
+                $this->productEntityLinkField => 9,
+                'type_id'                     => 'configurable',
+                'attr_set_code'               => 'Default',
+            ],
         ]);
         $this->_entityModel->expects($this->any())
             ->method('getNewSku')
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php
index 8848fc78dad6d..919edf489df24 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Button/Save.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Button;
 
-use Magento\Ui\Component\Control\Container;
 use Magento\Catalog\Block\Adminhtml\Product\Edit\Button\Generic;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
 use Magento\Catalog\Model\Product\Type;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
+use Magento\Ui\Component\Control\Container;
 
 /**
  * Class Save
diff --git a/app/code/Magento/ConfigurableProduct/Block/Plugin/Product/Media/Gallery.php b/app/code/Magento/ConfigurableProduct/Block/Plugin/Product/Media/Gallery.php
index 1df68482eb6b8..ffa4e87b04a93 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Plugin/Product/Media/Gallery.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Plugin/Product/Media/Gallery.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ConfigurableProduct\Block\Plugin\Product\Media;
 
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\Serialize\Serializer\Json;
 
 /**
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Builder/Plugin.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Builder/Plugin.php
index f96f73eb3c328..538ce55cedbd2 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Builder/Plugin.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Builder/Plugin.php
@@ -6,10 +6,10 @@
  */
 namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product\Builder;
 
+use Magento\Catalog\Controller\Adminhtml\Product\Builder as CatalogProductBuilder;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\ConfigurableProduct\Model\Product\Type;
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Controller\Adminhtml\Product\Builder as CatalogProductBuilder;
 use Magento\Framework\App\RequestInterface;
 
 class Plugin
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php
index 8adfdea96102c..baa3f53717570 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Wizard.php
@@ -6,9 +6,9 @@
 namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product;
 
 use Magento\Backend\App\Action;
-use Magento\Framework\Controller\ResultFactory;
-use Magento\Catalog\Controller\Adminhtml\Product\Builder;
 use Magento\Backend\App\Action\Context;
+use Magento\Catalog\Controller\Adminhtml\Product\Builder;
+use Magento\Framework\Controller\ResultFactory;
 
 /**
  * Class Wizard
diff --git a/app/code/Magento/ConfigurableProduct/Helper/Product/Options/Factory.php b/app/code/Magento/ConfigurableProduct/Helper/Product/Options/Factory.php
index 8a60b62d093d5..5242fc5c1f317 100644
--- a/app/code/Magento/ConfigurableProduct/Helper/Product/Options/Factory.php
+++ b/app/code/Magento/ConfigurableProduct/Helper/Product/Options/Factory.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\ConfigurableProduct\Helper\Product\Options;
 
-use Magento\ConfigurableProduct\Api\Data\OptionInterface;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\ConfigurableProduct\Api\Data\OptionInterface;
 use Magento\ConfigurableProduct\Api\Data\OptionValueInterfaceFactory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\AttributeFactory;
 
diff --git a/app/code/Magento/ConfigurableProduct/Helper/Product/Options/Loader.php b/app/code/Magento/ConfigurableProduct/Helper/Product/Options/Loader.php
index 5a58c24185020..d7176cf461175 100644
--- a/app/code/Magento/ConfigurableProduct/Helper/Product/Options/Loader.php
+++ b/app/code/Magento/ConfigurableProduct/Helper/Product/Options/Loader.php
@@ -7,8 +7,8 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\ConfigurableProduct\Api\Data\OptionInterface;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\ConfigurableProduct\Api\Data\OptionValueInterfaceFactory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 
 /**
diff --git a/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProvider.php b/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProvider.php
index 759691433b807..cdc717e4cba66 100644
--- a/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProvider.php
+++ b/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProvider.php
@@ -7,10 +7,9 @@
 namespace Magento\ConfigurableProduct\Model;
 
 use Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\App\ScopeResolverInterface;
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
-use Magento\Framework\DB\Select;
 
 /**
  * Provider for retrieving configurable options.
diff --git a/app/code/Magento/ConfigurableProduct/Model/ConfigurableProductManagement.php b/app/code/Magento/ConfigurableProduct/Model/ConfigurableProductManagement.php
index cff5d78ca1335..d5900a3f17366 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ConfigurableProductManagement.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ConfigurableProductManagement.php
@@ -8,7 +8,6 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory;
 
 class ConfigurableProductManagement implements \Magento\ConfigurableProduct\Api\ConfigurableProductManagementInterface
diff --git a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
index bdf4a3678524e..b1340db4f5909 100644
--- a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
+++ b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
@@ -13,12 +13,11 @@
 use Magento\ConfigurableProduct\Helper\Product\Options\Loader;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Store\Model\Store;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php b/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php
index 54b6e42ff7678..f78a332d2216a 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\ConfigurableProduct\Model\Plugin;
 
-use Magento\Catalog\Model\ProductFactory;
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\Exception\InputException;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Catalog\Model\ProductFactory;
 use Magento\ConfigurableProduct\Api\Data\OptionInterface;
-use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\InputException;
 
 class ProductRepositorySave
 {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index fbaa4e60c29cc..a7dac378f5cf8 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -10,11 +10,11 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\ProductInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\ConfigurableProduct\Model\Product\Type\Collection\SalableProcessor;
 use Magento\Catalog\Model\Config;
+use Magento\Catalog\Model\Product\Gallery\ReadHandler as GalleryReadHandler;
+use Magento\ConfigurableProduct\Model\Product\Type\Collection\SalableProcessor;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Model\Product\Gallery\ReadHandler as GalleryReadHandler;
 
 /**
  * Configurable product type implementation
@@ -267,7 +267,6 @@ public function __construct(
             $productRepository,
             $serializer
         );
-
     }
 
     /**
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Validator/Plugin.php b/app/code/Magento/ConfigurableProduct/Model/Product/Validator/Plugin.php
index 4dcc170b53caf..b45e2764381f6 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Validator/Plugin.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Validator/Plugin.php
@@ -8,9 +8,9 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\DataObject;
 use Magento\Framework\Event\Manager;
 use Magento\Framework\Json\Helper\Data;
-use Magento\Framework\DataObject;
 
 /**
  * Configurable product validation
diff --git a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
index 4450bbd75e574..7e746557bb2cc 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\ConfigurableProduct\Model\Quote\Item;
 
-use Magento\Quote\Model\Quote\Item\CartItemProcessorInterface;
-use Magento\Quote\Api\Data\CartItemInterface;
-use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Quote\Model\Quote\Item\CartItemProcessorInterface;
 
 class CartItemProcessor implements CartItemProcessorInterface
 {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionProvider.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionProvider.php
index b77d2115b56ef..4e78830224fd2 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionProvider.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionProvider.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ConfigurableProduct\Model\ResourceModel\Attribute;
 
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 
 class OptionProvider
 {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
index 40f390d526974..e2d3293e6f829 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
@@ -8,10 +8,7 @@
 namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
-use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Store\Api\StoreResolverInterface;
-use Magento\Store\Model\Store;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php
index bc118043adc8e..a55ced97004e0 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\ConfigurableProduct\Model\ResourceModel\Product;
 
-use Magento\Framework\DB\Select;
 use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\CatalogInventory\Model\Stock\Status as StockStatus;
 use Magento\CatalogInventory\Model\ResourceModel\Stock\Status as StockStatusResource;
+use Magento\CatalogInventory\Model\Stock\Status as StockStatus;
+use Magento\Framework\DB\Select;
 
 /**
  * A Select object processor.
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
index 3c9689a1c4eb9..20dedd74007a1 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
@@ -8,15 +8,15 @@
 namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Type;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\ConfigurableProduct\Api\Data\OptionInterface;
-use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-use Magento\Catalog\Model\ResourceModel\Product\Relation as ProductRelation;
-use Magento\Framework\Model\ResourceModel\Db\Context as DbContext;
 use Magento\Catalog\Model\Product as ProductModel;
+use Magento\Catalog\Model\ResourceModel\Product\Relation as ProductRelation;
+use Magento\ConfigurableProduct\Api\Data\OptionInterface;
 use Magento\ConfigurableProduct\Model\AttributeOptionProviderInterface;
 use Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionProvider;
-use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\Model\ResourceModel\Db\Context as DbContext;
 
 class Configurable extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php
index 7ea83099f2589..8a46c8d652c06 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute.php
@@ -9,7 +9,6 @@
 
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute as ConfigurableAttribute;
 use Magento\Store\Model\Store;
-use Magento\Store\Model\StoreManagerInterface;
 
 class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
index e46f688db562e..c0dab08615723 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
@@ -7,13 +7,13 @@
  */
 namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable as ConfigurableResource;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * @api
diff --git a/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilder.php b/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilder.php
index 0afde6144bf88..b5fd5f006b8cd 100644
--- a/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilder.php
+++ b/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilder.php
@@ -20,7 +20,7 @@ class InStockOptionSelectBuilder
      * @var Status
      */
     private $stockStatusResource;
-    
+
     /**
      * @param Status $stockStatusResource
      */
@@ -48,7 +48,7 @@ public function afterGetSelect(OptionSelectBuilderInterface $subject, Select $se
             'stock.stock_status = ?',
             \Magento\CatalogInventory\Model\Stock\Status::STATUS_IN_STOCK
         );
-        
+
         return $select;
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php
index 6cc5625df5b18..f1ca27514aee9 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php
@@ -7,11 +7,11 @@
 namespace Magento\ConfigurableProduct\Pricing\Price;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
-use Magento\Framework\App\ResourceConnection;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Framework\App\RequestSafetyInterface;
+use Magento\Framework\App\ResourceConnection;
 
 class ConfigurableOptionsProvider implements ConfigurableOptionsProviderInterface
 {
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPriceInterface.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPriceInterface.php
index 1aef59b376e3f..d8a3b6287bf6b 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPriceInterface.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPriceInterface.php
@@ -6,7 +6,6 @@
 
 namespace Magento\ConfigurableProduct\Pricing\Price;
 
-use Magento\Catalog\Model\Product;
 use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
 
 /**
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php
index 66bc3db7ee89d..3c6e19244008c 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php
@@ -6,9 +6,9 @@
 namespace Magento\ConfigurableProduct\Pricing\Price;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 
 /**
  * Retrieve list of products where each product contains lower price than others at least for one possible price type
diff --git a/app/code/Magento/ConfigurableProduct/Setup/Recurring.php b/app/code/Magento/ConfigurableProduct/Setup/Recurring.php
index 77e792fc99616..37199cdb3f92e 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/Recurring.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/Recurring.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\ConfigurableProduct\Setup;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Setup\ExternalFKSetup;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php b/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php
index 326af02fe39bb..f870d80c25536 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php
@@ -6,11 +6,11 @@
 namespace Magento\ConfigurableProduct\Setup;
 
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Eav\Setup\EavSetup;
 use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
 
 /**
  * Upgrade Data script
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php
index 8df6df53cc065..a4cef53973c22 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Edit/Button/SaveTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Block\Adminhtml\Product\Edit\Button;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Button\Save as SaveButton;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\Registry;
-use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class SaveTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Steps/SelectAttributesTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Steps/SelectAttributesTest.php
index 040329dbb3d87..cc30169dcae3a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Steps/SelectAttributesTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Adminhtml/Product/Steps/SelectAttributesTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Block\Adminhtml\Product\Steps;
 
-use Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\SelectAttributes;
-use Magento\Framework\View\Element\Template\Context;
-use Magento\Framework\Registry;
 use Magento\Backend\Block\Widget\Button;
-use Magento\Framework\View\LayoutInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\SelectAttributes;
+use Magento\Framework\Registry;
 use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\View\LayoutInterface;
 
 class SelectAttributesTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Plugin/Product/Media/GalleryTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Plugin/Product/Media/GalleryTest.php
index 83056e7d0554f..06e1be84dfc5a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Plugin/Product/Media/GalleryTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Plugin/Product/Media/GalleryTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Block\Plugin\Product\Media;
 
-use Magento\ConfigurableProduct\Block\Plugin\Product\Media\Gallery;
 use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Block\Plugin\Product\Media\Gallery;
 use Magento\Framework\Serialize\Serializer\Json;
 
 /**
@@ -14,7 +14,6 @@
  */
 class GalleryTest extends \PHPUnit\Framework\TestCase
 {
-
     public function testAfterGetOptions()
     {
         $jsonMock = $this->createJsonMock();
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurationsTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurationsTest.php
index fb63dc330db32..6493746c7cb02 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurationsTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/UpdateConfigurationsTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Controller\Adminhtml\Product\Initialization\Helper\Plugin;
 
-use Magento\ConfigurableProduct\Controller\Adminhtml\Product\Initialization\Helper\Plugin\UpdateConfigurations;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\App\RequestInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\ConfigurableProduct\Model\Product\VariationHandler;
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper as ProductInitializationHelper;
 use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Controller\Adminhtml\Product\Initialization\Helper\Plugin\UpdateConfigurations;
+use Magento\ConfigurableProduct\Model\Product\VariationHandler;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * Class UpdateConfigurationsTest
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
index c89d6e2e9ac45..efea9052d6713 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
@@ -215,7 +215,6 @@ public function testGetGalleryImages()
             \Magento\Framework\Data\Collection::class,
             $this->_model->getGalleryImages($productMock)
         );
-
     }
 
     /**
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/Product/Options/LoaderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/Product/Options/LoaderTest.php
index 921a2bcfcc2ef..c86fffc06fdd6 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/Product/Options/LoaderTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/Product/Options/LoaderTest.php
@@ -82,7 +82,7 @@ public function testLoad()
             ->getMock();
 
         $attributes = [$attribute];
-        
+
         $iterator = $this->getMockBuilder(Collection::class)->disableOriginalConstructor()->getMock();
         $iterator->expects($this->once())->method('getIterator')
             ->willReturn(new \ArrayIterator($attributes));
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Attribute/LockValidatorTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Attribute/LockValidatorTest.php
index 090c464d49307..021aef737b5af 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Attribute/LockValidatorTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Attribute/LockValidatorTest.php
@@ -6,11 +6,10 @@
 namespace Magento\ConfigurableProduct\Test\Unit\Model\Attribute;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\App\ResourceConnection;
+use Magento\ConfigurableProduct\Model\Attribute\LockValidator;
 use Magento\Framework\EntityManager\EntityMetadata;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\ConfigurableProduct\Model\Attribute\LockValidator;
 
 class LockValidatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/AttributeOptionProviderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/AttributeOptionProviderTest.php
index cdaad049423af..f2e302065cfcb 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/AttributeOptionProviderTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/AttributeOptionProviderTest.php
@@ -8,14 +8,14 @@
 
 use Magento\ConfigurableProduct\Model\AttributeOptionProvider;
 use Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -119,12 +119,12 @@ public function testGetAttributeOptions(array $options)
         $this->scopeResolver->expects($this->any())
             ->method('getScope')
             ->willReturn($this->scope);
-        
+
         $this->optionSelectBuilder->expects($this->any())
             ->method('getSelect')
             ->with($this->abstractAttribute, 4, $this->scope)
             ->willReturn($this->select);
-        
+
         $this->attributeResource->expects($this->once())
             ->method('getConnection')
             ->willReturn($this->connectionMock);
@@ -161,7 +161,7 @@ public function testGetAttributeOptionsWithBackendModel(array $options)
                 ['value' => 14, 'label' => 'Option Value for index 14'],
                 ['value' => 15, 'label' => 'Option Value for index 15']
             ]);
-        
+
         $this->abstractAttribute->expects($this->any())
             ->method('getSource')
             ->willReturn($source);
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/ProductExtensionAttributes.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/ProductExtensionAttributes.php
index f869396064c18..0556354f6c152 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/ProductExtensionAttributes.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/ProductExtensionAttributes.php
@@ -12,5 +12,4 @@
  */
 abstract class ProductExtensionAttributes implements ProductExtensionInterface
 {
-
 }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/ProductOptionExtensionAttributes.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/ProductOptionExtensionAttributes.php
index 1bab9d8f0df4f..a36f52f151bb7 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/ProductOptionExtensionAttributes.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/ProductOptionExtensionAttributes.php
@@ -12,5 +12,4 @@
  */
 abstract class ProductOptionExtensionAttributes implements ProductOptionExtensionInterface
 {
-
 }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/SaveHandlerTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/SaveHandlerTest.php
index 6fda5b867ccef..343971ef2d907 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/SaveHandlerTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/SaveHandlerTest.php
@@ -6,7 +6,6 @@
 namespace Magento\ConfigurableProduct\Test\Unit\Model\Product;
 
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\ProductRepository;
 use Magento\ConfigurableProduct\Api\Data\OptionInterface;
 use Magento\ConfigurableProduct\Model\OptionRepository;
 use Magento\ConfigurableProduct\Model\Product\SaveHandler;
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Collection/SalableProcessorTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Collection/SalableProcessorTest.php
index 4e42da090e57a..b23863f38b264 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Collection/SalableProcessorTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Collection/SalableProcessorTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Type\Collection;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class SalableProcessorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
index ea136dd037baf..70a0c4550bdea 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
@@ -8,20 +8,20 @@
 use Magento\Catalog\Api\Data\ProductExtensionInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Config;
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\Framework\EntityManager\EntityMetadata;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Customer\Model\Session;
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory;
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection;
 use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
-use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Collection\SalableProcessor;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\AttributeFactory;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ProductCollection;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\ConfigurableFactory;
+use Magento\Customer\Model\Session;
 use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ProductCollection;
-use Magento\ConfigurableProduct\Model\Product\Type\Collection\SalableProcessor;
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Framework\EntityManager\EntityMetadata;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * @SuppressWarnings(PHPMD.LongVariable)
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/VariationMatrixTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/VariationMatrixTest.php
index 41995be418130..d2c84f41d4f0a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/VariationMatrixTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/VariationMatrixTest.php
@@ -32,14 +32,14 @@ public function testGetVariations()
                 130 => [
                     'value' => '3',
                     'label' => 'red',
-                    'price' => ['value_index' => '3', 'pricing_value' => '', 'is_percent' => '0', 'include' => '1',],
+                    'price' => ['value_index' => '3', 'pricing_value' => '', 'is_percent' => '0', 'include' => '1'],
                 ],
             ],
             [
                 130 => [
                     'value' => '4',
                     'label' => 'blue',
-                    'price' => ['value_index' => '4', 'pricing_value' => '', 'is_percent' => '0', 'include' => '1',],
+                    'price' => ['value_index' => '4', 'pricing_value' => '', 'is_percent' => '0', 'include' => '1'],
                 ],
             ],
         ];
@@ -61,7 +61,7 @@ public function testGetVariations()
                     ],
                 ],
                 'attribute_id' => '130',
-                'options' => [['value' => '3', 'label' => 'red',], ['value' => '4', 'label' => 'blue',],],
+                'options' => [['value' => '3', 'label' => 'red'], ['value' => '4', 'label' => 'blue']],
             ],
         ];
 
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/VariationHandlerTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/VariationHandlerTest.php
index 78707332f60c8..a6879749fa0a6 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/VariationHandlerTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/VariationHandlerTest.php
@@ -85,7 +85,6 @@ protected function setUp()
 
     public function testPrepareAttributeSet()
     {
-
         $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->setMethods(['getNewVariationsAttributeSetId'])
             ->disableOriginalConstructor()
@@ -145,8 +144,7 @@ public function testGenerateSimpleProducts($weight, $typeId)
                 'name' => 'config-red',
                 'configurable_attribute' => '{"new_attr":"6"}',
                 'sku' => 'config-red',
-                'quantity_and_stock_status' =>
-                    [
+                'quantity_and_stock_status' => [
                         'qty' => '',
                     ],
             ]
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionProviderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionProviderTest.php
index 7aa67832eb802..d1e313ea34ee5 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionProviderTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionProviderTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Model\ResourceModel\Attribute;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionProvider;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class OptionProviderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
index 9802c97372bbb..11e36370712cc 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Attribute/OptionSelectBuilderTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Model\ResourceModel\Attribute;
 
+use Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionProvider;
 use Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilder;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute;
-use Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionProvider;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\App\ScopeInterface;
-use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
@@ -58,7 +58,7 @@ class OptionSelectBuilderTest extends \PHPUnit\Framework\TestCase
      * @var ScopeInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $scope;
-    
+
     protected function setUp()
     {
         $this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/LinkedProductSelectBuilderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/LinkedProductSelectBuilderTest.php
index 46dc9edb48dcc..044a090cf736f 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/LinkedProductSelectBuilderTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/LinkedProductSelectBuilderTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Model\ResourceModel\Product;
 
-use Magento\Framework\DB\Select;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\LinkedProductSelectBuilder;
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class LinkedProductSelectBuilderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/StockStatusBaseSelectProcessorTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/StockStatusBaseSelectProcessorTest.php
index dac3cef35ffa5..4fff0d4096977 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/StockStatusBaseSelectProcessorTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/StockStatusBaseSelectProcessorTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Model\ResourceModel\Product;
 
-use Magento\Framework\DB\Select;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\CatalogInventory\Model\Stock\Status as StockStatus;
 use Magento\CatalogInventory\Model\ResourceModel\Stock\Status as StockStatusResource;
+use Magento\CatalogInventory\Model\Stock\Status as StockStatus;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\StockStatusBaseSelectProcessor;
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class StockStatusBaseSelectProcessorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/Type/ConfigurableTest.php
index 5a494d1c7a19b..34c84867f575b 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/Type/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/Type/ConfigurableTest.php
@@ -5,18 +5,18 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Model\ResourceModel\Product\Type;
 
-use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable;
-use Magento\Framework\App\ScopeResolverInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\CatalogInventory\Api\StockRegistryInterface;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Relation as ProductRelation;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
 use Magento\ConfigurableProduct\Model\AttributeOptionProvider;
 use Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionProvider;
-use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Catalog\Model\ResourceModel\Product\Relation as ProductRelation;
+use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Observer/HideUnsupportedAttributeTypesTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Observer/HideUnsupportedAttributeTypesTest.php
index 3bad81126f510..0b14e5d60a06c 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Observer/HideUnsupportedAttributeTypesTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Observer/HideUnsupportedAttributeTypesTest.php
@@ -6,13 +6,10 @@
 
 namespace Magento\ConfigurableProduct\Test\Unit\Observer;
 
-use Magento\Catalog\Block\Adminhtml\Product\Attribute\Edit\Tab\Main as MainBlock;
 use Magento\ConfigurableProduct\Observer\HideUnsupportedAttributeTypes;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Event\Observer as EventObserver;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\View\Element\BlockInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilderTest.php
index 4d7d5702aacf6..7af5ed99115ec 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilderTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilderTest.php
@@ -23,7 +23,7 @@ class InStockOptionSelectBuilderTest extends \PHPUnit\Framework\TestCase
      * @var ObjectManager
      */
     private $objectManagerHelper;
-    
+
     /**
      * @var Status|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -38,7 +38,7 @@ class InStockOptionSelectBuilderTest extends \PHPUnit\Framework\TestCase
      * @var Select|\PHPUnit_Framework_MockObject_MockObject
      */
     private $selectMock;
-    
+
     protected function setUp()
     {
         $this->stockStatusResourceMock = $this->getMockBuilder(Status::class)
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/LowestPriceOptionsProviderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/LowestPriceOptionsProviderTest.php
index ceeb242a750a2..150831dbf4031 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/LowestPriceOptionsProviderTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Price/LowestPriceOptionsProviderTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\ConfigurableProduct\Test\Unit\Pricing\Price;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class LowestPriceOptionsProviderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/Component/Listing/AssociatedProduct/Columns/AttributesTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/Component/Listing/AssociatedProduct/Columns/AttributesTest.php
index 4ee7901e3da47..524202176d4d5 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/Component/Listing/AssociatedProduct/Columns/AttributesTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/Component/Listing/AssociatedProduct/Columns/AttributesTest.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Ui\Component\Listing\AssociatedProduct\Columns;
 
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\Data\ProductAttributeSearchResultsInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\ConfigurableProduct\Ui\Component\Listing\AssociatedProduct\Columns\Attributes as AttributesColumn;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
-use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\View\Element\UiComponent\Processor as UiElementProcessor;
-use Magento\Framework\Api\SearchCriteria;
-use Magento\Catalog\Api\Data\ProductAttributeSearchResultsInterface;
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
-use Magento\Eav\Api\Data\AttributeOptionInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/Component/Listing/AssociatedProduct/Columns/PriceTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/Component/Listing/AssociatedProduct/Columns/PriceTest.php
index cdae68b4c7a8d..1803de8e9b668 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/Component/Listing/AssociatedProduct/Columns/PriceTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/Component/Listing/AssociatedProduct/Columns/PriceTest.php
@@ -6,15 +6,15 @@
 namespace Magento\ConfigurableProduct\Test\Unit\Ui\Component\Listing\AssociatedProduct\Columns;
 
 use Magento\ConfigurableProduct\Ui\Component\Listing\AssociatedProduct\Columns\Price as PriceColumn;
+use Magento\Directory\Model\Currency as CurrencyModel;
+use Magento\Framework\Currency;
+use Magento\Framework\Locale\CurrencyInterface as LocaleCurrency;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Framework\Locale\CurrencyInterface as LocaleCurrency;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\View\Element\UiComponent\Processor as UiElementProcessor;
 use Magento\Store\Api\Data\StoreInterface;
-use Magento\Framework\Currency;
-use Magento\Directory\Model\Currency as CurrencyModel;
 use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
index 67f758af22bec..3295d29995412 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\Composite as CompositeModifier;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Framework\ObjectManagerInterface;
-use Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\Data\AssociatedProducts;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\AllowedProductTypes;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
+use Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\Composite as CompositeModifier;
+use Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\Data\AssociatedProducts;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Ui\DataProvider\Modifier\ModifierInterface;
-use Magento\Catalog\Ui\AllowedProductTypes;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanelTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanelTest.php
index 020551ff02537..22aadb5fc3a16 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanelTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanelTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\ConfigurablePanel as ConfigurablePanelModifier;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Framework\UrlInterface;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 class ConfigurablePanelTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/StockDataTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/StockDataTest.php
index 0a65454192adc..2603d73f3c0c0 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/StockDataTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/StockDataTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\ConfigurableProduct\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\StockData as StockDataModifier;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 class StockDataTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns/Attributes.php b/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns/Attributes.php
index d8bbd8def4738..18705fbb194fa 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns/Attributes.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns/Attributes.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\ConfigurableProduct\Ui\Component\Listing\AssociatedProduct\Columns;
 
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface as AttributeRepository;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
 
 class Attributes extends \Magento\Ui\Component\Listing\Columns\Column
 {
diff --git a/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns/Name.php b/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns/Name.php
index bfdaf474dae43..5a609f747ce14 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns/Name.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns/Name.php
@@ -6,8 +6,8 @@
 namespace Magento\ConfigurableProduct\Ui\Component\Listing\AssociatedProduct\Columns;
 
 use Magento\Framework\UrlInterface;
-use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
 
 class Name extends \Magento\Ui\Component\Listing\Columns\Column
 {
diff --git a/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns/Price.php b/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns/Price.php
index 1433a3736263b..4bfc0880c3113 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns/Price.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/Component/Listing/AssociatedProduct/Columns/Price.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ConfigurableProduct\Ui\Component\Listing\AssociatedProduct\Columns;
 
-use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
 
 class Price extends \Magento\Ui\Component\Listing\Columns\Column
 {
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Composite.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Composite.php
index c9c3a5659aa5e..ad7a37b8a0258 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Composite.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Composite.php
@@ -6,13 +6,13 @@
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Ui\AllowedProductTypes;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
-use Magento\Catalog\Model\Product\Type;
-use Magento\Ui\DataProvider\Modifier\ModifierInterface;
-use Magento\Framework\ObjectManagerInterface;
 use Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier\Data\AssociatedProducts;
-use Magento\Catalog\Ui\AllowedProductTypes;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Ui\DataProvider\Modifier\ModifierInterface;
 
 /**
  * Data provider for Configurable products
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurableAttributeSetHandler.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurableAttributeSetHandler.php
index 67773f019be8c..6bbd2031936a9 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurableAttributeSetHandler.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurableAttributeSetHandler.php
@@ -6,10 +6,10 @@
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
-use Magento\Ui\Component\Modal;
-use Magento\Ui\Component\Form;
-use Magento\Ui\Component\Container;
 use Magento\Framework\UrlInterface;
+use Magento\Ui\Component\Container;
+use Magento\Ui\Component\Form;
+use Magento\Ui\Component\Modal;
 
 /**
  * Data provider for Attribute Set handler in the Configurable products
@@ -202,8 +202,7 @@ protected function getNewAttributeSet()
                         'validation' => ['required-entry' => true],
                         'imports' => [
                             'visible' => 'ns = ${ $.ns }, index = affectedAttributeSetNew:checked',
-                            'disabled' =>
-                                '!ns = ${ $.ns }, index = affectedAttributeSetNew:checked',
+                            'disabled' => '!ns = ${ $.ns }, index = affectedAttributeSetNew:checked',
                         ]
                     ],
                 ],
@@ -241,8 +240,7 @@ protected function getExistingAttributeSet($meta)
                                 'imports' => [
                                     'value' => 'ns = ${ $.ns }, index = attribute_set_id:value',
                                     'visible' => 'ns = ${ $.ns }, index = affectedAttributeSetExisting:checked',
-                                    'disabled' =>
-                                        '!ns = ${ $.ns }, index = affectedAttributeSetExisting:checked',
+                                    'disabled' => '!ns = ${ $.ns }, index = affectedAttributeSetExisting:checked',
                                 ],
                             ],
                         ],
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
index 9fd225e8acaab..b720cf700b705 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\Framework\UrlInterface;
 use Magento\Ui\Component\Container;
-use Magento\Ui\Component\Form;
 use Magento\Ui\Component\DynamicRows;
+use Magento\Ui\Component\Form;
 use Magento\Ui\Component\Modal;
-use Magento\Framework\UrlInterface;
-use Magento\Catalog\Model\Locator\LocatorInterface;
 
 /**
  * Data provider for Configurable panel
@@ -197,7 +197,7 @@ public function modifyMeta(array $meta)
                                         'autoRender' => false,
                                         'componentType' => 'insertListing',
                                         'component' => 'Magento_ConfigurableProduct/js'
-                                            .'/components/associated-product-insert-listing',
+                                            . '/components/associated-product-insert-listing',
                                         'dataScope' => $this->associatedListingPrefix
                                             . static::ASSOCIATED_PRODUCT_LISTING,
                                         'externalProvider' => $this->associatedListingPrefix
@@ -328,14 +328,12 @@ protected function getButtonSet()
                                 'component' => 'Magento_Ui/js/form/components/button',
                                 'actions' => [
                                     [
-                                        'targetName' =>
-                                            $this->dataScopeName . '.configurableModal',
+                                        'targetName' => $this->dataScopeName . '.configurableModal',
                                         'actionName' => 'trigger',
                                         'params' => ['active', true],
                                     ],
                                     [
-                                        'targetName' =>
-                                            $this->dataScopeName . '.configurableModal',
+                                        'targetName' => $this->dataScopeName . '.configurableModal',
                                         'actionName' => 'openModal',
                                     ],
                                 ],
@@ -471,8 +469,7 @@ protected function getRows()
                         'sku',
                         __('SKU'),
                         [
-                            'validation' =>
-                                [
+                            'validation' => [
                                     'required-entry' => true,
                                     'max_text_length' => Sku::SKU_MAX_LENGTH,
                                 ]
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePrice.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePrice.php
index d3129a09d0056..2739e77440bb5 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePrice.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePrice.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableType;
 
 /**
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
index 636d832842f92..bfb63cdcd131c 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\CustomOptions as CustomOptionsModifier;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
+use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Ui\Component\Container;
 
 /**
diff --git a/app/code/Magento/ConfigurableProductSales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php b/app/code/Magento/ConfigurableProductSales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php
index 42d7d91fb90e8..06756b02b8998 100644
--- a/app/code/Magento/ConfigurableProductSales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php
+++ b/app/code/Magento/ConfigurableProductSales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\ConfigurableProductSales\Model\Order\Reorder;
 
-use Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityCheckerInterface;
-use Magento\Sales\Model\Order\Item;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Sales\Model\Order\Item;
+use Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityCheckerInterface;
 use Magento\Store\Model\Store;
 
 /**
diff --git a/app/code/Magento/ConfigurableProductSales/registration.php b/app/code/Magento/ConfigurableProductSales/registration.php
index 99affe39c15c1..a6d88cff482e4 100644
--- a/app/code/Magento/ConfigurableProductSales/registration.php
+++ b/app/code/Magento/ConfigurableProductSales/registration.php
@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_ConfigurableProductSales', __DIR__);
diff --git a/app/code/Magento/Contact/Controller/Index/Post.php b/app/code/Magento/Contact/Controller/Index/Post.php
index ee2d23b74df24..c69eafa4856ea 100644
--- a/app/code/Magento/Contact/Controller/Index/Post.php
+++ b/app/code/Magento/Contact/Controller/Index/Post.php
@@ -9,13 +9,13 @@
 use Magento\Contact\Model\ConfigInterface;
 use Magento\Contact\Model\MailInterface;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\HTTP\PhpEnvironment\Request;
 use Psr\Log\LoggerInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\DataObject;
 
 class Post extends \Magento\Contact\Controller\Index
 {
diff --git a/app/code/Magento/Contact/Model/Mail.php b/app/code/Magento/Contact/Model/Mail.php
index 43c1974252b5a..17ceb00a30126 100644
--- a/app/code/Magento/Contact/Model/Mail.php
+++ b/app/code/Magento/Contact/Model/Mail.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Contact\Model;
 
+use Magento\Framework\App\Area;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Mail\Template\TransportBuilder;
 use Magento\Framework\Translate\Inline\StateInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\Area;
 
 class Mail implements MailInterface
 {
diff --git a/app/code/Magento/Contact/Test/Unit/Model/MailTest.php b/app/code/Magento/Contact/Test/Unit/Model/MailTest.php
index 54583e25eaf9c..f9c8d7c2b0914 100644
--- a/app/code/Magento/Contact/Test/Unit/Model/MailTest.php
+++ b/app/code/Magento/Contact/Test/Unit/Model/MailTest.php
@@ -8,8 +8,8 @@
 
 use Magento\Contact\Model\ConfigInterface;
 use Magento\Contact\Model\Mail;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class MailTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Cron/Console/Command/CronCommand.php b/app/code/Magento/Cron/Console/Command/CronCommand.php
index 78bbb2329f8dc..513f51e5d8efb 100644
--- a/app/code/Magento/Cron/Console/Command/CronCommand.php
+++ b/app/code/Magento/Cron/Console/Command/CronCommand.php
@@ -6,16 +6,16 @@
 
 namespace Magento\Cron\Console\Command;
 
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Magento\Framework\App\ObjectManagerFactory;
-use Magento\Store\Model\Store;
-use Magento\Store\Model\StoreManager;
 use Magento\Cron\Observer\ProcessCronQueueObserver;
+use Magento\Framework\App\ObjectManagerFactory;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Shell\ComplexParameter;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Command for executing cron jobs
diff --git a/app/code/Magento/Cron/Console/Command/CronInstallCommand.php b/app/code/Magento/Cron/Console/Command/CronInstallCommand.php
index a3087b4c3d730..b6f5256b72a5c 100644
--- a/app/code/Magento/Cron/Console/Command/CronInstallCommand.php
+++ b/app/code/Magento/Cron/Console/Command/CronInstallCommand.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Cron\Console\Command;
 
+use Magento\Framework\Console\Cli;
 use Magento\Framework\Crontab\CrontabManagerInterface;
 use Magento\Framework\Crontab\TasksProviderInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * CronInstallCommand installs Magento cron tasks
diff --git a/app/code/Magento/Cron/Console/Command/CronRemoveCommand.php b/app/code/Magento/Cron/Console/Command/CronRemoveCommand.php
index a84629b3b5673..8ba47bf77dcf0 100644
--- a/app/code/Magento/Cron/Console/Command/CronRemoveCommand.php
+++ b/app/code/Magento/Cron/Console/Command/CronRemoveCommand.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Cron\Console\Command;
 
+use Magento\Framework\Console\Cli;
 use Magento\Framework\Crontab\CrontabManagerInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Framework\Console\Cli;
-use Magento\Framework\Exception\LocalizedException;
 
 /**
  * CronRemoveCommand removes Magento cron tasks
diff --git a/app/code/Magento/Cron/Model/Schedule.php b/app/code/Magento/Cron/Model/Schedule.php
index 39a58ef360cb3..3417f9e872e55 100644
--- a/app/code/Magento/Cron/Model/Schedule.php
+++ b/app/code/Magento/Cron/Model/Schedule.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Cron\Model;
 
-use Magento\Framework\Exception\CronException;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\CronException;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
diff --git a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
index f772a6c0c8493..e6f4f9cf46f90 100644
--- a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
+++ b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
@@ -9,10 +9,10 @@
  */
 namespace Magento\Cron\Observer;
 
+use Magento\Cron\Model\Schedule;
 use Magento\Framework\App\State;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Event\ObserverInterface;
-use \Magento\Cron\Model\Schedule;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Cron/Test/Unit/Console/Command/CronInstallCommandTest.php b/app/code/Magento/Cron/Test/Unit/Console/Command/CronInstallCommandTest.php
index 23403d3bdd73b..a4e59cc38f86d 100644
--- a/app/code/Magento/Cron/Test/Unit/Console/Command/CronInstallCommandTest.php
+++ b/app/code/Magento/Cron/Test/Unit/Console/Command/CronInstallCommandTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Cron\Test\Unit\Console\Command;
 
-use Symfony\Component\Console\Tester\CommandTester;
 use Magento\Cron\Console\Command\CronInstallCommand;
+use Magento\Framework\Console\Cli;
 use Magento\Framework\Crontab\CrontabManagerInterface;
 use Magento\Framework\Crontab\TasksProviderInterface;
-use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
+use Symfony\Component\Console\Tester\CommandTester;
 
 class CronInstallCommandTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Cron/Test/Unit/Console/Command/CronRemoveCommandTest.php b/app/code/Magento/Cron/Test/Unit/Console/Command/CronRemoveCommandTest.php
index fa0de64f43004..3cc7752ec9a49 100644
--- a/app/code/Magento/Cron/Test/Unit/Console/Command/CronRemoveCommandTest.php
+++ b/app/code/Magento/Cron/Test/Unit/Console/Command/CronRemoveCommandTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Cron\Test\Unit\Console\Command;
 
-use Symfony\Component\Console\Tester\CommandTester;
 use Magento\Cron\Console\Command\CronRemoveCommand;
-use Magento\Framework\Crontab\CrontabManagerInterface;
 use Magento\Framework\Console\Cli;
+use Magento\Framework\Crontab\CrontabManagerInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
+use Symfony\Component\Console\Tester\CommandTester;
 
 class CronRemoveCommandTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Cron/Test/Unit/Model/Config/Reader/DbTest.php b/app/code/Magento/Cron/Test/Unit/Model/Config/Reader/DbTest.php
index 1f69429e7c389..0a41ddb510bb3 100644
--- a/app/code/Magento/Cron/Test/Unit/Model/Config/Reader/DbTest.php
+++ b/app/code/Magento/Cron/Test/Unit/Model/Config/Reader/DbTest.php
@@ -6,7 +6,6 @@
 namespace Magento\Cron\Test\Unit\Model\Config\Reader;
 
 use Magento\Framework\App\Config;
-use Magento\GoogleAdwords\Block\Code;
 
 /**
  * Test reading for cron parameters from data base storage
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
index b16330f1b3f98..ad62971fd3e7d 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/FetchRates.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\CurrencySymbol\Controller\Adminhtml\System\Currency;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
 
 class FetchRates extends \Magento\CurrencySymbol\Controller\Adminhtml\System\Currency
 {
diff --git a/app/code/Magento/CurrencySymbol/Observer/CurrencyDisplayOptions.php b/app/code/Magento/CurrencySymbol/Observer/CurrencyDisplayOptions.php
index b3cbc2e9b2c66..cbf8f528b2da3 100644
--- a/app/code/Magento/CurrencySymbol/Observer/CurrencyDisplayOptions.php
+++ b/app/code/Magento/CurrencySymbol/Observer/CurrencyDisplayOptions.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CurrencySymbol\Observer;
 
-use Magento\Framework\Locale\Currency;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Locale\Currency;
 
 class CurrencyDisplayOptions implements ObserverInterface
 {
diff --git a/app/code/Magento/CurrencySymbol/Setup/UpgradeData.php b/app/code/Magento/CurrencySymbol/Setup/UpgradeData.php
index 474efde78ea5b..2c3ca0d808288 100644
--- a/app/code/Magento/CurrencySymbol/Setup/UpgradeData.php
+++ b/app/code/Magento/CurrencySymbol/Setup/UpgradeData.php
@@ -9,9 +9,9 @@
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\Select\QueryModifierFactory;
-use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
 
 /**
  * Data upgrade script
diff --git a/app/code/Magento/Customer/Block/Account/AuthorizationLink.php b/app/code/Magento/Customer/Block/Account/AuthorizationLink.php
index ff9d56c8fc4cb..f33fee00aec7c 100644
--- a/app/code/Magento/Customer/Block/Account/AuthorizationLink.php
+++ b/app/code/Magento/Customer/Block/Account/AuthorizationLink.php
@@ -6,7 +6,6 @@
 namespace Magento\Customer\Block\Account;
 
 use Magento\Customer\Model\Context;
-use Magento\Customer\Block\Account\SortLinkInterface;
 
 /**
  * Customer authorization link
diff --git a/app/code/Magento/Customer/Block/Account/Customer.php b/app/code/Magento/Customer/Block/Account/Customer.php
index 0c5820837d769..208de09ad0b93 100644
--- a/app/code/Magento/Customer/Block/Account/Customer.php
+++ b/app/code/Magento/Customer/Block/Account/Customer.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Customer\Block\Account;
 
-use Magento\Customer\Api\CustomerRepositoryInterface;
-
 /**
  * @api
  * @since 100.0.2
diff --git a/app/code/Magento/Customer/Block/Account/Link.php b/app/code/Magento/Customer/Block/Account/Link.php
index ed29a10abc8b7..e048a3fabeb48 100644
--- a/app/code/Magento/Customer/Block/Account/Link.php
+++ b/app/code/Magento/Customer/Block/Account/Link.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Customer\Block\Account;
 
-use Magento\Customer\Block\Account\SortLinkInterface;
-
 /**
  * Class Link
  *
diff --git a/app/code/Magento/Customer/Block/Account/Navigation.php b/app/code/Magento/Customer/Block/Account/Navigation.php
index cb38d762769f2..ef0365adff6d0 100644
--- a/app/code/Magento/Customer/Block/Account/Navigation.php
+++ b/app/code/Magento/Customer/Block/Account/Navigation.php
@@ -6,8 +6,7 @@
 
 namespace Magento\Customer\Block\Account;
 
-use \Magento\Framework\View\Element\Html\Links;
-use \Magento\Customer\Block\Account\SortLinkInterface;
+use Magento\Framework\View\Element\Html\Links;
 
 /**
  * Class for sorting links in navigation panels.
diff --git a/app/code/Magento/Customer/Block/Address/Edit.php b/app/code/Magento/Customer/Block/Address/Edit.php
index 6e21158651879..00679026880f3 100644
--- a/app/code/Magento/Customer/Block/Address/Edit.php
+++ b/app/code/Magento/Customer/Block/Address/Edit.php
@@ -6,8 +6,8 @@
 namespace Magento\Customer\Block\Address;
 
 use Magento\Customer\Model\AttributeChecker;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Customer address edit block
diff --git a/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php b/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
index 2f867d928bab0..5473a17e8b037 100644
--- a/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
+++ b/app/code/Magento/Customer/Block/Address/Renderer/RendererInterface.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Customer\Block\Address\Renderer;
 
-use Magento\Directory\Model\Country\Format;
 use Magento\Customer\Model\Address\AddressModelInterface;
+use Magento\Directory\Model\Country\Format;
 
 /**
  * Address renderer interface
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
index 81b7b8b3f96b5..b6c3a67c19b29 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
@@ -8,8 +8,8 @@
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Controller\RegistryConstants;
 use Magento\Customer\Model\Address\Mapper;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Customer\Model\Customer;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Adminhtml customer view personal information sales block.
@@ -158,7 +158,6 @@ public function __construct(
      */
     public function setCustomerRegistry(\Magento\Customer\Model\CustomerRegistry $customerRegistry)
     {
-
         $this->customerRegistry = $customerRegistry;
     }
 
@@ -170,7 +169,6 @@ public function setCustomerRegistry(\Magento\Customer\Model\CustomerRegistry $cu
      */
     public function getCustomerRegistry()
     {
-
         if (!($this->customerRegistry instanceof \Magento\Customer\Model\CustomerRegistry)) {
             return \Magento\Framework\App\ObjectManager::getInstance()->get(
                 \Magento\Customer\Model\CustomerRegistry::class
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/UnlockButton.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/UnlockButton.php
index 316cd511ef63e..35a930bf5852c 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/UnlockButton.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/UnlockButton.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Customer\Block\Adminhtml\Edit;
 
-use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 /**
  * Class UnlockButton
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
index 4a0d0f66425bb..b0366e2d26e56 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Customer\Block\Adminhtml\Sales\Order\Address\Form\Renderer;
 
-use Magento\Framework\View\Element\Template;
-
 /**
  * VAT ID element renderer
  *
diff --git a/app/code/Magento/Customer/Block/Form/Edit.php b/app/code/Magento/Customer/Block/Form/Edit.php
index 1608ba0f24367..d388786b28bab 100644
--- a/app/code/Magento/Customer/Block/Form/Edit.php
+++ b/app/code/Magento/Customer/Block/Form/Edit.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Customer\Block\Form;
 
-use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\AccountManagement;
 
 /**
diff --git a/app/code/Magento/Customer/Block/Newsletter.php b/app/code/Magento/Customer/Block/Newsletter.php
index 7a34b1d892bc1..83e2bd58cb4f4 100644
--- a/app/code/Magento/Customer/Block/Newsletter.php
+++ b/app/code/Magento/Customer/Block/Newsletter.php
@@ -5,9 +5,6 @@
  */
 namespace Magento\Customer\Block;
 
-use Magento\Customer\Api\AccountManagementInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
-
 /**
  * Customer front  newsletter manage block
  *
diff --git a/app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php b/app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php
index dd8dec0b94c15..d621a8301e5be 100644
--- a/app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php
+++ b/app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php
@@ -6,9 +6,9 @@
 namespace Magento\Customer\Console\Command;
 
 use Magento\Customer\Model\Customer;
-use Magento\Framework\Encryption\Encryptor;
 use Magento\Customer\Model\ResourceModel\Customer\Collection;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
+use Magento\Framework\Encryption\Encryptor;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php
index 2b3cb9aa61ab5..8303fa5197e2b 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirm.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirm.php
@@ -6,18 +6,18 @@
  */
 namespace Magento\Customer\Controller\Account;
 
-use Magento\Customer\Model\Url;
-use Magento\Framework\App\Action\Context;
-use Magento\Customer\Model\Session;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Helper\Address;
-use Magento\Framework\UrlFactory;
+use Magento\Customer\Model\Session;
+use Magento\Customer\Model\Url;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\StateException;
+use Magento\Framework\UrlFactory;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class Confirm
diff --git a/app/code/Magento/Customer/Controller/Account/Confirmation.php b/app/code/Magento/Customer/Controller/Account/Confirmation.php
index a3e2db0207630..cbfdf6c069564 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirmation.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirmation.php
@@ -6,14 +6,14 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Model\Session;
 use Magento\Customer\Model\Url;
 use Magento\Framework\App\Action\Context;
-use Magento\Customer\Model\Session;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\State\InvalidTransitionException;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Customer\Api\AccountManagementInterface;
-use Magento\Framework\Exception\State\InvalidTransitionException;
 
 class Confirmation extends \Magento\Customer\Controller\AbstractAccount
 {
diff --git a/app/code/Magento/Customer/Controller/Account/Create.php b/app/code/Magento/Customer/Controller/Account/Create.php
index 8f1bc107547ea..b59acb3bad23a 100644
--- a/app/code/Magento/Customer/Controller/Account/Create.php
+++ b/app/code/Magento/Customer/Controller/Account/Create.php
@@ -8,8 +8,8 @@
 
 use Magento\Customer\Model\Registration;
 use Magento\Customer\Model\Session;
-use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\View\Result\PageFactory;
 
 class Create extends \Magento\Customer\Controller\AbstractAccount
 {
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePassword.php b/app/code/Magento/Customer/Controller/Account/CreatePassword.php
index fb2e3dd42908b..b25248b06a958 100644
--- a/app/code/Magento/Customer/Controller/Account/CreatePassword.php
+++ b/app/code/Magento/Customer/Controller/Account/CreatePassword.php
@@ -8,8 +8,8 @@
 
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Model\Session;
-use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\View\Result\PageFactory;
 
 class CreatePassword extends \Magento\Customer\Controller\AbstractAccount
 {
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
index 27d8ddd99344c..ce2b322f646b4 100644
--- a/app/code/Magento/Customer/Controller/Account/CreatePost.php
+++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php
@@ -5,30 +5,30 @@
  */
 namespace Magento\Customer\Controller\Account;
 
-use Magento\Customer\Model\Account\Redirect as AccountRedirect;
+use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Api\Data\RegionInterfaceFactory;
+use Magento\Customer\Helper\Address;
+use Magento\Customer\Model\Account\Redirect as AccountRedirect;
+use Magento\Customer\Model\CustomerExtractor;
+use Magento\Customer\Model\Metadata\FormFactory;
+use Magento\Customer\Model\Registration;
+use Magento\Customer\Model\Session;
+use Magento\Customer\Model\Url as CustomerUrl;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\App\Action\Context;
-use Magento\Customer\Model\Session;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Form\FormKey\Validator;
+use Magento\Framework\Escaper;
+use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Customer\Api\AccountManagementInterface;
-use Magento\Customer\Helper\Address;
+use Magento\Framework\Exception\StateException;
 use Magento\Framework\UrlFactory;
-use Magento\Customer\Model\Metadata\FormFactory;
 use Magento\Newsletter\Model\SubscriberFactory;
-use Magento\Customer\Api\Data\RegionInterfaceFactory;
-use Magento\Customer\Api\Data\AddressInterfaceFactory;
-use Magento\Customer\Api\Data\CustomerInterfaceFactory;
-use Magento\Customer\Model\Url as CustomerUrl;
-use Magento\Customer\Model\Registration;
-use Magento\Framework\Escaper;
-use Magento\Customer\Model\CustomerExtractor;
-use Magento\Framework\Exception\StateException;
-use Magento\Framework\Exception\InputException;
-use Magento\Framework\Data\Form\FormKey\Validator;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
diff --git a/app/code/Magento/Customer/Controller/Account/Edit.php b/app/code/Magento/Customer/Controller/Account/Edit.php
index 3c1e60199399b..55a51cba05806 100644
--- a/app/code/Magento/Customer/Controller/Account/Edit.php
+++ b/app/code/Magento/Customer/Controller/Account/Edit.php
@@ -7,10 +7,10 @@
 namespace Magento\Customer\Controller\Account;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Framework\Api\DataObjectHelper;
 use Magento\Customer\Model\Session;
-use Magento\Framework\View\Result\PageFactory;
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\View\Result\PageFactory;
 
 class Edit extends \Magento\Customer\Controller\AbstractAccount
 {
diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php
index 3f895ad2f17ac..ba47f1868d21a 100644
--- a/app/code/Magento/Customer/Controller/Account/EditPost.php
+++ b/app/code/Magento/Customer/Controller/Account/EditPost.php
@@ -6,17 +6,16 @@
  */
 namespace Magento\Customer\Controller\Account;
 
-use Magento\Customer\Model\AuthenticationInterface;
-use Magento\Customer\Model\Customer\Mapper;
-use Magento\Customer\Model\EmailNotificationInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\AuthenticationInterface;
+use Magento\Customer\Model\Customer\Mapper;
 use Magento\Customer\Model\CustomerExtractor;
+use Magento\Customer\Model\EmailNotificationInterface;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
 use Magento\Framework\Exception\State\UserLockedException;
@@ -103,7 +102,6 @@ public function __construct(
      */
     private function getAuthentication()
     {
-
         if (!($this->authentication instanceof AuthenticationInterface)) {
             return ObjectManager::getInstance()->get(
                 \Magento\Customer\Model\AuthenticationInterface::class
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
index b55863a3b486a..02fc321dbb9c6 100644
--- a/app/code/Magento/Customer/Controller/Account/LoginPost.php
+++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -5,17 +5,17 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Model\Account\Redirect as AccountRedirect;
-use Magento\Framework\App\Action\Context;
 use Magento\Customer\Model\Session;
-use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Model\Url as CustomerUrl;
-use Magento\Framework\Exception\EmailNotConfirmedException;
-use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Data\Form\FormKey\Validator;
+use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\State\UserLockedException;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
index 3de44e35d2447..f2e74e3b2050e 100644
--- a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
+++ b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
@@ -8,11 +8,11 @@
 
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Customer\CredentialsValidator;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\Exception\InputException;
-use Magento\Customer\Model\Customer\CredentialsValidator;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\InputException;
 
 class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount
 {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php b/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php
index 7337d005a7323..372e953d240bd 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Customer/InvalidateToken.php
@@ -7,15 +7,15 @@
 
 namespace Magento\Customer\Controller\Adminhtml\Customer;
 
-use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Customer\Model\Address\Mapper;
-use Magento\Framework\DataObjectFactory;
 use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\DataObjectFactory;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
 
 /**
  * Class to invalidate tokens for customers
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
index 936d9cdbc1704..b90b254a7eecb 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php
@@ -7,7 +7,6 @@
 namespace Magento\Customer\Controller\Adminhtml\Group;
 
 use Magento\Customer\Api\Data\GroupInterfaceFactory;
-use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
 
 class Save extends \Magento\Customer\Controller\Adminhtml\Group
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Index.php
index a0317a51260da..a415fbe2d3e8f 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index.php
@@ -12,9 +12,9 @@
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Customer\Controller\RegistryConstants;
 use Magento\Customer\Model\Address\Mapper;
-use Magento\Framework\Message\Error;
-use Magento\Framework\DataObjectFactory as ObjectFactory;
 use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\DataObjectFactory as ObjectFactory;
+use Magento\Framework\Message\Error;
 
 /**
  * Class Index
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
index ebab2a42a02ec..0224cc0183f2e 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
-use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
-use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 
 /**
  * Class AbstractMassStatus
@@ -79,7 +79,7 @@ public function execute()
      */
     protected function getComponentRefererUrl()
     {
-        return $this->filter->getComponentRefererUrl()?: 'customer/*/index';
+        return $this->filter->getComponentRefererUrl() ?: 'customer/*/index';
     }
 
     /**
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
index 1e4c1fb001ea3..c376a17d5940d 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
@@ -11,8 +11,8 @@
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Customer\Model\Address\Mapper;
-use Magento\Framework\DataObjectFactory as ObjectFactory;
 use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\DataObjectFactory as ObjectFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
index 2d0ee3ae13da4..4deaa07907dbd 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/InlineEdit.php
@@ -6,11 +6,10 @@
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
 use Magento\Backend\App\Action;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\EmailNotificationInterface;
-use Magento\Customer\Test\Block\Form\Login;
 use Magento\Customer\Ui\Component\Listing\AttributeRepository;
-use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
index 762b872b97b6d..0a97809c6202f 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassAssignGroup.php
@@ -6,11 +6,11 @@
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
 use Magento\Backend\App\Action\Context;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
-use Magento\Ui\Component\MassAction\Filter;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * Class MassAssignGroup
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php
index 453585c881a05..ec587a1fcc53b 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassDelete.php
@@ -6,11 +6,11 @@
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
 use Magento\Backend\App\Action\Context;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
-use Magento\Ui\Component\MassAction\Filter;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * Class MassDelete
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassSubscribe.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassSubscribe.php
index 25c56ac60c14b..58701bbb6de00 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassSubscribe.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassSubscribe.php
@@ -6,12 +6,12 @@
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
 use Magento\Backend\App\Action\Context;
-use Magento\Ui\Component\MassAction\Filter;
-use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * Class MassSubscribe
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassUnsubscribe.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassUnsubscribe.php
index 4b40722ba9ab2..a55224f6df222 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/MassUnsubscribe.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/MassUnsubscribe.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Backend\App\Action\Context;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
+use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\Backend\App\Action\Context;
 use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\Ui\Component\MassAction\Filter;
-use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
-use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 
 /**
  * Class MassUnsubscribe
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
index 711fab9e608bf..b8e7447d3a35b 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Viewfile.php
@@ -12,9 +12,9 @@
 use Magento\Customer\Api\Data\AddressInterfaceFactory;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
 use Magento\Customer\Model\Address\Mapper;
-use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\DataObjectFactory;
+use Magento\Framework\Exception\NotFoundException;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Locks/Unlock.php b/app/code/Magento/Customer/Controller/Adminhtml/Locks/Unlock.php
index 1fd06a3182948..742872e4f024e 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Locks/Unlock.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Locks/Unlock.php
@@ -6,9 +6,9 @@
  */
 namespace Magento\Customer\Controller\Adminhtml\Locks;
 
+use Magento\Backend\App\Action;
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\Backend\App\Action;
 
 /**
  * Unlock Customer Controller
diff --git a/app/code/Magento/Customer/Controller/Ajax/Login.php b/app/code/Magento/Customer/Controller/Ajax/Login.php
index 8664e0cbf87ea..7df96260343bd 100644
--- a/app/code/Magento/Customer/Controller/Ajax/Login.php
+++ b/app/code/Magento/Customer/Controller/Ajax/Login.php
@@ -7,14 +7,14 @@
 namespace Magento\Customer\Controller\Ajax;
 
 use Magento\Customer\Api\AccountManagementInterface;
-use Magento\Framework\Exception\EmailNotConfirmedException;
-use Magento\Framework\Exception\InvalidEmailOrPasswordException;
-use Magento\Framework\App\ObjectManager;
 use Magento\Customer\Model\Account\Redirect as AccountRedirect;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\EmailNotConfirmedException;
+use Magento\Framework\Exception\InvalidEmailOrPasswordException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Stdlib\CookieManagerInterface;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
+use Magento\Framework\Stdlib\CookieManagerInterface;
 
 /**
  * Login controller
diff --git a/app/code/Magento/Customer/Controller/Plugin/Account.php b/app/code/Magento/Customer/Controller/Plugin/Account.php
index 179da148e7f78..98857d1533335 100644
--- a/app/code/Magento/Customer/Controller/Plugin/Account.php
+++ b/app/code/Magento/Customer/Controller/Plugin/Account.php
@@ -6,10 +6,10 @@
 namespace Magento\Customer\Controller\Plugin;
 
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\Action\AbstractAction;
 use Magento\Framework\App\ActionInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\App\Action\AbstractAction;
 use Magento\Framework\Controller\ResultInterface;
 
 class Account
diff --git a/app/code/Magento/Customer/Helper/View.php b/app/code/Magento/Customer/Helper/View.php
index a47930abb6d0e..6f615068ebd08 100644
--- a/app/code/Magento/Customer/Helper/View.php
+++ b/app/code/Magento/Customer/Helper/View.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Customer\Helper;
 
-use Magento\Customer\Api\CustomerNameGenerationInterface;
 use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Customer\Api\CustomerNameGenerationInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 
 /**
diff --git a/app/code/Magento/Customer/Model/Account/Redirect.php b/app/code/Magento/Customer/Model/Account/Redirect.php
index 2e8d596474e96..c14f282bf3f6e 100644
--- a/app/code/Magento/Customer/Model/Account/Redirect.php
+++ b/app/code/Magento/Customer/Model/Account/Redirect.php
@@ -7,18 +7,18 @@
 
 use Magento\Customer\Model\Session;
 use Magento\Customer\Model\Url as CustomerUrl;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Forward as ResultForward;
+use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Stdlib\CookieManagerInterface;
+use Magento\Framework\Url\DecoderInterface;
 use Magento\Framework\Url\HostChecker;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
-use Magento\Framework\Controller\Result\Forward as ResultForward;
-use Magento\Framework\Url\DecoderInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Stdlib\CookieManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Model/AccountConfirmation.php b/app/code/Magento/Customer/Model/AccountConfirmation.php
index 7d01ff0efc411..aea718731115a 100644
--- a/app/code/Magento/Customer/Model/AccountConfirmation.php
+++ b/app/code/Magento/Customer/Model/AccountConfirmation.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Customer\Model;
 
-use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Registry;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Class AccountConfirmation.
diff --git a/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php b/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php
index b8c83551ee381..ddae398c27e95 100644
--- a/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php
+++ b/app/code/Magento/Customer/Model/App/Action/ContextPlugin.php
@@ -8,10 +8,10 @@
 
 use Magento\Customer\Model\Context;
 use Magento\Customer\Model\GroupManagement;
-use Magento\Framework\App\Action\AbstractAction;
-use Magento\Framework\App\RequestInterface;
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\Action\AbstractAction;
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\App\RequestInterface;
 
 /**
  * Class ContextPlugin
diff --git a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
index 380b8a4d3446f..9410001ad7e01 100644
--- a/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
+++ b/app/code/Magento/Customer/Model/Attribute/Data/Postcode.php
@@ -9,8 +9,8 @@
 use Magento\Eav\Model\AttributeDataFactory;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Locale\ResolverInterface;
-use Psr\Log\LoggerInterface as PsrLogger;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface as MagentoTimezone;
+use Psr\Log\LoggerInterface as PsrLogger;
 
 /**
  * Customer Address Postal/Zip Code Attribute Data Model
diff --git a/app/code/Magento/Customer/Model/AttributeMetadataConverter.php b/app/code/Magento/Customer/Model/AttributeMetadataConverter.php
index 44d104659e069..1bd73e02636c9 100644
--- a/app/code/Magento/Customer/Model/AttributeMetadataConverter.php
+++ b/app/code/Magento/Customer/Model/AttributeMetadataConverter.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Customer\Model;
 
+use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
 use Magento\Customer\Api\Data\OptionInterfaceFactory;
 use Magento\Customer\Api\Data\ValidationRuleInterfaceFactory;
-use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
 use Magento\Eav\Api\Data\AttributeDefaultValueInterface;
 
 /**
diff --git a/app/code/Magento/Customer/Model/Authentication.php b/app/code/Magento/Customer/Model/Authentication.php
index 0967f1a0189e3..8755327a026b9 100644
--- a/app/code/Magento/Customer/Model/Authentication.php
+++ b/app/code/Magento/Customer/Model/Authentication.php
@@ -5,10 +5,8 @@
  */
 namespace Magento\Customer\Model;
 
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Model\ResourceModel\CustomerRepository;
-use Magento\Customer\Model\CustomerAuthUpdate;
 use Magento\Backend\App\ConfigInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Encryption\EncryptorInterface as Encryptor;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
 use Magento\Framework\Exception\State\UserLockedException;
diff --git a/app/code/Magento/Customer/Model/Checkout/ConfigProvider.php b/app/code/Magento/Customer/Model/Checkout/ConfigProvider.php
index 36eabe3571ceb..a30ca2a85d14e 100644
--- a/app/code/Magento/Customer/Model/Checkout/ConfigProvider.php
+++ b/app/code/Magento/Customer/Model/Checkout/ConfigProvider.php
@@ -6,13 +6,13 @@
 namespace Magento\Customer\Model\Checkout;
 
 use Magento\Checkout\Model\ConfigProviderInterface;
+use Magento\Customer\Model\Form;
 use Magento\Customer\Model\Url;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\UrlInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Customer\Model\Form;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class ConfigProvider implements ConfigProviderInterface
 {
diff --git a/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php b/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php
index bf1fae8d34bed..f6148b1fd15e5 100644
--- a/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php
+++ b/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Customer\Model\Config\Source\Group;
 
-use Magento\Customer\Model\Customer\Attribute\Source\GroupSourceLoggedInOnlyInterface;
 use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Customer\Model\Customer\Attribute\Source\GroupSourceLoggedInOnlyInterface;
 use Magento\Framework\App\ObjectManager;
 
 class Multiselect implements \Magento\Framework\Option\ArrayInterface
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index e0a7281776de9..07ee7957e84a4 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -12,13 +12,13 @@
 use Magento\Customer\Model\ResourceModel\Address\CollectionFactory;
 use Magento\Customer\Model\ResourceModel\Customer as ResourceCustomer;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
 use Magento\Framework\Indexer\StateInterface;
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Customer model
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Source/GroupSourceLoggedInOnlyInterface.php b/app/code/Magento/Customer/Model/Customer/Attribute/Source/GroupSourceLoggedInOnlyInterface.php
index e57053118300e..7a25699930bd8 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Source/GroupSourceLoggedInOnlyInterface.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Source/GroupSourceLoggedInOnlyInterface.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Model\Customer\Attribute\Source;
 
-use \Magento\Framework\Data\OptionSourceInterface;
+use Magento\Framework\Data\OptionSourceInterface;
 
 /**
  * Interface \Magento\Customer\Model\Customer\Attribute\Source\GroupSourceLoggedInOnlyInterface
@@ -14,5 +14,4 @@
  */
 interface GroupSourceLoggedInOnlyInterface extends OptionSourceInterface
 {
-
 }
diff --git a/app/code/Magento/Customer/Model/Customer/Source/Group.php b/app/code/Magento/Customer/Model/Customer/Source/Group.php
index e4c1d2e75be22..e138613de920c 100644
--- a/app/code/Magento/Customer/Model/Customer/Source/Group.php
+++ b/app/code/Magento/Customer/Model/Customer/Source/Group.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Customer\Model\Customer\Source;
 
-use Magento\Customer\Api\Data\GroupSearchResultsInterface;
-use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Customer\Api\Data\GroupInterface;
+use Magento\Customer\Api\Data\GroupSearchResultsInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Module\Manager as ModuleManager;
 
 class Group implements GroupSourceInterface
 {
diff --git a/app/code/Magento/Customer/Model/Customer/Source/GroupSourceInterface.php b/app/code/Magento/Customer/Model/Customer/Source/GroupSourceInterface.php
index 26be387a02f9c..ad34f437e72c2 100644
--- a/app/code/Magento/Customer/Model/Customer/Source/GroupSourceInterface.php
+++ b/app/code/Magento/Customer/Model/Customer/Source/GroupSourceInterface.php
@@ -13,5 +13,4 @@
  */
 interface GroupSourceInterface extends OptionSourceInterface
 {
-
 }
diff --git a/app/code/Magento/Customer/Model/Data/Address.php b/app/code/Magento/Customer/Model/Data/Address.php
index f4cf228fb557c..8cc3bead4d624 100644
--- a/app/code/Magento/Customer/Model/Data/Address.php
+++ b/app/code/Magento/Customer/Model/Data/Address.php
@@ -8,7 +8,7 @@
 namespace Magento\Customer\Model\Data;
 
 use Magento\Customer\Api\Data\RegionInterface;
-use \Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Api\AttributeValueFactory;
 
 /**
  * Class Address
diff --git a/app/code/Magento/Customer/Model/Data/AttributeMetadata.php b/app/code/Magento/Customer/Model/Data/AttributeMetadata.php
index 578362f7228d1..b1984cb6d3d19 100644
--- a/app/code/Magento/Customer/Model/Data/AttributeMetadata.php
+++ b/app/code/Magento/Customer/Model/Data/AttributeMetadata.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Customer\Model\Data;
 
-use Magento\Customer\Api\Data\AttributeMetadataInterface;
-
 /**
  * Customer attribute metadata class.
  */
diff --git a/app/code/Magento/Customer/Model/Data/Customer.php b/app/code/Magento/Customer/Model/Data/Customer.php
index 7a135904f6663..44502908ba79a 100644
--- a/app/code/Magento/Customer/Model/Data/Customer.php
+++ b/app/code/Magento/Customer/Model/Data/Customer.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Model\Data;
 
-use \Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Api\AttributeValueFactory;
 
 /**
  * Class Customer
diff --git a/app/code/Magento/Customer/Model/Data/ValidationRule.php b/app/code/Magento/Customer/Model/Data/ValidationRule.php
index fb979a1c87602..80ee33bd7de20 100644
--- a/app/code/Magento/Customer/Model/Data/ValidationRule.php
+++ b/app/code/Magento/Customer/Model/Data/ValidationRule.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Customer\Model\Data;
 
-use Magento\Customer\Api\Data\ValidationRuleInterface;
-
 class ValidationRule extends \Magento\Framework\Api\AbstractSimpleObject implements
     \Magento\Customer\Api\Data\ValidationRuleInterface
 {
diff --git a/app/code/Magento/Customer/Model/EmailNotification.php b/app/code/Magento/Customer/Model/EmailNotification.php
index 14ae9a885c7b1..1787341224a8c 100644
--- a/app/code/Magento/Customer/Model/EmailNotification.php
+++ b/app/code/Magento/Customer/Model/EmailNotification.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Customer\Model;
 
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Helper\View as CustomerViewHelper;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Mail\Template\TransportBuilder;
-use Magento\Customer\Helper\View as CustomerViewHelper;
-use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\Reflection\DataObjectProcessor;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Model/FileUploader.php b/app/code/Magento/Customer/Model/FileUploader.php
index b94eff6bdff44..e6d24c6a3a84d 100644
--- a/app/code/Magento/Customer/Model/FileUploader.php
+++ b/app/code/Magento/Customer/Model/FileUploader.php
@@ -8,7 +8,6 @@
 use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
-use Magento\Customer\Model\FileProcessorFactory;
 use Magento\Customer\Model\Metadata\ElementFactory;
 use Magento\Framework\Exception\LocalizedException;
 
diff --git a/app/code/Magento/Customer/Model/GroupManagement.php b/app/code/Magento/Customer/Model/GroupManagement.php
index 47d7d7ad1ac41..2d71e83f816ed 100644
--- a/app/code/Magento/Customer/Model/GroupManagement.php
+++ b/app/code/Magento/Customer/Model/GroupManagement.php
@@ -8,14 +8,13 @@
 namespace Magento\Customer\Model;
 
 use Magento\Customer\Api\Data\GroupInterface;
+use Magento\Customer\Api\Data\GroupInterfaceFactory;
+use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Customer\Api\GroupRepositoryInterface;
-use Magento\Customer\Api\Data\GroupInterfaceFactory;
-use Magento\Customer\Model\GroupFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Model/Indexer/Address/AttributeProvider.php b/app/code/Magento/Customer/Model/Indexer/Address/AttributeProvider.php
index 64f51e162e7c5..8f5f55d433a9e 100644
--- a/app/code/Magento/Customer/Model/Indexer/Address/AttributeProvider.php
+++ b/app/code/Magento/Customer/Model/Indexer/Address/AttributeProvider.php
@@ -5,9 +5,7 @@
  */
 namespace Magento\Customer\Model\Indexer\Address;
 
-use Magento\Customer\Model\ResourceModel\Address\Attribute\Collection;
 use Magento\Eav\Model\Config;
-use Magento\Eav\Model\Entity\Attribute;
 
 class AttributeProvider extends \Magento\Customer\Model\Indexer\AttributeProvider
 {
diff --git a/app/code/Magento/Customer/Model/Indexer/Attribute/Filter.php b/app/code/Magento/Customer/Model/Indexer/Attribute/Filter.php
index 9380b32288dd7..be3f69160610a 100644
--- a/app/code/Magento/Customer/Model/Indexer/Attribute/Filter.php
+++ b/app/code/Magento/Customer/Model/Indexer/Attribute/Filter.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Customer\Model\Indexer\Attribute;
 
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
 use Magento\Customer\Model\Customer;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
 use Magento\Framework\Indexer\StateInterface;
 
 class Filter
diff --git a/app/code/Magento/Customer/Model/Indexer/AttributeProvider.php b/app/code/Magento/Customer/Model/Indexer/AttributeProvider.php
index 337bf7b5013ff..c8a87f5bc2ed9 100644
--- a/app/code/Magento/Customer/Model/Indexer/AttributeProvider.php
+++ b/app/code/Magento/Customer/Model/Indexer/AttributeProvider.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Customer\Model\Indexer;
 
+use Magento\Customer\Model\Attribute;
 use Magento\Customer\Model\Customer;
-use Magento\Framework\Indexer\FieldsetInterface;
 use Magento\Eav\Model\Config;
-use Magento\Customer\Model\Attribute;
+use Magento\Framework\Indexer\FieldsetInterface;
 
 class AttributeProvider implements FieldsetInterface
 {
diff --git a/app/code/Magento/Customer/Model/Metadata/AttributeResolver.php b/app/code/Magento/Customer/Model/Metadata/AttributeResolver.php
index 2692e5699df52..ca7c09b9fde84 100644
--- a/app/code/Magento/Customer/Model/Metadata/AttributeResolver.php
+++ b/app/code/Magento/Customer/Model/Metadata/AttributeResolver.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Customer\Model\Metadata;
 
+use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Customer\Model\Attribute;
 use Magento\Customer\Model\AttributeMetadataDataProvider;
-use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
 class AttributeResolver
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Postcode.php b/app/code/Magento/Customer/Model/Metadata/Form/Postcode.php
index 6f751558d29c9..2a2eee8bcd920 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Postcode.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Postcode.php
@@ -9,8 +9,8 @@
 use Magento\Customer\Model\Metadata\ElementFactory;
 use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Framework\Locale\ResolverInterface;
-use Psr\Log\LoggerInterface as PsrLogger;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface as MagentoTimezone;
+use Psr\Log\LoggerInterface as PsrLogger;
 
 /**
  * Customer Address Postal/Zip Code Attribute Data Model
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer.php b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
index 7e5f9d51549ec..8363b13f8099e 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Customer.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
@@ -7,8 +7,8 @@
 
 use Magento\Customer\Model\Customer\NotificationStorage;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Validator\Exception as ValidatorException;
 use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Validator\Exception as ValidatorException;
 
 /**
  * Customer entity resource model
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php b/app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php
index 281abc77d2267..feb0738e6aa65 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer/Grid.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Customer\Model\ResourceModel\Customer;
 
+use Magento\Customer\Model\Customer;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
-use Magento\Customer\Model\Customer;
 
 /**
  * @deprecated 100.1.0
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Group.php b/app/code/Magento/Customer/Model/ResourceModel/Group.php
index 80203e742e09a..46195dc425bb4 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Group.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Group.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Customer\Model\ResourceModel;
 
-use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite;
+use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
 
 /**
  * Customer group resource model
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollection.php b/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollection.php
index c0afd353fa7a7..7fe6a687d3fc9 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollection.php
@@ -8,7 +8,6 @@
 
 namespace Magento\Customer\Model\ResourceModel\Group\Grid;
 
-use Magento\Framework\Data\Collection\EntityFactory;
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\Api\AbstractServiceCollection;
@@ -16,6 +15,7 @@
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SimpleDataObjectConverter;
 use Magento\Framework\Api\SortOrderBuilder;
+use Magento\Framework\Data\Collection\EntityFactory;
 
 /**
  * Customer group collection backed by services
diff --git a/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php b/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
index d004b99c5a3c9..8a6f69f5a7a3c 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
@@ -6,17 +6,17 @@
 
 namespace Magento\Customer\Model\ResourceModel;
 
+use Magento\Customer\Api\Data\GroupExtensionInterface;
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Customer\Model\ResourceModel\Group\Collection;
+use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\Search\FilterGroup;
-use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\State\InvalidTransitionException;
 use Magento\Tax\Api\Data\TaxClassInterface;
 use Magento\Tax\Api\TaxClassManagementInterface;
-use Magento\Framework\Api\ExtensibleDataInterface;
-use Magento\Customer\Api\Data\GroupExtensionInterface;
 
 /**
  * Customer group CRUD class
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Online/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Online/Grid/Collection.php
index 0262bf30dc827..b04b00b7ad602 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Online/Grid/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Online/Grid/Collection.php
@@ -5,12 +5,11 @@
  */
 namespace Magento\Customer\Model\ResourceModel\Online\Grid;
 
-use Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult;
 use Magento\Customer\Model\Visitor;
-use Magento\Framework\Api;
-use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
 use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
+use Magento\Framework\Event\ManagerInterface as EventManager;
+use Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult;
 use Psr\Log\LoggerInterface as Logger;
 
 /**
diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index 9822e2ad1b80e..ae49ad277ead3 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -8,10 +8,10 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Store\Model\Store;
 use Magento\Store\Model\Information as StoreInformation;
-use Psr\Log\LoggerInterface as PsrLogger;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Psr\Log\LoggerInterface as PsrLogger;
 
 /**
  * Customer VAT model
diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
index b4bad240bc825..03c12a073c0d8 100644
--- a/app/code/Magento/Customer/Model/Visitor.php
+++ b/app/code/Magento/Customer/Model/Visitor.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Customer\Model;
 
-use Magento\Framework\Indexer\StateInterface;
-
 /**
  * Class Visitor
  * @package Magento\Customer\Model
diff --git a/app/code/Magento/Customer/Observer/BeforeAddressSaveObserver.php b/app/code/Magento/Customer/Observer/BeforeAddressSaveObserver.php
index a24b27543a5cc..5374eb0677841 100644
--- a/app/code/Magento/Customer/Observer/BeforeAddressSaveObserver.php
+++ b/app/code/Magento/Customer/Observer/BeforeAddressSaveObserver.php
@@ -7,10 +7,10 @@
 namespace Magento\Customer\Observer;
 
 use Magento\Customer\Helper\Address as HelperAddress;
+use Magento\Customer\Model\Address;
 use Magento\Customer\Model\Address\AbstractAddress;
-use Magento\Framework\Registry;
 use Magento\Framework\Event\ObserverInterface;
-use Magento\Customer\Model\Address;
+use Magento\Framework\Registry;
 
 /**
  * Customer Observer Model
diff --git a/app/code/Magento/Customer/Observer/LogLastLoginAtObserver.php b/app/code/Magento/Customer/Observer/LogLastLoginAtObserver.php
index 0228921a1c280..cedb91e8b5cc3 100644
--- a/app/code/Magento/Customer/Observer/LogLastLoginAtObserver.php
+++ b/app/code/Magento/Customer/Observer/LogLastLoginAtObserver.php
@@ -6,7 +6,6 @@
 namespace Magento\Customer\Observer;
 
 use Magento\Customer\Model\Logger;
-use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 
diff --git a/app/code/Magento/Customer/Observer/LogLastLogoutAtObserver.php b/app/code/Magento/Customer/Observer/LogLastLogoutAtObserver.php
index 535128e6a4b0a..3ff45a4725d5d 100644
--- a/app/code/Magento/Customer/Observer/LogLastLogoutAtObserver.php
+++ b/app/code/Magento/Customer/Observer/LogLastLogoutAtObserver.php
@@ -6,7 +6,6 @@
 namespace Magento\Customer\Observer;
 
 use Magento\Customer\Model\Logger;
-use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 
diff --git a/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php b/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
index eb7e81009c92c..133cbae403673 100644
--- a/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
+++ b/app/code/Magento/Customer/Observer/UpgradeCustomerPasswordObserver.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Customer\Observer;
 
-use Magento\Framework\Encryption\EncryptorInterface;
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Framework\Event\ObserverInterface;
 
 class UpgradeCustomerPasswordObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/Customer/Setup/CustomerSetup.php b/app/code/Magento/Customer/Setup/CustomerSetup.php
index b1f07e4872fd8..61a84a1072da1 100644
--- a/app/code/Magento/Customer/Setup/CustomerSetup.php
+++ b/app/code/Magento/Customer/Setup/CustomerSetup.php
@@ -7,12 +7,13 @@
  */
 namespace Magento\Customer\Setup;
 
+use Magento\Customer\Model\ResourceModel\Address\Attribute\Collection;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Setup\Context;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
 use Magento\Eav\Setup\EavSetup;
 use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Group\CollectionFactory;
 
 /**
  * @codeCoverageIgnore
@@ -345,8 +346,7 @@ public function getDefaultEntities()
                 'attribute_model' => \Magento\Customer\Model\Attribute::class,
                 'table' => 'customer_address_entity',
                 'additional_attribute_table' => 'customer_eav_attribute',
-                'entity_attribute_collection' =>
-                    \Magento\Customer\Model\ResourceModel\Address\Attribute\Collection::class,
+                'entity_attribute_collection' => Collection::class,
                 'attributes' => [
                     'prefix' => [
                         'type' => 'static',
diff --git a/app/code/Magento/Customer/Setup/UpgradeData.php b/app/code/Magento/Customer/Setup/UpgradeData.php
index 0ad36b1d6d11c..61f815f180a5c 100644
--- a/app/code/Magento/Customer/Setup/UpgradeData.php
+++ b/app/code/Magento/Customer/Setup/UpgradeData.php
@@ -9,16 +9,16 @@
 use Magento\Customer\Model\Customer;
 use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\Encryption\Encryptor;
 use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\Setup\SetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\SetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\DB\FieldDataConverterFactory;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php b/app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php
index 02d31d69e73df..75ec1aa254a21 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Account/Dashboard/InfoTest.php
@@ -8,8 +8,8 @@
 
 namespace Magento\Customer\Test\Unit\Block\Account\Dashboard;
 
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Customer\Block\Account\Dashboard\Info;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Test class for \Magento\Customer\Block\Account\Dashboard\Info.
diff --git a/app/code/Magento/Customer/Test/Unit/Block/CustomerScopeDataTest.php b/app/code/Magento/Customer/Test/Unit/Block/CustomerScopeDataTest.php
index cfafbb7ece782..9e9dc95f351a2 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/CustomerScopeDataTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/CustomerScopeDataTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Customer\Test\Unit\Block;
 
+use Magento\Customer\Block\CustomerScopeData;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Json\EncoderInterface;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Customer\Block\CustomerScopeData;
-use Magento\Framework\Json\EncoderInterface;
 
 class CustomerScopeDataTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
index 74b2c119784e6..9e691ee392954 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
@@ -8,8 +8,8 @@
 
 namespace Magento\Customer\Test\Unit\Block\Widget;
 
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Customer\Block\Widget\Dob;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Locale\Resolver;
 
 /**
@@ -480,7 +480,7 @@ public function testGetMaxDateRangeWithException()
             );
         $this->assertNull($this->_block->getMaxDateRange());
     }
-    
+
     public function testGetHtmlExtraParamsWithoutRequiredOption()
     {
         $this->escaper->expects($this->any())
@@ -509,7 +509,6 @@ public function testGetHtmlExtraParamsWithRequiredOption()
             ->with('{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"}}')
             ->will($this->returnValue('{"required":true,"validate-date":{"dateFormat":"M\/d\/Y"}}'));
 
-
         $this->context->expects($this->any())->method('getEscaper')->will($this->returnValue($this->escaper));
 
         $this->assertEquals(
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Widget/GenderTest.php b/app/code/Magento/Customer/Test/Unit/Block/Widget/GenderTest.php
index 5eaf54810addb..ae4f5c92c5286 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Widget/GenderTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Widget/GenderTest.php
@@ -9,7 +9,6 @@
 namespace Magento\Customer\Test\Unit\Block\Widget;
 
 use Magento\Customer\Block\Widget\Gender;
-use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 
 class GenderTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Widget/NameTest.php b/app/code/Magento/Customer/Test/Unit/Block/Widget/NameTest.php
index 3f174484df3e1..73845eff6a68c 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Widget/NameTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Widget/NameTest.php
@@ -9,8 +9,8 @@
 namespace Magento\Customer\Test\Unit\Block\Widget;
 
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Customer\Block\Widget\Name;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Test class for \Magento\Customer\Block\Widget\Name.
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Widget/TaxvatTest.php b/app/code/Magento/Customer/Test/Unit/Block/Widget/TaxvatTest.php
index e132d10ae8667..e55695d585013 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Widget/TaxvatTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Widget/TaxvatTest.php
@@ -8,8 +8,8 @@
 
 namespace Magento\Customer\Test\Unit\Block\Widget;
 
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Customer\Block\Widget\Taxvat;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 class TaxvatTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Customer/Test/Unit/Console/Command/UpgradeHashAlgorithmCommandTest.php b/app/code/Magento/Customer/Test/Unit/Console/Command/UpgradeHashAlgorithmCommandTest.php
index ad73d4d1cdcbe..9f50e440e1e9c 100644
--- a/app/code/Magento/Customer/Test/Unit/Console/Command/UpgradeHashAlgorithmCommandTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Console/Command/UpgradeHashAlgorithmCommandTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Customer\Test\Unit\Console\Command;
 
 use Magento\Customer\Console\Command\UpgradeHashAlgorithmCommand;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class UpgradeHashAlgorithmCommandTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmationTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmationTest.php
index 113f8c104a4ea..5e0fb4fe340a5 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmationTest.php
@@ -16,7 +16,7 @@ class ConfirmationTest extends \PHPUnit\Framework\TestCase
      * @var Confirmation
      */
     private $model;
-    
+
     /**
      * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -59,7 +59,7 @@ public function setUp()
         $this->contextMock->expects($this->any())
             ->method('getRequest')
             ->willReturn($this->requestMock);
-        
+
         $this->resultPageFactoryMock = $this->getMockBuilder(\Magento\Framework\View\Result\PageFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
@@ -84,7 +84,7 @@ public function testGetLoginUrl()
         $this->customerSessionMock->expects($this->once())
             ->method('isLoggedIn')
             ->willReturn(false);
-        
+
         $this->requestMock->expects($this->once())->method('getPost')->with('email')->willReturn(null);
 
         $resultPageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php
index 5f7064d5b124b..8b9c40afebe1a 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php
@@ -7,8 +7,8 @@
 
 use Magento\Customer\Api\Data\GroupInterfaceFactory;
 use Magento\Customer\Controller\Adminhtml\Group\Save;
-use Magento\Framework\Controller\Result\RedirectFactory;
 use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\Result\RedirectFactory;
 use Magento\Framework\Reflection\DataObjectProcessor;
 
 /**
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ResetPasswordTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ResetPasswordTest.php
index 02d071ab394a5..ae376e953c875 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ResetPasswordTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ResetPasswordTest.php
@@ -8,7 +8,6 @@
 
 namespace Magento\Customer\Test\Unit\Controller\Adminhtml\Index;
 
-use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\AccountManagement;
 use Magento\Framework\Exception\NoSuchEntityException;
 
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Plugin/AccountTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Plugin/AccountTest.php
index 2c70a8bda28fe..3b133800fa4ee 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Plugin/AccountTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Plugin/AccountTest.php
@@ -7,9 +7,9 @@
 
 use Magento\Customer\Controller\Plugin\Account;
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\Action\AbstractAction;
 use Magento\Framework\App\ActionFlag;
 use Magento\Framework\App\ActionInterface;
-use Magento\Framework\App\Action\AbstractAction;
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php
index 2552beeca463d..8531b31c6a8de 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php
@@ -9,11 +9,11 @@
 use Magento\Customer\CustomerData\Section\Identifier;
 use Magento\Customer\CustomerData\SectionPoolInterface;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Escaper;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Framework\App\Request\Http as HttpRequest;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class LoadTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Customer/Test/Unit/CustomerData/Section/IdentifierTest.php b/app/code/Magento/Customer/Test/Unit/CustomerData/Section/IdentifierTest.php
index e958be8375aea..b90e6ab19d027 100644
--- a/app/code/Magento/Customer/Test/Unit/CustomerData/Section/IdentifierTest.php
+++ b/app/code/Magento/Customer/Test/Unit/CustomerData/Section/IdentifierTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Unit\CustomerData\Section;
 
-use \Magento\Customer\CustomerData\Section\Identifier;
+use Magento\Customer\CustomerData\Section\Identifier;
 
 class IdentifierTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php b/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php
index 95e6223d91afb..a55965efafb1d 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php
@@ -13,9 +13,9 @@
 use Magento\Customer\Model\Account\Redirect;
 use Magento\Customer\Model\Url as CustomerUrl;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Url\HostChecker;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountConfirmationTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountConfirmationTest.php
index ae246665b28ed..596b0359d3fef 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AccountConfirmationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountConfirmationTest.php
@@ -6,9 +6,9 @@
 namespace Magento\Customer\Test\Unit\Model;
 
 use Magento\Customer\Model\AccountConfirmation;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Registry;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
index d72d7ec87ec3d..a6ba000d6b2e5 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Customer\Test\Unit\Model;
 
-use Magento\Customer\Model\AccountManagement;
 use Magento\Customer\Model\AccountConfirmation;
+use Magento\Customer\Model\AccountManagement;
 use Magento\Customer\Model\AuthenticationInterface;
 use Magento\Customer\Model\EmailNotificationInterface;
 use Magento\Framework\App\Area;
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AttributeCheckerTest.php b/app/code/Magento/Customer/Test/Unit/Model/AttributeCheckerTest.php
index 480f5be96e318..06b177115ce4c 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AttributeCheckerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AttributeCheckerTest.php
@@ -9,8 +9,8 @@
 use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\AddressMetadataManagementInterface;
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
-use Magento\Customer\Model\AttributeChecker;
 use Magento\Customer\Model\Attribute;
+use Magento\Customer\Model\AttributeChecker;
 use Magento\Customer\Model\Metadata\AttributeResolver;
 
 class AttributeCheckerTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AttributeMetadatConverterTest.php b/app/code/Magento/Customer/Test/Unit/Model/AttributeMetadatConverterTest.php
index 01fc8c01970b1..06cc165e9a800 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AttributeMetadatConverterTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AttributeMetadatConverterTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Customer\Test\Unit\Model;
 
+use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
 use Magento\Customer\Api\Data\OptionInterfaceFactory;
 use Magento\Customer\Api\Data\ValidationRuleInterfaceFactory;
-use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
 use Magento\Customer\Model\AttributeMetadataConverter;
 
 /**
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Checkout/ConfigProviderTest.php b/app/code/Magento/Customer/Test/Unit/Model/Checkout/ConfigProviderTest.php
index 58b099a1d387d..4bb2cdb5d3a76 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Checkout/ConfigProviderTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Checkout/ConfigProviderTest.php
@@ -6,13 +6,13 @@
 namespace Magento\Customer\Test\Unit\Model\Checkout;
 
 use Magento\Customer\Model\Checkout\ConfigProvider;
+use Magento\Customer\Model\Form;
+use Magento\Customer\Model\Url;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\UrlInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Customer\Model\Url;
-use Magento\Customer\Model\Form;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class ConfigProviderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/PasswordTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/PasswordTest.php
index 9a9449a64ecbd..ea598f209524f 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/PasswordTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/PasswordTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Customer\Test\Unit\Model\Customer\Attribute\Backend;
 
+use Magento\Customer\Model\Customer\Attribute\Backend\Password;
 use Magento\Framework\DataObject;
 use Magento\Framework\Stdlib\StringUtils;
-use Magento\Customer\Model\Customer\Attribute\Backend\Password;
 
 class PasswordTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
index 029949c5f35b0..e8f92a86f4983 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
@@ -1162,7 +1162,6 @@ function ($origName) {
      */
     public function testGetDataWithVisibleAttributes()
     {
-
         $firstAttributesBundle = $this->getAttributeMock(
             'customer',
             [
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/Source/GroupTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/Source/GroupTest.php
index e07f2f0add972..c7b63e97a5c71 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/Source/GroupTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/Source/GroupTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Customer\Test\Unit\Model\Customer\Source;
 
-use Magento\Customer\Model\Customer\Source\Group;
-use Magento\Framework\Module\Manager;
+use Magento\Customer\Api\Data\GroupSearchResultsInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
-use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Customer\Model\Customer\Source\Group;
 use Magento\Framework\Api\SearchCriteria;
-use Magento\Customer\Api\Data\GroupSearchResultsInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Module\Manager;
 
 class GroupTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
index f5b7f08d2906d..f650ec3c8ce11 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/CustomerTest.php
@@ -11,8 +11,8 @@
  */
 namespace Magento\Customer\Test\Unit\Model;
 
-use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\AccountConfirmation;
+use Magento\Customer\Model\Customer;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Indexer/Attribute/FilterTest.php b/app/code/Magento/Customer/Test/Unit/Model/Indexer/Attribute/FilterTest.php
index bc886af3a391d..4b09d2ef63275 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Indexer/Attribute/FilterTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Indexer/Attribute/FilterTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Customer\Test\Unit\Model\Indexer\Attribute;
 
-use Magento\Customer\Model\Indexer\Attribute\Filter;
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
+use Magento\Customer\Model\Indexer\Attribute\Filter;
 
 class FilterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Indexer/AttributeProviderTest.php b/app/code/Magento/Customer/Test/Unit/Model/Indexer/AttributeProviderTest.php
index bb67eebcb6e54..5f5307a454f10 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Indexer/AttributeProviderTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Indexer/AttributeProviderTest.php
@@ -118,8 +118,7 @@ public function testAddDynamicData()
             );
 
         $this->assertEquals(
-            ['fields' =>
-                [
+            ['fields' => [
                     $existentName => $existentField,
                     $attrName => [
                         'name' => $attrName,
@@ -210,8 +209,7 @@ public function testAddDynamicDataWithStaticAndSearchable()
             ->method('canBeFilterableInGrid');
 
         $this->assertEquals(
-            ['fields' =>
-                [
+            ['fields' => [
                     $attrName => [
                         'name' => $attrName,
                         'handler' => 'handler',
@@ -320,8 +318,7 @@ public function testAddDynamicDataWithStaticAndFilterable()
             );
 
         $this->assertEquals(
-            ['fields' =>
-                [
+            ['fields' => [
                     $attrName => [
                         'name' => $attrName,
                         'handler' => \Magento\Framework\Indexer\Handler\AttributeHandler::class,
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/AddressMetadataManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/AddressMetadataManagementTest.php
index 06a30ca06f7a7..b8a3e196cfab2 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/AddressMetadataManagementTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/AddressMetadataManagementTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Customer\Test\Unit\Model\Metadata;
 
 use Magento\Customer\Api\AddressMetadataManagementInterface;
-use Magento\Customer\Model\Attribute;
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
+use Magento\Customer\Model\Attribute;
 use Magento\Customer\Model\Metadata\AddressMetadataManagement;
 
 class AddressMetadataManagementTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/CustomerMetadataManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/CustomerMetadataManagementTest.php
index d5880e3ef6dcf..a852b07dc9582 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/CustomerMetadataManagementTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/CustomerMetadataManagementTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Customer\Test\Unit\Model\Metadata;
 
-use Magento\Customer\Model\Attribute;
 use Magento\Customer\Api\Data\AttributeMetadataInterface;
+use Magento\Customer\Model\Attribute;
 use Magento\Customer\Model\Metadata\CustomerMetadataManagement;
 
 class CustomerMetadataManagementTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
index 0278e2b2d791d..39b7515f5e824 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
@@ -8,8 +8,8 @@
 use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Model\FileProcessor;
-use Magento\MediaStorage\Model\File\Validator\NotProtectedExtension;
 use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
+use Magento\MediaStorage\Model\File\Validator\NotProtectedExtension;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/PostcodeTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/PostcodeTest.php
index 8efbbfc7f3623..0ac789491a3d7 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/PostcodeTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/PostcodeTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Customer\Test\Unit\Model\Metadata\Form;
 
-use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Customer\Model\Metadata\Form\Postcode;
+use Magento\Directory\Helper\Data as DirectoryHelper;
 
 class PostcodeTest extends AbstractFormTestCase
 {
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/ServiceCollectionTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/ServiceCollectionTest.php
index 61081e1aaf224..cdc8d5f69e2f1 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/ServiceCollectionTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/Group/Grid/ServiceCollectionTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Customer\Test\Unit\Model\ResourceModel\Group\Grid;
 
-use Magento\Framework\Api\SearchCriteria;
 use Magento\Customer\Model\ResourceModel\Group\Grid\ServiceCollection;
+use Magento\Framework\Api\SearchCriteria;
 use Magento\Framework\Api\SortOrder;
 
 /**
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupTest.php
index 7855b1e6f823e..882efecae07e3 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/GroupTest.php
@@ -8,8 +8,8 @@
 
 namespace Magento\Customer\Test\Unit\Model\ResourceModel;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -89,7 +89,7 @@ protected function setUp()
 
     /**
      * Test for save() method when we try to save entity with system's reserved ID.
-     * 
+     *
      * @return void
      */
     public function testSaveWithReservedId()
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/BeforeAddressSaveObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/BeforeAddressSaveObserverTest.php
index 22b207b9c1b67..9963b6e1517ce 100644
--- a/app/code/Magento/Customer/Test/Unit/Observer/BeforeAddressSaveObserverTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Observer/BeforeAddressSaveObserverTest.php
@@ -8,8 +8,6 @@
 use Magento\Customer\Helper\Address as HelperAddress;
 use Magento\Customer\Model\Address\AbstractAddress;
 use Magento\Customer\Observer\BeforeAddressSaveObserver;
-use Magento\Framework\App\Area;
-use Magento\Framework\App\State as AppState;
 use Magento\Framework\Registry;
 
 class BeforeAddressSaveObserverTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/CustomerLoginSuccessObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/CustomerLoginSuccessObserverTest.php
index f8ce164010aa4..9037c4bfda504 100644
--- a/app/code/Magento/Customer/Test/Unit/Observer/CustomerLoginSuccessObserverTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Observer/CustomerLoginSuccessObserverTest.php
@@ -6,7 +6,6 @@
 namespace Magento\Customer\Test\Unit\Observer;
 
 use Magento\Customer\Model\AuthenticationInterface;
-use Magento\Framework\Event\Observer;
 use Magento\Customer\Observer\CustomerLoginSuccessObserver;
 
 /**
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/LogLastLoginAtObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/LogLastLoginAtObserverTest.php
index 6cc77a39f15f0..da3c81df5c973 100644
--- a/app/code/Magento/Customer/Test/Unit/Observer/LogLastLoginAtObserverTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Observer/LogLastLoginAtObserverTest.php
@@ -6,8 +6,6 @@
 namespace Magento\Customer\Test\Unit\Observer;
 
 use Magento\Customer\Model\Logger;
-use Magento\Framework\Stdlib\DateTime;
-use Magento\Framework\Event\Observer;
 use Magento\Customer\Observer\LogLastLoginAtObserver;
 
 /**
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/LogLastLogoutAtObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/LogLastLogoutAtObserverTest.php
index 378266190dffc..5fc8ad83bcabb 100644
--- a/app/code/Magento/Customer/Test/Unit/Observer/LogLastLogoutAtObserverTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Observer/LogLastLogoutAtObserverTest.php
@@ -6,8 +6,6 @@
 namespace Magento\Customer\Test\Unit\Observer;
 
 use Magento\Customer\Model\Logger;
-use Magento\Framework\Stdlib\DateTime;
-use Magento\Framework\Event\Observer;
 use Magento\Customer\Observer\LogLastLogoutAtObserver;
 
 /**
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ConfirmationTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ConfirmationTest.php
index b712c0f30b430..95e33de6d32ad 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ConfirmationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ConfirmationTest.php
@@ -116,7 +116,7 @@ public function testPrepareDataSource(
             ->method('isConfirmationRequired')
             ->with($websiteId, $customerId, $customerEmail)
             ->willReturn($isConfirmationRequired);
-        
+
         $this->confirmation->setData('name', 'confirmation');
         $result = $this->confirmation->prepareDataSource($dataSource);
 
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/InlineEditUpdaterTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/InlineEditUpdaterTest.php
index a84fa566c0e2b..4f0a0cf2a1330 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/InlineEditUpdaterTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/InlineEditUpdaterTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Customer\Test\Unit\Ui\Component\Listing\Column;
 
-use Magento\Customer\Ui\Component\Listing\Column\ValidationRules;
-use Magento\Customer\Ui\Component\Listing\Column\InlineEditUpdater;
 use Magento\Customer\Api\Data\ValidationRuleInterface;
+use Magento\Customer\Ui\Component\Listing\Column\InlineEditUpdater;
+use Magento\Customer\Ui\Component\Listing\Column\ValidationRules;
 
 class InlineEditUpdaterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
index 130b3acd11e76..eb68983a5d109 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ValidationRulesTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Customer\Test\Unit\Ui\Component\Listing\Column;
 
-use Magento\Customer\Ui\Component\Listing\Column\ValidationRules;
 use Magento\Customer\Api\Data\ValidationRuleInterface;
+use Magento\Customer\Ui\Component\Listing\Column\ValidationRules;
 
 class ValidationRulesTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Customer/Ui/Component/ColumnFactory.php b/app/code/Magento/Customer/Ui/Component/ColumnFactory.php
index 60bf3ea26b78c..76a82de23cdf3 100644
--- a/app/code/Magento/Customer/Ui/Component/ColumnFactory.php
+++ b/app/code/Magento/Customer/Ui/Component/ColumnFactory.php
@@ -7,7 +7,6 @@
 
 use Magento\Customer\Api\Data\AttributeMetadataInterface as AttributeMetadata;
 use Magento\Customer\Ui\Component\Listing\Column\InlineEditUpdater;
-use Magento\Customer\Api\CustomerMetadataInterface;
 
 class ColumnFactory
 {
diff --git a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
index 6a197feb03c61..722444ce7b74b 100644
--- a/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
+++ b/app/code/Magento/Customer/Ui/Component/DataProvider/Document.php
@@ -6,12 +6,12 @@
 namespace Magento\Customer\Ui\Component\DataProvider;
 
 use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Customer\Model\AccountManagement;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -125,7 +125,7 @@ public function getCustomAttribute($attributeCode)
     private function setGenderValue()
     {
         $value = $this->getData(self::$genderAttributeCode);
-        
+
         if (!$value) {
             $this->setCustomAttribute(self::$genderAttributeCode, 'N/A');
             return;
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/AccountLock.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/AccountLock.php
index e622edbd29567..f07b76c08f829 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/AccountLock.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/AccountLock.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Customer\Ui\Component\Listing\Column;
 
-use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class AccountLock
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/Actions.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/Actions.php
index d6a4067ef3db6..615d45ab9c549 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/Actions.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/Actions.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Customer\Ui\Component\Listing\Column;
 
+use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Framework\UrlInterface;
 
 /**
  * Class ProductActions
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/AttributeColumn.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/AttributeColumn.php
index 87a27d32765a2..fe819b8b0a348 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/AttributeColumn.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/AttributeColumn.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Customer\Ui\Component\Listing\Column;
 
+use Magento\Customer\Api\Data\AttributeMetadataInterface as AttributeMetadata;
+use Magento\Customer\Ui\Component\Listing\AttributeRepository;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Customer\Ui\Component\Listing\AttributeRepository;
-use Magento\Customer\Api\Data\AttributeMetadataInterface as AttributeMetadata;
 
 class AttributeColumn extends Column
 {
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/Confirmation.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/Confirmation.php
index 1786c52844a75..b518b706419c4 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/Confirmation.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/Confirmation.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Customer\Ui\Component\Listing\Column;
 
+use Magento\Customer\Model\AccountConfirmation;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Framework\App\ObjectManager;
-use Magento\Customer\Model\AccountConfirmation;
 
 /**
  * Class Confirmation column.
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/Group/Options.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/Group/Options.php
index f521a95e1e616..f10e6f5f337d6 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/Group/Options.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/Group/Options.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Customer\Ui\Component\Listing\Column\Group;
 
-use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Customer\Model\ResourceModel\Group\CollectionFactory;
+use Magento\Framework\Data\OptionSourceInterface;
 
 /**
  * Class Options
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/Online/Type.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/Online/Type.php
index 9af6159651d8d..84b312255c16b 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/Online/Type.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/Online/Type.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Customer\Ui\Component\Listing\Column\Online;
 
-use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Customer\Model\Visitor;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class Type
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/Websites.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/Websites.php
index bd653064ece42..28e83745f62f1 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/Websites.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/Websites.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Store\Model\StoreManagerInterface as StoreManager;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class Websites
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Columns.php b/app/code/Magento/Customer/Ui/Component/Listing/Columns.php
index 70f8d085cc5ea..2ada0f80ef6ee 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Columns.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Columns.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Customer\Ui\Component\Listing;
 
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Customer\Ui\Component\ColumnFactory;
+use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Api\Data\AttributeMetadataInterface as AttributeMetadata;
-use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Customer\Ui\Component\ColumnFactory;
 use Magento\Customer\Ui\Component\Listing\Column\InlineEditUpdater;
-use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentInterface;
 
 class Columns extends \Magento\Ui\Component\Listing\Columns
 {
diff --git a/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php b/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php
index ad2af528a89c5..0cc3a182947f5 100644
--- a/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php
+++ b/app/code/Magento/Customer/Ui/Component/MassAction/Group/Options.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Customer\Ui\Component\MassAction\Group;
 
+use Magento\Customer\Model\ResourceModel\Group\CollectionFactory;
 use Magento\Framework\Phrase;
 use Magento\Framework\UrlInterface;
 use Zend\Stdlib\JsonSerializable;
-use Magento\Customer\Model\ResourceModel\Group\CollectionFactory;
 
 /**
  * Class Options
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml b/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml
index 143b4be507af9..5e0358d588109 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/edit/js.phtml
@@ -5,5 +5,3 @@
  */
 
 // @codingStandardsIgnoreFile
-
-?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
index 2bdb6ac044a92..051d56290f64f 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
@@ -7,7 +7,7 @@
 // @codingStandardsIgnoreFile
 /** @var Magento\Customer\Block\Account\Customer $block */
 ?>
-<?php if($block->customerLoggedIn()): ?>
+<?php if ($block->customerLoggedIn()): ?>
     <li class="customer-welcome">
         <span class="customer-name"
               role="link"
@@ -37,7 +37,7 @@
             }
         }
         </script>
-        <?php if($block->getChildHtml()):?>
+        <?php if ($block->getChildHtml()):?>
         <div class="customer-menu" data-target="dropdown">
             <?= $block->getChildHtml() ?>
         </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
index d60f0968ad4fe..c44800303137f 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
@@ -8,14 +8,18 @@
 
 /** @var \Magento\Customer\Block\Widget\Gender $block */
 ?>
-<div class="field gender<?php if ($block->isRequired()) echo ' required' ?>">
+<div class="field gender<?php if ($block->isRequired()) {
+    echo ' required';
+} ?>">
     <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('gender')) ?>"><span><?= $block->escapeHtml(__('Gender')) ?></span></label>
     <div class="control">
         <select id="<?= $block->escapeHtmlAttr($block->getFieldId('gender')) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('gender')) ?>" title="<?= $block->escapeHtmlAttr(__('Gender')) ?>"<?php if ($block->isRequired()):?> class="validate-select" data-validate="{required:true}"<?php endif; ?>>
             <?php $options = $block->getGenderOptions(); ?>
             <?php $value = $block->getGender();?>
             <?php foreach ($options as $option):?>
-                <option value="<?= $block->escapeHtmlAttr($option->getValue()) ?>"<?php if ($option->getValue() == $value) echo ' selected="selected"' ?>><?= $block->escapeHtml(__($option->getLabel())) ?></option>
+                <option value="<?= $block->escapeHtmlAttr($option->getValue()) ?>"<?php if ($option->getValue() == $value) {
+    echo ' selected="selected"';
+} ?>><?= $block->escapeHtml(__($option->getLabel())) ?></option>
             <?php endforeach;?>
         </select>
     </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
index 73e9c4fa34bb3..7ba9094005940 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
@@ -37,7 +37,9 @@ $suffix = $block->showSuffix();
 <?php endif; ?>
 
     <?php if ($prefix): ?>
-        <div class="field field-name-prefix<?php if ($block->isPrefixRequired()) echo ' required' ?>">
+        <div class="field field-name-prefix<?php if ($block->isPrefixRequired()) {
+    echo ' required';
+} ?>">
             <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>">
                 <span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span>
             </label>
@@ -48,12 +50,16 @@ $suffix = $block->showSuffix();
                            name="<?= $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
                            value="<?= $block->escapeHtmlAttr($block->getObject()->getPrefix()) ?>"
                            title="<?= $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
-                           class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?php if ($block->isPrefixRequired()) echo ' data-validate="{required:true}"' ?>>
+                           class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?php if ($block->isPrefixRequired()) {
+    echo ' data-validate="{required:true}"';
+} ?>>
                 <?php else: ?>
                     <select id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
                             name="<?= $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
                             title="<?= $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
-                            class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?php if ($block->isPrefixRequired()) echo ' data-validate="{required:true}"' ?> >
+                            class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?php if ($block->isPrefixRequired()) {
+    echo ' data-validate="{required:true}"';
+} ?> >
                         <?php foreach ($block->getPrefixOptions() as $_option): ?>
                             <option value="<?= $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getPrefix() == $_option): ?> selected="selected"<?php endif; ?>>
                                 <?= $block->escapeHtml(__($_option)) ?>
@@ -74,7 +80,9 @@ $suffix = $block->showSuffix();
                        name="<?= $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
                        value="<?= $block->escapeHtmlAttr($block->getObject()->getFirstname()) ?>"
                        title="<?= $block->escapeHtmlAttr($block->getStoreLabel('firstname')) ?>"
-                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('firstname')) ?>" <?php if ($block->getAttributeValidationClass('firstname') == 'required-entry') echo ' data-validate="{required:true}"' ?>>
+                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('firstname')) ?>" <?php if ($block->getAttributeValidationClass('firstname') == 'required-entry') {
+    echo ' data-validate="{required:true}"';
+} ?>>
             </div>
         </div>
     <?php if ($middle): ?>
@@ -103,11 +111,15 @@ $suffix = $block->showSuffix();
                        name="<?= $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
                        value="<?= $block->escapeHtmlAttr($block->getObject()->getLastname()) ?>"
                        title="<?= $block->escapeHtmlAttr($block->getStoreLabel('lastname')) ?>"
-                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('lastname')) ?>" <?php if ($block->getAttributeValidationClass('lastname') == 'required-entry') echo ' data-validate="{required:true}"' ?>>
+                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('lastname')) ?>" <?php if ($block->getAttributeValidationClass('lastname') == 'required-entry') {
+    echo ' data-validate="{required:true}"';
+} ?>>
             </div>
         </div>
     <?php if ($suffix): ?>
-        <div class="field field-name-suffix<?php if ($block->isSuffixRequired()) echo ' required' ?>">
+        <div class="field field-name-suffix<?php if ($block->isSuffixRequired()) {
+    echo ' required';
+} ?>">
             <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>">
                 <span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span>
             </label>
@@ -118,12 +130,16 @@ $suffix = $block->showSuffix();
                            name="<?= $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
                            value="<?= $block->escapeHtmlAttr($block->getObject()->getSuffix()) ?>"
                            title="<?= $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
-                           class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?php if ($block->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
+                           class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?php if ($block->isSuffixRequired()) {
+    echo ' data-validate="{required:true}"';
+} ?>>
                 <?php else: ?>
                     <select id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
                             name="<?= $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
                             title="<?= $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
-                            class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?php if ($block->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
+                            class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?php if ($block->isSuffixRequired()) {
+    echo ' data-validate="{required:true}"';
+} ?>>
                         <?php foreach ($block->getSuffixOptions() as $_option): ?>
                             <option value="<?= $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getSuffix() == $_option): ?> selected="selected"<?php endif; ?>>
                                 <?= $block->escapeHtml(__($_option)) ?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
index 4b3681d4d8fd3..26fa008719cfa 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
@@ -8,9 +8,13 @@
 
 /** @var \Magento\Customer\Block\Widget\Taxvat $block */
 ?>
-<div class="field taxvat<?php if ($block->isRequired()) echo ' required'; ?>">
+<div class="field taxvat<?php if ($block->isRequired()) {
+    echo ' required';
+} ?>">
     <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>"><span><?= $block->escapeHtml(__('Tax/VAT number')) ?></span></label>
     <div class="control">
-        <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('taxvat')) ?>" value="<?= $block->escapeHtmlAttr($block->getTaxvat()) ?>" title="<?= $block->escapeHtmlAttr(__('Tax/VAT number')) ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('taxvat')) ?>" <?php if ($block->isRequired()) echo ' data-validate="{required:true}"' ?>>
+        <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('taxvat')) ?>" value="<?= $block->escapeHtmlAttr($block->getTaxvat()) ?>" title="<?= $block->escapeHtmlAttr(__('Tax/VAT number')) ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('taxvat')) ?>" <?php if ($block->isRequired()) {
+    echo ' data-validate="{required:true}"';
+} ?>>
     </div>
 </div>
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
index 1d78c4e5bc20e..ef5d8e8580726 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CustomerImportExport\Model\Import;
 
-use Magento\ImportExport\Model\Import;
 use Magento\CustomerImportExport\Model\ResourceModel\Import\Customer\Storage;
+use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
 /**
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php
index 3d8736dc80fc6..23d0aa5d555bd 100644
--- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php
+++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php
@@ -8,9 +8,9 @@
 
 namespace Magento\CustomerImportExport\Test\Unit\Model\Import;
 
-use Magento\CustomerImportExport\Model\Import\CustomerComposite;
-use Magento\CustomerImportExport\Model\Import\Customer;
 use Magento\CustomerImportExport\Model\Import\Address;
+use Magento\CustomerImportExport\Model\Import\Customer;
+use Magento\CustomerImportExport\Model\Import\CustomerComposite;
 use Magento\Framework\Filesystem\Driver\File;
 use Magento\Framework\Filesystem\File\Read;
 use Magento\ImportExport\Model\Import;
diff --git a/app/code/Magento/Deploy/Collector/Collector.php b/app/code/Magento/Deploy/Collector/Collector.php
index b02c8e478d639..cfb5e67f632dd 100644
--- a/app/code/Magento/Deploy/Collector/Collector.php
+++ b/app/code/Magento/Deploy/Collector/Collector.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Deploy\Collector;
 
-use Magento\Deploy\Source\SourcePool;
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Package\PackageFactory;
+use Magento\Deploy\Source\SourcePool;
 use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
 
 /**
diff --git a/app/code/Magento/Deploy/Console/Command/App/ConfigImport/Processor.php b/app/code/Magento/Deploy/Console/Command/App/ConfigImport/Processor.php
index 34a5001916213..ad38de87d5e04 100644
--- a/app/code/Magento/Deploy/Console/Command/App/ConfigImport/Processor.php
+++ b/app/code/Magento/Deploy/Console/Command/App/ConfigImport/Processor.php
@@ -5,18 +5,18 @@
  */
 namespace Magento\Deploy\Console\Command\App\ConfigImport;
 
-use Magento\Framework\App\DeploymentConfig\ImporterInterface;
-use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\Exception\RuntimeException;
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
-use Magento\Deploy\Model\DeploymentConfig\ImporterPool;
 use Magento\Deploy\Model\DeploymentConfig\Hash;
-use Magento\Framework\Exception\ValidatorException;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Deploy\Model\DeploymentConfig\ImporterFactory;
+use Magento\Deploy\Model\DeploymentConfig\ImporterPool;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\DeploymentConfig\ImporterInterface;
 use Magento\Framework\Console\QuestionPerformer\YesNo;
+use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Exception\ValidatorException;
 use Psr\Log\LoggerInterface as Logger;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Runs process of importing config data from deployment configuration files.
diff --git a/app/code/Magento/Deploy/Console/Command/App/ConfigImportCommand.php b/app/code/Magento/Deploy/Console/Command/App/ConfigImportCommand.php
index 8a75ad0def222..b4a9ea1448cc2 100644
--- a/app/code/Magento/Deploy/Console/Command/App/ConfigImportCommand.php
+++ b/app/code/Magento/Deploy/Console/Command/App/ConfigImportCommand.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Deploy\Console\Command\App;
 
+use Magento\Deploy\Console\Command\App\ConfigImport\Processor;
+use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\RuntimeException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Framework\Console\Cli;
-use Magento\Deploy\Console\Command\App\ConfigImport\Processor;
 
 /**
  * Runs the process of importing configuration data from shared source to appropriate application sources
diff --git a/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/InteractiveCollector.php b/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/InteractiveCollector.php
index fb02267f6efeb..44aae4f0dd685 100644
--- a/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/InteractiveCollector.php
+++ b/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/InteractiveCollector.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Deploy\Console\Command\App\SensitiveConfigSet;
 
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\QuestionFactory;
-use Symfony\Component\Console\Helper\QuestionHelper;
 
 /**
  * Class InteractiveCollector collects configuration values from user input
diff --git a/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/SensitiveConfigSetFacade.php b/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/SensitiveConfigSetFacade.php
index 7ca4fee416d68..98e0a780c9eba 100644
--- a/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/SensitiveConfigSetFacade.php
+++ b/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/SensitiveConfigSetFacade.php
@@ -6,15 +6,15 @@
 namespace Magento\Deploy\Console\Command\App\SensitiveConfigSet;
 
 use Magento\Deploy\Console\Command\App\SensitiveConfigSetCommand;
-use Magento\Framework\Exception\FileSystemException;
-use Magento\Framework\Exception\RuntimeException;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Deploy\Model\ConfigWriter;
 use Magento\Framework\App\Config\CommentParserInterface;
 use Magento\Framework\App\Scope\ValidatorInterface;
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\RuntimeException;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Processes the sensitive:config:set command.
diff --git a/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/SimpleCollector.php b/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/SimpleCollector.php
index 0dd5930794168..ef95c8162b153 100644
--- a/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/SimpleCollector.php
+++ b/app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSet/SimpleCollector.php
@@ -8,11 +8,11 @@
 use Magento\Deploy\Console\Command\App\SensitiveConfigSetCommand;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Question\QuestionFactory;
-use Symfony\Component\Console\Helper\QuestionHelper;
 
 /**
  * Class SimpleCollector collects configuration value from user input
diff --git a/app/code/Magento/Deploy/Console/Command/SetModeCommand.php b/app/code/Magento/Deploy/Console/Command/SetModeCommand.php
index 55b4a4f4f9b6a..f37ad0c158018 100644
--- a/app/code/Magento/Deploy/Console/Command/SetModeCommand.php
+++ b/app/code/Magento/Deploy/Console/Command/SetModeCommand.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Deploy\Console\Command;
 
+use Magento\Framework\App\State;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\App\State;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/app/code/Magento/Deploy/Console/Command/ShowModeCommand.php b/app/code/Magento/Deploy/Console/Command/ShowModeCommand.php
index b28051e603f6c..5b33b46562b8c 100644
--- a/app/code/Magento/Deploy/Console/Command/ShowModeCommand.php
+++ b/app/code/Magento/Deploy/Console/Command/ShowModeCommand.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Deploy\Console\Command;
 
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\App\State;
+use Magento\Framework\ObjectManagerInterface;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Command to show application mode
diff --git a/app/code/Magento/Deploy/Console/ConsoleLogger.php b/app/code/Magento/Deploy/Console/ConsoleLogger.php
index a7d3b48fde130..a2c2c4f77e9dd 100644
--- a/app/code/Magento/Deploy/Console/ConsoleLogger.php
+++ b/app/code/Magento/Deploy/Console/ConsoleLogger.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Deploy\Console;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Psr\Log\AbstractLogger;
 use Psr\Log\LogLevel;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Helper\FormatterHelper;
-use Magento\Framework\Filesystem;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Symfony\Component\Console\Output\ConsoleOutputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * PSR logger implementation for CLI
diff --git a/app/code/Magento/Deploy/Console/DeployStaticOptions.php b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
index 9a73dd5d65fc7..d43fb1ac60704 100644
--- a/app/code/Magento/Deploy/Console/DeployStaticOptions.php
+++ b/app/code/Magento/Deploy/Console/DeployStaticOptions.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Deploy\Console;
 
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
 
 /**
  * Static Content Deployment Options helper
diff --git a/app/code/Magento/Deploy/Console/InputValidator.php b/app/code/Magento/Deploy/Console/InputValidator.php
index b3301f60fec26..056d59f1c8fd4 100644
--- a/app/code/Magento/Deploy/Console/InputValidator.php
+++ b/app/code/Magento/Deploy/Console/InputValidator.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Deploy\Console;
 
-use Magento\Setup\Console\Command\DeployStaticContentCommand;
 use Magento\Deploy\Console\DeployStaticOptions as Options;
 use Magento\Framework\Validator\Locale;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/app/code/Magento/Deploy/Model/ConfigWriter.php b/app/code/Magento/Deploy/Model/ConfigWriter.php
index 4aededaf96800..51ed26338729d 100644
--- a/app/code/Magento/Deploy/Model/ConfigWriter.php
+++ b/app/code/Magento/Deploy/Model/ConfigWriter.php
@@ -6,13 +6,13 @@
 namespace Magento\Deploy\Model;
 
 use Magento\Config\App\Config\Type\System;
+use Magento\Config\Model\PreparedValueFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Config\Value;
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Config\Model\PreparedValueFactory;
 
 /**
  * Class ConfigWriter. Save configuration values into config file.
diff --git a/app/code/Magento/Deploy/Model/Filesystem.php b/app/code/Magento/Deploy/Model/Filesystem.php
index 0557914f48d24..b637e7411b3e4 100644
--- a/app/code/Magento/Deploy/Model/Filesystem.php
+++ b/app/code/Magento/Deploy/Model/Filesystem.php
@@ -137,7 +137,7 @@ public function regenerateStatic(
                 DirectoryList::STATIC_VIEW
             ]
         );
-        
+
         // Trigger code generation
         $this->compile($output);
         // Trigger static assets compilation and deployment
diff --git a/app/code/Magento/Deploy/Model/Mode.php b/app/code/Magento/Deploy/Model/Mode.php
index 792ee7f1b7968..dab8b583669f4 100644
--- a/app/code/Magento/Deploy/Model/Mode.php
+++ b/app/code/Magento/Deploy/Model/Mode.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Deploy\Model;
 
+use Magento\Config\Console\Command\ConfigSet\ProcessorFacadeFactory;
+use Magento\Config\Console\Command\EmulatedAdminhtmlAreaProcessor;
 use Magento\Deploy\App\Mode\ConfigProvider;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Console\MaintenanceModeEnabler;
@@ -13,14 +15,12 @@
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\MaintenanceMode;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\State;
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Exception\LocalizedException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Config\Console\Command\ConfigSet\ProcessorFacadeFactory;
-use Magento\Config\Console\Command\EmulatedAdminhtmlAreaProcessor;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * A class to manage Magento modes
diff --git a/app/code/Magento/Deploy/Package/Bundle/RequireJs.php b/app/code/Magento/Deploy/Package/Bundle/RequireJs.php
index c7c9e5315c7ab..a6c68c2fe825c 100644
--- a/app/code/Magento/Deploy/Package/Bundle/RequireJs.php
+++ b/app/code/Magento/Deploy/Package/Bundle/RequireJs.php
@@ -7,9 +7,9 @@
 
 use Magento\Deploy\Config\BundleConfig;
 use Magento\Deploy\Package\BundleInterface;
-use Magento\Framework\Filesystem;
-use \Magento\Framework\Filesystem\File\WriteInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\File\WriteInterface;
 use Magento\Framework\View\Asset\Minification;
 
 /**
diff --git a/app/code/Magento/Deploy/Package/BundleInterfaceFactory.php b/app/code/Magento/Deploy/Package/BundleInterfaceFactory.php
index da691e7e25590..9f9ee3c32b4d2 100644
--- a/app/code/Magento/Deploy/Package/BundleInterfaceFactory.php
+++ b/app/code/Magento/Deploy/Package/BundleInterfaceFactory.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Deploy\Package;
 
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/app/code/Magento/Deploy/Package/Package.php b/app/code/Magento/Deploy/Package/Package.php
index ef50a7f47073d..d19a5a3f0b0e7 100644
--- a/app/code/Magento/Deploy/Package/Package.php
+++ b/app/code/Magento/Deploy/Package/Package.php
@@ -6,8 +6,8 @@
 namespace Magento\Deploy\Package;
 
 use Magento\Deploy\Package\Processor\ProcessorInterface;
-use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
+use Magento\Framework\View\Design\ThemeInterface;
 
 /**
  * Deployment Package
diff --git a/app/code/Magento/Deploy/Package/PackageFactory.php b/app/code/Magento/Deploy/Package/PackageFactory.php
index 2d251a0a3eff4..ef35e02aa0472 100644
--- a/app/code/Magento/Deploy/Package/PackageFactory.php
+++ b/app/code/Magento/Deploy/Package/PackageFactory.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Deploy\Package;
 
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/app/code/Magento/Deploy/Package/PackagePool.php b/app/code/Magento/Deploy/Package/PackagePool.php
index b9c0418df860a..056d6fa09551e 100644
--- a/app/code/Magento/Deploy/Package/PackagePool.php
+++ b/app/code/Magento/Deploy/Package/PackagePool.php
@@ -8,8 +8,8 @@
 use Magento\Deploy\Collector\Collector;
 use Magento\Deploy\Console\DeployStaticOptions as Options;
 use Magento\Framework\AppInterface;
-use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\Design\Theme\ListInterface;
+use Magento\Framework\View\Design\ThemeInterface;
 
 /**
  * Deployment Packages Pool class
diff --git a/app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php b/app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php
index 1c139d5682df1..387603d708720 100644
--- a/app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php
+++ b/app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php
@@ -12,8 +12,8 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Filesystem;
-use Magento\Framework\View\Url\CssResolver;
 use Magento\Framework\View\Asset\Minification;
+use Magento\Framework\View\Url\CssResolver;
 
 /**
  * Post-processor scans through all CSS files and correct misleading URLs
diff --git a/app/code/Magento/Deploy/Package/Processor/PostProcessor/Map.php b/app/code/Magento/Deploy/Package/Processor/PostProcessor/Map.php
index 181968c016245..6ed84286cc8e7 100644
--- a/app/code/Magento/Deploy/Package/Processor/PostProcessor/Map.php
+++ b/app/code/Magento/Deploy/Package/Processor/PostProcessor/Map.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Deploy\Package\Processor\PostProcessor;
 
-use Magento\Deploy\Package\PackageFile;
-use Magento\Deploy\Service\DeployStaticFile;
 use Magento\Deploy\Package\Package;
+use Magento\Deploy\Package\PackageFile;
 use Magento\Deploy\Package\PackageFileFactory;
-use Magento\Framework\App\DeploymentConfig\Writer\PhpFormatter;
 use Magento\Deploy\Package\Processor\ProcessorInterface;
-use Magento\Framework\View\Asset\Repository;
+use Magento\Deploy\Service\DeployStaticFile;
+use Magento\Framework\App\DeploymentConfig\Writer\PhpFormatter;
 use Magento\Framework\View\Asset\Minification;
+use Magento\Framework\View\Asset\Repository;
 use Magento\Framework\View\Asset\RepositoryMap;
 
 /**
diff --git a/app/code/Magento/Deploy/Package/Processor/PreProcessor/Css.php b/app/code/Magento/Deploy/Package/Processor/PreProcessor/Css.php
index b3461e3ab4a22..4a6c5d29b1742 100644
--- a/app/code/Magento/Deploy/Package/Processor/PreProcessor/Css.php
+++ b/app/code/Magento/Deploy/Package/Processor/PreProcessor/Css.php
@@ -9,11 +9,11 @@
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Package\PackageFile;
 use Magento\Deploy\Package\Processor\ProcessorInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\View\Url\CssResolver;
 use Magento\Framework\View\Asset\Minification;
+use Magento\Framework\View\Url\CssResolver;
 
 /**
  * Pre-processor for speeding up deployment of CSS files
diff --git a/app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php b/app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php
index 8a464ca4bc627..145ccc8ffb8e8 100644
--- a/app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php
+++ b/app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php
@@ -10,10 +10,10 @@
 use Magento\Deploy\Package\PackageFile;
 use Magento\Deploy\Package\Processor\ProcessorInterface;
 use Magento\Deploy\Service\DeployStaticFile;
-use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
-use Magento\Framework\View\Asset\Minification;
 use Magento\Framework\Css\PreProcessor\Instruction\Import;
+use Magento\Framework\View\Asset\Minification;
 use Magento\Framework\View\Asset\NotationResolver;
+use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
 use Magento\Framework\View\Asset\Repository;
 
 /**
diff --git a/app/code/Magento/Deploy/Process/Queue.php b/app/code/Magento/Deploy/Process/Queue.php
index e5e10c8f54a19..4ca065d6c4fb0 100644
--- a/app/code/Magento/Deploy/Process/Queue.php
+++ b/app/code/Magento/Deploy/Process/Queue.php
@@ -8,9 +8,9 @@
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Service\DeployPackage;
 use Magento\Framework\App\ResourceConnection;
-use Psr\Log\LoggerInterface;
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\Locale\ResolverInterface as LocaleResolver;
+use Psr\Log\LoggerInterface;
 
 /**
  * Deployment Queue
diff --git a/app/code/Magento/Deploy/Process/QueueFactory.php b/app/code/Magento/Deploy/Process/QueueFactory.php
index 1f1a614277c26..be87b457b3faa 100644
--- a/app/code/Magento/Deploy/Process/QueueFactory.php
+++ b/app/code/Magento/Deploy/Process/QueueFactory.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Deploy\Process;
 
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/app/code/Magento/Deploy/Service/Bundle.php b/app/code/Magento/Deploy/Service/Bundle.php
index cf0d7a551f4c3..23238e2659d16 100644
--- a/app/code/Magento/Deploy/Service/Bundle.php
+++ b/app/code/Magento/Deploy/Service/Bundle.php
@@ -9,8 +9,8 @@
 use Magento\Deploy\Package\BundleInterface;
 use Magento\Deploy\Package\BundleInterfaceFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem;
 use Magento\Framework\App\Utility\Files;
+use Magento\Framework\Filesystem;
 use Magento\Framework\View\Asset\Repository;
 use Magento\Framework\View\Asset\RepositoryMap;
 
diff --git a/app/code/Magento/Deploy/Service/DeployPackage.php b/app/code/Magento/Deploy/Service/DeployPackage.php
index ec80387e96cc9..83245ae26c854 100644
--- a/app/code/Magento/Deploy/Service/DeployPackage.php
+++ b/app/code/Magento/Deploy/Service/DeployPackage.php
@@ -6,15 +6,12 @@
 
 namespace Magento\Deploy\Service;
 
+use Magento\Deploy\Console\InputValidator;
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Package\PackageFile;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\Locale\ResolverInterface as LocaleResolver;
 use Magento\Framework\View\Asset\ContentProcessorException;
-use Magento\Deploy\Console\InputValidator;
-use Magento\Framework\View\Design\Theme\ListInterface;
-use Magento\Framework\View\DesignInterface;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/app/code/Magento/Deploy/Service/DeployRequireJsConfig.php b/app/code/Magento/Deploy/Service/DeployRequireJsConfig.php
index 966f127c6ba67..93975ca507fbd 100644
--- a/app/code/Magento/Deploy/Service/DeployRequireJsConfig.php
+++ b/app/code/Magento/Deploy/Service/DeployRequireJsConfig.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Deploy\Service;
 
-use Magento\Framework\Locale\ResolverInterfaceFactory;
 use Magento\Framework\Locale\ResolverInterface;
-use Magento\RequireJs\Model\FileManagerFactory;
-use Magento\Framework\View\DesignInterfaceFactory;
-use Magento\Framework\View\Design\Theme\ListInterface;
-use Magento\Framework\View\Asset\RepositoryFactory;
+use Magento\Framework\Locale\ResolverInterfaceFactory;
 use Magento\Framework\RequireJs\ConfigFactory;
+use Magento\Framework\View\Asset\RepositoryFactory;
+use Magento\Framework\View\Design\Theme\ListInterface;
+use Magento\Framework\View\DesignInterfaceFactory;
+use Magento\RequireJs\Model\FileManagerFactory;
 
 /**
  * Deploy RequireJS configuration service
diff --git a/app/code/Magento/Deploy/Service/DeployStaticContent.php b/app/code/Magento/Deploy/Service/DeployStaticContent.php
index 72de645868e22..1084cd560b863 100644
--- a/app/code/Magento/Deploy/Service/DeployStaticContent.php
+++ b/app/code/Magento/Deploy/Service/DeployStaticContent.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Deploy\Service;
 
-use Magento\Deploy\Strategy\DeployStrategyFactory;
-use Magento\Deploy\Process\QueueFactory;
 use Magento\Deploy\Console\DeployStaticOptions as Options;
+use Magento\Deploy\Process\QueueFactory;
+use Magento\Deploy\Strategy\DeployStrategyFactory;
 use Magento\Framework\App\View\Deployment\Version\StorageInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Psr\Log\LoggerInterface;
diff --git a/app/code/Magento/Deploy/Service/DeployStaticFile.php b/app/code/Magento/Deploy/Service/DeployStaticFile.php
index 40986087c405e..e471c58ac81e1 100644
--- a/app/code/Magento/Deploy/Service/DeployStaticFile.php
+++ b/app/code/Magento/Deploy/Service/DeployStaticFile.php
@@ -6,13 +6,13 @@
 namespace Magento\Deploy\Service;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\View\Asset\Publisher;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\Framework\Filesystem\File\WriteInterface;
 use Magento\Framework\View\Asset\Minification;
-use Magento\Framework\View\Asset\Repository;
-use Magento\Framework\App\View\Asset\Publisher;
 use Magento\Framework\View\Asset\PreProcessor\FileNameResolver;
-use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\View\Asset\Repository;
 
 /**
  * Deploy static file service
diff --git a/app/code/Magento/Deploy/Service/MinifyTemplates.php b/app/code/Magento/Deploy/Service/MinifyTemplates.php
index 9be2d5281364d..58641d5616f92 100644
--- a/app/code/Magento/Deploy/Service/MinifyTemplates.php
+++ b/app/code/Magento/Deploy/Service/MinifyTemplates.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Deploy\Service;
 
-use Magento\Framework\View\Template\Html\MinifierInterface;
 use Magento\Framework\App\Utility\Files;
+use Magento\Framework\View\Template\Html\MinifierInterface;
 
 /**
  * Minify PHTML templates service
diff --git a/app/code/Magento/Deploy/Source/Lib.php b/app/code/Magento/Deploy/Source/Lib.php
index d1e7cdaea6c9d..fb34880aa716c 100644
--- a/app/code/Magento/Deploy/Source/Lib.php
+++ b/app/code/Magento/Deploy/Source/Lib.php
@@ -6,10 +6,10 @@
 namespace Magento\Deploy\Source;
 
 use Magento\Deploy\Package\Package;
+use Magento\Deploy\Package\PackageFileFactory;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Filesystem;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Deploy\Package\PackageFileFactory;
 
 /**
  * Collect files eligible for deployment from library
diff --git a/app/code/Magento/Deploy/Source/Modules.php b/app/code/Magento/Deploy/Source/Modules.php
index a852ace2735a6..f3b62ae30d037 100644
--- a/app/code/Magento/Deploy/Source/Modules.php
+++ b/app/code/Magento/Deploy/Source/Modules.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Deploy\Source;
 
-use Magento\Framework\App\Utility\Files;
 use Magento\Deploy\Package\PackageFileFactory;
+use Magento\Framework\App\Utility\Files;
 
 /**
  * Collect files eligible for deployment from  modules
diff --git a/app/code/Magento/Deploy/Source/Themes.php b/app/code/Magento/Deploy/Source/Themes.php
index 2ca599b12e2cc..4649e78ba3f55 100644
--- a/app/code/Magento/Deploy/Source/Themes.php
+++ b/app/code/Magento/Deploy/Source/Themes.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Deploy\Source;
 
-use Magento\Framework\App\Utility\Files;
 use Magento\Deploy\Package\PackageFileFactory;
+use Magento\Framework\App\Utility\Files;
 
 /**
  * Collect files eligible for deployment from themes
diff --git a/app/code/Magento/Deploy/Strategy/CompactDeploy.php b/app/code/Magento/Deploy/Strategy/CompactDeploy.php
index 72f8893dde145..4727342002a04 100644
--- a/app/code/Magento/Deploy/Strategy/CompactDeploy.php
+++ b/app/code/Magento/Deploy/Strategy/CompactDeploy.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Deploy\Strategy;
 
-use Magento\Deploy\Package\PackagePool;
 use Magento\Deploy\Package\Package;
+use Magento\Deploy\Package\PackagePool;
 use Magento\Deploy\Process\Queue;
 
 /**
diff --git a/app/code/Magento/Deploy/Strategy/QuickDeploy.php b/app/code/Magento/Deploy/Strategy/QuickDeploy.php
index 02badd7272936..38d5d35736f0b 100644
--- a/app/code/Magento/Deploy/Strategy/QuickDeploy.php
+++ b/app/code/Magento/Deploy/Strategy/QuickDeploy.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Deploy\Strategy;
 
-use Magento\Deploy\Package\PackagePool;
 use Magento\Deploy\Package\Package;
+use Magento\Deploy\Package\PackagePool;
 use Magento\Deploy\Process\Queue;
 
 /**
diff --git a/app/code/Magento/Deploy/Strategy/StandardDeploy.php b/app/code/Magento/Deploy/Strategy/StandardDeploy.php
index 8a5ec462d3f4f..fbad5d447eb07 100644
--- a/app/code/Magento/Deploy/Strategy/StandardDeploy.php
+++ b/app/code/Magento/Deploy/Strategy/StandardDeploy.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Deploy\Strategy;
 
-use Magento\Deploy\Package\PackagePool;
 use Magento\Deploy\Package\Package;
+use Magento\Deploy\Package\PackagePool;
 use Magento\Deploy\Process\Queue;
 
 /**
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImport/ProcessorTest.php b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImport/ProcessorTest.php
index 56c952b46beaa..4bd065117352c 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImport/ProcessorTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImport/ProcessorTest.php
@@ -5,18 +5,18 @@
  */
 namespace Magento\Deploy\Test\Unit\Console\Command\App\ConfigImport;
 
-use Magento\Framework\App\DeploymentConfig\ImporterInterface;
-use Magento\Framework\App\DeploymentConfig;
-use Psr\Log\LoggerInterface as Logger;
 use Magento\Deploy\Console\Command\App\ConfigImport\Processor;
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
 use Magento\Deploy\Model\DeploymentConfig\Hash;
-use Magento\Deploy\Model\DeploymentConfig\ImporterPool;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputInterface;
 use Magento\Deploy\Model\DeploymentConfig\ImporterFactory;
-use Magento\Framework\Console\QuestionPerformer\YesNo;
+use Magento\Deploy\Model\DeploymentConfig\ImporterPool;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\DeploymentConfig\ImporterInterface;
 use Magento\Framework\App\DeploymentConfig\ValidatorInterface;
+use Magento\Framework\Console\QuestionPerformer\YesNo;
+use Psr\Log\LoggerInterface as Logger;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImportCommandTest.php b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImportCommandTest.php
index e15f9316028f7..0f90253a38121 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImportCommandTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImportCommandTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Deploy\Test\Unit\Console\Command\App;
 
-use Magento\Deploy\Console\Command\App\ConfigImportCommand;
 use Magento\Deploy\Console\Command\App\ConfigImport\Processor;
+use Magento\Deploy\Console\Command\App\ConfigImportCommand;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\RuntimeException;
 use Symfony\Component\Console\Tester\CommandTester;
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/App/SensitiveConfigSet/InteractiveCollectorTest.php b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/SensitiveConfigSet/InteractiveCollectorTest.php
index 804dca60937e6..9744d86a626f9 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/Command/App/SensitiveConfigSet/InteractiveCollectorTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/SensitiveConfigSet/InteractiveCollectorTest.php
@@ -7,11 +7,11 @@
 
 use Magento\Deploy\Console\Command\App\SensitiveConfigSet\InteractiveCollector;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Question\QuestionFactory;
-use Symfony\Component\Console\Helper\QuestionHelper;
 
 class InteractiveCollectorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/App/SensitiveConfigSet/SimpleCollectorTest.php b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/SensitiveConfigSet/SimpleCollectorTest.php
index 0e6bebe1737cd..9ff5290ba5d2a 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/Command/App/SensitiveConfigSet/SimpleCollectorTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/SensitiveConfigSet/SimpleCollectorTest.php
@@ -8,12 +8,12 @@
 use Magento\Deploy\Console\Command\App\SensitiveConfigSet\SimpleCollector;
 use Magento\Deploy\Console\Command\App\SensitiveConfigSetCommand;
 use Magento\Framework\Exception\LocalizedException;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Question\QuestionFactory;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class SimpleCollectorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/SetModeCommandTest.php b/app/code/Magento/Deploy/Test/Unit/Console/Command/SetModeCommandTest.php
index a49bae655e87f..33ffbf20c5bd9 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/Command/SetModeCommandTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Console/Command/SetModeCommandTest.php
@@ -7,7 +7,6 @@
 
 use Magento\Deploy\Console\Command\SetModeCommand;
 use Symfony\Component\Console\Tester\CommandTester;
-use Magento\Framework\App\State;
 
 /**
  * @package Magento\Deploy\Test\Unit\Console\Command
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/ShowModeCommandTest.php b/app/code/Magento/Deploy/Test/Unit/Console/Command/ShowModeCommandTest.php
index 9ea42362d9646..1dfa064a8d24f 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/Command/ShowModeCommandTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Console/Command/ShowModeCommandTest.php
@@ -7,7 +7,6 @@
 
 use Magento\Deploy\Console\Command\ShowModeCommand;
 use Symfony\Component\Console\Tester\CommandTester;
-use Magento\Framework\App\State;
 
 /**
  * @package Magento\Deploy\Test\Unit\Console\Command
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/ConfigWriterTest.php b/app/code/Magento/Deploy/Test/Unit/Model/ConfigWriterTest.php
index 8c80d4f850376..a95b8b5316a7a 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/ConfigWriterTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/ConfigWriterTest.php
@@ -7,8 +7,8 @@
 
 use Magento\Config\Model\PreparedValueFactory;
 use Magento\Deploy\Model\ConfigWriter;
-use Magento\Framework\App\Config\ValueInterface;
 use Magento\Framework\App\Config\Value;
+use Magento\Framework\App\Config\ValueInterface;
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Stdlib\ArrayManager;
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ChangeDetectorTest.php b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ChangeDetectorTest.php
index dbb23be311b47..ecda10312b6e5 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ChangeDetectorTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ChangeDetectorTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Deploy\Test\Unit\Model\DeploymentConfig;
 
-use Magento\Deploy\Model\DeploymentConfig\Hash\Generator as HashGenerator;
-use Magento\Deploy\Model\DeploymentConfig\Hash;
-use Magento\Deploy\Model\DeploymentConfig\DataCollector;
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
+use Magento\Deploy\Model\DeploymentConfig\DataCollector;
+use Magento\Deploy\Model\DeploymentConfig\Hash;
+use Magento\Deploy\Model\DeploymentConfig\Hash\Generator as HashGenerator;
 
 class ChangeDetectorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php b/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php
index d14c86c4a3264..3ce71b9a976ae 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/FilesystemTest.php
@@ -9,15 +9,15 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Setup\Lists;
 use Magento\Framework\ShellInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Validator\Locale;
 use Magento\Store\Model\Config\StoreView;
 use Magento\User\Model\ResourceModel\User\Collection;
 use Magento\User\Model\User;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Framework\Validator\Locale;
-use Magento\Framework\Setup\Lists;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/ModeTest.php b/app/code/Magento/Deploy/Test/Unit/Model/ModeTest.php
index 25625eaa5e267..3e895a8b5a410 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/ModeTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/ModeTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Deploy\Test\Unit\Model;
 
-use Magento\Config\Console\Command\ConfigSet\ProcessorFacadeFactory;
 use Magento\Config\Console\Command\ConfigSet\ProcessorFacade;
+use Magento\Config\Console\Command\ConfigSet\ProcessorFacadeFactory;
 use Magento\Config\Console\Command\EmulatedAdminhtmlAreaProcessor;
 use Magento\Deploy\App\Mode\ConfigProvider;
 use Magento\Deploy\Model\Filesystem;
@@ -17,11 +17,11 @@
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\App\MaintenanceMode;
 use Magento\Framework\App\State;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Exception\LocalizedException;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Framework\Config\File\ConfigFilePool;
-use Magento\Framework\Exception\LocalizedException;
 
 /**
  * @inheritdoc
diff --git a/app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php b/app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php
index 62cb1bab3b330..1252b9e55fedf 100644
--- a/app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Deploy\Test\Unit\Model\Plugin;
 
-use Magento\Deploy\Model\Plugin\ConfigChangeDetector;
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
+use Magento\Deploy\Model\Plugin\ConfigChangeDetector;
 use Magento\Framework\App\FrontControllerInterface;
 use Magento\Framework\App\RequestInterface;
 
diff --git a/app/code/Magento/Deploy/Test/Unit/Process/QueueTest.php b/app/code/Magento/Deploy/Test/Unit/Process/QueueTest.php
index dc32de527c8c1..0e03c1e6049b0 100644
--- a/app/code/Magento/Deploy/Test/Unit/Process/QueueTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Process/QueueTest.php
@@ -5,17 +5,17 @@
  */
 namespace Magento\Deploy\Test\Unit\Process;
 
-use Magento\Deploy\Process\Queue;
 use Magento\Deploy\Package\Package;
+use Magento\Deploy\Process\Queue;
 use Magento\Deploy\Service\DeployPackage;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\Locale\ResolverInterface as LocaleResolver;
-use Magento\Framework\App\ResourceConnection;
-use Psr\Log\LoggerInterface;
-
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
+use Psr\Log\LoggerInterface;
+
 /**
  * Deployment Queue class unit tests
  *
diff --git a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
index 3fe1c9800a730..40585a6614c6a 100644
--- a/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Service/DeployStaticContentTest.php
@@ -7,11 +7,11 @@
 
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Process\Queue;
+use Magento\Deploy\Process\QueueFactory;
 use Magento\Deploy\Service\Bundle;
 use Magento\Deploy\Service\DeployPackage;
 use Magento\Deploy\Service\DeployRequireJsConfig;
 use Magento\Deploy\Service\DeployStaticContent;
-use Magento\Deploy\Process\QueueFactory;
 use Magento\Deploy\Service\DeployTranslationsDictionary;
 use Magento\Deploy\Service\MinifyTemplates;
 use Magento\Deploy\Strategy\CompactDeploy;
@@ -20,10 +20,10 @@
 use Magento\Framework\App\View\Deployment\Version\StorageInterface;
 use Magento\Framework\ObjectManagerInterface;
 
-use Psr\Log\LoggerInterface;
-
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
+use Psr\Log\LoggerInterface;
+
 /**
  * Static Content deploy service class unit tests
  *
diff --git a/app/code/Magento/Deploy/Test/Unit/Service/DeployTranslationsDictionaryTest.php b/app/code/Magento/Deploy/Test/Unit/Service/DeployTranslationsDictionaryTest.php
index b03f797c8b037..fbbd473b1a6dc 100644
--- a/app/code/Magento/Deploy/Test/Unit/Service/DeployTranslationsDictionaryTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Service/DeployTranslationsDictionaryTest.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Deploy\Test\Unit\Service;
 
-use Magento\Deploy\Service\DeployTranslationsDictionary;
 use Magento\Deploy\Service\DeployStaticFile;
+use Magento\Deploy\Service\DeployTranslationsDictionary;
 
 use Magento\Framework\App\State;
 use Magento\Framework\Translate\Js\Config as JsTranslationConfig;
 
-use Psr\Log\LoggerInterface;
-
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
+use Psr\Log\LoggerInterface;
+
 /**
  * Translation Dictionaries deploy service class unit tests
  */
diff --git a/app/code/Magento/Deploy/Test/Unit/Strategy/CompactDeployTest.php b/app/code/Magento/Deploy/Test/Unit/Strategy/CompactDeployTest.php
index 439f5d811a844..1e44aea8d7dea 100644
--- a/app/code/Magento/Deploy/Test/Unit/Strategy/CompactDeployTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Strategy/CompactDeployTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Deploy\Test\Unit\Strategy;
 
-use Magento\Deploy\Strategy\CompactDeploy;
 use Magento\Deploy\Package\Package;
 use Magento\Deploy\Package\PackagePool;
 use Magento\Deploy\Process\Queue;
+use Magento\Deploy\Strategy\CompactDeploy;
 
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
diff --git a/app/code/Magento/Developer/Console/Command/DiInfoCommand.php b/app/code/Magento/Developer/Console/Command/DiInfoCommand.php
index 2235aa5e5d9df..6bcae7796f91e 100644
--- a/app/code/Magento/Developer/Console/Command/DiInfoCommand.php
+++ b/app/code/Magento/Developer/Console/Command/DiInfoCommand.php
@@ -9,10 +9,10 @@
 use Magento\Developer\Model\Di\Information;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Helper\Table;
 
 class DiInfoCommand extends Command
 {
diff --git a/app/code/Magento/Developer/Console/Command/ProfilerDisableCommand.php b/app/code/Magento/Developer/Console/Command/ProfilerDisableCommand.php
index 40916703ed28f..02fffbd03c173 100644
--- a/app/code/Magento/Developer/Console/Command/ProfilerDisableCommand.php
+++ b/app/code/Magento/Developer/Console/Command/ProfilerDisableCommand.php
@@ -66,7 +66,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->filesystem->rm(BP . '/' . self::PROFILER_FLAG_FILE);
         if (!$this->filesystem->fileExists(BP . '/' . self::PROFILER_FLAG_FILE)) {
-            $output->writeln('<info>'. self::SUCCESS_MESSAGE . '</info>');
+            $output->writeln('<info>' . self::SUCCESS_MESSAGE . '</info>');
             return;
         }
         $output->writeln('<error>Something went wrong while disabling the profiler.</error>');
diff --git a/app/code/Magento/Developer/Console/Command/ProfilerEnableCommand.php b/app/code/Magento/Developer/Console/Command/ProfilerEnableCommand.php
index 0917f55cd1bdc..2b136d5063787 100644
--- a/app/code/Magento/Developer/Console/Command/ProfilerEnableCommand.php
+++ b/app/code/Magento/Developer/Console/Command/ProfilerEnableCommand.php
@@ -8,9 +8,9 @@
 
 use Magento\Framework\Filesystem\Io\File;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 
 /**
  * CLI Command to enable Magento profiler.
@@ -88,7 +88,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->filesystem->write(BP . '/' . self::PROFILER_FLAG_FILE, $type);
         if ($this->filesystem->fileExists(BP . '/' . self::PROFILER_FLAG_FILE)) {
-            $output->write('<info>'. sprintf(self::SUCCESS_MESSAGE, $type) . '</info>');
+            $output->write('<info>' . sprintf(self::SUCCESS_MESSAGE, $type) . '</info>');
             if ($type == 'csvfile') {
                 $output->write(
                     '<info> ' . sprintf(
diff --git a/app/code/Magento/Developer/Console/Command/QueryLogDisableCommand.php b/app/code/Magento/Developer/Console/Command/QueryLogDisableCommand.php
index 52bb148ffff0c..f75e26125a0d0 100644
--- a/app/code/Magento/Developer/Console/Command/QueryLogDisableCommand.php
+++ b/app/code/Magento/Developer/Console/Command/QueryLogDisableCommand.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Developer\Console\Command;
 
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\DB\Logger\LoggerProxy;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 class QueryLogDisableCommand extends Command
 {
@@ -63,6 +63,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $data = [LoggerProxy::PARAM_ALIAS => LoggerProxy::LOGGER_ALIAS_DISABLED];
         $this->deployConfigWriter->saveConfig([ConfigFilePool::APP_ENV => [LoggerProxy::CONF_GROUP_NAME => $data]]);
 
-        $output->writeln("<info>". self::SUCCESS_MESSAGE . "</info>");
+        $output->writeln("<info>" . self::SUCCESS_MESSAGE . "</info>");
     }
 }
diff --git a/app/code/Magento/Developer/Console/Command/QueryLogEnableCommand.php b/app/code/Magento/Developer/Console/Command/QueryLogEnableCommand.php
index c221bed3877bf..d68ec5a6f38a0 100644
--- a/app/code/Magento/Developer/Console/Command/QueryLogEnableCommand.php
+++ b/app/code/Magento/Developer/Console/Command/QueryLogEnableCommand.php
@@ -6,13 +6,13 @@
 
 namespace Magento\Developer\Console\Command;
 
+use Magento\Framework\App\DeploymentConfig\Writer;
+use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\DB\Logger\LoggerProxy;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Framework\App\DeploymentConfig\Writer;
-use Magento\Framework\Config\File\ConfigFilePool;
 
 class QueryLogEnableCommand extends Command
 {
@@ -115,6 +115,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->deployConfigWriter->saveConfig([ConfigFilePool::APP_ENV => $configGroup]);
 
-        $output->writeln("<info>". self::SUCCESS_MESSAGE . "</info>");
+        $output->writeln("<info>" . self::SUCCESS_MESSAGE . "</info>");
     }
 }
diff --git a/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php b/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php
index 25519e5c83054..c137a453f080a 100644
--- a/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php
+++ b/app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php
@@ -5,14 +5,13 @@
  */
 namespace Magento\Developer\Console\Command;
 
-use Magento\Framework\App\State;
+use Magento\Framework\App\View\Asset\Publisher;
 use Magento\Framework\Validator\Locale;
 use Magento\Framework\View\Asset\Repository;
 use Symfony\Component\Console\Command\Command;
-use Magento\Framework\App\View\Asset\Publisher;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
diff --git a/app/code/Magento/Developer/Console/Command/TemplateHintsDisableCommand.php b/app/code/Magento/Developer/Console/Command/TemplateHintsDisableCommand.php
index dbecc673c1b85..27f2ae4e0826f 100644
--- a/app/code/Magento/Developer/Console/Command/TemplateHintsDisableCommand.php
+++ b/app/code/Magento/Developer/Console/Command/TemplateHintsDisableCommand.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Developer\Console\Command;
 
+use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
 
 class TemplateHintsDisableCommand extends Command
 {
@@ -57,6 +57,6 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->resourceConfig->saveConfig('dev/debug/template_hints_storefront', 0, 'default', 0);
-        $output->writeln("<info>". self::SUCCESS_MESSAGE . "</info>");
+        $output->writeln("<info>" . self::SUCCESS_MESSAGE . "</info>");
     }
 }
diff --git a/app/code/Magento/Developer/Console/Command/TemplateHintsEnableCommand.php b/app/code/Magento/Developer/Console/Command/TemplateHintsEnableCommand.php
index b1813686c565f..62982e6133396 100644
--- a/app/code/Magento/Developer/Console/Command/TemplateHintsEnableCommand.php
+++ b/app/code/Magento/Developer/Console/Command/TemplateHintsEnableCommand.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Developer\Console\Command;
 
+use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
 
 class TemplateHintsEnableCommand extends Command
 {
@@ -58,6 +58,6 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->resourceConfig->saveConfig('dev/debug/template_hints_storefront', 1, 'default', 0);
-        $output->writeln("<info>". self::SUCCESS_MESSAGE . "</info>");
+        $output->writeln("<info>" . self::SUCCESS_MESSAGE . "</info>");
     }
 }
diff --git a/app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php b/app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php
index 323b8e1016291..4212d3780933a 100644
--- a/app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php
+++ b/app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php
@@ -9,8 +9,8 @@
 use Magento\Framework\Exception\InputException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -86,7 +86,7 @@ protected function configure()
                     self::IDE_OPTION,
                     null,
                     InputOption::VALUE_REQUIRED,
-                    'Format in which catalog will be generated. Supported: ['.
+                    'Format in which catalog will be generated. Supported: [' .
                     implode(', ', $this->getSupportedFormats()) . ']',
                     'phpstorm'
                 ),
diff --git a/app/code/Magento/Developer/Console/Command/XmlConverterCommand.php b/app/code/Magento/Developer/Console/Command/XmlConverterCommand.php
index 16d3449530247..b450574a6594f 100644
--- a/app/code/Magento/Developer/Console/Command/XmlConverterCommand.php
+++ b/app/code/Magento/Developer/Console/Command/XmlConverterCommand.php
@@ -6,14 +6,14 @@
 
 namespace Magento\Developer\Console\Command;
 
+use Magento\Developer\Model\Tools\Formatter;
+use Magento\Framework\DomDocument\DomDocumentFactory;
+use Magento\Framework\XsltProcessor\XsltProcessorFactory;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Developer\Model\Tools\Formatter;
-use Magento\Framework\DomDocument\DomDocumentFactory;
-use Magento\Framework\XsltProcessor\XsltProcessorFactory;
 
 /**
  * Class XmlConverterCommand
diff --git a/app/code/Magento/Developer/Model/Di/PluginList.php b/app/code/Magento/Developer/Model/Di/PluginList.php
index 0a1df8a974242..962b312179d93 100644
--- a/app/code/Magento/Developer/Model/Di/PluginList.php
+++ b/app/code/Magento/Developer/Model/Di/PluginList.php
@@ -145,7 +145,7 @@ private function addPluginToList($pluginInstance, $pluginMethod, $methodTypes, $
             if (!array_key_exists($pluginInstance, $this->pluginList[$this->pluginTypeMapping[$typeCode]])) {
                 $this->pluginList[$this->pluginTypeMapping[$typeCode]][$pluginInstance] = [];
             }
-            $this->pluginList[$this->pluginTypeMapping[$typeCode]][$pluginInstance][] = $pluginMethod ;
+            $this->pluginList[$this->pluginTypeMapping[$typeCode]][$pluginInstance][] = $pluginMethod;
         }
     }
 }
diff --git a/app/code/Magento/Developer/Model/Logger/Handler/Debug.php b/app/code/Magento/Developer/Model/Logger/Handler/Debug.php
index 9bfee42fa6a83..c3d6df23b7906 100644
--- a/app/code/Magento/Developer/Model/Logger/Handler/Debug.php
+++ b/app/code/Magento/Developer/Model/Logger/Handler/Debug.php
@@ -6,10 +6,10 @@
 namespace Magento\Developer\Model\Logger\Handler;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\State;
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Enable/disable debug logging based on the store config setting
diff --git a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php
index 5c26fdb80a165..3f962b5996e55 100644
--- a/app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php
+++ b/app/code/Magento/Developer/Model/View/Asset/PreProcessor/FrontendCompilation.php
@@ -6,11 +6,11 @@
 namespace Magento\Developer\Model\View\Asset\PreProcessor;
 
 use Magento\Framework\View\Asset\File\FallbackContext;
-use Magento\Framework\View\Asset\PreProcessor;
-use Magento\Framework\View\Asset\PreProcessorInterface;
 use Magento\Framework\View\Asset\LockerProcessInterface;
-use Magento\Framework\View\Asset\PreProcessor\AlternativeSourceInterface;
+use Magento\Framework\View\Asset\PreProcessor;
 use Magento\Framework\View\Asset\PreProcessor\AlternativeSource\AssetBuilder;
+use Magento\Framework\View\Asset\PreProcessor\AlternativeSourceInterface;
+use Magento\Framework\View\Asset\PreProcessorInterface;
 use Magento\Framework\View\Asset\Source;
 
 /**
@@ -77,7 +77,6 @@ public function __construct(
      */
     public function process(PreProcessor\Chain $chain)
     {
-
         try {
             $this->lockerProcess->lockProcess($this->lockName);
 
diff --git a/app/code/Magento/Developer/Test/Unit/Block/Adminhtml/System/Config/WorkflowTypeTest.php b/app/code/Magento/Developer/Test/Unit/Block/Adminhtml/System/Config/WorkflowTypeTest.php
index 4f19a0b7fbe89..596faab8c9e44 100644
--- a/app/code/Magento/Developer/Test/Unit/Block/Adminhtml/System/Config/WorkflowTypeTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Block/Adminhtml/System/Config/WorkflowTypeTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Developer\Test\Unit\Block\Adminhtml\System\Config;
 
-use Magento\Developer\Block\Adminhtml\System\Config\WorkflowType;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Backend\Block\Template\Context;
+use Magento\Developer\Block\Adminhtml\System\Config\WorkflowType;
 use Magento\Framework\App\State;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class WorkflowTypeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/SourceThemeDeployCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/SourceThemeDeployCommandTest.php
index 648230ab2d1ca..584f0778bd560 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/SourceThemeDeployCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/SourceThemeDeployCommandTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Developer\Test\Unit\Console\Command;
 
-use Magento\Framework\Validator\Locale;
-use Magento\Framework\View\Asset\Repository;
+use Magento\Developer\Console\Command\SourceThemeDeployCommand;
 use Magento\Framework\App\View\Asset\Publisher;
+use Magento\Framework\Validator\Locale;
 use Magento\Framework\View\Asset\LocalInterface;
+use Magento\Framework\View\Asset\Repository;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Developer\Console\Command\SourceThemeDeployCommand;
 
 /**
  * Class SourceThemeDeployCommandTest
@@ -194,7 +194,7 @@ public function testExecuteNonExistingValue()
         $this->assetPublisherMock->expects(self::once())
             ->method('publish')
             ->with($assetMock)
-            ->willThrowException(new \Magento\Framework\View\Asset\File\NotFoundException);
+            ->willThrowException(new \Magento\Framework\View\Asset\File\NotFoundException());
 
         $valueMap = [
             ['area', self::AREA_TEST_VALUE],
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/XmlConverterCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/XmlConverterCommandTest.php
index 0876258768876..8bf9aa543467a 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/XmlConverterCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/XmlConverterCommandTest.php
@@ -7,10 +7,10 @@
 namespace Magento\Developer\Test\Unit\Console\Command;
 
 use Magento\Developer\Console\Command\XmlConverterCommand;
-use Symfony\Component\Console\Tester\CommandTester;
 use Magento\Developer\Model\Tools\Formatter;
 use Magento\Framework\DomDocument\DomDocumentFactory;
 use Magento\Framework\XsltProcessor\XsltProcessorFactory;
+use Symfony\Component\Console\Tester\CommandTester;
 
 class XmlConverterCommandTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Developer/Test/Unit/Model/Config/Backend/WorkflowTypeTest.php b/app/code/Magento/Developer/Test/Unit/Model/Config/Backend/WorkflowTypeTest.php
index dcb7138353f5d..6181f83eb3dbd 100644
--- a/app/code/Magento/Developer/Test/Unit/Model/Config/Backend/WorkflowTypeTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Model/Config/Backend/WorkflowTypeTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Developer\Test\Unit\Model\Config\Backend;
 
-use Magento\Framework\App\State;
-use Magento\Framework\Model\Context;
 use Magento\Developer\Model\Config\Backend\WorkflowType;
-use Magento\Framework\App\State\CleanupFiles;
 use Magento\Developer\Model\Config\Source\WorkflowType as SourceWorkflowType;
+use Magento\Framework\App\State;
+use Magento\Framework\App\State\CleanupFiles;
+use Magento\Framework\Model\Context;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class WorkflowTypeTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Developer/Test/Unit/Model/Di/InformationTest.php b/app/code/Magento/Developer/Test/Unit/Model/Di/InformationTest.php
index db9a59a73a6d2..97b4d759b2522 100644
--- a/app/code/Magento/Developer/Test/Unit/Model/Di/InformationTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Model/Di/InformationTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Developer\Test\Unit\Model\Di;
 
+use Magento\Developer\Model\Di\Information;
+use Magento\Developer\Model\Di\PluginList;
 use Magento\Framework\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManager\DefinitionInterface;
-use Magento\Developer\Model\Di\PluginList;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Developer\Model\Di\Information;
 
 class InformationTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php b/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php
index c116775d582bb..f6f4609500362 100644
--- a/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Model/Logger/Handler/DebugTest.php
@@ -7,13 +7,13 @@
 
 use Magento\Developer\Model\Logger\Handler\Debug;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\State;
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\ScopeInterface;
 use Monolog\Formatter\FormatterInterface;
 use Monolog\Logger;
-use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Class DebugTest
diff --git a/app/code/Magento/Developer/Test/Unit/Model/View/Asset/PreProcessor/FrontendCompilationTest.php b/app/code/Magento/Developer/Test/Unit/Model/View/Asset/PreProcessor/FrontendCompilationTest.php
index ce64ceb6db83d..c076b7b080dcc 100644
--- a/app/code/Magento/Developer/Test/Unit/Model/View/Asset/PreProcessor/FrontendCompilationTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Model/View/Asset/PreProcessor/FrontendCompilationTest.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Developer\Test\Unit\Model\View\Asset\PreProcessor;
 
+use Magento\Developer\Model\View\Asset\PreProcessor\FrontendCompilation;
 use Magento\Framework\View\Asset\File;
-use Magento\Framework\View\Asset\Source;
-use Magento\Framework\View\Asset\LocalInterface;
-use Magento\Framework\View\Asset\PreProcessor\Chain;
 use Magento\Framework\View\Asset\File\FallbackContext;
+use Magento\Framework\View\Asset\LocalInterface;
 use Magento\Framework\View\Asset\LockerProcessInterface;
-use Magento\Developer\Model\View\Asset\PreProcessor\FrontendCompilation;
-use Magento\Framework\View\Asset\PreProcessor\AlternativeSourceInterface;
 use Magento\Framework\View\Asset\PreProcessor\AlternativeSource\AssetBuilder;
+use Magento\Framework\View\Asset\PreProcessor\AlternativeSourceInterface;
+use Magento\Framework\View\Asset\PreProcessor\Chain;
+use Magento\Framework\View\Asset\Source;
 
 /**
  * Class FrontendCompilationTest
diff --git a/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php b/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
index deeb769c808fa..590673b49c614 100644
--- a/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
+++ b/app/code/Magento/Dhl/Block/Adminhtml/Unitofmeasure.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Dhl\Block\Adminhtml;
 
-use Magento\Dhl\Model;
-use Magento\Shipping\Helper;
 use Magento\Backend\Block\Template\Context;
 use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Dhl\Model;
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Shipping\Helper;
 
 /**
  * Frontend model for DHL shipping methods for documentation
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 9a26efee744d5..2a15b75750195 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -7,15 +7,15 @@
 namespace Magento\Dhl\Model;
 
 use Magento\Catalog\Model\Product\Type;
+use Magento\Dhl\Model\Validator\XmlValidator;
 use Magento\Framework\Module\Dir;
-use Magento\Sales\Exception\DocumentValidationException;
-use Magento\Sales\Model\Order\Shipment;
+use Magento\Framework\Xml\Security;
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use Magento\Quote\Model\Quote\Address\RateResult\Error;
+use Magento\Sales\Exception\DocumentValidationException;
+use Magento\Sales\Model\Order\Shipment;
 use Magento\Shipping\Model\Carrier\AbstractCarrier;
 use Magento\Shipping\Model\Rate\Result;
-use Magento\Framework\Xml\Security;
-use Magento\Dhl\Model\Validator\XmlValidator;
 
 /**
  * DHL International (API v1.4)
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index 8738d3bb8dae2..67f236efb60f7 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Dhl\Test\Unit\Model;
 
+use Magento\Dhl\Model\Validator\XmlValidator;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\HTTP\ZendClient;
 use Magento\Framework\HTTP\ZendClientFactory;
@@ -12,7 +13,6 @@
 use Magento\Framework\Xml\Security;
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Dhl\Model\Validator\XmlValidator;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/Validator/ResponseErrorProcessorTest.php b/app/code/Magento/Dhl/Test/Unit/Model/Validator/ResponseErrorProcessorTest.php
index 721cca16a87d0..1c6af579c771a 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/Validator/ResponseErrorProcessorTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/Validator/ResponseErrorProcessorTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Dhl\Test\Unit\Model\Validator;
 
 use Magento\Dhl\Model\Validator\ResponseErrorProcessor;
-use Magento\Shipping\Model\Simplexml\Element;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Shipping\Model\Simplexml\Element;
 
 class ResponseErrorProcessorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Dhl/Test/Unit/Model/Validator/XmlValidatorTest.php b/app/code/Magento/Dhl/Test/Unit/Model/Validator/XmlValidatorTest.php
index 3d7893fea118f..4faa924c143eb 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/Validator/XmlValidatorTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/Validator/XmlValidatorTest.php
@@ -6,13 +6,12 @@
 
 namespace Magento\Dhl\Test\Unit\Model\Validator;
 
-use Magento\Sales\Exception\DocumentValidationException;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Framework\Xml\Security;
 use Magento\Dhl\Model\Validator\ResponseErrorProcessor;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Dhl\Model\Validator\XmlValidator;
-use Magento\Shipping\Model\Simplexml\Element;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Xml\Security;
+use Magento\Sales\Exception\DocumentValidationException;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class XmlValidatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
index 0b5b836b4ac93..eadd4d25214e7 100644
--- a/app/code/Magento/Directory/Model/Currency.php
+++ b/app/code/Magento/Directory/Model/Currency.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Directory\Model;
 
+use Magento\Directory\Model\Currency\Filter;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
-use Magento\Directory\Model\Currency\Filter;
 
 /**
  * Currency model
@@ -426,7 +426,7 @@ public function saveRates($rates)
     private function trimUnicodeDirectionMark($string)
     {
         if (preg_match('/^(\x{200E}|\x{200F})/u', $string, $match)) {
-            $string = preg_replace('/^'.$match[1].'/u', '', $string);
+            $string = preg_replace('/^' . $match[1] . '/u', '', $string);
         }
         return $string;
     }
diff --git a/app/code/Magento/Directory/Model/CurrencyInformationAcquirer.php b/app/code/Magento/Directory/Model/CurrencyInformationAcquirer.php
index 8bd9f37d7082d..e2ccc517b791e 100644
--- a/app/code/Magento/Directory/Model/CurrencyInformationAcquirer.php
+++ b/app/code/Magento/Directory/Model/CurrencyInformationAcquirer.php
@@ -24,7 +24,7 @@ class CurrencyInformationAcquirer implements \Magento\Directory\Api\CurrencyInfo
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
-    
+
     /**
      * @param \Magento\Directory\Model\Data\CurrencyInformationFactory $currencyInformationFactory
      * @param \Magento\Directory\Model\Data\ExchangeRateFactory $exchangeRateFactory
diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
index 07d2e60d61335..d0689147f0626 100644
--- a/app/code/Magento/Directory/Model/PriceCurrency.php
+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -6,9 +6,9 @@
 namespace Magento\Directory\Model;
 
 use Magento\Framework\App\ScopeInterface;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface as Logger;
-use Magento\Store\Model\Store;
 
 /**
  * Class PriceCurrency model for convert and format price value
diff --git a/app/code/Magento/Directory/Model/TopDestinationCountries.php b/app/code/Magento/Directory/Model/TopDestinationCountries.php
index c33927604d7b9..c860c1f424018 100644
--- a/app/code/Magento/Directory/Model/TopDestinationCountries.php
+++ b/app/code/Magento/Directory/Model/TopDestinationCountries.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Directory\Model;
 
-use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Class TopDestinationCountries
diff --git a/app/code/Magento/Directory/Setup/UpgradeData.php b/app/code/Magento/Directory/Setup/UpgradeData.php
index 4ee9ea33673d7..a8f76b57636a8 100644
--- a/app/code/Magento/Directory/Setup/UpgradeData.php
+++ b/app/code/Magento/Directory/Setup/UpgradeData.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Directory\Setup;
 
+use Magento\Directory\Helper\Data;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Directory\Helper\Data;
 
 /**
  * Upgrade Data script for Directory module.
diff --git a/app/code/Magento/Directory/Test/Unit/Model/AllowedCountriesTest.php b/app/code/Magento/Directory/Test/Unit/Model/AllowedCountriesTest.php
index 5931e5a839341..0988f94facd41 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/AllowedCountriesTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/AllowedCountriesTest.php
@@ -8,7 +8,6 @@
 
 use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
diff --git a/app/code/Magento/Directory/Test/Unit/Model/CountryInformationAcquirerTest.php b/app/code/Magento/Directory/Test/Unit/Model/CountryInformationAcquirerTest.php
index 3f963cb2b82af..f3624e148e833 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/CountryInformationAcquirerTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/CountryInformationAcquirerTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Directory\Test\Unit\Model;
 
-use Magento\Framework\Exception\NoSuchEntityException;
-
 /**
  * Class CountryInformationAcquirerTest
  */
diff --git a/app/code/Magento/Directory/Test/Unit/Model/CountryTest.php b/app/code/Magento/Directory/Test/Unit/Model/CountryTest.php
index b42214d4dd14a..bef03bf470a47 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/CountryTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/CountryTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Directory\Test\Unit\Model;
 
-use Magento\Directory\Model\Country;
-
 class CountryTest extends \PHPUnit\Framework\TestCase
 {
     protected $country;
diff --git a/app/code/Magento/Directory/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Directory/Test/Unit/Model/ObserverTest.php
index 5fb7271a411ed..4c25ded960357 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/ObserverTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Directory\Test\Unit\Model;
 
-use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Directory\Model\Observer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Region/CollectionTest.php b/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Region/CollectionTest.php
index db76b7ba00a6b..1800f7db90e2d 100644
--- a/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Region/CollectionTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Region/CollectionTest.php
@@ -5,19 +5,19 @@
  */
 namespace Magento\Directory\Test\Unit\Model\ResourceModel\Region;
 
-use Magento\Directory\Model\ResourceModel\Region\Collection;
 use Magento\Directory\Model\AllowedCountries;
+use Magento\Directory\Model\ResourceModel\Region\Collection;
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
+use Magento\Framework\Data\Collection\EntityFactory;
+use Magento\Framework\DataObject;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\DB\Select;
-use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
-use Magento\Framework\Data\Collection\EntityFactory;
 use Magento\Framework\Locale\ResolverInterface;
-use Magento\Framework\DataObject;
-use Psr\Log\LoggerInterface;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class CollectionTest
diff --git a/app/code/Magento/Downloadable/Api/LinkRepositoryInterface.php b/app/code/Magento/Downloadable/Api/LinkRepositoryInterface.php
index 8da1f0b0a75ea..60ed5525ee137 100644
--- a/app/code/Magento/Downloadable/Api/LinkRepositoryInterface.php
+++ b/app/code/Magento/Downloadable/Api/LinkRepositoryInterface.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Downloadable\Api;
 
-use Magento\Downloadable\Api\Data\LinkInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Downloadable\Api\Data\LinkInterface;
 
 /**
  * Interface LinkRepositoryInterface
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
index f56b219f72db2..d0a513a17b79b 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Downloadable\Controller\Adminhtml\Product\Initialization\Helper\Plugin;
 
-use Magento\Framework\App\RequestInterface;
+use Magento\Downloadable\Api\Data\LinkInterfaceFactory;
+use Magento\Downloadable\Api\Data\SampleInterfaceFactory;
 use Magento\Downloadable\Model\Link\Builder as LinkBuilder;
 use Magento\Downloadable\Model\Sample\Builder as SampleBuilder;
-use Magento\Downloadable\Api\Data\SampleInterfaceFactory;
-use Magento\Downloadable\Api\Data\LinkInterfaceFactory;
+use Magento\Framework\App\RequestInterface;
 
 class Downloadable
 {
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index 910eaa42f0e84..1525e9a1f1b33 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -9,8 +9,8 @@
 namespace Magento\Downloadable\Helper;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem;
 use Magento\Framework\Exception\LocalizedException as CoreException;
+use Magento\Framework\Filesystem;
 
 /**
  * Downloadable Products Download Helper
diff --git a/app/code/Magento/Downloadable/Model/File/ContentUploader.php b/app/code/Magento/Downloadable/Model/File/ContentUploader.php
index ab226b40c3cb6..cad2c3d847399 100644
--- a/app/code/Magento/Downloadable/Model/File/ContentUploader.php
+++ b/app/code/Magento/Downloadable/Model/File/ContentUploader.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Downloadable\Model\File;
 
-use Magento\MediaStorage\Helper\File\Storage;
-use Magento\MediaStorage\Helper\File\Storage\Database;
-use Magento\MediaStorage\Model\File\Uploader;
-use Magento\MediaStorage\Model\File\Validator\NotProtectedExtension;
 use Magento\Downloadable\Api\Data\File\ContentInterface;
 use Magento\Downloadable\Model\Link as LinkConfig;
 use Magento\Downloadable\Model\Sample as SampleConfig;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
+use Magento\MediaStorage\Helper\File\Storage;
+use Magento\MediaStorage\Helper\File\Storage\Database;
+use Magento\MediaStorage\Model\File\Uploader;
+use Magento\MediaStorage\Model\File\Validator\NotProtectedExtension;
 
 class ContentUploader extends Uploader implements \Magento\Downloadable\Api\Data\File\ContentUploaderInterface
 {
diff --git a/app/code/Magento/Downloadable/Model/Link/Builder.php b/app/code/Magento/Downloadable/Model/Link/Builder.php
index 83d01f76fe9cd..8e0283e86ca6c 100644
--- a/app/code/Magento/Downloadable/Model/Link/Builder.php
+++ b/app/code/Magento/Downloadable/Model/Link/Builder.php
@@ -112,7 +112,7 @@ public function build(\Magento\Downloadable\Api\Data\LinkInterface $link)
             $link->setLinkFile($linkFileName);
             $link->setLinkUrl(null);
         }
-        
+
         if (isset($this->data['sample'])) {
             $link = $this->buildSample($link, $this->data['sample']);
         }
diff --git a/app/code/Magento/Downloadable/Model/Link/CreateHandler.php b/app/code/Magento/Downloadable/Model/Link/CreateHandler.php
index 025f2450af0fb..6c6f044dba9a3 100644
--- a/app/code/Magento/Downloadable/Model/Link/CreateHandler.php
+++ b/app/code/Magento/Downloadable/Model/Link/CreateHandler.php
@@ -46,7 +46,7 @@ public function execute($entity, $arguments = [])
             $link->setId(null);
             $this->linkRepository->save($entity->getSku(), $link, !(bool)$entity->getStoreId());
         }
-        
+
         return $entity;
     }
 }
diff --git a/app/code/Magento/Downloadable/Model/Link/Purchased/Item.php b/app/code/Magento/Downloadable/Model/Link/Purchased/Item.php
index 10304aa6a50fa..a179b40caa499 100644
--- a/app/code/Magento/Downloadable/Model/Link/Purchased/Item.php
+++ b/app/code/Magento/Downloadable/Model/Link/Purchased/Item.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Downloadable\Model\Link\Purchased;
 
-use Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item as Resource;
-
 /**
  * Downloadable links purchased item model
  *
diff --git a/app/code/Magento/Downloadable/Model/LinkRepository.php b/app/code/Magento/Downloadable/Model/LinkRepository.php
index b84a8284c9083..73dad4e1e61d9 100644
--- a/app/code/Magento/Downloadable/Model/LinkRepository.php
+++ b/app/code/Magento/Downloadable/Model/LinkRepository.php
@@ -6,16 +6,16 @@
 namespace Magento\Downloadable\Model;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Downloadable\Api\Data\File\ContentUploaderInterface;
 use Magento\Downloadable\Api\Data\LinkInterface;
 use Magento\Downloadable\Model\Product\Type;
-use Magento\Downloadable\Api\Data\File\ContentUploaderInterface;
 use Magento\Downloadable\Model\Product\TypeHandler\Link as LinkHandler;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Json\EncoderInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class LinkRepository
diff --git a/app/code/Magento/Downloadable/Model/Product/TypeHandler/AbstractTypeHandler.php b/app/code/Magento/Downloadable/Model/Product/TypeHandler/AbstractTypeHandler.php
index 42d2c52da0ca6..e363a06d9f594 100644
--- a/app/code/Magento/Downloadable/Model/Product/TypeHandler/AbstractTypeHandler.php
+++ b/app/code/Magento/Downloadable/Model/Product/TypeHandler/AbstractTypeHandler.php
@@ -9,9 +9,9 @@
 use Magento\Catalog\Model\Product;
 use Magento\Downloadable\Helper\File;
 use Magento\Downloadable\Model\ComponentInterface;
-use Magento\Framework\Json\Helper\Data;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Json\Helper\Data;
 
 /**
  * Class AbstractTypeHandler
diff --git a/app/code/Magento/Downloadable/Model/Product/TypeTransitionManager/Plugin/Downloadable.php b/app/code/Magento/Downloadable/Model/Product/TypeTransitionManager/Plugin/Downloadable.php
index 2838e8a34daa2..46f925f8bb301 100644
--- a/app/code/Magento/Downloadable/Model/Product/TypeTransitionManager/Plugin/Downloadable.php
+++ b/app/code/Magento/Downloadable/Model/Product/TypeTransitionManager/Plugin/Downloadable.php
@@ -6,8 +6,8 @@
 namespace Magento\Downloadable\Model\Product\TypeTransitionManager\Plugin;
 
 use Closure;
-use Magento\Framework\App\RequestInterface;
 use Magento\Catalog\Model\Product\Edit\WeightResolver;
+use Magento\Framework\App\RequestInterface;
 
 /**
  * Plugin for product type transition manager
diff --git a/app/code/Magento/Downloadable/Model/ProductOptionProcessor.php b/app/code/Magento/Downloadable/Model/ProductOptionProcessor.php
index 729e15512955b..381953a7ff011 100644
--- a/app/code/Magento/Downloadable/Model/ProductOptionProcessor.php
+++ b/app/code/Magento/Downloadable/Model/ProductOptionProcessor.php
@@ -7,7 +7,6 @@
 
 use Magento\Catalog\Api\Data\ProductOptionInterface;
 use Magento\Catalog\Model\ProductOptionProcessorInterface;
-use Magento\Downloadable\Model\DownloadableOptionFactory;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\DataObject;
 use Magento\Framework\DataObject\Factory as DataObjectFactory;
diff --git a/app/code/Magento/Downloadable/Model/Quote/Item/CartItemProcessor.php b/app/code/Magento/Downloadable/Model/Quote/Item/CartItemProcessor.php
index 563b14d630365..e2f5669920509 100644
--- a/app/code/Magento/Downloadable/Model/Quote/Item/CartItemProcessor.php
+++ b/app/code/Magento/Downloadable/Model/Quote/Item/CartItemProcessor.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Downloadable\Model\Quote\Item;
 
-use Magento\Quote\Model\Quote\Item\CartItemProcessorInterface;
-use Magento\Quote\Api\Data\CartItemInterface;
 use Magento\Framework\DataObject\Factory as DataObjectFactory;
+use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Quote\Model\Quote\Item\CartItemProcessorInterface;
 
 class CartItemProcessor implements CartItemProcessorInterface
 {
diff --git a/app/code/Magento/Downloadable/Model/Sample/Builder.php b/app/code/Magento/Downloadable/Model/Sample/Builder.php
index 7cc7cb640ae74..19a6790f57c08 100644
--- a/app/code/Magento/Downloadable/Model/Sample/Builder.php
+++ b/app/code/Magento/Downloadable/Model/Sample/Builder.php
@@ -6,7 +6,6 @@
 namespace Magento\Downloadable\Model\Sample;
 
 use Magento\Downloadable\Api\Data\SampleInterface;
-use Magento\Catalog\Model\Product;
 use Magento\Downloadable\Helper\File;
 use Magento\Downloadable\Model\Sample;
 use Magento\Downloadable\Model\SampleFactory;
@@ -24,7 +23,7 @@ class Builder
      * @var Sample
      */
     private $component;
-    
+
     /**
      * @var File
      */
diff --git a/app/code/Magento/Downloadable/Model/SampleRepository.php b/app/code/Magento/Downloadable/Model/SampleRepository.php
index 5b9e8e784b9f3..df120d1e7d538 100644
--- a/app/code/Magento/Downloadable/Model/SampleRepository.php
+++ b/app/code/Magento/Downloadable/Model/SampleRepository.php
@@ -7,18 +7,18 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Downloadable\Api\Data\SampleInterfaceFactory;
-use Magento\Downloadable\Model\Product\Type;
 use Magento\Downloadable\Api\Data\File\ContentUploaderInterface;
 use Magento\Downloadable\Api\Data\SampleInterface;
+use Magento\Downloadable\Api\Data\SampleInterfaceFactory;
+use Magento\Downloadable\Model\Product\Type;
 use Magento\Downloadable\Model\Product\TypeHandler\Sample as SampleHandler;
 use Magento\Downloadable\Model\Sample\ContentValidator;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Json\EncoderInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class SampleRepository
diff --git a/app/code/Magento/Downloadable/Setup/UpgradeSchema.php b/app/code/Magento/Downloadable/Setup/UpgradeSchema.php
index 6a510e663bcf2..7f58142784ae8 100755
--- a/app/code/Magento/Downloadable/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Downloadable/Setup/UpgradeSchema.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Downloadable\Setup;
 
-use Magento\Framework\Setup\UpgradeSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Link/BuilderTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Link/BuilderTest.php
index 26c5ccd90c463..0cfafe7f42206 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Model/Link/BuilderTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Model/Link/BuilderTest.php
@@ -6,9 +6,9 @@
 namespace Magento\Downloadable\Test\Unit\Model\Link;
 
 use Magento\Downloadable\Api\Data\LinkInterface;
+use Magento\Downloadable\Helper\Download;
 use Magento\Downloadable\Model\Link;
 use Magento\Downloadable\Model\Link\Builder;
-use Magento\Downloadable\Helper\Download;
 
 /**
  * Class BuilderTest
@@ -68,7 +68,7 @@ protected function setUp()
         $this->linkMock = $this->getMockBuilder(LinkInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        
+
         $this->service = $objectManagerHelper->getObject(
             Builder::class,
             [
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Sample/BuilderTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Sample/BuilderTest.php
index 28ffa6db05e0b..08f260282756b 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Model/Sample/BuilderTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Model/Sample/BuilderTest.php
@@ -123,7 +123,7 @@ public function testBuild()
         $this->sampleMock->expects($this->once())->method('setSampleFile')->with($fileName);
         $this->sampleMock->expects($this->once())->method('setSortOrder')->with(1);
         $this->service->setData($data);
-        
+
         $this->service->build($this->sampleMock);
     }
 }
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Sample/CreateHandlerTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Sample/CreateHandlerTest.php
index d8012155e0766..104fd422124d8 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Model/Sample/CreateHandlerTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Model/Sample/CreateHandlerTest.php
@@ -9,8 +9,8 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Downloadable\Api\Data\SampleInterface;
 use Magento\Downloadable\Api\SampleRepositoryInterface;
-use Magento\Downloadable\Model\Sample\CreateHandler;
 use Magento\Downloadable\Model\Product\Type;
+use Magento\Downloadable\Model\Sample\CreateHandler;
 
 class CreateHandlerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Sample/UpdateHandlerTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Sample/UpdateHandlerTest.php
index 0677a2eabce22..2b17d20797b49 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Model/Sample/UpdateHandlerTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Model/Sample/UpdateHandlerTest.php
@@ -9,8 +9,8 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Downloadable\Api\Data\SampleInterface;
 use Magento\Downloadable\Api\SampleRepositoryInterface;
-use Magento\Downloadable\Model\Sample\UpdateHandler;
 use Magento\Downloadable\Model\Product\Type;
+use Magento\Downloadable\Model\Sample\UpdateHandler;
 
 class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
index 89eb29e0f398a..b64372ecc45b0 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
@@ -5,11 +5,10 @@
  */
 namespace Magento\Downloadable\Test\Unit\Observer;
 
-use Magento\Downloadable\Observer\IsAllowedGuestCheckoutObserver;
 use Magento\Downloadable\Model\Product\Type;
-use Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Downloadable\Observer\IsAllowedGuestCheckoutObserver;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/SaveDownloadableOrderItemObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/SaveDownloadableOrderItemObserverTest.php
index 756ec44edae42..9b770992fb10a 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/SaveDownloadableOrderItemObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/SaveDownloadableOrderItemObserverTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Downloadable\Test\Unit\Observer;
 
-use Magento\Downloadable\Observer\SaveDownloadableOrderItemObserver;
 use Magento\Downloadable\Model\Product\Type as DownloadableProductType;
 use Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory;
+use Magento\Downloadable\Observer\SaveDownloadableOrderItemObserver;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/SetLinkStatusObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/SetLinkStatusObserverTest.php
index 5a138d83d2673..f11b0e6eb1dfb 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/SetLinkStatusObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/SetLinkStatusObserverTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Downloadable\Test\Unit\Observer;
 
-use Magento\Downloadable\Observer\SetLinkStatusObserver;
-use Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory;
-use Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\Collection as LinkItemCollection;
 use Magento\Downloadable\Model\Product\Type as DownloadableProductType;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\Collection as LinkItemCollection;
+use Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory;
+use Magento\Downloadable\Observer\SetLinkStatusObserver;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
index 5b04c83f4ffb7..45e77e947a317 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Downloadable\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Model\Product\Type as CatalogType;
+use Magento\Downloadable\Model\Product\Type as DownloadableType;
 use Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Ui\DataProvider\Modifier\ModifierFactory;
-use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Ui\DataProvider\Modifier\ModifierInterface;
-use Magento\Downloadable\Model\Product\Type as DownloadableType;
-use Magento\Catalog\Model\Product\Type as CatalogType;
 
 class CompositeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php
index dd8e8ff38e931..d787a29da6bda 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Data/LinksTest.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Downloadable\Test\Unit\Ui\DataProvider\Product\Form\Modifier\Data;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Data\Links;
-use \Magento\Framework\Escaper;
-use Magento\Downloadable\Model\Product\Type;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Downloadable\Helper\File as DownloadableFile;
-use Magento\Framework\UrlInterface;
 use Magento\Downloadable\Model\Link as LinkModel;
-use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Downloadable\Model\Product\Type;
+use Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Data\Links;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Escaper;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\UrlInterface;
 
 /**
  * Class LinksTest
diff --git a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/DownloadablePanelTest.php b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/DownloadablePanelTest.php
index 7eb85a1f3637e..7b3a6075090cc 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/DownloadablePanelTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/DownloadablePanelTest.php
@@ -5,14 +5,13 @@
  */
 namespace Magento\Downloadable\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Downloadable\Api\Data\ProductAttributeInterface;
 use Magento\Downloadable\Model\Product\Type;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\DownloadablePanel;
-use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Ui\Component\Form;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * Class DownloadablePanelTest
diff --git a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/LinksTest.php b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/LinksTest.php
index cff48420938b1..fd41eaa6504d6 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/LinksTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/LinksTest.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Downloadable\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Links;
-use Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Data\Links as LinksData;
-use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Downloadable\Model\Source\TypeUpload;
+use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Downloadable\Model\Source\Shareable;
-use Magento\Framework\UrlInterface;
+use Magento\Downloadable\Model\Source\TypeUpload;
+use Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Data\Links as LinksData;
+use Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Links;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class LinksTest
diff --git a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/SamplesTest.php b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/SamplesTest.php
index 420950d08e101..ed052062556ac 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/SamplesTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Ui/DataProvider/Product/Form/Modifier/SamplesTest.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Downloadable\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples;
-use Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Data\Samples as SamplesData;
-use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Downloadable\Model\Source\TypeUpload;
-use Magento\Framework\UrlInterface;
+use Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Data\Samples as SamplesData;
+use Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class SamplesTest
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Composite.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Composite.php
index fac341a4c92b5..f16026a1b70f1 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Composite.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Composite.php
@@ -5,19 +5,18 @@
  */
 namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Downloadable\Model\Product\Type as DownloadableType;
 use Magento\Catalog\Model\Product\Type as CatalogType;
-use Magento\Ui\DataProvider\Modifier\ModifierInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\Downloadable\Model\Product\Type as DownloadableType;
 use Magento\Ui\DataProvider\Modifier\ModifierFactory;
+use Magento\Ui\DataProvider\Modifier\ModifierInterface;
 
 /**
  * Customize Downloadable panel
  */
 class Composite extends AbstractModifier
 {
-
     const CHILDREN_PATH = 'downloadable/children';
     const CONTAINER_LINKS = 'container_links';
     const CONTAINER_SAMPLES = 'container_samples';
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Links.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Links.php
index f29708cc9a2c6..4a8d87ff54c44 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Links.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Links.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Data;
 
-use \Magento\Framework\Escaper;
-use Magento\Downloadable\Model\Product\Type;
 use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Downloadable\Api\Data\LinkInterface;
 use Magento\Downloadable\Helper\File as DownloadableFile;
-use Magento\Framework\UrlInterface;
 use Magento\Downloadable\Model\Link as LinkModel;
-use Magento\Downloadable\Api\Data\LinkInterface;
+use Magento\Downloadable\Model\Product\Type;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Escaper;
+use Magento\Framework\UrlInterface;
 
 /**
  * Class Links
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Samples.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Samples.php
index b000de487b775..3d4ba56013b9b 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Samples.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Data/Samples.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Data;
 
-use \Magento\Framework\Escaper;
-use Magento\Downloadable\Model\Sample as SampleModel;
-use Magento\Downloadable\Model\Product\Type;
 use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Downloadable\Api\Data\SampleInterface;
 use Magento\Downloadable\Helper\File as DownloadableFile;
+use Magento\Downloadable\Model\Product\Type;
+use Magento\Downloadable\Model\Sample as SampleModel;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Escaper;
 use Magento\Framework\UrlInterface;
-use Magento\Downloadable\Api\Data\SampleInterface;
 
 /**
  * Class Samples
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/DownloadablePanel.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/DownloadablePanel.php
index a34ef79d70d30..d2ce69428e491 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/DownloadablePanel.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/DownloadablePanel.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Downloadable\Api\Data\ProductAttributeInterface;
 use Magento\Downloadable\Model\Product\Type;
 use Magento\Framework\Stdlib\ArrayManager;
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
index 2ed8ed8893dfb..2fa19e701d17d 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Downloadable\Model\Product\Type;
-use Magento\Downloadable\Model\Source\TypeUpload;
 use Magento\Downloadable\Model\Source\Shareable;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Downloadable\Model\Source\TypeUpload;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Ui\Component\DynamicRows;
 use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Container;
+use Magento\Ui\Component\DynamicRows;
 use Magento\Ui\Component\Form;
 
 /**
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
index 178420c62a020..b1c047cfda802 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Downloadable\Model\Product\Type;
 use Magento\Downloadable\Model\Source\TypeUpload;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\Ui\Component\DynamicRows;
 use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Container;
+use Magento\Ui\Component\DynamicRows;
 use Magento\Ui\Component\Form;
 
 /**
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/UsedDefault.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/UsedDefault.php
index d0e24ce7c4aca..e777858e291bb 100644
--- a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/UsedDefault.php
+++ b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/UsedDefault.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Ui\Component\Form;
 
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
index c86eb56a39008..45e5b4735004e 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
@@ -17,7 +17,9 @@
     <legend class="legend admin__legend"><span><?= /* @escapeNotVerified */ __('Downloadable Information') ?></span></legend><br />
     <?php $_links = $block->getLinks(); ?>
     <?php $_isRequired = $block->getLinkSelectionRequired(); ?>
-    <div class="field admin__field link<?php if ($_isRequired) echo ' required _required' ?>">
+    <div class="field admin__field link<?php if ($_isRequired) {
+    echo ' required _required';
+} ?>">
         <label class="label admin__field-label"><span><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></span></label>
         <div class="control admin__field-control" id="downloadable-links-list">
             <?php foreach ($_links as $_link): ?>
@@ -32,7 +34,7 @@
                     <label for="links_<?= /* @escapeNotVerified */ $_link->getId() ?>" class="label">
                         <?= $block->escapeHtml($_link->getTitle()) ?>
                         <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
-                            &nbsp;(<a href="<?= /* @escapeNotVerified */ $block->getLinkSampleUrl($_link) ?>" <?= $block->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':'' ?>><?= /* @escapeNotVerified */ __('sample') ?></a>)
+                            &nbsp;(<a href="<?= /* @escapeNotVerified */ $block->getLinkSampleUrl($_link) ?>" <?= $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>><?= /* @escapeNotVerified */ __('sample') ?></a>)
                         <?php endif; ?>
                         <?php if ($_linksPurchasedSeparately): ?>
                         <?= /* @escapeNotVerified */ $block->getFormattedLinkPrice($_link) ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
index 2515e5e339366..29a1eef9a49cc 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
@@ -40,7 +40,7 @@
                         <input type="radio" name="product[links_purchased_separately]" value="1"
                                class="admin__control-radio"
                                id="link-switcher1"
-                           <?php if($block->isProductLinksCanBePurchasedSeparately()): ?>
+                           <?php if ($block->isProductLinksCanBePurchasedSeparately()): ?>
                                checked="checked"
                            <?php endif; ?>
                             >
@@ -52,7 +52,7 @@
                         <input type="radio" name="product[links_purchased_separately]" value="0"
                                 class="admin__control-radio"
                                 id="link-switcher0"
-                            <?php if(!$block->isProductLinksCanBePurchasedSeparately()): ?>
+                            <?php if (!$block->isProductLinksCanBePurchasedSeparately()): ?>
                                 checked="checked"
                             <?php endif; ?>
                             >
@@ -120,7 +120,7 @@ require([
                 '<input type="hidden" class="__delete__" name="downloadable[link][<%- data.id %>][is_delete]" value="" />'+
                 '<input type="hidden" name="downloadable[link][<%- data.id %>][link_id]" value="<%- data.link_id %>" />'+
                 '<input type="text" class="required-entry input-text admin__control-text" name="downloadable[link][<%- data.id %>][title]" value="<%- data.title %>" />'+
-                <?php if($_product->getStoreId()): ?>
+                <?php if ($_product->getStoreId()): ?>
                     '<div class="admin__field admin__field-option">'+
                     '<input type="checkbox" id="downloadable_link_<%- data.id %>_title" name="downloadable[link][<%- data.id %>][use_default_title]" value="1" class="admin__control-checkbox" />'+
                     '<label for="downloadable_link_<%- data.id %>_title" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>'+
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
index af4dee226f38b..cdfd7af8ee360 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
@@ -76,7 +76,7 @@ require([
                 '<input type="hidden" class="__delete__" name="downloadable[sample][<%- data.id %>][is_delete]" value="" />'+
                 '<input type="hidden" name="downloadable[sample][<%- data.id %>][sample_id]" value="<%- data.sample_id %>" />'+
                 '<input type="text" class="required-entry input-text admin__control-text" name="downloadable[sample][<%- data.id %>][title]" value="<%- data.title %>" />'+
-                <?php if($_product->getStoreId()): ?>
+                <?php if ($_product->getStoreId()): ?>
                     '<div class="admin__field admin__field-option">'+
                         '<input type="checkbox" id="downloadable_sample_<%- data.id %>_title" name="downloadable[sample][<%- data.id %>][use_default_title]" value="1" class="admin__control-checkbox" />'+
                         '<label for="downloadable_link_<%- data.id %>_price" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>'+
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
index fbc673ef910fb..1bc7223bc1666 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
@@ -14,7 +14,11 @@
     <?php $_linksLength = 0; ?>
     <?php $_isRequired = $block->getLinkSelectionRequired(); ?>
     <legend class="legend links-title"><span><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></span></legend><br>
-    <div class="field downloads<?php if ($_isRequired) echo ' required' ?><?php if (!$_linksPurchasedSeparately) echo ' downloads-no-separately' ?>">
+    <div class="field downloads<?php if ($_isRequired) {
+    echo ' required';
+} ?><?php if (!$_linksPurchasedSeparately) {
+    echo ' downloads-no-separately';
+} ?>">
         <label class="label"><span><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></span></label>
         <div class="control" id="downloadable-links-list"
              data-mage-init='{"downloadable":{
diff --git a/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php b/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php
index 06df8b12351be..e11b34816809f 100644
--- a/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php
+++ b/app/code/Magento/DownloadableImportExport/Model/Import/Product/Type/Downloadable.php
@@ -9,7 +9,7 @@
 
 use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
 use Magento\Framework\EntityManager\MetadataPool;
-use \Magento\Store\Model\Store;
+use Magento\Store\Model\Store;
 
 /**
  * Class Downloadable
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
index 3e9a7e8afed78..82bb7506e31e6 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
@@ -112,7 +112,7 @@ protected function _prepareForm()
 
         /** @var \Magento\Framework\Data\Form $form */
         $form = $this->_formFactory->create(
-            
+
             ['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
         );
 
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/PropertyLocker.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/PropertyLocker.php
index b8d1be2019064..ba6f889e856f0 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/PropertyLocker.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/PropertyLocker.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Eav\Block\Adminhtml\Attribute;
 
-use Magento\Framework\Registry;
 use Magento\Eav\Model\Entity\Attribute\Config;
+use Magento\Framework\Registry;
 
 /**
  * Disable form fields
diff --git a/app/code/Magento/Eav/Model/Attribute/GroupRepository.php b/app/code/Magento/Eav/Model/Attribute/GroupRepository.php
index 0714f8efac88c..b32e3627d4509 100644
--- a/app/code/Magento/Eav/Model/Attribute/GroupRepository.php
+++ b/app/code/Magento/Eav/Model/Attribute/GroupRepository.php
@@ -6,7 +6,6 @@
 namespace Magento\Eav\Model\Attribute;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 
diff --git a/app/code/Magento/Eav/Model/AttributeProvider.php b/app/code/Magento/Eav/Model/AttributeProvider.php
index 7f9d0620b6096..ea08bb8831108 100644
--- a/app/code/Magento/Eav/Model/AttributeProvider.php
+++ b/app/code/Magento/Eav/Model/AttributeProvider.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Eav\Model;
 
-use Magento\Framework\Model\EntitySnapshot\AttributeProviderInterface;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Model\EntitySnapshot\AttributeProviderInterface;
 
 /**
  * Class EntitySnapshot
diff --git a/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator.php b/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator.php
index b20ee08a47aba..fca097d95c9fc 100644
--- a/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator.php
+++ b/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator.php
@@ -7,11 +7,11 @@
 namespace Magento\Eav\Model;
 
 use Magento\Eav\Api\AttributeRepositoryInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface;
 use Magento\Eav\Model\EavCustomAttributeTypeLocator\ComplexType as ComplexTypeLocator;
 use Magento\Eav\Model\EavCustomAttributeTypeLocator\SimpleType as SimpleTypeLocator;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Reflection\TypeProcessor;
+use Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface;
 
 /**
  * Class to locate types for Eav custom attributes
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index feb2c4d7d3f9f..963c025c27e81 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -12,17 +12,17 @@
 use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
 use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
 use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
+use Magento\Eav\Model\ResourceModel\Attribute\DefaultEntityAttributes\ProviderInterface as DefaultAttributesProvider;
 use Magento\Framework\App\Config\Element;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Framework\DB\Adapter\DuplicateException;
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor;
 use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
-use Magento\Eav\Model\ResourceModel\Attribute\DefaultEntityAttributes\ProviderInterface as DefaultAttributesProvider;
-use Magento\Framework\Model\ResourceModel\AbstractResource;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Entity/Attribute/Model - entity abstract
@@ -519,7 +519,7 @@ private function getAttributesCacheSuffix(DataObject $object)
         $attributeSetId = $object->getAttributeSetId() ?: 0;
         $storeId = $object->getStoreId() ?: 0;
         return $storeId . '-' . $attributeSetId;
-     }
+    }
 
     /**
      * Retrieve partial load flag
@@ -1027,7 +1027,6 @@ public function load($object, $entityId, $attributes = [])
             $object->isObjectNew(true);
         }
 
-
         \Magento\Framework\Profiler::stop('EAV:load_entity');
         return $this;
     }
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
index cdd4fce583230..24f45c11934b0 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Frontend/AbstractFrontend.php
@@ -11,13 +11,13 @@
  */
 namespace Magento\Eav\Model\Entity\Attribute\Frontend;
 
-use Magento\Framework\App\CacheInterface;
-use Magento\Framework\Serialize\Serializer\Json as Serializer;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\App\ObjectManager;
 use Magento\Eav\Model\Cache\Type as CacheType;
 use Magento\Eav\Model\Entity\Attribute;
 use Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory;
+use Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json as Serializer;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @api
diff --git a/app/code/Magento/Eav/Model/ResourceModel/AttributePersistor.php b/app/code/Magento/Eav/Model/ResourceModel/AttributePersistor.php
index f3b2e0ba3e618..427d723072381 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/AttributePersistor.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/AttributePersistor.php
@@ -6,15 +6,12 @@
 
 namespace Magento\Eav\Model\ResourceModel;
 
-use Magento\Catalog\Model\Product;
 use Magento\Eav\Api\AttributeRepositoryInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Locale\FormatInterface;
 use Magento\Framework\Model\Entity\ScopeInterface;
-use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * Class AttributePersistor
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Grid/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Grid/Collection.php
index bf7521f560cfd..f5734857b5e6f 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Grid/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Grid/Collection.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Eav\Model\ResourceModel\Entity\Attribute\Grid;
 
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-
 /**
  * Eav Resource Attribute Set Collection
  *
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Store.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Store.php
index 80d8780b69b38..79e02ce1a114b 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Store.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Store.php
@@ -6,7 +6,6 @@
 namespace Magento\Eav\Model\ResourceModel\Entity;
 
 use Magento\Framework\Model\AbstractModel;
-use Magento\Framework\DataObject;
 
 /**
  * Eav Entity store resource model
diff --git a/app/code/Magento/Eav/Model/ResourceModel/ReadSnapshot.php b/app/code/Magento/Eav/Model/ResourceModel/ReadSnapshot.php
index fa67424939264..046e2d574e544 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/ReadSnapshot.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/ReadSnapshot.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Eav\Model\ResourceModel;
 
-use Magento\Store\Model\StoreManagerInterface as StoreManager;
 use Magento\Framework\Model\Entity\ScopeInterface;
 
 /**
diff --git a/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php b/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
index cc7a0c4deb14c..ee6e2ba8e1646 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/UpdateHandler.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Eav\Model\ResourceModel;
 
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Eav\Api\AttributeRepositoryInterface as AttributeRepository;
 use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Framework\Model\Entity\ScopeResolver;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
+use Magento\Framework\Model\Entity\ScopeResolver;
 
 /**
  * Class UpdateHandler
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
index 13f55308e6fa6..77680886cf7cd 100644
--- a/app/code/Magento/Eav/Setup/EavSetup.php
+++ b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -1037,7 +1037,7 @@ private function _updateAttributeAdditionalData($entityTypeId, $id, $field, $val
                 return $this;
             }
         }
-      
+
         $attributeId = $this->getAttributeId($entityTypeId, $id);
         if (false === $attributeId) {
             throw new LocalizedException(__('Attribute with ID: "%1" does not exist', $id));
diff --git a/app/code/Magento/Eav/Setup/InstallData.php b/app/code/Magento/Eav/Setup/InstallData.php
index ca2156d62ee42..b2454b8e0e989 100644
--- a/app/code/Magento/Eav/Setup/InstallData.php
+++ b/app/code/Magento/Eav/Setup/InstallData.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Eav\Setup;
 
-use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
diff --git a/app/code/Magento/Eav/Setup/UpgradeSchema.php b/app/code/Magento/Eav/Setup/UpgradeSchema.php
index 616514b3aa156..aa57f020755cf 100644
--- a/app/code/Magento/Eav/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Eav/Setup/UpgradeSchema.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Eav\Setup;
 
-use Magento\Framework\Setup\UpgradeSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
 
 /**
  * Upgrade the Eav module DB scheme
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
index e75c5ef2b1ffa..503f7ec655773 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
@@ -262,7 +262,7 @@ public function validateValueDataProvider()
             ],
         ];
     }
-};
+}
 
 /**
  * Mocking of std function to test validation
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
index 83b15718ed389..612521ec4236f 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
@@ -159,4 +159,4 @@ public function validateValueDataProvider()
             ],
         ];
     }
-};
+}
diff --git a/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php b/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
index 62fae4f5eb568..a95bab7333477 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Eav\Test\Unit\Model;
 
-use Magento\Eav\Model\AttributeManagement;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory;
+use Magento\Eav\Api\AttributeGroupRepositoryInterface;
+use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\Eav\Api\AttributeSetRepositoryInterface;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection;
+use Magento\Eav\Model\AttributeManagement;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\ConfigFactory;
-use Magento\Eav\Api\AttributeGroupRepositoryInterface;
-use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\CollectionFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Eav/Test/Unit/Model/EavCustomAttributeTypeLocatorTest.php b/app/code/Magento/Eav/Test/Unit/Model/EavCustomAttributeTypeLocatorTest.php
index 75f6b02cc4aea..1c830b9fdecb5 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/EavCustomAttributeTypeLocatorTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/EavCustomAttributeTypeLocatorTest.php
@@ -10,8 +10,8 @@
 
 use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\Eav\Model\EavCustomAttributeTypeLocator;
-use Magento\Eav\Model\EavCustomAttributeTypeLocator\SimpleType as SimpleTypeLocator;
 use Magento\Eav\Model\EavCustomAttributeTypeLocator\ComplexType as ComplexTypeLocator;
+use Magento\Eav\Model\EavCustomAttributeTypeLocator\SimpleType as SimpleTypeLocator;
 
 /**
  * Unit test class for \Magento\Eav\Model\EavCustomAttributeTypeLocator
@@ -169,10 +169,8 @@ public function getTypeDataProvider()
                 'attributeRepositoryResponse' => $attributeNoBackendModel,
                 'stringUtility' => $stringUtility,
                 'serviceEntityTypeMapData' => [$serviceInterface => 'image'],
-                'serviceBackendModelDataInterfaceMapData' =>
-                    [
-                        $serviceInterface =>
-                            [\Magento\Eav\Model\Attribute\Data\Image::class => $mediaAttributeDataInterface
+                'serviceBackendModelDataInterfaceMapData' => [
+                        $serviceInterface => [\Magento\Eav\Model\Attribute\Data\Image::class => $mediaAttributeDataInterface
                             ]
                     ],
                 'expected' => $mediaAttributeDataInterface
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
index a61c9ef447458..3372ab435acc7 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Frontend/DefaultFrontendTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Eav\Test\Unit\Model\Entity\Attribute\Frontend;
 
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Attribute\Frontend\DefaultFrontend;
+use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
 use Magento\Eav\Model\Entity\Attribute\Source\BooleanFactory;
+use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Serialize\Serializer\Json as Serializer;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
-use Magento\Framework\App\CacheInterface;
-use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
+use Magento\Store\Model\StoreManagerInterface;
 
 class DefaultFrontendTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
index bb7baa0e461ee..d20eb7a9b1d35 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Source/BooleanTest.php
@@ -97,13 +97,11 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t1' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
+                        'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
                     ],
                     1 => [
                         'requisites' => ['code_t2' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
+                        'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
                     ],
                 ],
                 'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) ASC',
@@ -114,13 +112,11 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t1' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
+                        'condition' => "e.entity_id=code_t1.entity_id AND code_t1.attribute_id='123' AND code_t1.store_id='0'",
                     ],
                     1 => [
                         'requisites' => ['code_t2' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
+                        'condition' => "e.entity_id=code_t2.entity_id AND code_t2.attribute_id='123' AND code_t2.store_id='12'",
                     ],
                 ],
                 'expectedOrder' => 'IF(code_t2.value_id > 0, code_t2.value, code_t1.value) DESC',
@@ -131,8 +127,7 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
+                        'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
                     ],
                 ],
                 'expectedOrder' => 'code_t.value DESC',
@@ -143,8 +138,7 @@ public function addValueSortToCollectionDataProvider()
                 'expectedJoinCondition' => [
                     0 => [
                         'requisites' => ['code_t' => "table"],
-                        'condition' =>
-                            "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
+                        'condition' => "e.entity_id=code_t.entity_id AND code_t.attribute_id='123' AND code_t.store_id='0'",
                     ],
                 ],
                 'expectedOrder' => 'code_t.value ASC',
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php
index 3370695b47d7e..99e388d6e5567 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Eav\Test\Unit\Model\Entity;
 
-use Magento\Eav\Model\Attribute;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\AbstractEntity;
 use Magento\Eav\Model\Entity\AttributeLoader;
diff --git a/app/code/Magento/Eav/Test/Unit/Plugin/Model/ResourceModel/Entity/AttributeTest.php b/app/code/Magento/Eav/Test/Unit/Plugin/Model/ResourceModel/Entity/AttributeTest.php
index 0f3325a3295a6..1321b6f859335 100644
--- a/app/code/Magento/Eav/Test/Unit/Plugin/Model/ResourceModel/Entity/AttributeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Plugin/Model/ResourceModel/Entity/AttributeTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Eav\Test\Unit\Plugin\Model\ResourceModel\Entity;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\App\CacheInterface;
-use Magento\Framework\App\Cache\StateInterface;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute as AttributeResource;
-use Magento\Eav\Plugin\Model\ResourceModel\Entity\Attribute as AttributeResourcePlugin;
 use Magento\Eav\Model\Cache\Type;
 use Magento\Eav\Model\Entity\Attribute;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute as AttributeResource;
+use Magento\Eav\Plugin\Model\ResourceModel\Entity\Attribute as AttributeResourcePlugin;
+use Magento\Framework\App\Cache\StateInterface;
+use Magento\Framework\App\CacheInterface;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class AttributeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Eav/view/adminhtml/templates/attribute/edit/js.phtml b/app/code/Magento/Eav/view/adminhtml/templates/attribute/edit/js.phtml
index 223b3e9888eea..75f04eae82159 100644
--- a/app/code/Magento/Eav/view/adminhtml/templates/attribute/edit/js.phtml
+++ b/app/code/Magento/Eav/view/adminhtml/templates/attribute/edit/js.phtml
@@ -2,4 +2,4 @@
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
- */;
+ */
diff --git a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php
index 76bbba7406609..876651b7a249f 100644
--- a/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/AbstractTemplateTest.php
@@ -244,7 +244,8 @@ public function testGetProcessedTemplate($variables, $templateType, $storeId, $e
     /**
      * @expectedException \LogicException
      */
-    public function testGetProcessedTemplateException() {
+    public function testGetProcessedTemplateException()
+    {
         $filterTemplate = $this->getMockBuilder(\Magento\Email\Model\Template\Filter::class)
             ->setMethods([
                 'setUseSessionInUrl',
@@ -298,7 +299,7 @@ public function testGetProcessedTemplateException() {
 
         $filterTemplate->expects($this->once())
             ->method('filter')
-            ->will($this->throwException(new \Exception));
+            ->will($this->throwException(new \Exception()));
         $model->getProcessedTemplate([]);
     }
 
diff --git a/app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Form.php b/app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Form.php
index 3dad34d17d0c1..ce96bfcadbee5 100644
--- a/app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Form.php
+++ b/app/code/Magento/EncryptionKey/Block/Adminhtml/Crypt/Key/Form.php
@@ -43,7 +43,7 @@ protected function _prepareForm()
                 'name' => 'generate_random',
                 'label' => __('Auto-generate a Key'),
                 'options' => [0 => __('No'), 1 => __('Yes')],
-                'onclick' => "var cryptKey = jQuery('#crypt_key'); var cryptKeyBlock = cryptKey.parent().parent(); ".
+                'onclick' => "var cryptKey = jQuery('#crypt_key'); var cryptKeyBlock = cryptKey.parent().parent(); " .
                     "cryptKey.prop('disabled', this.value === '1'); " .
                     "if (cryptKey.prop('disabled')) { cryptKeyBlock.hide() } " .
                     "else { cryptKeyBlock.show() }",
diff --git a/app/code/Magento/GiftMessage/Block/Message/Multishipping/Plugin/ItemsBox.php b/app/code/Magento/GiftMessage/Block/Message/Multishipping/Plugin/ItemsBox.php
index e02401c1a865d..737b6a6b4e02f 100644
--- a/app/code/Magento/GiftMessage/Block/Message/Multishipping/Plugin/ItemsBox.php
+++ b/app/code/Magento/GiftMessage/Block/Message/Multishipping/Plugin/ItemsBox.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\GiftMessage\Block\Message\Multishipping\Plugin;
 
-use Magento\Multishipping\Block\Checkout\Shipping as ShippingBlock;
-use Magento\GiftMessage\Helper\Message as MessageHelper;
 use Magento\Framework\DataObject;
+use Magento\GiftMessage\Helper\Message as MessageHelper;
+use Magento\Multishipping\Block\Checkout\Shipping as ShippingBlock;
 
 /**
  * Multishipping items box plugin
diff --git a/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php b/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
index c7f145eaddbb4..709f867ac9df7 100644
--- a/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
+++ b/app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\GiftMessage\Model;
 
+use Magento\Catalog\Model\Product\Attribute\Source\Boolean;
 use Magento\Checkout\Model\ConfigProviderInterface;
-use Magento\GiftMessage\Helper\Message as GiftMessageHelper;
-use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Customer\Model\Context as CustomerContext;
-use Magento\Framework\UrlInterface;
-use Magento\Framework\Locale\FormatInterface as LocaleFormat;
+use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Framework\Data\Form\FormKey;
-use Magento\Catalog\Model\Product\Attribute\Source\Boolean;
+use Magento\Framework\Locale\FormatInterface as LocaleFormat;
+use Magento\Framework\UrlInterface;
+use Magento\GiftMessage\Helper\Message as GiftMessageHelper;
 
 /**
  * Configuration provider for GiftMessage rendering on "Checkout cart" page.
diff --git a/app/code/Magento/GiftMessage/Model/ItemRepository.php b/app/code/Magento/GiftMessage/Model/ItemRepository.php
index 6d369e083b135..9404fb3674896 100644
--- a/app/code/Magento/GiftMessage/Model/ItemRepository.php
+++ b/app/code/Magento/GiftMessage/Model/ItemRepository.php
@@ -8,9 +8,8 @@
 namespace Magento\GiftMessage\Model;
 
 use Magento\Framework\Exception\CouldNotSaveException;
-use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\State\InvalidTransitionException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\State\InvalidTransitionException;
 
 /**
  * Shopping cart gift message item repository object for registered customer
@@ -86,7 +85,7 @@ public function get($cartId, $itemId)
         $quote = $this->quoteRepository->getActive($cartId);
         if (!$item = $quote->getItemById($itemId)) {
             throw new NoSuchEntityException(__('There is no item with provided id in the cart'));
-        };
+        }
         $messageId = $item->getGiftMessageId();
         if (!$messageId) {
             return null;
@@ -116,7 +115,7 @@ public function save($cartId, \Magento\GiftMessage\Api\Data\MessageInterface $gi
             throw new NoSuchEntityException(
                 __('There is no product with provided  itemId: %1 in the cart', $itemId)
             );
-        };
+        }
 
         if ($item->getIsVirtual()) {
             throw new InvalidTransitionException(__('Gift Messages are not applicable for virtual products'));
diff --git a/app/code/Magento/GiftMessage/Model/OrderItemRepository.php b/app/code/Magento/GiftMessage/Model/OrderItemRepository.php
index 4be7483dfe672..5eae0d1969a30 100644
--- a/app/code/Magento/GiftMessage/Model/OrderItemRepository.php
+++ b/app/code/Magento/GiftMessage/Model/OrderItemRepository.php
@@ -87,7 +87,7 @@ public function get($orderId, $orderItemId)
         /** @var \Magento\Sales\Api\Data\OrderItemInterface $orderItem */
         if (!$orderItem = $this->getItemById($orderId, $orderItemId)) {
             throw new NoSuchEntityException(__('There is no item with provided id in the order'));
-        };
+        }
 
         if (!$this->helper->isMessagesAllowed('order_item', $orderItem, $this->storeManager->getStore())) {
             throw new NoSuchEntityException(
@@ -114,7 +114,7 @@ public function save($orderId, $orderItemId, \Magento\GiftMessage\Api\Data\Messa
         /** @var \Magento\Sales\Api\Data\OrderItemInterface $orderItem */
         if (!$orderItem = $this->getItemById($orderId, $orderItemId)) {
             throw new NoSuchEntityException(__('There is no item with provided id in the order'));
-        };
+        }
 
         if ($order->getIsVirtual()) {
             throw new InvalidTransitionException(__('Gift Messages are not applicable for virtual products'));
diff --git a/app/code/Magento/GiftMessage/Model/OrderRepository.php b/app/code/Magento/GiftMessage/Model/OrderRepository.php
index 1960281367e3a..9e44a59a9a38f 100644
--- a/app/code/Magento/GiftMessage/Model/OrderRepository.php
+++ b/app/code/Magento/GiftMessage/Model/OrderRepository.php
@@ -9,8 +9,8 @@
 
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\State\InvalidTransitionException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\State\InvalidTransitionException;
 
 /**
  * Order gift message repository object.
@@ -104,7 +104,7 @@ public function save($orderId, \Magento\GiftMessage\Api\Data\MessageInterface $g
         $order = $this->orderFactory->create()->load($orderId);
         if (!$order->getEntityId()) {
             throw new NoSuchEntityException(__('There is no order with provided id'));
-        };
+        }
 
         if (0 == $order->getTotalItemCount()) {
             throw new InputException(__('Gift Messages are not applicable for empty order'));
diff --git a/app/code/Magento/GiftMessage/Model/Plugin/QuoteItem.php b/app/code/Magento/GiftMessage/Model/Plugin/QuoteItem.php
index 12e5e1645bf46..fdc6ab82592c8 100644
--- a/app/code/Magento/GiftMessage/Model/Plugin/QuoteItem.php
+++ b/app/code/Magento/GiftMessage/Model/Plugin/QuoteItem.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\GiftMessage\Model\Plugin;
 
-use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\GiftMessage\Helper\Message as MessageHelper;
-use Magento\Quote\Model\Quote\Item\ToOrderItem;
 use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\Quote\Model\Quote\Item\ToOrderItem;
+use Magento\Sales\Api\Data\OrderItemInterface;
 
 class QuoteItem
 {
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/GuestCartRepositoryTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/GuestCartRepositoryTest.php
index db52be7c811ba..12bdb03a4bbd2 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/GuestCartRepositoryTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/GuestCartRepositoryTest.php
@@ -9,8 +9,8 @@
 // @codingStandardsIgnoreFile
 
 use Magento\GiftMessage\Api\Data\MessageInterface;
-use Magento\GiftMessage\Model\ItemRepository;
 use Magento\GiftMessage\Model\GuestItemRepository;
+use Magento\GiftMessage\Model\ItemRepository;
 use Magento\Quote\Model\QuoteIdMask;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/OrderItemRepositoryTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/OrderItemRepositoryTest.php
index d6847259dbe5c..bcc2a8f3bfcf8 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/OrderItemRepositoryTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/OrderItemRepositoryTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\GiftMessage\Test\Unit\Model;
 
+use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\State\InvalidTransitionException;
-use Magento\Framework\Exception\CouldNotSaveException;
 
 /**
  * Test class for \Magento\GiftMessage\Model\OrderItemRepository
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/SaveTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/SaveTest.php
index 5804e3d6ea9ad..547bec83208cf 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/SaveTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/SaveTest.php
@@ -37,8 +37,7 @@ protected function setUp()
 
     public function testSaveAllInOrder()
     {
-        $message = [1 =>
-            [
+        $message = [1 => [
                 'from' => 'John Doe',
                 'to' => 'Jane Doe',
                 'message' => 'I love Magento',
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Ui/DataProvider/Product/Modifier/GiftMessageTest.php b/app/code/Magento/GiftMessage/Test/Unit/Ui/DataProvider/Product/Modifier/GiftMessageTest.php
index d33d5b9bc3b8d..5b15c9b4ac316 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Ui/DataProvider/Product/Modifier/GiftMessageTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Ui/DataProvider/Product/Modifier/GiftMessageTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\GiftMessage\Test\Unit\Ui\DataProvider\Product\Modifier;
 
+use Magento\Catalog\Model\Product\Attribute\Source\Boolean;
 use Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier\AbstractModifierTest;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\GiftMessage\Ui\DataProvider\Product\Modifier\GiftMessage;
 use Magento\GiftMessage\Helper\Message as GiftMessageHelper;
+use Magento\GiftMessage\Ui\DataProvider\Product\Modifier\GiftMessage;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Catalog\Model\Product\Attribute\Source\Boolean;
 
 /**
  * Class GiftMessageTest
diff --git a/app/code/Magento/GiftMessage/Ui/DataProvider/Product/Modifier/GiftMessage.php b/app/code/Magento/GiftMessage/Ui/DataProvider/Product/Modifier/GiftMessage.php
index e3d617eac1cd2..4190ec8f31dc4 100644
--- a/app/code/Magento/GiftMessage/Ui/DataProvider/Product/Modifier/GiftMessage.php
+++ b/app/code/Magento/GiftMessage/Ui/DataProvider/Product/Modifier/GiftMessage.php
@@ -6,6 +6,7 @@
 namespace Magento\GiftMessage\Ui\DataProvider\Product\Modifier;
 
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Boolean;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Stdlib\ArrayManager;
@@ -13,7 +14,6 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Ui\Component\Form\Element\Checkbox;
 use Magento\Ui\Component\Form\Field;
-use Magento\Catalog\Model\Product\Attribute\Source\Boolean;
 
 /**
  * Class GiftMessageDataProvider
diff --git a/app/code/Magento/GoogleAnalytics/Helper/Data.php b/app/code/Magento/GoogleAnalytics/Helper/Data.php
index 2af03c71fb1b0..003dc474cfa5f 100644
--- a/app/code/Magento/GoogleAnalytics/Helper/Data.php
+++ b/app/code/Magento/GoogleAnalytics/Helper/Data.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\GoogleAnalytics\Helper;
 
-use Magento\Store\Model\Store;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
 
 /**
  * GoogleAnalytics data helper
diff --git a/app/code/Magento/GoogleAnalytics/Test/Unit/Block/GaTest.php b/app/code/Magento/GoogleAnalytics/Test/Unit/Block/GaTest.php
index 63a97b99c1e48..6822125c82fbc 100644
--- a/app/code/Magento/GoogleAnalytics/Test/Unit/Block/GaTest.php
+++ b/app/code/Magento/GoogleAnalytics/Test/Unit/Block/GaTest.php
@@ -17,7 +17,6 @@
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
-use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -185,7 +184,7 @@ public function testGetPageTrackingData()
         ];
         $this->gaBlock->setData('page_name', $pageName);
         $this->googleAnalyticsDataMock->expects($this->once())->method('isAnonymizedIpActive')->willReturn(true);
-        
+
         $this->assertEquals($expectedResult, $this->gaBlock->getPageTrackingData($accountId));
     }
 
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Form.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Form.php
index 2c738e428454c..27cd21edadb9e 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Form.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Form.php
@@ -7,9 +7,9 @@
  */
 namespace Magento\GoogleOptimizer\Block\Adminhtml;
 
-use Magento\Framework\Exception\ConfigurationMismatchException;
-use Magento\Framework\App\ObjectManager;
 use Magento\Backend\Block\Widget\Form\Generic;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\ConfigurationMismatchException;
 
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
diff --git a/app/code/Magento/GoogleOptimizer/Helper/Data.php b/app/code/Magento/GoogleOptimizer/Helper/Data.php
index e4d9a44148204..694fe5cc32f15 100644
--- a/app/code/Magento/GoogleOptimizer/Helper/Data.php
+++ b/app/code/Magento/GoogleOptimizer/Helper/Data.php
@@ -10,7 +10,7 @@
 
 namespace Magento\GoogleOptimizer\Helper;
 
-use \Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @api
diff --git a/app/code/Magento/GoogleOptimizer/Model/Plugin/Catalog/Category/DataProvider.php b/app/code/Magento/GoogleOptimizer/Model/Plugin/Catalog/Category/DataProvider.php
index 7c0330740a151..be7f4a888605f 100644
--- a/app/code/Magento/GoogleOptimizer/Model/Plugin/Catalog/Category/DataProvider.php
+++ b/app/code/Magento/GoogleOptimizer/Model/Plugin/Catalog/Category/DataProvider.php
@@ -6,9 +6,6 @@
 
 namespace Magento\GoogleOptimizer\Model\Plugin\Catalog\Category;
 
-use Magento\Framework\Event\Observer as EventObserver;
-use Magento\Framework\Event\ObserverInterface;
-
 class DataProvider
 {
     /**
diff --git a/app/code/Magento/GoogleOptimizer/Model/Plugin/Catalog/Product/Category/DataProvider.php b/app/code/Magento/GoogleOptimizer/Model/Plugin/Catalog/Product/Category/DataProvider.php
index 6dec2105e7945..e83ddcad0d39c 100644
--- a/app/code/Magento/GoogleOptimizer/Model/Plugin/Catalog/Product/Category/DataProvider.php
+++ b/app/code/Magento/GoogleOptimizer/Model/Plugin/Catalog/Product/Category/DataProvider.php
@@ -6,7 +6,7 @@
 
 namespace Magento\GoogleOptimizer\Model\Plugin\Catalog\Product\Category;
 
-use \Magento\Catalog\Ui\DataProvider\Product\Form\NewCategoryDataProvider;
+use Magento\Catalog\Ui\DataProvider\Product\Form\NewCategoryDataProvider;
 
 class DataProvider
 {
diff --git a/app/code/Magento/GoogleOptimizer/Ui/DataProvider/Product/Form/Modifier/GoogleOptimizer.php b/app/code/Magento/GoogleOptimizer/Ui/DataProvider/Product/Form/Modifier/GoogleOptimizer.php
index 5dd2d612e99e0..e4687f9e4d9ad 100644
--- a/app/code/Magento/GoogleOptimizer/Ui/DataProvider/Product/Form/Modifier/GoogleOptimizer.php
+++ b/app/code/Magento/GoogleOptimizer/Ui/DataProvider/Product/Form/Modifier/GoogleOptimizer.php
@@ -7,13 +7,13 @@
 
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\GoogleOptimizer\Helper\Code as CodeHelper;
+use Magento\GoogleOptimizer\Helper\Data as DataHelper;
 use Magento\Ui\Component\Form\Element\DataType\Text;
 use Magento\Ui\Component\Form\Element\Input;
 use Magento\Ui\Component\Form\Element\Textarea;
 use Magento\Ui\Component\Form\Field;
 use Magento\Ui\Component\Form\Fieldset;
-use Magento\GoogleOptimizer\Helper\Data as DataHelper;
-use Magento\GoogleOptimizer\Helper\Code as CodeHelper;
 
 /**
  * Class GoogleOptimizer adds Product View Optimization Panel
diff --git a/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/Grouped/LinksTest.php b/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/Grouped/LinksTest.php
index ffcfa5c0a90d7..91a24f2e6d813 100644
--- a/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/Grouped/LinksTest.php
+++ b/app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/Grouped/LinksTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\GroupedImportExport\Test\Unit\Model\Import\Product\Type\Grouped;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class LinksTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php b/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php
index ad63b335cb189..d139ddedbc14b 100644
--- a/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php
+++ b/app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php
@@ -7,10 +7,10 @@
 
 use Magento\Backend\App\AbstractAction;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\Registry;
 use Magento\Catalog\Model\ProductFactory;
-use Psr\Log\LoggerInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Registry;
+use Psr\Log\LoggerInterface;
 
 class Popup extends AbstractAction
 {
diff --git a/app/code/Magento/GroupedProduct/Model/ResourceModel/Indexer/Stock/Grouped.php b/app/code/Magento/GroupedProduct/Model/ResourceModel/Indexer/Stock/Grouped.php
index 9d29b02f68bf1..769558440e9a9 100644
--- a/app/code/Magento/GroupedProduct/Model/ResourceModel/Indexer/Stock/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/ResourceModel/Indexer/Stock/Grouped.php
@@ -11,8 +11,8 @@
  */
 namespace Magento\GroupedProduct\Model\ResourceModel\Indexer\Stock;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\CatalogInventory\Model\Indexer\Stock\Action\Full;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Stock indexer for grouped product.
diff --git a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php
index cbbb58d3c24c8..7f3d65b3014cf 100644
--- a/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/ResourceModel/Product/Indexer/Price/Grouped.php
@@ -7,8 +7,8 @@
  */
 namespace Magento\GroupedProduct\Model\ResourceModel\Product\Indexer\Price;
 
-use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice;
 
 class Grouped extends DefaultPrice implements GroupedInterface
 {
diff --git a/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php
index 497117069101a..5bf022248183d 100644
--- a/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php
+++ b/app/code/Magento/GroupedProduct/Pricing/Price/ConfiguredPrice.php
@@ -10,7 +10,6 @@
 use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
 use Magento\Catalog\Pricing\Price\FinalPrice as CatalogFinalPrice;
-use Magento\Framework\Pricing\Amount\AmountInterface;
 
 class ConfiguredPrice extends CatalogFinalPrice implements ConfiguredPriceInterface
 {
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php
index 346ef3ecb9647..c32e18f316e2d 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\GroupedProduct\Test\Unit\Model;
 
-use \Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
@@ -285,7 +285,6 @@ protected function setUp()
                 'data' => ['id' => 1]
             ]
         );
-
     }
 
     /**
@@ -324,7 +323,7 @@ public function testGetProductLinks()
         $reflectionOfExtension = new \ReflectionClass(\Magento\Catalog\Api\Data\ProductLinkExtension::class);
         $method = $reflectionOfExtension->getMethod('setData');
         $method->setAccessible(true);
-        $method->invokeArgs($groupExtension, array('qty', 1));
+        $method->invokeArgs($groupExtension, ['qty', 1]);
 
         $outputGroupLink = $this->objectManagerHelper->getObject(\Magento\Catalog\Model\ProductLink\Link::class);
         $outputGroupLink->setProductSku("Simple Product 1");
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/ResourceModel/Product/Link/RelationPersisterTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/ResourceModel/Product/Link/RelationPersisterTest.php
index 57466d551d296..02e86ae4bd49b 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Model/ResourceModel/Product/Link/RelationPersisterTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/ResourceModel/Product/Link/RelationPersisterTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\GroupedProduct\Test\Unit\Model\ResourceModel\Product\Link;
 
-use Magento\GroupedProduct\Model\ResourceModel\Product\Link\RelationPersister;
-use Magento\Catalog\Model\ProductLink\LinkFactory;
 use Magento\Catalog\Model\Product\Link;
+use Magento\Catalog\Model\ProductLink\LinkFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Link as LinkResourceModel;
 use Magento\Catalog\Model\ResourceModel\Product\Relation;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Catalog\Model\ResourceModel\Product\Link as LinkResourceModel;
+use Magento\GroupedProduct\Model\ResourceModel\Product\Link\RelationPersister;
 
 class RelationPersisterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Sales/AdminOrder/Product/Quote/Plugin/InitializerTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Sales/AdminOrder/Product/Quote/Plugin/InitializerTest.php
index afa4ef256ccc7..1705d5e53c160 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Model/Sales/AdminOrder/Product/Quote/Plugin/InitializerTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/Sales/AdminOrder/Product/Quote/Plugin/InitializerTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\GroupedProduct\Test\Unit\Model\Sales\AdminOrder\Product\Quote\Plugin;
 
-use Magento\GroupedProduct\Model\Sales\AdminOrder\Product\Quote\Plugin\Initializer as QuoteInitializerPlugin;
-use Magento\Sales\Model\AdminOrder\Product\Quote\Initializer as QuoteInitializer;
-use Magento\Quote\Model\Quote;
 use Magento\Catalog\Model\Product;
-use Magento\Quote\Model\Quote\Item as QuoteItem;
 use Magento\Framework\DataObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\GroupedProduct\Model\Sales\AdminOrder\Product\Quote\Plugin\Initializer as QuoteInitializerPlugin;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Sales\Model\AdminOrder\Product\Quote\Initializer as QuoteInitializer;
 
 class InitializerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/GroupedProductDataProviderTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/GroupedProductDataProviderTest.php
index 8dc8fc0483d41..2d19ab8be23e7 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/GroupedProductDataProviderTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/GroupedProductDataProviderTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\GroupedProduct\Test\Unit\Ui\DataProvider\Product;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\GroupedProduct\Ui\DataProvider\Product\GroupedProductDataProvider;
-use Magento\Framework\App\RequestInterface;
+use Magento\Catalog\Model\ProductTypes\ConfigInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
-use Magento\Catalog\Model\ProductTypes\ConfigInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\GroupedProduct\Ui\DataProvider\Product\GroupedProductDataProvider;
 
 class GroupedProductDataProviderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
index 947677207f9c2..4cb13c7558e1d 100644
--- a/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
+++ b/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\GroupedProduct\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\CustomOptions as CustomOptionsModifier;
+use Magento\Framework\Stdlib\ArrayManager;
 
 /**
  * Data provider that customizes Customizable Options for Grouped product
diff --git a/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php b/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php
index 2d1a1d19757e2..7b357d74bda75 100644
--- a/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/Form/Modifier/Grouped.php
@@ -7,20 +7,20 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\ProductLinkInterface;
-use Magento\Catalog\Model\Locator\LocatorInterface;
-use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
-use Magento\Framework\Phrase;
-use Magento\Ui\Component\Modal;
-use Magento\Ui\Component\Form;
-use Magento\GroupedProduct\Model\Product\Type\Grouped as GroupedProductType;
-use Magento\Framework\UrlInterface;
-use Magento\Ui\Component\DynamicRows;
 use Magento\Catalog\Api\ProductLinkRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Helper\Image as ImageHelper;
-use Magento\Eav\Api\AttributeSetRepositoryInterface;
+use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\Eav\Api\AttributeSetRepositoryInterface;
 use Magento\Framework\Locale\CurrencyInterface;
+use Magento\Framework\Phrase;
+use Magento\Framework\UrlInterface;
+use Magento\GroupedProduct\Model\Product\Type\Grouped as GroupedProductType;
+use Magento\Ui\Component\DynamicRows;
+use Magento\Ui\Component\Form;
+use Magento\Ui\Component\Modal;
 
 /**
  * Data provider for Grouped products
@@ -295,8 +295,7 @@ protected function getModal()
                     'config' => [
                         'componentType' => Modal::NAME,
                         'dataScope' => '',
-                        'provider' =>
-                            $this->uiComponentsConfig['form']
+                        'provider' => $this->uiComponentsConfig['form']
                             . '.'
                             . $this->uiComponentsConfig['form']
                             . '_data_source',
@@ -341,21 +340,18 @@ protected function getListing()
                         'autoRender' => false,
                         'componentType' => 'insertListing',
                         'dataScope' => $this->uiComponentsConfig['listing'],
-                        'externalProvider' =>
-                            $this->uiComponentsConfig['listing']
+                        'externalProvider' => $this->uiComponentsConfig['listing']
                             . '.'
                             . $this->uiComponentsConfig['listing']
                             . '_data_source',
-                        'selectionsProvider' =>
-                            $this->uiComponentsConfig['listing']
+                        'selectionsProvider' => $this->uiComponentsConfig['listing']
                             . '.'
                             . $this->uiComponentsConfig['listing']
                             . '.product_columns.ids',
                         'ns' => $this->uiComponentsConfig['listing'],
                         'render_url' => $this->urlBuilder->getUrl('mui/index/render'),
                         'realTimeLink' => true,
-                        'provider' =>
-                            $this->uiComponentsConfig['form']
+                        'provider' => $this->uiComponentsConfig['form']
                             . '.'
                             . $this->uiComponentsConfig['form']
                             . '_data_source',
@@ -408,22 +404,17 @@ protected function getButtonSet()
                                 'component' => 'Magento_Ui/js/form/components/button',
                                 'actions' => [
                                     [
-                                        'targetName' =>
-                                            $this->uiComponentsConfig['form'] . '.' . $this->uiComponentsConfig['form']
-                                            . '.'
-                                            . static::GROUP_GROUPED
-                                            . '.'
+                                        'targetName' => $this->uiComponentsConfig['form'] . '.'
+                                            . $this->uiComponentsConfig['form'] . '.'
+                                            . static::GROUP_GROUPED . '.'
                                             . $this->uiComponentsConfig['modal'],
                                         'actionName' => 'openModal',
                                     ],
                                     [
-                                        'targetName' =>
-                                            $this->uiComponentsConfig['form'] . '.' . $this->uiComponentsConfig['form']
-                                            . '.'
-                                            . static::GROUP_GROUPED
-                                            . '.'
-                                            . $this->uiComponentsConfig['modal']
-                                            . '.'
+                                        'targetName' => $this->uiComponentsConfig['form'] . '.' .
+                                            $this->uiComponentsConfig['form'] . '.'
+                                            . static::GROUP_GROUPED . '.'
+                                            . $this->uiComponentsConfig['modal'] . '.'
                                             . $this->uiComponentsConfig['listing'],
                                         'actionName' => 'render',
                                     ],
diff --git a/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/GroupedProductDataProvider.php b/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/GroupedProductDataProvider.php
index 046c2d763129a..12fb6c232e909 100644
--- a/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/GroupedProductDataProvider.php
+++ b/app/code/Magento/GroupedProduct/Ui/DataProvider/Product/GroupedProductDataProvider.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\GroupedProduct\Ui\DataProvider\Product;
 
+use Magento\Catalog\Model\ProductTypes\ConfigInterface;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Ui\DataProvider\Product\ProductDataProvider;
-use Magento\GroupedProduct\Model\Product\Type\Grouped as GroupedProductType;
-use Magento\Catalog\Model\ProductTypes\ConfigInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index 94dc0ee7493b0..f0f2db34b9094 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ImportExport\Block\Adminhtml\Export;
 
-use Magento\Eav\Model\Entity\Attribute;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Eav\Model\Entity\Attribute;
 
 /**
  * Export filter block
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
index 81fa9767fbaa4..35c2a14600733 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\ImportExport\Block\Adminhtml\Grid\Column\Renderer;
 
-use Magento\ImportExport\Model\Import;
-
 /**
  * Backup grid item renderer
  */
@@ -20,7 +18,7 @@ class Download extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
      */
     public function _getValue(\Magento\Framework\DataObject $row)
     {
-        return '<p> ' . $row->getData('imported_file') .  '</p><a href="'
+        return '<p> ' . $row->getData('imported_file') . '</p><a href="'
         . $this->getUrl('*/*/download', ['filename' => $row->getData('imported_file')]) . '">'
         . __('Download')
         . '</a>';
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
index 527bc5025d139..2bd7f60299f71 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\ImportExport\Block\Adminhtml\Grid\Column\Renderer;
 
-use Magento\ImportExport\Model\Import;
-
 /**
  * Backup grid item renderer
  */
@@ -22,7 +20,7 @@ public function _getValue(\Magento\Framework\DataObject $row)
     {
         $result = '';
         if ($row->getData('error_file') != '') {
-            $result = '<p> ' . $row->getData('error_file') .  '</p><a href="'
+            $result = '<p> ' . $row->getData('error_file') . '</p><a href="'
                 . $this->getUrl('*/*/download', ['filename' => $row->getData('error_file')]) . '">'
                 . __('Download')
                 . '</a>';
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
index acca62b4cb72e..be611d3cca31d 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\ImportExport\Block\Adminhtml\Import\Frame;
 
-use Magento\Framework\View\Element\Template;
-
 /**
  * Import frame result block.
  *
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
index 06d8610a247cc..0b6f0780f2073 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Export;
 
-use Magento\Framework\Controller\ResultFactory;
-use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\App\Response\Http\FileFactory;
-use Magento\ImportExport\Model\Export as ExportModel;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
+use Magento\ImportExport\Model\Export as ExportModel;
 
 class Export extends ExportController
 {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
index 05475b5161977..789c99b361ee6 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Export;
 
-use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 
 class GetFilter extends ExportController
 {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php
index d2ca99f1a7973..2687697c68734 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Index.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Export;
 
-use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 
 class Index extends ExportController
 {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Index.php
index 223aa9b2ac5d9..3733681d068c6 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/History/Index.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/History/Index.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\History;
 
-use Magento\ImportExport\Controller\Adminhtml\History as HistoryController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\ImportExport\Controller\Adminhtml\History as HistoryController;
 
 class Index extends HistoryController
 {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import.php
index bd08b215f7c51..7eefc74d927e2 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import.php
@@ -6,8 +6,6 @@
 namespace Magento\ImportExport\Controller\Adminhtml;
 
 use Magento\Backend\App\Action;
-use Magento\ImportExport\Model\Import\Entity\AbstractEntity;
-use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
 /**
  * Import controller
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
index 33dbba8320051..e298aa8312687 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\ImportExport\Controller\Adminhtml\Import as ImportController;
-use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * Download sample file controller
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php
index df32d61cceb7f..e3335a1cc744a 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Index.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
-use Magento\ImportExport\Controller\Adminhtml\Import as ImportController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\ImportExport\Controller\Adminhtml\Import as ImportController;
 
 class Index extends ImportController
 {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
index 695a0e61709f1..9064996c0e5bb 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Start.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
-use Magento\ImportExport\Controller\Adminhtml\ImportResult as ImportResultController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\ImportExport\Controller\Adminhtml\ImportResult as ImportResultController;
 
 class Start extends ImportResultController
 {
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
index df9f63e79b75e..34dc8a42f855f 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\ImportExport\Block\Adminhtml\Import\Frame\Result;
 use Magento\ImportExport\Controller\Adminhtml\ImportResult as ImportResultController;
 use Magento\ImportExport\Model\Import;
-use Magento\ImportExport\Block\Adminhtml\Import\Frame\Result;
-use Magento\Framework\Controller\ResultFactory;
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Model\Import\Adapter as ImportAdapter;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php b/app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php
index 47210dd9805e5..b9b1363da4004 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml;
 
-use Magento\Backend\App\Action;
+use Magento\ImportExport\Model\History as ModelHistory;
 use Magento\ImportExport\Model\Import\Entity\AbstractEntity;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
-use Magento\ImportExport\Model\History as ModelHistory;
 
 /**
  * Import controller
diff --git a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
index 8baf9e8fe9cb9..982eab043f1f2 100644
--- a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
@@ -6,8 +6,8 @@
 namespace Magento\ImportExport\Model\Export;
 
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-use Magento\ImportExport\Model\Export\Adapter\AbstractAdapter;
 use Magento\ImportExport\Model\Export;
+use Magento\ImportExport\Model\Export\Adapter\AbstractAdapter;
 
 /**
  * Export entity abstract model
diff --git a/app/code/Magento/ImportExport/Model/Export/Adapter/AbstractAdapter.php b/app/code/Magento/ImportExport/Model/Export/Adapter/AbstractAdapter.php
index 8fbc91de5b211..fc862197d777d 100644
--- a/app/code/Magento/ImportExport/Model/Export/Adapter/AbstractAdapter.php
+++ b/app/code/Magento/ImportExport/Model/Export/Adapter/AbstractAdapter.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ImportExport\Model\Export\Adapter;
 
-use Magento\Framework\Filesystem;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
 
 /**
  * Abstract adapter model
diff --git a/app/code/Magento/ImportExport/Model/Export/Config/Converter.php b/app/code/Magento/ImportExport/Model/Export/Config/Converter.php
index 13b7e52c8d5a4..2e14fb99afacc 100644
--- a/app/code/Magento/ImportExport/Model/Export/Config/Converter.php
+++ b/app/code/Magento/ImportExport/Model/Export/Config/Converter.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ImportExport\Model\Export\Config;
 
-use Magento\Framework\Module\Manager;
 use Magento\Framework\App\Utility\Classes;
+use Magento\Framework\Module\Manager;
 
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
diff --git a/app/code/Magento/ImportExport/Model/History.php b/app/code/Magento/ImportExport/Model/History.php
index 3138f150d5fc5..5036acc8e149f 100644
--- a/app/code/Magento/ImportExport/Model/History.php
+++ b/app/code/Magento/ImportExport/Model/History.php
@@ -139,7 +139,7 @@ public function invalidateReport(Import $import)
     {
         if ($import->isReportEntityType()) {
             $this->load($this->getLastItemId());
-             $this->setExecutionTime(self::IMPORT_FAILED);
+            $this->setExecutionTime(self::IMPORT_FAILED);
             $this->save();
         }
         return $this;
diff --git a/app/code/Magento/ImportExport/Model/Import/AbstractSource.php b/app/code/Magento/ImportExport/Model/Import/AbstractSource.php
index 41665a71341c1..1c6798d1ad3ea 100644
--- a/app/code/Magento/ImportExport/Model/Import/AbstractSource.php
+++ b/app/code/Magento/ImportExport/Model/Import/AbstractSource.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\ImportExport\Model\Import;
 
-use Magento\ImportExport\Model\Import\AbstractEntity;
-
 /**
  * Data source with columns for Magento_ImportExport
  *
diff --git a/app/code/Magento/ImportExport/Model/Import/Config/Converter.php b/app/code/Magento/ImportExport/Model/Import/Config/Converter.php
index 8169b8fe63bbd..f1f1867bb7850 100644
--- a/app/code/Magento/ImportExport/Model/Import/Config/Converter.php
+++ b/app/code/Magento/ImportExport/Model/Import/Config/Converter.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ImportExport\Model\Import\Config;
 
-use Magento\Framework\Module\Manager;
 use Magento\Framework\App\Utility\Classes;
+use Magento\Framework\Module\Manager;
 
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
diff --git a/app/code/Magento/ImportExport/Model/Report/Csv.php b/app/code/Magento/ImportExport/Model/Report/Csv.php
index 86c68d7c4df77..919977b1d4327 100644
--- a/app/code/Magento/ImportExport/Model/Report/Csv.php
+++ b/app/code/Magento/ImportExport/Model/Report/Csv.php
@@ -6,9 +6,9 @@
 
 namespace Magento\ImportExport\Model\Report;
 
-use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\ImportExport\Model\Import;
+use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
 /**
  * Class Csv create new CSV file and add Error data in additional column
diff --git a/app/code/Magento/ImportExport/Model/ResourceModel/History/Collection.php b/app/code/Magento/ImportExport/Model/ResourceModel/History/Collection.php
index e6e98914c4631..ec6f934f95d8d 100644
--- a/app/code/Magento/ImportExport/Model/ResourceModel/History/Collection.php
+++ b/app/code/Magento/ImportExport/Model/ResourceModel/History/Collection.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\ImportExport\Model\ResourceModel\History;
 
-use \Magento\ImportExport\Model\History;
+use Magento\ImportExport\Model\History;
 
 /**
  * Import history collection
diff --git a/app/code/Magento/ImportExport/Setup/UpgradeSchema.php b/app/code/Magento/ImportExport/Setup/UpgradeSchema.php
index f02ca7c738150..ffbef20b5ea5a 100644
--- a/app/code/Magento/ImportExport/Setup/UpgradeSchema.php
+++ b/app/code/Magento/ImportExport/Setup/UpgradeSchema.php
@@ -6,9 +6,9 @@
 
 namespace Magento\ImportExport\Setup;
 
-use Magento\Framework\Setup\UpgradeSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
 
 /**
  * @codeCoverageIgnore
@@ -20,7 +20,6 @@ class UpgradeSchema implements UpgradeSchemaInterface
      */
     public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
-
         $installer = $setup;
         $installer->startSetup();
         $installer->getConnection()->addColumn(
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/ResourceModel/CollectionByPagesIteratorTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/ResourceModel/CollectionByPagesIteratorTest.php
index 06b511d7e1e86..f513de2ccc289 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/ResourceModel/CollectionByPagesIteratorTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/ResourceModel/CollectionByPagesIteratorTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\ImportExport\Test\Unit\Model\ResourceModel;
 
-use \Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Data\Collection\AbstractDb;
 
 /**
  * Test class for \Magento\ImportExport\Model\ResourceModel\CollectionByPagesIterator
diff --git a/app/code/Magento/Indexer/Console/Command/AbstractIndexerCommand.php b/app/code/Magento/Indexer/Console/Command/AbstractIndexerCommand.php
index 1461fbadc76be..529deef48784d 100644
--- a/app/code/Magento/Indexer/Console/Command/AbstractIndexerCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/AbstractIndexerCommand.php
@@ -6,10 +6,10 @@
 namespace Magento\Indexer\Console\Command;
 
 use Magento\Backend\App\Area\FrontNameResolver;
+use Magento\Framework\App\ObjectManagerFactory;
+use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Symfony\Component\Console\Command\Command;
-use Magento\Framework\Indexer\IndexerInterface;
-use Magento\Framework\App\ObjectManagerFactory;
 
 /**
  * An Abstract class for Indexer related commands.
diff --git a/app/code/Magento/Indexer/Console/Command/AbstractIndexerManageCommand.php b/app/code/Magento/Indexer/Console/Command/AbstractIndexerManageCommand.php
index f1cc7d8a72972..a0fcc5b612763 100644
--- a/app/code/Magento/Indexer/Console/Command/AbstractIndexerManageCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/AbstractIndexerManageCommand.php
@@ -6,8 +6,8 @@
 namespace Magento\Indexer\Console\Command;
 
 use Magento\Framework\Indexer\IndexerInterface;
-use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
 
 /**
  * An Abstract class for all Indexer related commands.
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
index 43065ada77271..ae16b8d6c2fc4 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Indexer\Console\Command;
 
+use Magento\Framework\App\ObjectManagerFactory;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Indexer\Config\DependencyInfoProvider;
+use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Framework\Indexer\StateInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Framework\Indexer\ConfigInterface;
-use Magento\Framework\App\ObjectManagerFactory;
 
 /**
  * Command to run indexers
@@ -186,7 +186,7 @@ private function getDependentIndexerIds(string $indexerId)
                     $this->getDependentIndexerIds($id)
                 );
             }
-        };
+        }
 
         return array_unique($dependentIndexerIds);
     }
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerResetStateCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerResetStateCommand.php
index 75ea1f6b27f66..297574cab7848 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerResetStateCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerResetStateCommand.php
@@ -6,10 +6,8 @@
 namespace Magento\Indexer\Console\Command;
 
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Indexer\StateInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Framework\Indexer\ConfigInterface;
 
 /**
  * Command for invalidating indexers.
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerSetModeCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerSetModeCommand.php
index a184db660cdc3..8dfb1867237ab 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerSetModeCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerSetModeCommand.php
@@ -6,10 +6,10 @@
 namespace Magento\Indexer\Console\Command;
 
 use Magento\Framework\Exception\LocalizedException;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Command for setting index mode for indexers.
@@ -87,7 +87,7 @@ public function getInputList()
         $modeOptions[] = new InputArgument(
             self::INPUT_KEY_MODE,
             InputArgument::OPTIONAL,
-            'Indexer mode type ['. self::INPUT_KEY_REALTIME . '|' . self::INPUT_KEY_SCHEDULE .']'
+            'Indexer mode type [' . self::INPUT_KEY_REALTIME . '|' . self::INPUT_KEY_SCHEDULE . ']'
         );
         $optionsList = array_merge($modeOptions, parent::getInputList());
         return $optionsList;
@@ -107,7 +107,7 @@ public function validate(InputInterface $input)
 
         $inputMode = $input->getArgument(self::INPUT_KEY_MODE);
         if (!$inputMode) {
-            $errors[] = 'Missing argument \'' . self::INPUT_KEY_MODE .'\'.' . $acceptedValues;
+            $errors[] = 'Missing argument \'' . self::INPUT_KEY_MODE . '\'.' . $acceptedValues;
         } elseif (!in_array($inputMode, [self::INPUT_KEY_REALTIME, self::INPUT_KEY_SCHEDULE])) {
             $errors[] = $acceptedValues;
         }
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
index 22acdc6f82bbc..10a4d41f0be09 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Indexer\Console\Command;
 
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Framework\Indexer;
 use Magento\Framework\Mview;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Command for displaying status of indexers.
diff --git a/app/code/Magento/Indexer/Model/Config/Data.php b/app/code/Magento/Indexer/Model/Config/Data.php
index 6434d5a585b90..6886eab581914 100644
--- a/app/code/Magento/Indexer/Model/Config/Data.php
+++ b/app/code/Magento/Indexer/Model/Config/Data.php
@@ -6,7 +6,6 @@
 namespace Magento\Indexer\Model\Config;
 
 use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Provides indexer configuration
diff --git a/app/code/Magento/Indexer/Model/Processor/CleanCache.php b/app/code/Magento/Indexer/Model/Processor/CleanCache.php
index 344fef6ef04ff..d5538bfd2463c 100644
--- a/app/code/Magento/Indexer/Model/Processor/CleanCache.php
+++ b/app/code/Magento/Indexer/Model/Processor/CleanCache.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Indexer\Model\Processor;
 
-use \Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\CacheInterface;
 
 class CleanCache
 {
diff --git a/app/code/Magento/Indexer/Setup/InstallData.php b/app/code/Magento/Indexer/Setup/InstallData.php
index 98a49d6799b13..b138d2300e177 100644
--- a/app/code/Magento/Indexer/Setup/InstallData.php
+++ b/app/code/Magento/Indexer/Setup/InstallData.php
@@ -8,15 +8,15 @@
 
 use Magento\Framework\Encryption\Encryptor;
 use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Framework\Indexer\StateInterface;
 use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Indexer\ConfigInterface;
-use Magento\Indexer\Model\ResourceModel\Indexer\State\CollectionFactory;
 use Magento\Indexer\Model\Indexer\State;
 use Magento\Indexer\Model\Indexer\StateFactory;
-use Magento\Framework\Setup\InstallDataInterface;
+use Magento\Indexer\Model\ResourceModel\Indexer\State\CollectionFactory;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Indexer/Setup/Recurring.php b/app/code/Magento/Indexer/Setup/Recurring.php
index 2f1946fab1ab7..52fcc4b3b06a4 100644
--- a/app/code/Magento/Indexer/Setup/Recurring.php
+++ b/app/code/Magento/Indexer/Setup/Recurring.php
@@ -8,12 +8,12 @@
 
 use Magento\Framework\Encryption\Encryptor;
 use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Framework\Indexer\StateInterface;
 use Magento\Framework\Json\EncoderInterface;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Indexer\Model\Indexer\State;
 use Magento\Indexer\Model\Indexer\StateFactory;
 use Magento\Indexer\Model\ResourceModel\Indexer\State\CollectionFactory;
diff --git a/app/code/Magento/Indexer/Setup/RecurringData.php b/app/code/Magento/Indexer/Setup/RecurringData.php
index 1f6ea09ba853f..6ec15b73e1075 100644
--- a/app/code/Magento/Indexer/Setup/RecurringData.php
+++ b/app/code/Magento/Indexer/Setup/RecurringData.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Indexer\Setup;
 
+use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Framework\Indexer\IndexerInterfaceFactory;
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Indexer\ConfigInterface;
 
 /**
  * Recurring data upgrade for indexer module
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerResetStateCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerResetStateCommandTest.php
index 76969b275697e..45709aaa8c07c 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerResetStateCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerResetStateCommandTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Indexer\Test\Unit\Console\Command;
 
 use Magento\Backend\App\Area\FrontNameResolver;
-use Symfony\Component\Console\Tester\CommandTester;
 use Magento\Indexer\Console\Command\IndexerResetStateCommand;
+use Symfony\Component\Console\Tester\CommandTester;
 
 class IndexerResetStateCommandTest extends AbstractIndexerCommandCommonSetup
 {
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetModeCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetModeCommandTest.php
index ad3ae88816db4..25009279df48b 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetModeCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerSetModeCommandTest.php
@@ -76,7 +76,7 @@ public function testExecuteAll()
         $commandTester->execute(['mode' => 'realtime']);
         $actualValue = $commandTester->getDisplay();
         $this->assertSame(
-            'Index mode for Indexer Title_indexerOne was changed from '. '\'Update by Schedule\' to \'Update on Save\''
+            'Index mode for Indexer Title_indexerOne was changed from ' . '\'Update by Schedule\' to \'Update on Save\''
             . PHP_EOL,
             $actualValue
         );
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php
index 31513da018c6b..fdd651708d460 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php
@@ -7,9 +7,9 @@
 
 use Magento\Framework\Indexer\StateInterface;
 use Magento\Indexer\Console\Command\IndexerStatusCommand;
-use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Helper\TableHelper;
+use Symfony\Component\Console\Tester\CommandTester;
 
 class IndexerStatusCommandTest extends AbstractIndexerCommandCommonSetup
 {
@@ -27,7 +27,7 @@ class IndexerStatusCommandTest extends AbstractIndexerCommandCommonSetup
      */
     private function attachViewToIndexerMock($indexerMock, array $data)
     {
-         /** @var \Magento\Framework\Mview\View\Changelog|\PHPUnit_Framework_MockObject_MockObject $changelog */
+        /** @var \Magento\Framework\Mview\View\Changelog|\PHPUnit_Framework_MockObject_MockObject $changelog */
         $changelog = $this->getMockBuilder(\Magento\Framework\Mview\View\Changelog::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -101,7 +101,7 @@ public function testExecuteAll(array $indexers)
                 ['helpers' => [$objectManager->getObject(TableHelper::class)]]
             )
         );
-        
+
         $commandTester = new CommandTester($this->command);
         $commandTester->execute([]);
 
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/Indexer/CollectionTest.php b/app/code/Magento/Indexer/Test/Unit/Model/Indexer/CollectionTest.php
index 2489111fa6753..81c7f9a476c03 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/Indexer/CollectionTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/Indexer/CollectionTest.php
@@ -95,7 +95,7 @@ public function testLoadData(array $indexersData, array $states)
                 ->method('load')
                 ->with($indexerId);
             $indexer
-                ->expects($this->exactly($state ? 1: 0))
+                ->expects($this->exactly($state ? 1 : 0))
                 ->method('setState')
                 ->with($state);
             $calls[] = $indexer;
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
index e9c82906121cc..f24d2690a0f2a 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
@@ -279,7 +279,6 @@ function () {
      */
     public function testReindexAllWithError()
     {
-
         $indexId = 'indexer_internal_name';
         $this->loadIndexer($indexId);
 
@@ -306,7 +305,7 @@ public function testReindexAllWithError()
         $actionMock->expects($this->once())->method('executeFull')->will(
             $this->returnCallback(
                 function () {
-                     throw new \Error('Test Engine Error');
+                    throw new \Error('Test Engine Error');
                 }
             )
         );
diff --git a/app/code/Magento/Indexer/Test/Unit/Ui/DataProvider/Indexer/DataCollectionTest.php b/app/code/Magento/Indexer/Test/Unit/Ui/DataProvider/Indexer/DataCollectionTest.php
index 99465f2834ec0..0a7593900e2ff 100644
--- a/app/code/Magento/Indexer/Test/Unit/Ui/DataProvider/Indexer/DataCollectionTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Ui/DataProvider/Indexer/DataCollectionTest.php
@@ -55,10 +55,10 @@ protected function setUp()
         $this->indexerRegistryMock = $this->getMockBuilder(IndexerRegistry::class)
             ->disableOriginalConstructor()
             ->getMock();
-        
+
         $this->entityFactoryMock = $this->getMockBuilder(EntityFactoryInterface::class)
             ->getMock();
-        
+
         $this->dataCollection = $this->objectManagerHelper->getObject(
             DataCollection::class,
             [
diff --git a/app/code/Magento/InstantPurchase/Model/BillingAddressChoose/BillingAddressChooserInterface.php b/app/code/Magento/InstantPurchase/Model/BillingAddressChoose/BillingAddressChooserInterface.php
index cfed97cfefd36..7cbbfeee08efd 100644
--- a/app/code/Magento/InstantPurchase/Model/BillingAddressChoose/BillingAddressChooserInterface.php
+++ b/app/code/Magento/InstantPurchase/Model/BillingAddressChoose/BillingAddressChooserInterface.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\InstantPurchase\Model\BillingAddressChoose;
 
-use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\Address;
+use Magento\Customer\Model\Customer;
 
 /**
  * Interface to choose billing address for a customer if available.
diff --git a/app/code/Magento/InstantPurchase/Model/BillingAddressChoose/DefaultBillingAddressChooser.php b/app/code/Magento/InstantPurchase/Model/BillingAddressChoose/DefaultBillingAddressChooser.php
index b207c8247af7e..8f51c6e604dcb 100644
--- a/app/code/Magento/InstantPurchase/Model/BillingAddressChoose/DefaultBillingAddressChooser.php
+++ b/app/code/Magento/InstantPurchase/Model/BillingAddressChoose/DefaultBillingAddressChooser.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\InstantPurchase\Model\BillingAddressChoose;
 
-use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\Address;
+use Magento\Customer\Model\Customer;
 
 /**
  * Billing address chooser implementation to choose customer default billing address.
diff --git a/app/code/Magento/InstantPurchase/Model/Config.php b/app/code/Magento/InstantPurchase/Model/Config.php
index 6f6c279304d39..6fbdcf253aa1b 100644
--- a/app/code/Magento/InstantPurchase/Model/Config.php
+++ b/app/code/Magento/InstantPurchase/Model/Config.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Instant purchase configuration.
diff --git a/app/code/Magento/InstantPurchase/Model/InstantPurchaseChooser.php b/app/code/Magento/InstantPurchase/Model/InstantPurchaseChooser.php
index 63e4208f226ed..0127d670c2a87 100644
--- a/app/code/Magento/InstantPurchase/Model/InstantPurchaseChooser.php
+++ b/app/code/Magento/InstantPurchase/Model/InstantPurchaseChooser.php
@@ -7,9 +7,9 @@
 
 use Magento\Customer\Model\Customer;
 
+use Magento\InstantPurchase\Model\BillingAddressChoose\BillingAddressChooserInterface;
 use Magento\InstantPurchase\Model\PaymentMethodChoose\PaymentTokenChooserInterface;
 use Magento\InstantPurchase\Model\ShippingAddressChoose\ShippingAddressChooserInterface;
-use Magento\InstantPurchase\Model\BillingAddressChoose\BillingAddressChooserInterface;
 use Magento\InstantPurchase\Model\ShippingMethodChoose\ShippingMethodChooserInterface;
 use Magento\Store\Model\Store;
 
diff --git a/app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php b/app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php
index a780d9716bd94..e03485e508332 100644
--- a/app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php
+++ b/app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\InstantPurchase\Model;
 
+use InvalidArgumentException;
 use Magento\Customer\Model\Address;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Quote\Api\Data\ShippingMethodInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
-use InvalidArgumentException;
 
 /**
  * Option to make instant purchase.
diff --git a/app/code/Magento/InstantPurchase/Model/PlaceOrder.php b/app/code/Magento/InstantPurchase/Model/PlaceOrder.php
index 2ad56a8859cf3..0e68ebe01e92c 100644
--- a/app/code/Magento/InstantPurchase/Model/PlaceOrder.php
+++ b/app/code/Magento/InstantPurchase/Model/PlaceOrder.php
@@ -15,7 +15,7 @@
 use Magento\InstantPurchase\Model\QuoteManagement\ShippingConfiguration;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Store\Model\Store;
-use \Throwable;
+use Throwable;
 
 /**
  * Place an order using instant purchase option.
diff --git a/app/code/Magento/InstantPurchase/Model/ShippingAddressChoose/DefaultShippingAddressChooser.php b/app/code/Magento/InstantPurchase/Model/ShippingAddressChoose/DefaultShippingAddressChooser.php
index fa1c525c38952..8fcd22fe683b4 100644
--- a/app/code/Magento/InstantPurchase/Model/ShippingAddressChoose/DefaultShippingAddressChooser.php
+++ b/app/code/Magento/InstantPurchase/Model/ShippingAddressChoose/DefaultShippingAddressChooser.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\InstantPurchase\Model\ShippingAddressChoose;
 
-use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\Address;
+use Magento\Customer\Model\Customer;
 
 /**
  * Shipping address chooser implementation to choose customer default shipping address.
diff --git a/app/code/Magento/InstantPurchase/Model/ShippingAddressChoose/ShippingAddressChooserInterface.php b/app/code/Magento/InstantPurchase/Model/ShippingAddressChoose/ShippingAddressChooserInterface.php
index a65c8036a1e82..cb2b10def6b3c 100644
--- a/app/code/Magento/InstantPurchase/Model/ShippingAddressChoose/ShippingAddressChooserInterface.php
+++ b/app/code/Magento/InstantPurchase/Model/ShippingAddressChoose/ShippingAddressChooserInterface.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\InstantPurchase\Model\ShippingAddressChoose;
 
-use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\Address;
+use Magento\Customer\Model\Customer;
 
 /**
  * Interface to choose shipping address for a customer if available.
diff --git a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/ShippingMethodChooserInterface.php b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/ShippingMethodChooserInterface.php
index c227ad793f255..fcdfa107e4645 100644
--- a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/ShippingMethodChooserInterface.php
+++ b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/ShippingMethodChooserInterface.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\InstantPurchase\Model\ShippingMethodChoose;
 
-use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\Address;
+use Magento\Customer\Model\Customer;
 use Magento\Quote\Api\Data\ShippingMethodInterface;
 
 /**
diff --git a/app/code/Magento/InstantPurchase/registration.php b/app/code/Magento/InstantPurchase/registration.php
index 74b4f3e92cf44..1f2fce8c12c07 100644
--- a/app/code/Magento/InstantPurchase/registration.php
+++ b/app/code/Magento/InstantPurchase/registration.php
@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use \Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_InstantPurchase', __DIR__);
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration.php
index c061911f804e7..2e57aa165e2c4 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration.php
@@ -6,7 +6,6 @@
 namespace Magento\Integration\Controller\Adminhtml;
 
 use Magento\Backend\App\Action;
-use Magento\Integration\Api\OauthServiceInterface as IntegrationOauthService;
 
 /**
  * Controller for integrations management.
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
index 36073af56327a..a372f3fa330f7 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
@@ -6,9 +6,9 @@
  */
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
-use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
-use Magento\Framework\Exception\IntegrationException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\IntegrationException;
+use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 
 class Delete extends \Magento\Integration\Controller\Adminhtml\Integration
 {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
index 97cd7b46e086f..591aab4e1128f 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
@@ -7,8 +7,8 @@
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
 use Magento\Backend\App\Action;
-use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 use Magento\Framework\Exception\IntegrationException;
+use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 
 class Edit extends \Magento\Integration\Controller\Adminhtml\Integration
 {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
index dfddd8b954bd3..e56e95564212a 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
-use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 use Magento\Framework\Exception\IntegrationException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Integration\Model\Integration as IntegrationModel;
 use Magento\Framework\Exception\State\UserLockedException;
+use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
+use Magento\Integration\Model\Integration as IntegrationModel;
 use Magento\Security\Model\SecurityCookie;
 
 /**
diff --git a/app/code/Magento/Integration/Controller/Token/Access.php b/app/code/Magento/Integration/Controller/Token/Access.php
index 88d5029a724c7..b7a54ccb53a9d 100644
--- a/app/code/Magento/Integration/Controller/Token/Access.php
+++ b/app/code/Magento/Integration/Controller/Token/Access.php
@@ -6,9 +6,9 @@
  */
 namespace Magento\Integration\Controller\Token;
 
-use Magento\Integration\Model\Integration as IntegrationModel;
 use Magento\Integration\Api\IntegrationServiceInterface as IntegrationService;
 use Magento\Integration\Api\OauthServiceInterface as IntegrationOauthService;
+use Magento\Integration\Model\Integration as IntegrationModel;
 
 class Access extends \Magento\Framework\App\Action\Action
 {
diff --git a/app/code/Magento/Integration/Cron/CleanExpiredTokens.php b/app/code/Magento/Integration/Cron/CleanExpiredTokens.php
index 10eba65f06c91..7429c83944e5c 100644
--- a/app/code/Magento/Integration/Cron/CleanExpiredTokens.php
+++ b/app/code/Magento/Integration/Cron/CleanExpiredTokens.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Integration\Cron;
 
-use Magento\Integration\Model\ResourceModel\Oauth\Token as TokenResourceModel;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Integration\Helper\Oauth\Data as OauthHelper;
+use Magento\Integration\Model\ResourceModel\Oauth\Token as TokenResourceModel;
 
 /**
  * Cron class for deleting expired OAuth tokens.
diff --git a/app/code/Magento/Integration/Model/AdminTokenService.php b/app/code/Magento/Integration/Model/AdminTokenService.php
index 080181b5d8d61..330d8bb868ecc 100644
--- a/app/code/Magento/Integration/Model/AdminTokenService.php
+++ b/app/code/Magento/Integration/Model/AdminTokenService.php
@@ -8,12 +8,11 @@
 
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Integration\Model\CredentialsValidator;
 use Magento\Integration\Model\Oauth\Token as Token;
+use Magento\Integration\Model\Oauth\Token\RequestThrottler;
 use Magento\Integration\Model\Oauth\TokenFactory as TokenModelFactory;
 use Magento\Integration\Model\ResourceModel\Oauth\Token\CollectionFactory as TokenCollectionFactory;
 use Magento\User\Model\User as UserModel;
-use Magento\Integration\Model\Oauth\Token\RequestThrottler;
 
 /**
  * Class to handle token generation for Admins
diff --git a/app/code/Magento/Integration/Model/ConfigBasedIntegrationManager.php b/app/code/Magento/Integration/Model/ConfigBasedIntegrationManager.php
index d2f3f2dd7304e..10d5c558f382b 100644
--- a/app/code/Magento/Integration/Model/ConfigBasedIntegrationManager.php
+++ b/app/code/Magento/Integration/Model/ConfigBasedIntegrationManager.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Integration\Model;
 
-use Magento\Integration\Model\Config\Converter;
 use Magento\Authorization\Model\Acl\AclRetriever;
 use Magento\Authorization\Model\UserContextInterface;
+use Magento\Integration\Model\Config\Converter;
 
 /**
  * Class to manage integrations installed from config file
diff --git a/app/code/Magento/Integration/Model/CustomerTokenService.php b/app/code/Magento/Integration/Model/CustomerTokenService.php
index 947ca6f9f8821..0faa474dd3e7e 100644
--- a/app/code/Magento/Integration/Model/CustomerTokenService.php
+++ b/app/code/Magento/Integration/Model/CustomerTokenService.php
@@ -7,13 +7,12 @@
 namespace Magento\Integration\Model;
 
 use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Integration\Model\CredentialsValidator;
 use Magento\Integration\Model\Oauth\Token as Token;
+use Magento\Integration\Model\Oauth\Token\RequestThrottler;
 use Magento\Integration\Model\Oauth\TokenFactory as TokenModelFactory;
 use Magento\Integration\Model\ResourceModel\Oauth\Token\CollectionFactory as TokenCollectionFactory;
-use Magento\Integration\Model\Oauth\Token\RequestThrottler;
-use Magento\Framework\Exception\AuthenticationException;
 
 class CustomerTokenService implements \Magento\Integration\Api\CustomerTokenServiceInterface
 {
diff --git a/app/code/Magento/Integration/Model/IntegrationService.php b/app/code/Magento/Integration/Model/IntegrationService.php
index 6acb692273957..287b989cd01e9 100644
--- a/app/code/Magento/Integration/Model/IntegrationService.php
+++ b/app/code/Magento/Integration/Model/IntegrationService.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Integration\Model;
 
-use Magento\Integration\Model\Integration as IntegrationModel;
-use Magento\Integration\Model\IntegrationFactory;
-use Magento\Integration\Api\OauthServiceInterface as IntegrationOauthService;
 use Magento\Framework\Exception\IntegrationException;
+use Magento\Integration\Api\OauthServiceInterface as IntegrationOauthService;
+use Magento\Integration\Model\Integration as IntegrationModel;
 
 /**
  * Integration Service.
diff --git a/app/code/Magento/Integration/Model/Oauth/Token.php b/app/code/Magento/Integration/Model/Oauth/Token.php
index 53d9ec300a862..30469cff215c1 100644
--- a/app/code/Magento/Integration/Model/Oauth/Token.php
+++ b/app/code/Magento/Integration/Model/Oauth/Token.php
@@ -8,7 +8,6 @@
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\Oauth\Exception as OauthException;
 use Magento\Framework\Oauth\Helper\Oauth as OauthHelper;
-use Magento\Integration\Model\ResourceModel\Oauth\Token\Collection as TokenCollection;
 
 /**
  * oAuth token model
diff --git a/app/code/Magento/Integration/Model/Oauth/Token/RequestThrottler.php b/app/code/Magento/Integration/Model/Oauth/Token/RequestThrottler.php
index 9af6510d0930e..e2ab4950f80b5 100644
--- a/app/code/Magento/Integration/Model/Oauth/Token/RequestThrottler.php
+++ b/app/code/Magento/Integration/Model/Oauth/Token/RequestThrottler.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Integration\Model\Oauth\Token;
 
+use Magento\Framework\Exception\AuthenticationException;
+use Magento\Integration\Model\Oauth\Token\RequestLog\Config as RequestLogConfig;
 use Magento\Integration\Model\Oauth\Token\RequestLog\ReaderInterface as RequestLogReader;
 use Magento\Integration\Model\Oauth\Token\RequestLog\WriterInterface as RequestLogWriter;
-use Magento\Integration\Model\Oauth\Token\RequestLog\Config as RequestLogConfig;
-use Magento\Framework\Exception\AuthenticationException;
 
 /**
  * Model for OAuth admin/customer token requests throttling.
diff --git a/app/code/Magento/Integration/Model/OauthService.php b/app/code/Magento/Integration/Model/OauthService.php
index 859f3815d0702..98e62afb1dd89 100644
--- a/app/code/Magento/Integration/Model/OauthService.php
+++ b/app/code/Magento/Integration/Model/OauthService.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Integration\Model;
 
+use Magento\Framework\Exception\IntegrationException;
 use Magento\Framework\Oauth\Helper\Oauth as OauthHelper;
 use Magento\Integration\Helper\Oauth\Data as IntegrationOauthHelper;
 use Magento\Integration\Model\Oauth\Consumer as ConsumerModel;
 use Magento\Integration\Model\Oauth\ConsumerFactory;
 use Magento\Integration\Model\Oauth\Token as OauthTokenModel;
-use Magento\Integration\Model\Oauth\TokenFactory as TokenFactory;
 use Magento\Integration\Model\Oauth\Token\Provider as TokenProvider;
-use Magento\Framework\Exception\IntegrationException;
+use Magento\Integration\Model\Oauth\TokenFactory as TokenFactory;
 
 /**
  * Integration oAuth service.
diff --git a/app/code/Magento/Integration/Model/Plugin/Integration.php b/app/code/Magento/Integration/Model/Plugin/Integration.php
index 86ddd207d57d6..74806ceeb2aa8 100644
--- a/app/code/Magento/Integration/Model/Plugin/Integration.php
+++ b/app/code/Magento/Integration/Model/Plugin/Integration.php
@@ -8,11 +8,11 @@
 
 use Magento\Authorization\Model\Acl\AclRetriever;
 use Magento\Authorization\Model\UserContextInterface;
-use Magento\Integration\Model\Integration as IntegrationModel;
 use Magento\Integration\Api\AuthorizationServiceInterface;
 use Magento\Integration\Api\IntegrationServiceInterface;
-use Magento\Integration\Model\IntegrationConfig;
 use Magento\Integration\Model\ConsolidatedConfig;
+use Magento\Integration\Model\Integration as IntegrationModel;
+use Magento\Integration\Model\IntegrationConfig;
 
 /**
  * Plugin for \Magento\Integration\Model\IntegrationService.
diff --git a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token/RequestLog.php b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token/RequestLog.php
index d94297bbcf46e..34bf015b23da2 100644
--- a/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token/RequestLog.php
+++ b/app/code/Magento/Integration/Model/ResourceModel/Oauth/Token/RequestLog.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Integration\Model\ResourceModel\Oauth\Token;
 
+use Magento\Integration\Model\Oauth\Token\RequestLog\Config as RequestLogConfig;
 use Magento\Integration\Model\Oauth\Token\RequestLog\ReaderInterface;
 use Magento\Integration\Model\Oauth\Token\RequestLog\WriterInterface;
-use Magento\Integration\Model\Oauth\Token\RequestLog\Config as RequestLogConfig;
 
 /**
  * Resource model for failed authentication attempts to retrieve admin/customer token.
diff --git a/app/code/Magento/Integration/Setup/Recurring.php b/app/code/Magento/Integration/Setup/Recurring.php
index 2a7aa6df263fc..e16b4c7461bd6 100644
--- a/app/code/Magento/Integration/Setup/Recurring.php
+++ b/app/code/Magento/Integration/Setup/Recurring.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Integration\Setup;
 
-use Magento\Integration\Model\ConfigBasedIntegrationManager;
-use Magento\Integration\Model\ConsolidatedConfig;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Integration\Model\ConfigBasedIntegrationManager;
+use Magento\Integration\Model\ConsolidatedConfig;
 
 /**
  * Class Recurring
diff --git a/app/code/Magento/Integration/Setup/UpgradeData.php b/app/code/Magento/Integration/Setup/UpgradeData.php
index b376d6a2b8b1e..7aa9a862c3a5e 100644
--- a/app/code/Magento/Integration/Setup/UpgradeData.php
+++ b/app/code/Magento/Integration/Setup/UpgradeData.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Integration\Setup;
 
-use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
 
 /**
  * Upgrade data script for Integration module
diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php
index 8173c50083973..7f8d367374f24 100644
--- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php
@@ -8,9 +8,9 @@
 
 namespace Magento\Integration\Test\Unit\Controller\Adminhtml\Integration;
 
+use Magento\Framework\Exception\IntegrationException;
 use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 use Magento\Integration\Model\Integration as IntegrationModel;
-use Magento\Framework\Exception\IntegrationException;
 
 class DeleteTest extends \Magento\Integration\Test\Unit\Controller\Adminhtml\IntegrationTest
 {
diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/EditTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/EditTest.php
index 7cbbfbc59234c..98c62371e5229 100644
--- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/EditTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/EditTest.php
@@ -8,8 +8,8 @@
 
 namespace Magento\Integration\Test\Unit\Controller\Adminhtml\Integration;
 
-use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 use Magento\Framework\Exception\IntegrationException;
+use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 
 class EditTest extends \Magento\Integration\Test\Unit\Controller\Adminhtml\IntegrationTest
 {
diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
index ca614966194a2..dba45fea82096 100644
--- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
@@ -8,12 +8,12 @@
 
 namespace Magento\Integration\Test\Unit\Controller\Adminhtml\Integration;
 
+use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Exception\IntegrationException;
+use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 use Magento\Integration\Controller\Adminhtml\Integration as IntegrationController;
 use Magento\Integration\Model\Integration as IntegrationModel;
-use Magento\Framework\Exception\IntegrationException;
-use Magento\Framework\Exception\State\UserLockedException;
-use Magento\Framework\Exception\AuthenticationException;
 
 class SaveTest extends \Magento\Integration\Test\Unit\Controller\Adminhtml\IntegrationTest
 {
diff --git a/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php b/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php
index 3ce760a47f61f..b4bdca75425a5 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Integration\Test\Unit\Model;
 
-use Magento\Integration\Model\Oauth\Token;
-
 /**
  * @codingStandardsIgnoreFile
  */
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/ConverterTest.php b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/ConverterTest.php
index 99f284ec2c3ed..728ec3917d800 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/ConverterTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/ConverterTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Integration\Test\Unit\Model\Config\Consolidated;
 
-use \Magento\Integration\Model\Config\Consolidated\Converter;
+use Magento\Integration\Model\Config\Consolidated\Converter;
 
 /**
  * Test for conversion of integration XML config into array representation.
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php
index 5b7bbace5a65d..8d8b00ce684fc 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Config/Consolidated/_files/acl.php
@@ -6,8 +6,7 @@
 return [
     [],
     [
-        'children' =>
-            [
+        'children' => [
                 [
                     'id' => 'Magento_Customer::manageParent',
                     'title' => 'Magento Webapi',
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/ConverterTest.php b/app/code/Magento/Integration/Test/Unit/Model/Config/ConverterTest.php
index 49299d3f091d5..33f041aadcfa6 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Config/ConverterTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Config/ConverterTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Integration\Test\Unit\Model\Config;
 
-use \Magento\Integration\Model\Config\Converter;
+use Magento\Integration\Model\Config\Converter;
 
 /**
  * Test for conversion of integration XML config into array representation.
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Config/Integration/ConverterTest.php b/app/code/Magento/Integration/Test/Unit/Model/Config/Integration/ConverterTest.php
index 92e9578abee6c..efd8fc4b3c3ac 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Config/Integration/ConverterTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Config/Integration/ConverterTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Integration\Test\Unit\Model\Config\Integration;
 
-use \Magento\Integration\Model\Config\Integration\Converter;
+use Magento\Integration\Model\Config\Integration\Converter;
 
 /**
  * Test for conversion of integration API XML config into array representation.
diff --git a/app/code/Magento/Integration/Test/Unit/Model/ConsolidatedConfigTest.php b/app/code/Magento/Integration/Test/Unit/Model/ConsolidatedConfigTest.php
index 1f6becd55bd52..e204bfe5cf407 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/ConsolidatedConfigTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/ConsolidatedConfigTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Integration\Test\Unit\Model;
 
 use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Integration\Model\ConsolidatedConfig as Config;
 use Magento\Integration\Model\Cache\TypeConsolidated as Type;
+use Magento\Integration\Model\ConsolidatedConfig as Config;
 
 /**
  * Unit test for \Magento\Integration\Model\ConsolidatedConfig
diff --git a/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php b/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php
index ecd4788545c0a..78743b8ea1317 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/CustomerTokenServiceTest.php
@@ -6,9 +6,6 @@
 
 namespace Magento\Integration\Test\Unit\Model;
 
-use Magento\Integration\Model\Integration;
-use Magento\Integration\Model\Oauth\Token;
-
 class CustomerTokenServiceTest extends \PHPUnit\Framework\TestCase
 {
     /** \Magento\Integration\Model\CustomerTokenService */
diff --git a/app/code/Magento/Integration/Test/Unit/Model/IntegrationConfigTest.php b/app/code/Magento/Integration/Test/Unit/Model/IntegrationConfigTest.php
index 9fa90ae69cf9a..c93d5759edc63 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/IntegrationConfigTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/IntegrationConfigTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Integration\Test\Unit\Model;
 
 use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Integration\Model\IntegrationConfig;
 use Magento\Integration\Model\Cache\TypeIntegration;
+use Magento\Integration\Model\IntegrationConfig;
 
 /**
  * Unit test for \Magento\Integration\Model\IntegrationConfig
diff --git a/app/code/Magento/Integration/Test/Unit/Model/ManagerTest.php b/app/code/Magento/Integration/Test/Unit/Model/ManagerTest.php
index a8cd5977215e2..d1d2cb1e61ba9 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/ManagerTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/ManagerTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Integration\Test\Unit\Model;
 
-use \Magento\Integration\Model\Integration;
+use Magento\Integration\Model\Integration;
 
 /**
  * Class to test Integration Manager
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Oauth/Token/ProviderTest.php b/app/code/Magento/Integration/Test/Unit/Model/Oauth/Token/ProviderTest.php
index b7a5193f443ff..41baea35d76db 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Oauth/Token/ProviderTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Oauth/Token/ProviderTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Integration\Test\Unit\Model\Oauth\Token;
 
 use Magento\Authorization\Model\UserContextInterface;
-use Magento\Integration\Model\Oauth\Token;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Integration\Model\Oauth\Token;
 
 /**
  * Unit test for \Magento\Integration\Model\Oauth\Token\Provider
diff --git a/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php b/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php
index badb69aa19fe4..f887aec3f7dc5 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/Oauth/TokenTest.php
@@ -6,11 +6,10 @@
 
 namespace Magento\Integration\Test\Unit\Model\Oauth;
 
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Oauth\Helper\Oauth as OauthHelper;
 use Magento\Integration\Model\Oauth\Consumer\Validator\KeyLengthFactory;
 use Magento\Integration\Model\Oauth\Token;
-use Magento\Framework\Oauth\Helper\Oauth as OauthHelper;
-use Magento\Authorization\Model\UserContextInterface;
-use Magento\Framework\TestFramework\Unit\Matcher\MethodInvokedAtIndex;
 
 /**
  * Unit test for \Magento\Integration\Model\Oauth\Nonce
diff --git a/app/code/Magento/LayeredNavigation/Block/Navigation/FilterRenderer.php b/app/code/Magento/LayeredNavigation/Block/Navigation/FilterRenderer.php
index c82b78293ab2a..b8ac2257a9e8a 100644
--- a/app/code/Magento/LayeredNavigation/Block/Navigation/FilterRenderer.php
+++ b/app/code/Magento/LayeredNavigation/Block/Navigation/FilterRenderer.php
@@ -9,7 +9,6 @@
 
 use Magento\Catalog\Model\Layer\Filter\FilterInterface;
 use Magento\Framework\View\Element\Template;
-use Magento\LayeredNavigation\Block\Navigation\FilterRendererInterface;
 
 /**
  * Catalog layer filter renderer
diff --git a/app/code/Magento/LayeredNavigation/Block/Navigation/State.php b/app/code/Magento/LayeredNavigation/Block/Navigation/State.php
index ff3ab124a65ad..b604136133518 100644
--- a/app/code/Magento/LayeredNavigation/Block/Navigation/State.php
+++ b/app/code/Magento/LayeredNavigation/Block/Navigation/State.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\LayeredNavigation\Block\Navigation;
 
-use Magento\Framework\View\Element\Template;
-
 /**
  * Layered navigation state
  *
diff --git a/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php b/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
index 6b64610caf5ed..812913152a515 100644
--- a/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
+++ b/app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php
@@ -8,8 +8,8 @@
 namespace Magento\LayeredNavigation\Observer\Edit\Tab\Front;
 
 use Magento\Config\Model\Config\Source;
-use Magento\Framework\Module\Manager;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Module\Manager;
 
 class ProductAttributeFormBuildFrontTabObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php b/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php
index 0f1c95df5313c..d8d9840a27753 100644
--- a/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php
+++ b/app/code/Magento/LayeredNavigation/Observer/Grid/ProductAttributeGridBuildObserver.php
@@ -7,8 +7,8 @@
  */
 namespace Magento\LayeredNavigation\Observer\Grid;
 
-use Magento\Framework\Module\Manager;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Module\Manager;
 
 class ProductAttributeGridBuildObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/Marketplace/Model/Partners.php b/app/code/Magento/Marketplace/Model/Partners.php
index f105cf186fc0d..627bb9e8df7cf 100644
--- a/app/code/Magento/Marketplace/Model/Partners.php
+++ b/app/code/Magento/Marketplace/Model/Partners.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Marketplace\Model;
 
+use Magento\Backend\Model\UrlInterface;
 use Magento\Framework\HTTP\Client\Curl;
 use Magento\Marketplace\Helper\Cache;
-use Magento\Backend\Model\UrlInterface;
 
 /**
  * @api
diff --git a/app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php b/app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php
index d3a4127794ef3..3fbf77df0a32f 100644
--- a/app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php
+++ b/app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php
@@ -97,7 +97,7 @@ public function testGetPartnersException()
             ->method('post');
         $curlMock->expects($this->once())
             ->method('getBody')
-            ->will($this->throwException(new \Exception));
+            ->will($this->throwException(new \Exception()));
         $this->partnersModelMock->expects($this->exactly(3))
             ->method('getCurlClient')
             ->will($this->returnValue($curlMock));
diff --git a/app/code/Magento/MediaStorage/App/Media.php b/app/code/Magento/MediaStorage/App/Media.php
index bff4b0d194518..1ae93c405eb09 100644
--- a/app/code/Magento/MediaStorage/App/Media.php
+++ b/app/code/Magento/MediaStorage/App/Media.php
@@ -7,12 +7,12 @@
  */
 namespace Magento\MediaStorage\App;
 
-use Magento\Framework\Filesystem;
-use Magento\MediaStorage\Model\File\Storage\ConfigFactory;
-use Magento\MediaStorage\Model\File\Storage\Response;
 use Magento\Framework\App;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\AppInterface;
+use Magento\Framework\Filesystem;
+use Magento\MediaStorage\Model\File\Storage\ConfigFactory;
+use Magento\MediaStorage\Model\File\Storage\Response;
 use Magento\MediaStorage\Model\File\Storage\SynchronizationFactory;
 
 /**
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Config.php b/app/code/Magento/MediaStorage/Model/File/Storage/Config.php
index 8181b67b3692c..7255f092a5f94 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Config.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Config.php
@@ -6,9 +6,9 @@
 namespace Magento\MediaStorage\Model\File\Storage;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\Directory\WriteInterface as DirectoryWrite;
 use Magento\Framework\Filesystem\File\Write;
-use Magento\Framework\Exception\FileSystemException;
 
 class Config
 {
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Response.php b/app/code/Magento/MediaStorage/Model/File/Storage/Response.php
index 216068c9fc32a..8c5a211b3706d 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Response.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Response.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\MediaStorage\Model\File\Storage;
 
-use Magento\Framework\App\Response\Http;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\Response\Http;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\CookieManagerInterface;
 
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php b/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php
index d744afb0fad9f..e3b0fd215f562 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\Directory\WriteInterface as DirectoryWrite;
-use Magento\Framework\Filesystem\File\Write;
 
 /**
  * Class Synchronization
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Helper/File/Storage/DatabaseTest.php b/app/code/Magento/MediaStorage/Test/Unit/Helper/File/Storage/DatabaseTest.php
index 6ff2397f543fa..96d638655a99e 100644
--- a/app/code/Magento/MediaStorage/Test/Unit/Helper/File/Storage/DatabaseTest.php
+++ b/app/code/Magento/MediaStorage/Test/Unit/Helper/File/Storage/DatabaseTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\MediaStorage\Test\Unit\Helper\File\Storage;
 
-use Magento\MediaStorage\Helper\File\Storage\Database;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\MediaStorage\Helper\File\Storage\Database;
 
 class DatabaseTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/Asset/Plugin/CleanMergedJsCssTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/Asset/Plugin/CleanMergedJsCssTest.php
index 491a2db991058..8e1a789014723 100644
--- a/app/code/Magento/MediaStorage/Test/Unit/Model/Asset/Plugin/CleanMergedJsCssTest.php
+++ b/app/code/Magento/MediaStorage/Test/Unit/Model/Asset/Plugin/CleanMergedJsCssTest.php
@@ -41,7 +41,7 @@ protected function setUp()
     public function testAfterCleanMergedJsCss()
     {
         $readDir = 'read directory';
-        $mergedDir = $readDir .  '/' . \Magento\Framework\View\Asset\Merged::getRelativeDir();
+        $mergedDir = $readDir . '/' . \Magento\Framework\View\Asset\Merged::getRelativeDir();
 
         $readDirectoryMock = $this->basicMock(\Magento\Framework\Filesystem\Directory\ReadInterface::class);
         $readDirectoryMock->expects($this->any())->method('getAbsolutePath')->willReturn($readDir);
diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
index b4ec34ebee19c..46154dbddb970 100644
--- a/app/code/Magento/Msrp/Helper/Data.php
+++ b/app/code/Magento/Msrp/Helper/Data.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Msrp\Helper;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
 use Magento\Msrp\Model\Product\Attribute\Source\Type;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 
 /**
  * Msrp data helper
diff --git a/app/code/Magento/Msrp/Model/Config.php b/app/code/Magento/Msrp/Model/Config.php
index 2ee9f41870a5a..732bf95197b1d 100644
--- a/app/code/Magento/Msrp/Model/Config.php
+++ b/app/code/Magento/Msrp/Model/Config.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Msrp\Model;
 
-use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Escaper;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class Config
 {
diff --git a/app/code/Magento/Msrp/Model/ProductRender/MsrpPriceInfo.php b/app/code/Magento/Msrp/Model/ProductRender/MsrpPriceInfo.php
index dc1dd821c922e..cc03c124572bd 100644
--- a/app/code/Magento/Msrp/Model/ProductRender/MsrpPriceInfo.php
+++ b/app/code/Magento/Msrp/Model/ProductRender/MsrpPriceInfo.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Msrp\Model\ProductRender;
 
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
 use Magento\Msrp\Api\Data\ProductRender\MsrpPriceInfoInterface;
 
 class MsrpPriceInfo extends \Magento\Framework\Model\AbstractExtensibleModel implements
diff --git a/app/code/Magento/Msrp/Test/Unit/Observer/Frontend/Quote/SetCanApplyMsrpObserverTest.php b/app/code/Magento/Msrp/Test/Unit/Observer/Frontend/Quote/SetCanApplyMsrpObserverTest.php
index ef5552853478f..00d49fc8a57ec 100644
--- a/app/code/Magento/Msrp/Test/Unit/Observer/Frontend/Quote/SetCanApplyMsrpObserverTest.php
+++ b/app/code/Magento/Msrp/Test/Unit/Observer/Frontend/Quote/SetCanApplyMsrpObserverTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Msrp\Test\Unit\Observer\Frontend\Quote;
 
-use Magento\Quote\Model\Quote\Address;
-
 class SetCanApplyMsrpObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Form/Modifier/MsrpTest.php b/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Form/Modifier/MsrpTest.php
index 893d35814fe3d..90cea98990e96 100644
--- a/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Form/Modifier/MsrpTest.php
+++ b/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Form/Modifier/MsrpTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Msrp\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier\AbstractModifierTest;
-use Magento\Msrp\Ui\DataProvider\Product\Form\Modifier\Msrp;
 use Magento\Msrp\Model\Config as MsrpConfig;
+use Magento\Msrp\Ui\DataProvider\Product\Form\Modifier\Msrp;
 
 /**
  * Class MsrpTest
diff --git a/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php b/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php
index b096fe760ffbc..04d77d8fa3d14 100644
--- a/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php
+++ b/app/code/Magento/Msrp/Test/Unit/Ui/DataProvider/Product/Listing/Collector/MsrpPriceTest.php
@@ -5,15 +5,14 @@
  */
 namespace Magento\Msrp\Test\Unit\Ui\DataProvider\Product\Listing\Collector;
 
+use Magento\Catalog\Api\Data\ProductRender\PriceInfoExtensionFactory;
+use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface;
 use Magento\Catalog\Api\Data\ProductRenderInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Msrp\Api\Data\ProductRender\MsrpPriceInfoInterfaceFactory;
 use Magento\Msrp\Api\Data\ProductRender\MsrpPriceInfoInterface;
-use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface;
-use Magento\Catalog\Api\Data\ProductRender\PriceInfoExtensionFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Msrp/Ui/DataProvider/Product/Form/Modifier/Msrp.php b/app/code/Magento/Msrp/Ui/DataProvider/Product/Form/Modifier/Msrp.php
index 80eb842571fb2..58dba74a6e30a 100644
--- a/app/code/Magento/Msrp/Ui/DataProvider/Product/Form/Modifier/Msrp.php
+++ b/app/code/Magento/Msrp/Ui/DataProvider/Product/Form/Modifier/Msrp.php
@@ -7,8 +7,8 @@
 
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
-use Magento\Msrp\Model\Config as MsrpConfig;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Msrp\Model\Config as MsrpConfig;
 
 /**
  * Class Msrp
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index 869d81563645a..2f670173263ad 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -37,8 +37,7 @@ if ($product->isSaleable()) {
     $addToCartUrl = $addToCartUrlGenerator->getAddToCartUrl(
         $product,
         ['_query' => [
-            \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED =>
-                $this->helper('Magento\Framework\Url\Helper\Data')->getEncodedUrl(
+            \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $this->helper('Magento\Framework\Url\Helper\Data')->getEncodedUrl(
                     $addToCartUrlGenerator->getAddToCartUrl($product)
                 ),
         ]]
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php b/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php
index ab13507bbf982..58d91d826cbc2 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Address/Select.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Multishipping\Block\Checkout\Address;
 
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Customer\Helper\Address as CustomerAddressHelper;
 use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Helper\Address as CustomerAddressHelper;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
  * Class Select
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php b/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php
index 05f0dca1dc357..d19b0eab9e456 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Address/ShippingSaved.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Multishipping\Controller\Checkout\Address;
 
-use Magento\Framework\App\Action\Context;
-use Magento\Multishipping\Controller\Checkout\Address;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Action\Context;
+use Magento\Multishipping\Controller\Checkout\Address;
 
 /**
  * Class ShippingSaved
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Billing.php b/app/code/Magento/Multishipping/Controller/Checkout/Billing.php
index 84342a5d5563c..8e39969676a11 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Billing.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Billing.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Multishipping\Controller\Checkout;
 
-use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
 use Magento\Framework\App\ResponseInterface;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
 
 class Billing extends \Magento\Multishipping\Controller\Checkout
 {
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
index d23f8863d0728..16275d6f06ef3 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Multishipping\Controller\Checkout;
 
-use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Exception\PaymentException;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
 
 /**
  * Class OverviewPost
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Shipping.php b/app/code/Magento/Multishipping/Controller/Checkout/Shipping.php
index 1adb9b9feaf50..9b2f4b1dc4831 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Shipping.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Shipping.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Multishipping\Controller\Checkout;
 
-use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
 use Magento\Framework\App\ResponseInterface;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
 
 class Shipping extends \Magento\Multishipping\Controller\Checkout
 {
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index 767f58bb9e4ed..f63ddd45e036c 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -6,11 +6,11 @@
 namespace Magento\Multishipping\Model\Checkout\Type;
 
 use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Directory\Model\AllowedCountries;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\App\ObjectManager;
-use Magento\Directory\Model\AllowedCountries;
 
 /**
  * Multishipping checkout model
@@ -1001,7 +1001,7 @@ public function getCustomer()
      */
     protected function isAddressIdApplicable($addressId)
     {
-        $applicableAddressIds = array_map(function($address) {
+        $applicableAddressIds = array_map(function ($address) {
             /** @var \Magento\Customer\Api\Data\AddressInterface $address */
             return $address->getId();
         }, $this->getCustomer()->getAddresses());
diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Address/SelectTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Address/SelectTest.php
index c2bfe2137c72e..735b0b8a71bc6 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Address/SelectTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Address/SelectTest.php
@@ -8,8 +8,8 @@
 
 namespace Magento\Multishipping\Test\Unit\Block\Checkout\Address;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
index f90e85a904352..4a3b5ee955f3f 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Model/Checkout/Type/MultishippingTest.php
@@ -12,6 +12,7 @@
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\Data\Address;
 use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteria;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -22,6 +23,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Multishipping\Helper\Data;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping;
+use Magento\Payment\Model\Method\AbstractMethod;
 use Magento\Payment\Model\Method\SpecificationInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartExtension;
@@ -34,6 +36,7 @@
 use Magento\Quote\Model\Quote\AddressFactory;
 use Magento\Quote\Model\Quote\Item;
 use Magento\Quote\Model\Quote\Item\ToOrderItem;
+use Magento\Quote\Model\Quote\Payment;
 use Magento\Quote\Model\Quote\Payment\ToOrderPayment;
 use Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor;
 use Magento\Quote\Model\Quote\TotalsCollector;
@@ -43,10 +46,6 @@
 use Magento\Sales\Model\OrderFactory;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit_Framework_MockObject_MockObject;
-use \PHPUnit\Framework\TestCase;
-use Magento\Quote\Model\Quote\Payment;
-use Magento\Payment\Model\Method\AbstractMethod;
-use Magento\Directory\Model\AllowedCountries;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
index f66a2093b0aff..adaa8bb80ff7d 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
@@ -53,7 +53,9 @@
                                             <?php if ($_sole) : ?>
                                                 <input type="radio" name="shipping_method[<?= /* @escapeNotVerified */ $_address->getId() ?>]" value="<?= $block->escapeHtml($_rate->getCode()) ?>" id="s_method_<?= /* @escapeNotVerified */ $_address->getId() ?>_<?= /* @escapeNotVerified */ $_rate->getCode() ?>" class="radio solo method" checked="checked"/>
                                             <?php else: ?>
-                                                <input type="radio" name="shipping_method[<?= /* @escapeNotVerified */ $_address->getId() ?>]" value="<?= /* @escapeNotVerified */ $_rate->getCode() ?>" id="s_method_<?= /* @escapeNotVerified */ $_address->getId() ?>_<?= /* @escapeNotVerified */ $_rate->getCode() ?>"<?php if($_rate->getCode()===$block->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
+                                                <input type="radio" name="shipping_method[<?= /* @escapeNotVerified */ $_address->getId() ?>]" value="<?= /* @escapeNotVerified */ $_rate->getCode() ?>" id="s_method_<?= /* @escapeNotVerified */ $_address->getId() ?>_<?= /* @escapeNotVerified */ $_rate->getCode() ?>"<?php if ($_rate->getCode()===$block->getAddressShippingMethod($_address)) {
+    echo ' checked="checked"';
+} ?> class="radio" />
                                             <?php endif; ?>
                                         </div>
                                         <label for="s_method_<?= /* @escapeNotVerified */ $_address->getId() ?>_<?= /* @escapeNotVerified */ $_rate->getCode() ?>"><?= $block->escapeHtml($_rate->getMethodTitle()) ?>
diff --git a/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php b/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php
index 795028cffd18d..3ed32de51aa8e 100644
--- a/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php
+++ b/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\NewRelicReporting\Console\Command;
 
+use Magento\NewRelicReporting\Model\Apm\DeploymentsFactory;
+use Magento\NewRelicReporting\Model\ServiceShellUser;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
-use Magento\NewRelicReporting\Model\Apm\DeploymentsFactory;
-use Magento\NewRelicReporting\Model\ServiceShellUser;
 
 class DeployMarker extends Command
 {
diff --git a/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php b/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php
index bacdd3e4a81fe..2fe48a1c35cca 100644
--- a/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php
+++ b/app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\NewRelicReporting\Model\Apm;
 
-use \Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\HTTP\ZendClient;
 
 class Deployments
 {
diff --git a/app/code/Magento/NewRelicReporting/Model/Counter.php b/app/code/Magento/NewRelicReporting/Model/Counter.php
index b5f2df108d445..619f5243ec58f 100644
--- a/app/code/Magento/NewRelicReporting/Model/Counter.php
+++ b/app/code/Magento/NewRelicReporting/Model/Counter.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\NewRelicReporting\Model;
 
+use Magento\Catalog\Api\CategoryManagementInterface;
 use Magento\Catalog\Api\ProductManagementInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\ConfigurableProduct\Api\ConfigurableProductManagementInterface;
-use Magento\Catalog\Api\CategoryManagementInterface;
 use Magento\Customer\Api\CustomerManagementInterface;
-use Magento\Store\Api\WebsiteManagementInterface;
 use Magento\Store\Api\StoreManagementInterface;
+use Magento\Store\Api\WebsiteManagementInterface;
 
 class Counter
 {
diff --git a/app/code/Magento/NewRelicReporting/Model/Cron/ReportCounts.php b/app/code/Magento/NewRelicReporting/Model/Cron/ReportCounts.php
index 817fef0e3cc4d..5c2fb250ef914 100644
--- a/app/code/Magento/NewRelicReporting/Model/Cron/ReportCounts.php
+++ b/app/code/Magento/NewRelicReporting/Model/Cron/ReportCounts.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\NewRelicReporting\Model\Cron;
 
-use Magento\NewRelicReporting\Model\Config;
+use Magento\Catalog\Api\CategoryManagementInterface;
 use Magento\Catalog\Api\ProductManagementInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\ConfigurableProduct\Api\ConfigurableProductManagementInterface;
-use Magento\Catalog\Api\CategoryManagementInterface;
+use Magento\NewRelicReporting\Model\Config;
 
 /**
  * Class ReportCounts
diff --git a/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php b/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
index 6b2bd50dc456b..153e28a79a506 100644
--- a/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
+++ b/app/code/Magento/NewRelicReporting/Model/Cron/ReportNewRelicCron.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\NewRelicReporting\Model\Cron;
 
+use Magento\NewRelicReporting\Model\Apm\DeploymentsFactory;
 use Magento\NewRelicReporting\Model\Config;
-use Magento\NewRelicReporting\Model\Module\Collect;
 use Magento\NewRelicReporting\Model\Counter;
 use Magento\NewRelicReporting\Model\CronEventFactory;
-use Magento\NewRelicReporting\Model\Apm\DeploymentsFactory;
+use Magento\NewRelicReporting\Model\Module\Collect;
 
 /**
  * Class ReportNewRelicCron
diff --git a/app/code/Magento/NewRelicReporting/Model/CronEvent.php b/app/code/Magento/NewRelicReporting/Model/CronEvent.php
index 696c7132c5e49..af5dc84b1ee85 100644
--- a/app/code/Magento/NewRelicReporting/Model/CronEvent.php
+++ b/app/code/Magento/NewRelicReporting/Model/CronEvent.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\NewRelicReporting\Model;
 
-use \Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\HTTP\ZendClient;
 
 class CronEvent
 {
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php b/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php
index f7eb658f40784..6dcfa9d9e96f8 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Magento\NewRelicReporting\Model\Config;
 use Magento\Framework\Message\ManagerInterface;
+use Magento\NewRelicReporting\Model\Config;
 use Magento\NewRelicReporting\Model\NewRelicWrapper;
 
 /**
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Apm/DeploymentsTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Apm/DeploymentsTest.php
index eb665773d5f4b..c95fe3dfb50a4 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Apm/DeploymentsTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Apm/DeploymentsTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\NewRelicReporting\Test\Unit\Model\Apm;
 
+use Magento\Framework\HTTP\ZendClient;
 use Magento\NewRelicReporting\Model\Apm\Deployments;
-use \Magento\Framework\HTTP\ZendClient;
 
 /**
  * Class DeploymentsTest
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/CounterTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/CounterTest.php
index 8196dd24b7025..e29863e632972 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/CounterTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/CounterTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\NewRelicReporting\Test\Unit\Model;
 
-use Magento\NewRelicReporting\Model\Counter;
+use Magento\Catalog\Api\CategoryManagementInterface;
 use Magento\Catalog\Api\ProductManagementInterface;
 use Magento\ConfigurableProduct\Api\ConfigurableProductManagementInterface;
-use Magento\Catalog\Api\CategoryManagementInterface;
 use Magento\Customer\Api\CustomerManagementInterface;
-use Magento\Store\Api\WebsiteManagementInterface;
+use Magento\NewRelicReporting\Model\Counter;
 use Magento\Store\Api\StoreManagementInterface;
+use Magento\Store\Api\WebsiteManagementInterface;
 
 /**
  * Class CounterTest
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportCountsTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportCountsTest.php
index d0159ebbea368..a98d9bf88c9fb 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportCountsTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportCountsTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\NewRelicReporting\Test\Unit\Model\Cron;
 
-use Magento\NewRelicReporting\Model\Cron\ReportCounts;
+use Magento\Catalog\Api\CategoryManagementInterface;
 use Magento\Catalog\Api\ProductManagementInterface;
 use Magento\ConfigurableProduct\Api\ConfigurableProductManagementInterface;
-use Magento\Catalog\Api\CategoryManagementInterface;
+use Magento\NewRelicReporting\Model\Cron\ReportCounts;
 
 /**
  * Class ReportCountsTest
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportNewRelicCronTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportNewRelicCronTest.php
index 400bcefa9828b..358cf63ea4307 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportNewRelicCronTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportNewRelicCronTest.php
@@ -144,7 +144,6 @@ public function testReportNewRelicCronModuleDisabledFromConfig()
      */
     public function testReportNewRelicCron()
     {
-
         $this->config->expects($this->once())
             ->method('isNewRelicEnabled')
             ->willReturn(true);
@@ -184,7 +183,6 @@ public function testReportNewRelicCron()
      */
     public function testReportNewRelicCronRequestFailed()
     {
-
         $this->config->expects($this->once())
             ->method('isNewRelicEnabled')
             ->willReturn(true);
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/CronEventTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/CronEventTest.php
index da4dcc2e05519..8f17221247c30 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/CronEventTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/CronEventTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\NewRelicReporting\Test\Unit\Model;
 
+use Magento\Framework\HTTP\ZendClient;
 use Magento\NewRelicReporting\Model\CronEvent;
-use \Magento\Framework\HTTP\ZendClient;
 
 /**
  * Class CronEventTest
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
index a9dbacdfb0405..a6c728b854168 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
@@ -5,11 +5,10 @@
  */
 namespace Magento\NewRelicReporting\Test\Unit\Model\Module;
 
-use Magento\NewRelicReporting\Model\Module\Collect;
 use Magento\Framework\Module\FullModuleList;
-use Magento\Framework\Module\ModuleListInterface;
 use Magento\Framework\Module\Manager;
-use Magento\NewRelicReporting\Model\Module;
+use Magento\Framework\Module\ModuleListInterface;
+use Magento\NewRelicReporting\Model\Module\Collect;
 
 /**
  * Class CollectTest
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php
index 8a57d6e52beba..0dc4d3843e20e 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Preview.php
@@ -20,7 +20,7 @@ public function execute()
 
         $isEmptyRequestData = empty($data) || !isset($data['id']);
         $isEmptyPreviewData = !$this->_getSession()->hasPreviewData() || empty($this->_getSession()->getPreviewData());
-        
+
         if ($isEmptyRequestData && $isEmptyPreviewData) {
             $this->_forward('noroute');
             return;
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportCsv.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportCsv.php
index 6384617a62bbe..5edd4c490b007 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportCsv.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Subscriber;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportCsv extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
 {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportXml.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportXml.php
index 30dcfef85848f..82fd787851f0a 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportXml.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/ExportXml.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Newsletter\Controller\Adminhtml\Subscriber;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportXml extends \Magento\Newsletter\Controller\Adminhtml\Subscriber
 {
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
index fbce319a75fc1..aaa364143f31a 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Preview.php
@@ -20,7 +20,7 @@ public function execute()
         $data = $this->getRequest()->getParams();
         $isEmptyRequestData = empty($data) || !isset($data['id']);
         $isEmptyPreviewData = !$this->_getSession()->hasPreviewData() || empty($this->_getSession()->getPreviewData());
-        
+
         if ($isEmptyRequestData && $isEmptyPreviewData) {
             $this->_forward('noroute');
             return $this;
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber.php b/app/code/Magento/Newsletter/Controller/Subscriber.php
index 7aac7facd5f00..d3f87c40d0f77 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber.php
@@ -9,11 +9,11 @@
  */
 namespace Magento\Newsletter\Controller;
 
-use Magento\Framework\App\Action\Context;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Model\Session;
-use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\Customer\Model\Url as CustomerUrl;
+use Magento\Framework\App\Action\Context;
+use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 abstract class Subscriber extends \Magento\Framework\App\Action\Action
 {
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
index 13ab40665e591..8b331882c1cde 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -10,8 +10,8 @@
 use Magento\Customer\Model\Session;
 use Magento\Customer\Model\Url as CustomerUrl;
 use Magento\Framework\App\Action\Context;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Newsletter\Model\SubscriberFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Queue.php b/app/code/Magento/Newsletter/Model/ResourceModel/Queue.php
index 06ff66e290646..476ce38fab107 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Queue.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Queue.php
@@ -86,7 +86,7 @@ public function addSubscribersToQueue(ModelQueue $queue, array $subscriberIds)
         $usedIds = array_flip($connection->fetchCol($select));
         $subscriberIds = array_flip($subscriberIds);
         $newIds = array_diff_key($subscriberIds, $usedIds);
-        
+
         $connection->beginTransaction();
         try {
             foreach (array_keys($newIds) as $subscriberId) {
diff --git a/app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoConfigProviderTest.php b/app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoConfigProviderTest.php
index 7509ff03c3780..bb1974e0f754f 100644
--- a/app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoConfigProviderTest.php
+++ b/app/code/Magento/OfflinePayments/Test/Unit/Model/CheckmoConfigProviderTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\OfflinePayments\Test\Unit\Model;
 
-use Magento\OfflinePayments\Model\CheckmoConfigProvider;
-use Magento\OfflinePayments\Model\Checkmo;
 use Magento\Framework\Escaper;
+use Magento\OfflinePayments\Model\Checkmo;
+use Magento\OfflinePayments\Model\CheckmoConfigProvider;
 
 class CheckmoConfigProviderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/OfflinePayments/Test/Unit/Observer/BeforeOrderPaymentSaveObserverTest.php b/app/code/Magento/OfflinePayments/Test/Unit/Observer/BeforeOrderPaymentSaveObserverTest.php
index 51edaea0e659c..d0ee17e40424e 100644
--- a/app/code/Magento/OfflinePayments/Test/Unit/Observer/BeforeOrderPaymentSaveObserverTest.php
+++ b/app/code/Magento/OfflinePayments/Test/Unit/Observer/BeforeOrderPaymentSaveObserverTest.php
@@ -10,10 +10,10 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\OfflinePayments\Model\Banktransfer;
 use Magento\OfflinePayments\Model\Cashondelivery;
+use Magento\OfflinePayments\Model\Checkmo;
 use Magento\OfflinePayments\Observer\BeforeOrderPaymentSaveObserver;
 use Magento\Sales\Model\Order\Payment;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\OfflinePayments\Model\Checkmo;
 
 class BeforeOrderPaymentSaveObserverTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
index 6814e9a09843e..100786ebe6015 100644
--- a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
+++ b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
@@ -6,9 +6,9 @@
  */
 namespace Magento\OfflineShipping\Controller\Adminhtml\System\Config;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Config\Controller\Adminhtml\System\ConfigSectionChecker;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportTablerates extends \Magento\Config\Controller\Adminhtml\System\AbstractConfig
 {
diff --git a/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php
index 2a64603af0deb..320afbe601189 100644
--- a/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\OfflineShipping\Model\Config\Backend;
 
-use Magento\Framework\Model\AbstractModel;
-
 /**
  * Backend model for shipping table rates CSV importing
  *
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnNotFoundException.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnNotFoundException.php
index 5a75d50d300a8..5516c580b3e78 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnNotFoundException.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnNotFoundException.php
@@ -14,5 +14,4 @@
  */
 class ColumnNotFoundException extends LocalizedException
 {
-
 }
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/RowParser.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/RowParser.php
index 4d2e11ebb8a1e..39830ae6c00ed 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/RowParser.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/CSV/RowParser.php
@@ -6,7 +6,6 @@
 
 namespace Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CSV;
 
-use Magento\Framework\Phrase;
 use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\LocationDirectory;
 
 class RowParser
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/Carrier/FlatrateTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/Carrier/FlatrateTest.php
index 0c65d2268d409..f14a9bfb0b416 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Model/Carrier/FlatrateTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/Carrier/FlatrateTest.php
@@ -56,7 +56,6 @@ class FlatrateTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-
         $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['create', 'isSetFlag', 'getValue'])
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/Carrier/TablerateTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/Carrier/TablerateTest.php
index 7321925148c09..f40995a914653 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Model/Carrier/TablerateTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/Carrier/TablerateTest.php
@@ -56,7 +56,6 @@ class TablerateTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-
         $this->scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['create', 'isSetFlag', 'getValue'])
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/ImportTest.php
index 14fa8129532fa..ff3604203505f 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/ImportTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/ImportTest.php
@@ -9,8 +9,8 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\File\ReadInterface;
-use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CSV\ColumnResolverFactory;
 use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CSV\ColumnResolver;
+use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CSV\ColumnResolverFactory;
 use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\CSV\RowParser;
 use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\DataHashGenerator;
 use Magento\OfflineShipping\Model\ResourceModel\Carrier\Tablerate\Import;
diff --git a/app/code/Magento/PageCache/Console/Command/GenerateVclCommand.php b/app/code/Magento/PageCache/Console/Command/GenerateVclCommand.php
index 2d370cae5f55c..bed07468d508c 100644
--- a/app/code/Magento/PageCache/Console/Command/GenerateVclCommand.php
+++ b/app/code/Magento/PageCache/Console/Command/GenerateVclCommand.php
@@ -12,9 +12,9 @@
 use Magento\Framework\Filesystem\File\WriteFactory;
 use Magento\Framework\HTTP\PhpEnvironment\Request;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\PageCache\Model\VclGeneratorInterfaceFactory;
 use Magento\PageCache\Model\Config;
 use Magento\PageCache\Model\Varnish\VclTemplateLocator;
+use Magento\PageCache\Model\VclGeneratorInterfaceFactory;
 use Magento\Store\Model\ScopeInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -123,7 +123,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $errors = $this->validate($input);
         if ($errors) {
             foreach ($errors as $error) {
-                $output->writeln('<error>'.$error.'</error>');
+                $output->writeln('<error>' . $error . '</error>');
 
                 return Cli::RETURN_FAILURE;
             }
@@ -149,7 +149,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             return Cli::RETURN_SUCCESS;
         } catch (\Exception $e) {
-            $output->writeln('<error>'.$e->getMessage().'</error>');
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
             if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
                 $output->writeln($e->getTraceAsString());
             }
diff --git a/app/code/Magento/PageCache/Exception/UnsupportedVarnishVersion.php b/app/code/Magento/PageCache/Exception/UnsupportedVarnishVersion.php
index 35e549213e0e4..9b56060c902dc 100644
--- a/app/code/Magento/PageCache/Exception/UnsupportedVarnishVersion.php
+++ b/app/code/Magento/PageCache/Exception/UnsupportedVarnishVersion.php
@@ -10,5 +10,4 @@
 
 class UnsupportedVarnishVersion extends LocalizedException
 {
-
 }
diff --git a/app/code/Magento/PageCache/Model/App/FrontController/VarnishPlugin.php b/app/code/Magento/PageCache/Model/App/FrontController/VarnishPlugin.php
index 4df89c1321b67..598f1ce7c4784 100644
--- a/app/code/Magento/PageCache/Model/App/FrontController/VarnishPlugin.php
+++ b/app/code/Magento/PageCache/Model/App/FrontController/VarnishPlugin.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\PageCache\Model\App\FrontController;
 
-use Magento\PageCache\Model\Config;
-use Magento\Framework\App\PageCache\Version;
-use Magento\Framework\App\State as AppState;
 use Magento\Framework\App\FrontControllerInterface;
-use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\App\PageCache\Version;
 use Magento\Framework\App\Response\Http as ResponseHttp;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\App\State as AppState;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\PageCache\Model\Config;
 
 /**
  * Varnish for processing builtin cache
diff --git a/app/code/Magento/PageCache/Model/Cache/Server.php b/app/code/Magento/PageCache/Model/Cache/Server.php
index 349e9faffa673..7cc526334d6c2 100644
--- a/app/code/Magento/PageCache/Model/Cache/Server.php
+++ b/app/code/Magento/PageCache/Model/Cache/Server.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\PageCache\Model\Cache;
 
-use Magento\Framework\UrlInterface;
 use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\UrlInterface;
 use Zend\Uri\Uri;
 use Zend\Uri\UriFactory;
 
@@ -62,8 +62,7 @@ public function getUris()
             foreach ($configuredHosts as $host) {
                 $servers[] = UriFactory::factory('')
                     ->setHost($host['host'])
-                    ->setPort(isset($host['port']) ? $host['port'] : self::DEFAULT_PORT)
-                ;
+                    ->setPort(isset($host['port']) ? $host['port'] : self::DEFAULT_PORT);
             }
         } elseif ($this->request->getHttpHost()) {
             $servers[] = UriFactory::factory('')->setHost($this->request->getHttpHost())->setPort(self::DEFAULT_PORT);
diff --git a/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php b/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php
index aadae97009cac..f7d9c56ba0df7 100644
--- a/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php
+++ b/app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\PageCache\Model\Controller\Result;
 
-use Magento\PageCache\Model\Config;
 use Magento\Framework\App\PageCache\Kernel;
+use Magento\Framework\App\Response\Http as ResponseHttp;
 use Magento\Framework\App\State as AppState;
-use Magento\Framework\Registry;
 use Magento\Framework\Controller\ResultInterface;
-use Magento\Framework\App\Response\Http as ResponseHttp;
-use Zend\Http\Header\HeaderInterface as HttpHeaderInterface;
+use Magento\Framework\Registry;
 use Magento\PageCache\Model\Cache\Type as CacheType;
+use Magento\PageCache\Model\Config;
+use Zend\Http\Header\HeaderInterface as HttpHeaderInterface;
 
 /**
  * Plugin for processing builtin cache
diff --git a/app/code/Magento/PageCache/Model/Controller/Result/VarnishPlugin.php b/app/code/Magento/PageCache/Model/Controller/Result/VarnishPlugin.php
index 7880a955579e4..760f8648ac472 100644
--- a/app/code/Magento/PageCache/Model/Controller/Result/VarnishPlugin.php
+++ b/app/code/Magento/PageCache/Model/Controller/Result/VarnishPlugin.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\PageCache\Model\Controller\Result;
 
-use Magento\PageCache\Model\Config;
 use Magento\Framework\App\PageCache\Version;
-use Magento\Framework\App\State as AppState;
-use Magento\Framework\Registry;
 use Magento\Framework\App\Response\Http as ResponseHttp;
+use Magento\Framework\App\State as AppState;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Registry;
+use Magento\PageCache\Model\Config;
 
 /**
  * Plugin for processing varnish cache
diff --git a/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php b/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php
index cf5a703142c84..5a7c3a2d2f6d1 100644
--- a/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php
+++ b/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php
@@ -119,7 +119,7 @@ private function getReplacements()
     private function getRegexForDesignExceptions()
     {
         $result = '';
-        $tpl = "%s (req.http.user-agent ~ \"%s\") {\n"."        hash_data(\"%s\");\n"."    }";
+        $tpl = "%s (req.http.user-agent ~ \"%s\") {\n" . "        hash_data(\"%s\");\n" . "    }";
 
         $expressions = $this->getDesignExceptions();
 
@@ -157,7 +157,7 @@ private function getTransformedAccessList()
         $result = array_reduce(
             $this->getAccessList(),
             function ($ips, $ip) use ($tpl) {
-                return $ips.sprintf($tpl, trim($ip)) . "\n";
+                return $ips . sprintf($tpl, trim($ip)) . "\n";
             },
             ''
         );
diff --git a/app/code/Magento/PageCache/Model/Varnish/VclTemplateLocator.php b/app/code/Magento/PageCache/Model/Varnish/VclTemplateLocator.php
index 702f5b52434db..7ad767728c361 100644
--- a/app/code/Magento/PageCache/Model/Varnish/VclTemplateLocator.php
+++ b/app/code/Magento/PageCache/Model/Varnish/VclTemplateLocator.php
@@ -7,11 +7,11 @@
 namespace Magento\PageCache\Model\Varnish;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\Module\Dir;
 use Magento\Framework\Module\Dir\Reader;
-use Magento\Framework\Filesystem\Directory\ReadFactory;
-use Magento\PageCache\Model\VclTemplateLocatorInterface;
 use Magento\PageCache\Exception\UnsupportedVarnishVersion;
+use Magento\PageCache\Model\VclTemplateLocatorInterface;
 
 class VclTemplateLocator implements VclTemplateLocatorInterface
 {
diff --git a/app/code/Magento/PageCache/Observer/FlushFormKey.php b/app/code/Magento/PageCache/Observer/FlushFormKey.php
index 97fe7f2f5cedc..08f668852a420 100644
--- a/app/code/Magento/PageCache/Observer/FlushFormKey.php
+++ b/app/code/Magento/PageCache/Observer/FlushFormKey.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\PageCache\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\App\PageCache\FormKey as CookieFormKey;
 use Magento\Framework\Data\Form\FormKey as DataFormKey;
+use Magento\Framework\Event\ObserverInterface;
 
 class FlushFormKey implements ObserverInterface
 {
diff --git a/app/code/Magento/PageCache/Test/Unit/App/CacheIdentifierPluginTest.php b/app/code/Magento/PageCache/Test/Unit/App/CacheIdentifierPluginTest.php
index 6bb5603966834..b1d9e65472983 100644
--- a/app/code/Magento/PageCache/Test/Unit/App/CacheIdentifierPluginTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/App/CacheIdentifierPluginTest.php
@@ -93,8 +93,13 @@ public function afterGetValueDataProvider()
             'Varnish + PageCache enabled' => [Config::VARNISH, true, null, false, false],
             'Built-in + PageCache disabled' => [Config::BUILT_IN, false, null, false, false],
             'Built-in + PageCache enabled' => [Config::BUILT_IN, true, null, false, false],
-            'Built-in, PageCache enabled, no user-agent exceptions' =>
-                [Config::BUILT_IN, true, 'aa123aa', false, 'aa123aa'],
+            'Built-in, PageCache enabled, no user-agent exceptions' => [
+                Config::BUILT_IN,
+                true,
+                'aa123aa',
+                false,
+                'aa123aa',
+            ],
             'Built-in, PageCache enabled, with design exception' => [Config::BUILT_IN, true, 'aa123aa', '7', '7aa123aa']
         ];
     }
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/App/FrontController/VarnishPluginTest.php b/app/code/Magento/PageCache/Test/Unit/Model/App/FrontController/VarnishPluginTest.php
index 501fc9fe6a3d9..f5e929b18c3bc 100644
--- a/app/code/Magento/PageCache/Test/Unit/Model/App/FrontController/VarnishPluginTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Model/App/FrontController/VarnishPluginTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\PageCache\Test\Unit\Model\App\FrontController;
 
-use Magento\PageCache\Model\App\FrontController\VarnishPlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\PageCache\Model\Config;
-use Magento\Framework\App\PageCache\Version;
-use Magento\Framework\App\State as AppState;
 use Magento\Framework\App\FrontControllerInterface;
+use Magento\Framework\App\PageCache\Version;
 use Magento\Framework\App\Response\Http as ResponseHttp;
+use Magento\Framework\App\State as AppState;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\PageCache\Model\App\FrontController\VarnishPlugin;
+use Magento\PageCache\Model\Config;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/Cache/ServerTest.php b/app/code/Magento/PageCache/Test/Unit/Model/Cache/ServerTest.php
index 2321a951aafe8..9aab9e2918c2a 100644
--- a/app/code/Magento/PageCache/Test/Unit/Model/Cache/ServerTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Model/Cache/ServerTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\PageCache\Test\Unit\Model\Cache;
 
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use \Magento\PageCache\Model\Cache\Server;
-use \Zend\Uri\UriFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\PageCache\Model\Cache\Server;
+use Zend\Uri\UriFactory;
 
 class ServerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/Controller/Result/BuiltinPluginTest.php b/app/code/Magento/PageCache/Test/Unit/Model/Controller/Result/BuiltinPluginTest.php
index fc4e056734939..559a06c1cdaf6 100644
--- a/app/code/Magento/PageCache/Test/Unit/Model/Controller/Result/BuiltinPluginTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Model/Controller/Result/BuiltinPluginTest.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\PageCache\Test\Unit\Model\Controller\Result;
 
-use Magento\PageCache\Model\Controller\Result\BuiltinPlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\PageCache\Model\Config;
 use Magento\Framework\App\PageCache\Kernel;
+use Magento\Framework\App\Response\Http as ResponseHttp;
 use Magento\Framework\App\State as AppState;
-use Magento\Framework\Registry;
 use Magento\Framework\Controller\ResultInterface;
-use Magento\Framework\App\Response\Http as ResponseHttp;
-use Zend\Http\Header\HeaderInterface as HttpHeaderInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\PageCache\Model\Cache\Type as CacheType;
+use Magento\PageCache\Model\Config;
+use Magento\PageCache\Model\Controller\Result\BuiltinPlugin;
+use Zend\Http\Header\HeaderInterface as HttpHeaderInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/Controller/Result/VarnishPluginTest.php b/app/code/Magento/PageCache/Test/Unit/Model/Controller/Result/VarnishPluginTest.php
index 7be860182f5e0..9d41d27b2c2cd 100644
--- a/app/code/Magento/PageCache/Test/Unit/Model/Controller/Result/VarnishPluginTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Model/Controller/Result/VarnishPluginTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\PageCache\Test\Unit\Model\Controller\Result;
 
-use Magento\PageCache\Model\Controller\Result\VarnishPlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\PageCache\Model\Config;
 use Magento\Framework\App\PageCache\Version;
+use Magento\Framework\App\Response\Http as ResponseHttp;
 use Magento\Framework\App\State as AppState;
-use Magento\Framework\Registry;
 use Magento\Framework\Controller\ResultInterface;
-use Magento\Framework\App\Response\Http as ResponseHttp;
+use Magento\Framework\Registry;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\PageCache\Model\Config;
+use Magento\PageCache\Model\Controller\Result\VarnishPlugin;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/PageCache/Test/Unit/Observer/FlushFormKeyTest.php b/app/code/Magento/PageCache/Test/Unit/Observer/FlushFormKeyTest.php
index 8cc76702735cb..b50f2e85077f2 100644
--- a/app/code/Magento/PageCache/Test/Unit/Observer/FlushFormKeyTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Observer/FlushFormKeyTest.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\App\PageCache\FormKey as CookieFormKey;
 use Magento\Framework\Data\Form\FormKey as DataFormKey;
-use Magento\PageCache\Observer\FlushFormKey;
 use Magento\Framework\Event\Observer;
+use Magento\PageCache\Observer\FlushFormKey;
 
 class FlushFormKeyTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Block/Transparent/Form.php b/app/code/Magento/Payment/Block/Transparent/Form.php
index c9ddd32c75f46..bf928f9e05a61 100644
--- a/app/code/Magento/Payment/Block/Transparent/Form.php
+++ b/app/code/Magento/Payment/Block/Transparent/Form.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Payment\Block\Transparent;
 
+use Magento\Checkout\Model\Session;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Payment\Model\Config;
 use Magento\Payment\Model\Method\Adapter;
 use Magento\Payment\Model\Method\TransparentInterface;
-use Magento\Checkout\Model\Session;
-use Magento\Payment\Model\Config;
-use Magento\Framework\View\Element\Template\Context;
 
 /**
  * Transparent form block
diff --git a/app/code/Magento/Payment/Gateway/Command/CommandException.php b/app/code/Magento/Payment/Gateway/Command/CommandException.php
index 61f20a08fa351..75f9b90650974 100644
--- a/app/code/Magento/Payment/Gateway/Command/CommandException.php
+++ b/app/code/Magento/Payment/Gateway/Command/CommandException.php
@@ -15,5 +15,4 @@
  */
 class CommandException extends LocalizedException
 {
-
 }
diff --git a/app/code/Magento/Payment/Gateway/Command/CommandPool.php b/app/code/Magento/Payment/Gateway/Command/CommandPool.php
index f866914463d4d..233f5cf7c64ff 100644
--- a/app/code/Magento/Payment/Gateway/Command/CommandPool.php
+++ b/app/code/Magento/Payment/Gateway/Command/CommandPool.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Payment\Gateway\Command;
 
-use Magento\Framework\ObjectManager\TMap;
-use Magento\Payment\Gateway\CommandInterface;
 use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\ObjectManager\TMap;
 use Magento\Framework\ObjectManager\TMapFactory;
+use Magento\Payment\Gateway\CommandInterface;
 
 /**
  * Class CommandPool
diff --git a/app/code/Magento/Payment/Gateway/Data/Order/AddressAdapter.php b/app/code/Magento/Payment/Gateway/Data/Order/AddressAdapter.php
index f4b05df2e8a20..ea51870588caf 100644
--- a/app/code/Magento/Payment/Gateway/Data/Order/AddressAdapter.php
+++ b/app/code/Magento/Payment/Gateway/Data/Order/AddressAdapter.php
@@ -54,7 +54,7 @@ public function getCountryId()
     public function getStreetLine1()
     {
         $street = $this->address->getStreet();
-        return isset($street[0]) ? $street[0]: '';
+        return isset($street[0]) ? $street[0] : '';
     }
 
     /**
@@ -65,7 +65,7 @@ public function getStreetLine1()
     public function getStreetLine2()
     {
         $street = $this->address->getStreet();
-        return isset($street[1]) ? $street[1]: '';
+        return isset($street[1]) ? $street[1] : '';
     }
 
     /**
diff --git a/app/code/Magento/Payment/Gateway/Data/Quote/AddressAdapter.php b/app/code/Magento/Payment/Gateway/Data/Quote/AddressAdapter.php
index 3c8d5899a1083..77081972fd2e7 100644
--- a/app/code/Magento/Payment/Gateway/Data/Quote/AddressAdapter.php
+++ b/app/code/Magento/Payment/Gateway/Data/Quote/AddressAdapter.php
@@ -54,7 +54,7 @@ public function getCountryId()
     public function getStreetLine1()
     {
         $street = $this->address->getStreet();
-        return isset($street[0]) ? $street[0]: '';
+        return isset($street[0]) ? $street[0] : '';
     }
 
     /**
@@ -65,7 +65,7 @@ public function getStreetLine1()
     public function getStreetLine2()
     {
         $street = $this->address->getStreet();
-        return isset($street[1]) ? $street[1]: '';
+        return isset($street[1]) ? $street[1] : '';
     }
 
     /**
diff --git a/app/code/Magento/Payment/Gateway/Data/Quote/QuoteAdapter.php b/app/code/Magento/Payment/Gateway/Data/Quote/QuoteAdapter.php
index 645c3470cd661..44964d7d7050e 100644
--- a/app/code/Magento/Payment/Gateway/Data/Quote/QuoteAdapter.php
+++ b/app/code/Magento/Payment/Gateway/Data/Quote/QuoteAdapter.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Payment\Gateway\Data\Quote;
 
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Payment\Gateway\Data\AddressAdapterInterface;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Quote\Api\Data\CartInterface;
-use Magento\Payment\Gateway\Data\AddressAdapterInterface;
 
 /**
  * Class QuoteAdapter
diff --git a/app/code/Magento/Payment/Gateway/Helper/SubjectReader.php b/app/code/Magento/Payment/Gateway/Helper/SubjectReader.php
index b7def6506fc6a..e9dc13abbd3a1 100644
--- a/app/code/Magento/Payment/Gateway/Helper/SubjectReader.php
+++ b/app/code/Magento/Payment/Gateway/Helper/SubjectReader.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Payment\Gateway\Helper;
 
-use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Framework\DataObject;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 
 /**
  * This class encapsulates implicit interfaces (array structures) used in payments implementation.
diff --git a/app/code/Magento/Payment/Gateway/Http/ClientInterface.php b/app/code/Magento/Payment/Gateway/Http/ClientInterface.php
index 894b76e6db1e6..b01d9736a536f 100644
--- a/app/code/Magento/Payment/Gateway/Http/ClientInterface.php
+++ b/app/code/Magento/Payment/Gateway/Http/ClientInterface.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Payment\Gateway\Http;
 
-use Magento\Payment\Gateway\Response;
-
 /**
  * Interface ClientInterface
  * @package Magento\Payment\Gateway\Http
diff --git a/app/code/Magento/Payment/Gateway/Validator/CountryValidator.php b/app/code/Magento/Payment/Gateway/Validator/CountryValidator.php
index 05bc4c464a83f..0a01351b5acad 100644
--- a/app/code/Magento/Payment/Gateway/Validator/CountryValidator.php
+++ b/app/code/Magento/Payment/Gateway/Validator/CountryValidator.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Payment\Gateway\ConfigInterface;
-use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
 
 /**
  * Class CountryValidator
diff --git a/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php b/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
index b7f1368ddabce..ed13cb4dc93bb 100644
--- a/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
+++ b/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\ObjectManager\TMap;
 use Magento\Framework\ObjectManager\TMapFactory;
-use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
 
 /**
  * Class ValidatorComposite
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index f3565ea324290..e97b7f28adc19 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Payment\Helper;
 
-use Magento\Quote\Model\Quote;
-use Magento\Store\Model\Store;
-use Magento\Payment\Block\Form;
-use Magento\Payment\Model\InfoInterface;
 use Magento\Framework\View\Element\Template;
-use Magento\Framework\View\LayoutInterface;
 use Magento\Framework\View\LayoutFactory;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Payment\Block\Form;
+use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Model\Method\AbstractMethod;
 use Magento\Payment\Model\MethodInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Store\Model\Store;
 
 /**
  * Payment module base helper
diff --git a/app/code/Magento/Payment/Model/CcConfig.php b/app/code/Magento/Payment/Model/CcConfig.php
index 6d6a076688cd5..1f2f37989e1e6 100644
--- a/app/code/Magento/Payment/Model/CcConfig.php
+++ b/app/code/Magento/Payment/Model/CcConfig.php
@@ -9,8 +9,8 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Asset\Repository;
-use Psr\Log\LoggerInterface;
 use Magento\Payment\Model\Config as PaymentConfig;
+use Psr\Log\LoggerInterface;
 
 /**
  * Credit card configuration model
diff --git a/app/code/Magento/Payment/Model/Checks/CanUseForCountry.php b/app/code/Magento/Payment/Model/Checks/CanUseForCountry.php
index db4647d61fcbc..8d83dd443419e 100644
--- a/app/code/Magento/Payment/Model/Checks/CanUseForCountry.php
+++ b/app/code/Magento/Payment/Model/Checks/CanUseForCountry.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Payment\Model\Checks;
 
+use Magento\Payment\Model\Checks\CanUseForCountry\CountryProvider;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Quote\Model\Quote;
-use Magento\Payment\Model\Checks\CanUseForCountry\CountryProvider;
 
 /**
  * Checks possibility to use payment method at particular country
diff --git a/app/code/Magento/Payment/Model/Checks/CanUseForCountry/CountryProvider.php b/app/code/Magento/Payment/Model/Checks/CanUseForCountry/CountryProvider.php
index 05c889ecd5a4b..711a0d2b34bb8 100644
--- a/app/code/Magento/Payment/Model/Checks/CanUseForCountry/CountryProvider.php
+++ b/app/code/Magento/Payment/Model/Checks/CanUseForCountry/CountryProvider.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Payment\Model\Checks\CanUseForCountry;
 
-use Magento\Quote\Model\Quote;
 use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Quote\Model\Quote;
 
 /**
  * Select country which will be used for payment.
@@ -39,7 +39,7 @@ public function __construct(DirectoryHelper $directoryHelper)
      */
     public function getCountry(Quote $quote)
     {
-        $address = $quote->getBillingAddress() ? : $quote->getShippingAddress();
+        $address = $quote->getBillingAddress() ?: $quote->getShippingAddress();
         return (!empty($address) && !empty($address->getCountry()))
             ? $address->getCountry()
             : $this->directoryHelper->getDefaultCountry();
diff --git a/app/code/Magento/Payment/Model/Config.php b/app/code/Magento/Payment/Model/Config.php
index 3f74db041f61c..879e541bb17e6 100644
--- a/app/code/Magento/Payment/Model/Config.php
+++ b/app/code/Magento/Payment/Model/Config.php
@@ -6,7 +6,6 @@
 namespace Magento\Payment\Model;
 
 use Magento\Framework\Locale\Bundle\DataBundle;
-use Magento\Payment\Model\Method\AbstractMethod;
 use Magento\Store\Model\ScopeInterface;
 
 /**
diff --git a/app/code/Magento/Payment/Model/Config/SchemaLocator.php b/app/code/Magento/Payment/Model/Config/SchemaLocator.php
index 65b010f9835d1..563ca8f7ea71a 100644
--- a/app/code/Magento/Payment/Model/Config/SchemaLocator.php
+++ b/app/code/Magento/Payment/Model/Config/SchemaLocator.php
@@ -7,8 +7,6 @@
  */
 namespace Magento\Payment\Model\Config;
 
-use Magento\Framework\Module\Dir;
-
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
     /**
diff --git a/app/code/Magento/Payment/Model/IframeConfigProvider.php b/app/code/Magento/Payment/Model/IframeConfigProvider.php
index 6a0d4022058e1..1eb1a0d6fc418 100644
--- a/app/code/Magento/Payment/Model/IframeConfigProvider.php
+++ b/app/code/Magento/Payment/Model/IframeConfigProvider.php
@@ -146,7 +146,7 @@ protected function getDateDelim()
      */
     protected function getExpireDateYearLength()
     {
-         return (int)$this->getMethodConfigData('cc_year_length') ?: self::DEFAULT_YEAR_LENGTH;
+        return (int)$this->getMethodConfigData('cc_year_length') ?: self::DEFAULT_YEAR_LENGTH;
     }
 
     /**
diff --git a/app/code/Magento/Payment/Model/PaymentMethodList.php b/app/code/Magento/Payment/Model/PaymentMethodList.php
index 4e400dbf0c906..7eb3bd09f3ad6 100644
--- a/app/code/Magento/Payment/Model/PaymentMethodList.php
+++ b/app/code/Magento/Payment/Model/PaymentMethodList.php
@@ -61,7 +61,6 @@ function (MethodInterface $a, MethodInterface $b) use ($storeId) {
 
         $methodList = array_map(
             function (MethodInterface $methodInstance) use ($storeId) {
-
                 return $this->methodFactory->create([
                     'code' => (string)$methodInstance->getCode(),
                     'title' => (string)$methodInstance->getTitle(),
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Adminhtml/Transparent/FormTest.php b/app/code/Magento/Payment/Test/Unit/Block/Adminhtml/Transparent/FormTest.php
index 21547b7696eca..f01c03f2a0ff3 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Adminhtml/Transparent/FormTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Adminhtml/Transparent/FormTest.php
@@ -5,10 +5,7 @@
  */
 namespace Magento\Payment\Test\Unit\Block\Adminhtml\Transparent;
 
-use Magento\Framework\App\RequestInterface;
-use Magento\Framework\DataObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\UrlInterface;
 use Magento\Payment\Model\Method\TransparentInterface;
 
 class FormTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Payment/Test/Unit/Block/FormTest.php b/app/code/Magento/Payment/Test/Unit/Block/FormTest.php
index c1414c32daa38..2281e4a71c231 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/FormTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/FormTest.php
@@ -8,8 +8,6 @@
 
 namespace Magento\Payment\Test\Unit\Block;
 
-use Magento\Framework\DataObject;
-
 class FormTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Payment/Test/Unit/Block/InfoTest.php b/app/code/Magento/Payment/Test/Unit/Block/InfoTest.php
index 469d7971e21a9..5fe1800279d55 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/InfoTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/InfoTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Payment\Test\Unit\Block;
 
-use Magento\Framework\DataObject;
-
 class InfoTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php b/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php
index eb1e3d3a91b92..0ccad6d691555 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/Transparent/FormTest.php
@@ -7,7 +7,6 @@
 
 use Magento\Checkout\Model\Session;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\DataObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\UrlInterface;
 use Magento\Payment\Model\Method\TransparentInterface;
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigTest.php
index 3e6cc5f7caee9..14d22296364d7 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Payment\Test\Unit\Gateway\Config;
 
-use Magento\Payment\Gateway\Config\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Payment\Gateway\Config\Config;
 use Magento\Store\Model\ScopeInterface;
 
 /**
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigValueHandlerTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigValueHandlerTest.php
index f082d77a9f854..a521c4162f86d 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigValueHandlerTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Config/ConfigValueHandlerTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Payment\Test\Unit\Gateway\Config;
 
-use Magento\Payment\Gateway\ConfigInterface;
 use Magento\Payment\Gateway\Config\ConfigValueHandler;
+use Magento\Payment\Gateway\ConfigInterface;
 
 /**
  * Class ConfigValueHandlerTest
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Config/ValueHandlerPoolTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Config/ValueHandlerPoolTest.php
index ac44d9830fbc6..de8e5fa5c86b0 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Config/ValueHandlerPoolTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Config/ValueHandlerPoolTest.php
@@ -25,10 +25,10 @@ public function testConstructorException()
 
     public function testGet()
     {
-        $defaultHandler = $this->getMockBuilder(\Magento\Payment\Gateway\Config\ValueHandlerInterface::class)
+        $defaultHandler = $this->getMockBuilder(ValueHandlerInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $someValueHandler = $this->getMockBuilder(\Magento\Payment\Gateway\Config\ValueHandlerInterface::class)
+        $someValueHandler = $this->getMockBuilder(ValueHandlerInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $tMapFactory = $this->getMockBuilder(\Magento\Framework\ObjectManager\TMapFactory::class)
@@ -44,9 +44,8 @@ public function testGet()
             ->with(
                 [
                     'array' => [
-                        ValueHandlerPool::DEFAULT_HANDLER =>
-                            \Magento\Payment\Gateway\Config\ValueHandlerInterface::class,
-                        'some_value' => \Magento\Payment\Gateway\Config\ValueHandlerInterface::class
+                        ValueHandlerPool::DEFAULT_HANDLER => ValueHandlerInterface::class,
+                        'some_value' => ValueHandlerInterface::class
                     ],
                     'type' => ValueHandlerInterface::class
                 ]
@@ -72,8 +71,8 @@ public function testGet()
         $pool = new ValueHandlerPool(
             $tMapFactory,
             [
-                ValueHandlerPool::DEFAULT_HANDLER => \Magento\Payment\Gateway\Config\ValueHandlerInterface::class,
-                'some_value' => \Magento\Payment\Gateway\Config\ValueHandlerInterface::class
+                ValueHandlerPool::DEFAULT_HANDLER => ValueHandlerInterface::class,
+                'some_value' => ValueHandlerInterface::class
             ]
         );
         static::assertSame($someValueHandler, $pool->get('some_value'));
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/AddressAdapterTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/AddressAdapterTest.php
index 1cf19ff9292e9..d3cf0555b69cb 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/AddressAdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/AddressAdapterTest.php
@@ -76,7 +76,7 @@ public function testStreetLine2($street, $expected)
     public function streetLine2DataProvider()
     {
         return [
-            [['Street Line 1', 'Street Line 2',], 'Street Line 2'], //$street, $expected
+            [['Street Line 1', 'Street Line 2'], 'Street Line 2'], //$street, $expected
             [['Street Line 1'], ''],
             [null, '']
         ];
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/OrderAdapterTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/OrderAdapterTest.php
index dda20db222efa..5ec4bd62fd090 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/OrderAdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/OrderAdapterTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Payment\Test\Unit\Gateway\Data\Order;
 
+use Magento\Payment\Gateway\Data\AddressAdapterInterface;
 use Magento\Payment\Gateway\Data\Order\OrderAdapter;
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Payment\Gateway\Data\AddressAdapterInterface;
 
 /**
  * Class OrderAdapterTest
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectFactoryTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectFactoryTest.php
index 14832f4380f32..8e4747367210a 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectFactoryTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectFactoryTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Payment\Test\Unit\Gateway\Data;
 
-use Magento\Payment\Gateway\Data\PaymentDataObjectFactory;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Sales\Model\Order\Payment;
 use Magento\Payment\Gateway\Data\Order\OrderAdapter;
+use Magento\Payment\Gateway\Data\PaymentDataObjectFactory;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Payment;
 
 /**
  * Class PaymentDataObjectFactoryTest
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectTest.php
index dc9a51b30cfea..312e4e5a1d76e 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/PaymentDataObjectTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Payment\Test\Unit\Gateway\Data;
 
-use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
+use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Payment\Model\InfoInterface;
 
 /**
@@ -40,11 +40,11 @@ protected function setUp()
 
     public function testGetOrder()
     {
-        $this->assertSame($this->orderMock, $this->model->getOrder()) ;
+        $this->assertSame($this->orderMock, $this->model->getOrder());
     }
 
     public function testGetPayment()
     {
-        $this->assertSame($this->paymentMock, $this->model->getPayment()) ;
+        $this->assertSame($this->paymentMock, $this->model->getPayment());
     }
 }
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/AddressAdapterTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/AddressAdapterTest.php
index 751d8c51b4410..5a1687e702820 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/AddressAdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/AddressAdapterTest.php
@@ -76,7 +76,7 @@ public function testStreetLine2($street, $expected)
     public function streetLine2DataProvider()
     {
         return [
-            [['Street Line 1', 'Street Line 2',], 'Street Line 2'], //$street, $expected
+            [['Street Line 1', 'Street Line 2'], 'Street Line 2'], //$street, $expected
             [['Street Line 1'], ''],
             [null, '']
         ];
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php
index 198cf5e52f068..380fabe267713 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Payment\Test\Unit\Gateway\Data\Quote;
 
+use Magento\Payment\Gateway\Data\AddressAdapterInterface;
 use Magento\Payment\Gateway\Data\Quote\QuoteAdapter;
 use Magento\Quote\Api\Data\CartInterface;
-use Magento\Payment\Gateway\Data\AddressAdapterInterface;
 
 /**
  * Class QuoteAdapterTest
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Http/Client/ZendTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Http/Client/ZendTest.php
index 642619ec7f5ae..7d6c73083b8c7 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Http/Client/ZendTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Http/Client/ZendTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Payment\Test\Unit\Gateway\Http\Client;
 
+use Magento\Framework\HTTP\ZendClient;
+use Magento\Framework\HTTP\ZendClientFactory;
 use Magento\Payment\Gateway\Http\Client\Zend;
 use Magento\Payment\Gateway\Http\ConverterInterface;
-use Magento\Framework\HTTP\ZendClientFactory;
-use Magento\Framework\HTTP\ZendClient;
 use Magento\Payment\Gateway\Http\TransferInterface;
 
 /**
@@ -102,7 +102,7 @@ public function testPlaceRequestClientFail()
 
         $this->clientMock->expects($this->once())
             ->method('request')
-            ->willThrowException(new \Zend_Http_Client_Exception);
+            ->willThrowException(new \Zend_Http_Client_Exception());
 
         $this->converterMock->expects($this->never())->method('convert');
 
diff --git a/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php b/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php
index 931c2b5fd93d5..169ea2e5f5540 100644
--- a/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Helper/DataTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Payment\Test\Unit\Helper;
 
-use \Magento\Payment\Helper\Data;
-
 use Magento\Framework\TestFramework\Unit\Matcher\MethodInvokedAtIndex;
 
+use Magento\Payment\Helper\Data;
+
 class DataTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Payment\Helper\Data */
diff --git a/app/code/Magento/Payment/Test/Unit/Model/CartTest.php b/app/code/Magento/Payment/Test/Unit/Model/CartTest.php
index 9653810ee8214..43b468386f07d 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/CartTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/CartTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Payment\Test\Unit\Model;
 
-use \Magento\Payment\Model\Cart;
+use Magento\Payment\Model\Cart;
 
 class CartTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseCheckoutTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseCheckoutTest.php
index 4ee1a46799e8b..fcfd3306fe460 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseCheckoutTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseCheckoutTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Payment\Test\Unit\Model\Checks;
 
-use \Magento\Payment\Model\Checks\CanUseCheckout;
+use Magento\Payment\Model\Checks\CanUseCheckout;
 
 class CanUseCheckoutTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCurrencyTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCurrencyTest.php
index 1fc19d5da386a..04565c000d71f 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCurrencyTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseForCurrencyTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Payment\Test\Unit\Model\Checks;
 
-use \Magento\Payment\Model\Checks\CanUseForCurrency;
+use Magento\Payment\Model\Checks\CanUseForCurrency;
 
 class CanUseForCurrencyTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseInternalTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseInternalTest.php
index 09f2e22505e35..c9879ee7ceda0 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseInternalTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/CanUseInternalTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Payment\Test\Unit\Model\Checks;
 
-use \Magento\Payment\Model\Checks\CanUseInternal;
+use Magento\Payment\Model\Checks\CanUseInternal;
 
 class CanUseInternalTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/CompositeTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/CompositeTest.php
index bfb9a830c2080..826761e8f0d9f 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/CompositeTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/CompositeTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Payment\Test\Unit\Model\Checks;
 
-use \Magento\Payment\Model\Checks\Composite;
+use Magento\Payment\Model\Checks\Composite;
 
 class CompositeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/SpecificationFactoryTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/SpecificationFactoryTest.php
index bf615542db6c5..dce840ca13f27 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/SpecificationFactoryTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/SpecificationFactoryTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Payment\Test\Unit\Model\Checks;
 
-use \Magento\Payment\Model\Checks\SpecificationFactory;
+use Magento\Payment\Model\Checks\SpecificationFactory;
 
 class SpecificationFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/TotalMinMaxTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/TotalMinMaxTest.php
index 43f9efa8ceca1..af8f2d63bba93 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/TotalMinMaxTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/TotalMinMaxTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Payment\Test\Unit\Model\Checks;
 
-use \Magento\Payment\Model\Checks\TotalMinMax;
+use Magento\Payment\Model\Checks\TotalMinMax;
 
 class TotalMinMaxTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Checks/ZeroTotalTest.php b/app/code/Magento/Payment/Test/Unit/Model/Checks/ZeroTotalTest.php
index 4e7bc0e18cf52..cb017695dd7ec 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Checks/ZeroTotalTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Checks/ZeroTotalTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Payment\Test\Unit\Model\Checks;
 
-use \Magento\Payment\Model\Checks\ZeroTotal;
+use Magento\Payment\Model\Checks\ZeroTotal;
 
 class ZeroTotalTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Config/SchemaLocatorTest.php b/app/code/Magento/Payment/Test/Unit/Model/Config/SchemaLocatorTest.php
index eae5deb0ee29e..673c1fd9238d6 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Config/SchemaLocatorTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Config/SchemaLocatorTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Payment\Test\Unit\Model\Config;
 
-use \Magento\Payment\Model\Config\SchemaLocator;
+use Magento\Payment\Model\Config\SchemaLocator;
 
 class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Config/Source/AllmethodsTest.php b/app/code/Magento/Payment/Test/Unit/Model/Config/Source/AllmethodsTest.php
index 7cd577bf2ec27..3571625e7d9d9 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Config/Source/AllmethodsTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Config/Source/AllmethodsTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Payment\Test\Unit\Model\Config\Source;
 
-use \Magento\Payment\Model\Config\Source\Allmethods;
+use Magento\Payment\Model\Config\Source\Allmethods;
 
 class AllmethodsTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Config/Source/AllspecificcountriesTest.php b/app/code/Magento/Payment/Test/Unit/Model/Config/Source/AllspecificcountriesTest.php
index f2b6859b09763..959f1c322a59e 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Config/Source/AllspecificcountriesTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Config/Source/AllspecificcountriesTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Payment\Test\Unit\Model\Config\Source;
 
-use \Magento\Payment\Model\Config\Source\Allspecificcountries;
+use Magento\Payment\Model\Config\Source\Allspecificcountries;
 
 class AllspecificcountriesTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Config/Source/CctypeTest.php b/app/code/Magento/Payment/Test/Unit/Model/Config/Source/CctypeTest.php
index 197ad10ba25e8..14497e2985223 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Config/Source/CctypeTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Config/Source/CctypeTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Payment\Test\Unit\Model\Config\Source;
 
-use \Magento\Payment\Model\Config\Source\Cctype;
+use Magento\Payment\Model\Config\Source\Cctype;
 
 class CctypeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/InfoTest.php b/app/code/Magento/Payment/Test/Unit/Model/InfoTest.php
index 3203f1498b9a3..9c9b81be053b4 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/InfoTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/InfoTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Payment\Test\Unit\Model;
 
-use Magento\Payment\Model\Method;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Payment\Model\Method;
 
 class InfoTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/AbstractMethodTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/AbstractMethodTest.php
index f92c75d1adb03..ced9a662c85b5 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/AbstractMethodTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Method/AbstractMethodTest.php
@@ -8,8 +8,8 @@
 use Magento\Framework\DataObject;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Payment\Test\Unit\Model\Method\AbstractMethod\Stub;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Class AbstractMethodTest
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/CcTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/CcTest.php
index 2891b02d82eab..791eb5ee0c2b9 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/CcTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Method/CcTest.php
@@ -23,7 +23,7 @@ public function setUp()
         $objectManager = new ObjectManager($this);
         $this->ccModel = $objectManager->getObject(Cc::class);
     }
-    
+
     public function testAssignData()
     {
         $additionalData = [
diff --git a/app/code/Magento/Payment/Test/Unit/Model/MethodListTest.php b/app/code/Magento/Payment/Test/Unit/Model/MethodListTest.php
index 0ba72d38b2a03..4906b5c2f3d2d 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/MethodListTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/MethodListTest.php
@@ -8,8 +8,8 @@
 
 namespace Magento\Payment\Test\Unit\Model;
 
-use Magento\Payment\Model\MethodList;
 use Magento\Payment\Model\Method\AbstractMethod;
+use Magento\Payment\Model\MethodList;
 
 class MethodListTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Source/CctypeTest.php b/app/code/Magento/Payment/Test/Unit/Model/Source/CctypeTest.php
index 4f3ae6021f80b..ce2f683787054 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Source/CctypeTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Source/CctypeTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Payment\Test\Unit\Model\Source;
 
-use \Magento\Payment\Model\Source\Cctype;
+use Magento\Payment\Model\Source\Cctype;
 
 class CctypeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Source/InvoiceTest.php b/app/code/Magento/Payment/Test/Unit/Model/Source/InvoiceTest.php
index 54fd2ab934e02..29691ee81fdef 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Source/InvoiceTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Source/InvoiceTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Payment\Test\Unit\Model\Source;
 
-use \Magento\Payment\Model\Source\Invoice;
+use Magento\Payment\Model\Source\Invoice;
 
 class InvoiceTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php
index fe53573ec92e3..70473a520a71c 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Billing/Agreement/View/Tab/Orders.php
@@ -8,13 +8,13 @@
 
 namespace Magento\Paypal\Block\Adminhtml\Billing\Agreement\View\Tab;
 
-use Magento\Paypal\Model\ResourceModel\Billing\Agreement as BillingAgreementResource;
-use Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory;
+use Magento\Backend\Block\Template\Context as TemplateContext;
 use Magento\Backend\Block\Widget\Grid\Extended as ExtendedGrid;
 use Magento\Backend\Block\Widget\Tab\TabInterface;
-use Magento\Backend\Block\Template\Context as TemplateContext;
 use Magento\Backend\Helper\Data as BackendHelper;
 use Magento\Framework\Registry;
+use Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory;
+use Magento\Paypal\Model\ResourceModel\Billing\Agreement as BillingAgreementResource;
 
 /**
  * Adminhtml billing agreement related orders tab
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Payflowpro/CcForm.php b/app/code/Magento/Paypal/Block/Adminhtml/Payflowpro/CcForm.php
index bdf85ca3566cf..2feeafeacd53c 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Payflowpro/CcForm.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Payflowpro/CcForm.php
@@ -11,7 +11,6 @@
 use Magento\Payment\Helper\Data;
 use Magento\Payment\Model\Config;
 use Magento\Paypal\Model\Payflow\Transparent;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Vault\Model\VaultPaymentInterface;
 
 class CcForm extends \Magento\Payment\Block\Transparent\Form
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/AbstractEnable.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/AbstractEnable.php
index 1dbcf5b7e0f5d..35368e3979bd2 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/AbstractEnable.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/AbstractEnable.php
@@ -29,7 +29,7 @@ abstract class AbstractEnable extends Field
     public function getUiId($arg1 = null, $arg2 = null, $arg3 = null, $arg4 = null, $arg5 = null)
     {
         return parent::getUiId($arg1, $arg2, $arg3, $arg4, $arg5)
-            . 'data-enable="' . $this->getDataAttributeName(). '" ';
+            . 'data-enable="' . $this->getDataAttributeName() . '" ';
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
index 82997e764e9cf..1b0b5397e60df 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Expanded.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Paypal\Block\Adminhtml\System\Config\Fieldset;
 
-use Magento\Framework\Data\Form\Element\AbstractElement;
-
 /**
  * Fieldset renderer which expanded by default
  */
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Component.php b/app/code/Magento/Paypal/Block/Express/InContext/Component.php
index bb5c17a18fe95..364ed8bc190b4 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/Component.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/Component.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Paypal\Block\Express\InContext;
 
-use Magento\Paypal\Model\Config;
-use Magento\Paypal\Model\ConfigFactory;
-use Magento\Framework\View\Element\Template;
 use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
+use Magento\Paypal\Model\Config;
+use Magento\Paypal\Model\ConfigFactory;
 
 /**
  * Class Component
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
index 79142ecb1bfad..56c355345a942 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
@@ -5,15 +5,14 @@
  */
 namespace Magento\Paypal\Block\Express\InContext\Minicart;
 
+use Magento\Catalog\Block\ShortcutInterface;
 use Magento\Checkout\Model\Session;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Paypal\Model\Config;
 use Magento\Paypal\Model\ConfigFactory;
-use Magento\Paypal\Block\Express\InContext;
-use Magento\Framework\View\Element\Template;
-use Magento\Catalog\Block\ShortcutInterface;
-use Magento\Framework\Locale\ResolverInterface;
-use Magento\Framework\View\Element\Template\Context;
 
 /**
  * Class Button
diff --git a/app/code/Magento/Paypal/Block/Express/Shortcut.php b/app/code/Magento/Paypal/Block/Express/Shortcut.php
index bdb9279356d83..d87554ca5ebe5 100644
--- a/app/code/Magento/Paypal/Block/Express/Shortcut.php
+++ b/app/code/Magento/Paypal/Block/Express/Shortcut.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Paypal\Block\Express;
 
-use Magento\Paypal\Model\Config;
 use Magento\Catalog\Block as CatalogBlock;
 use Magento\Paypal\Helper\Shortcut\ValidatorInterface;
+use Magento\Paypal\Model\Config;
 
 /**
  * Paypal express checkout shortcut link
diff --git a/app/code/Magento/Paypal/Block/Payflow/Advanced/Info.php b/app/code/Magento/Paypal/Block/Payflow/Advanced/Info.php
index 30de5e6ae9d6d..9102c23e7a614 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Advanced/Info.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Advanced/Info.php
@@ -12,5 +12,4 @@
  */
 class Info extends \Magento\Paypal\Block\Payflow\Link\Info
 {
-
 }
diff --git a/app/code/Magento/Paypal/Block/Payflow/Customer/CardRenderer.php b/app/code/Magento/Paypal/Block/Payflow/Customer/CardRenderer.php
index d672acedb1e52..bf152273072b1 100644
--- a/app/code/Magento/Paypal/Block/Payflow/Customer/CardRenderer.php
+++ b/app/code/Magento/Paypal/Block/Payflow/Customer/CardRenderer.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Paypal\Block\Payflow\Customer;
 
-use Magento\Framework\View\Element\Template;
 use Magento\Paypal\Model\Config;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Block\AbstractCardRenderer;
diff --git a/app/code/Magento/Paypal/Controller/Adminhtml/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Adminhtml/Transparent/RequestSecureToken.php
index a7cd4fbe731bf..925b87f9f9d3a 100644
--- a/app/code/Magento/Paypal/Controller/Adminhtml/Transparent/RequestSecureToken.php
+++ b/app/code/Magento/Paypal/Controller/Adminhtml/Transparent/RequestSecureToken.php
@@ -12,5 +12,4 @@
  */
 class RequestSecureToken extends \Magento\Paypal\Controller\Transparent\RequestSecureToken
 {
-
 }
diff --git a/app/code/Magento/Paypal/Controller/Express/GetToken.php b/app/code/Magento/Paypal/Controller/Express/GetToken.php
index 7c127803cb0b1..7bd64996e8be1 100644
--- a/app/code/Magento/Paypal/Controller/Express/GetToken.php
+++ b/app/code/Magento/Paypal/Controller/Express/GetToken.php
@@ -8,12 +8,12 @@
 use Magento\Checkout\Helper\Data;
 use Magento\Checkout\Helper\ExpressRedirect;
 use Magento\Checkout\Model\Type\Onepage;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Webapi\Exception;
 use Magento\Paypal\Model\Express\Checkout;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class GetToken
diff --git a/app/code/Magento/Paypal/Controller/Transparent/Response.php b/app/code/Magento/Paypal/Controller/Transparent/Response.php
index 23ac20ca8c87b..35b2753c6cab8 100644
--- a/app/code/Magento/Paypal/Controller/Transparent/Response.php
+++ b/app/code/Magento/Paypal/Controller/Transparent/Response.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Paypal\Controller\Transparent;
 
-use Magento\Framework\Registry;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\View\Result\LayoutFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Registry;
+use Magento\Framework\View\Result\LayoutFactory;
 use Magento\Payment\Block\Transparent\Iframe;
 use Magento\Paypal\Model\Payflow\Service\Response\Transaction;
 use Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator;
diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
index 3b0f7b974829c..b43302083d768 100644
--- a/app/code/Magento/Paypal/Model/AbstractConfig.php
+++ b/app/code/Magento/Paypal/Model/AbstractConfig.php
@@ -5,12 +5,11 @@
  */
 namespace Magento\Paypal\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Payment\Model\Method\ConfigInterface;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Paypal\Model\Config;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class AbstractConfig
@@ -269,12 +268,12 @@ public function isMethodActive($method)
             case Config::METHOD_WPS_EXPRESS:
             case Config::METHOD_WPP_EXPRESS:
                 $isEnabled = $this->_scopeConfig->isSetFlag(
-                    'payment/' . Config::METHOD_WPS_EXPRESS .'/active',
+                    'payment/' . Config::METHOD_WPS_EXPRESS . '/active',
                     ScopeInterface::SCOPE_STORE,
                     $this->_storeId
                 )
                 || $this->_scopeConfig->isSetFlag(
-                    'payment/' . Config::METHOD_WPP_EXPRESS .'/active',
+                    'payment/' . Config::METHOD_WPP_EXPRESS . '/active',
                     ScopeInterface::SCOPE_STORE,
                     $this->_storeId
                 );
@@ -283,12 +282,12 @@ public function isMethodActive($method)
             case Config::METHOD_WPS_BML:
             case Config::METHOD_WPP_BML:
                 $isEnabled = $this->_scopeConfig->isSetFlag(
-                    'payment/' . Config::METHOD_WPS_BML .'/active',
+                    'payment/' . Config::METHOD_WPS_BML . '/active',
                     ScopeInterface::SCOPE_STORE,
                     $this->_storeId
                 )
                 || $this->_scopeConfig->isSetFlag(
-                    'payment/' . Config::METHOD_WPP_BML .'/active',
+                    'payment/' . Config::METHOD_WPP_BML . '/active',
                     ScopeInterface::SCOPE_STORE,
                     $this->_storeId
                 );
@@ -297,12 +296,12 @@ public function isMethodActive($method)
             case Config::METHOD_PAYMENT_PRO:
             case Config::METHOD_PAYFLOWPRO:
                 $isEnabled = $this->_scopeConfig->isSetFlag(
-                    'payment/' . Config::METHOD_PAYMENT_PRO .'/active',
+                    'payment/' . Config::METHOD_PAYMENT_PRO . '/active',
                     ScopeInterface::SCOPE_STORE,
                     $this->_storeId
                 )
                 || $this->_scopeConfig->isSetFlag(
-                    'payment/' . Config::METHOD_PAYFLOWPRO .'/active',
+                    'payment/' . Config::METHOD_PAYFLOWPRO . '/active',
                     ScopeInterface::SCOPE_STORE,
                     $this->_storeId
                 );
diff --git a/app/code/Magento/Paypal/Model/BillingAgreementConfigProvider.php b/app/code/Magento/Paypal/Model/BillingAgreementConfigProvider.php
index b225b366045c9..3b00d60ed05d7 100644
--- a/app/code/Magento/Paypal/Model/BillingAgreementConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/BillingAgreementConfigProvider.php
@@ -6,8 +6,8 @@
 namespace Magento\Paypal\Model;
 
 use Magento\Checkout\Model\ConfigProviderInterface;
-use Magento\Paypal\Model\Billing\AgreementFactory;
 use Magento\Customer\Helper\Session\CurrentCustomer;
+use Magento\Paypal\Model\Billing\AgreementFactory;
 use Magento\Paypal\Model\Payment\Method\Billing\AbstractAgreement;
 
 /**
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 08b646a661898..2a1ed96133f0f 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -19,7 +19,6 @@
  */
 class Config extends AbstractConfig
 {
-
     use Formatter;
 
     /**
diff --git a/app/code/Magento/Paypal/Model/Config/Rules/Reader.php b/app/code/Magento/Paypal/Model/Config/Rules/Reader.php
index cc2a433284476..15a08fa4db4de 100644
--- a/app/code/Magento/Paypal/Model/Config/Rules/Reader.php
+++ b/app/code/Magento/Paypal/Model/Config/Rules/Reader.php
@@ -6,10 +6,9 @@
 namespace Magento\Paypal\Model\Config\Rules;
 
 use Magento\Framework\Config\FileResolverInterface;
+use Magento\Framework\Config\Reader\Filesystem;
 use Magento\Framework\Config\SchemaLocatorInterface;
 use Magento\Framework\Config\ValidationStateInterface;
-use Magento\Framework\DataObject;
-use Magento\Framework\Config\Reader\Filesystem;
 use Magento\Paypal\Helper\Backend;
 
 /**
diff --git a/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php b/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
index c2056aea08c00..3ca85c82f7a24 100644
--- a/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
+++ b/app/code/Magento/Paypal/Model/Config/Structure/Element/FieldPlugin.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Paypal\Model\Config\Structure\Element;
 
-use Magento\Framework\App\RequestInterface;
 use Magento\Config\Model\Config\Structure\Element\Field as FieldConfigStructure;
+use Magento\Framework\App\RequestInterface;
 use Magento\Paypal\Model\Config\StructurePlugin as ConfigStructurePlugin;
 
 /**
diff --git a/app/code/Magento/Paypal/Model/Config/StructurePlugin.php b/app/code/Magento/Paypal/Model/Config/StructurePlugin.php
index f103583994bc9..4b2d3ac2cdf5c 100644
--- a/app/code/Magento/Paypal/Model/Config/StructurePlugin.php
+++ b/app/code/Magento/Paypal/Model/Config/StructurePlugin.php
@@ -9,8 +9,8 @@
 use Magento\Config\Model\Config\Structure;
 use Magento\Config\Model\Config\Structure\Element\Section;
 use Magento\Config\Model\Config\Structure\ElementInterface;
-use Magento\Paypal\Helper\Backend as BackendHelper;
 use Magento\Framework\App\ObjectManager;
+use Magento\Paypal\Helper\Backend as BackendHelper;
 use Magento\Paypal\Model\Config\Structure\PaymentSectionModifier;
 
 /**
diff --git a/app/code/Magento/Paypal/Model/Express.php b/app/code/Magento/Paypal/Model/Express.php
index accb22b265335..ac403d4249781 100644
--- a/app/code/Magento/Paypal/Model/Express.php
+++ b/app/code/Magento/Paypal/Model/Express.php
@@ -9,10 +9,10 @@
 use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
 use Magento\Paypal\Model\Express\Checkout as ExpressCheckout;
 use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Model\Quote;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\Order\Payment\Transaction;
-use Magento\Quote\Model\Quote;
 use Magento\Store\Model\ScopeInterface;
 
 /**
diff --git a/app/code/Magento/Paypal/Model/Express/QuotePlugin.php b/app/code/Magento/Paypal/Model/Express/QuotePlugin.php
index 0535c64c5935a..d0510ce87b57e 100644
--- a/app/code/Magento/Paypal/Model/Express/QuotePlugin.php
+++ b/app/code/Magento/Paypal/Model/Express/QuotePlugin.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Paypal\Model\Express;
 
-use Magento\Quote\Model\QuoteRepository\SaveHandler;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Quote\ProductOptionFactory;
+use Magento\Quote\Model\QuoteRepository\SaveHandler;
 
 /**
  * Plugin for Magento\Quote\Model\QuoteRepository\SaveHandler
@@ -30,7 +30,7 @@ public function __construct(
     ) {
         $this->productOptionFactory = $productOptionFactory;
     }
-    
+
     /**
      * Replace cart item product options for disabled quote.
      *
diff --git a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
index 518e8b12bfcd5..1f7e886660720 100644
--- a/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/ExpressConfigProvider.php
@@ -6,8 +6,8 @@
 namespace Magento\Paypal\Model;
 
 use Magento\Checkout\Model\ConfigProviderInterface;
-use Magento\Framework\Locale\ResolverInterface;
 use Magento\Customer\Helper\Session\CurrentCustomer;
+use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Payment\Helper\Data as PaymentHelper;
 use Magento\Paypal\Helper\Data as PaypalHelper;
diff --git a/app/code/Magento/Paypal/Model/Hostedpro.php b/app/code/Magento/Paypal/Model/Hostedpro.php
index 24701e084d7d6..3a2bfd774cffb 100644
--- a/app/code/Magento/Paypal/Model/Hostedpro.php
+++ b/app/code/Magento/Paypal/Model/Hostedpro.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Payment\Model\InfoInterface;
-use Magento\Paypal\Model\Config;
 use Magento\Paypal\Model\Hostedpro\Request;
 use Magento\Sales\Model\Order;
 
diff --git a/app/code/Magento/Paypal/Model/Hostedpro/Request.php b/app/code/Magento/Paypal/Model/Hostedpro/Request.php
index 3bb8b162fb831..aa26083333fa7 100644
--- a/app/code/Magento/Paypal/Model/Hostedpro/Request.php
+++ b/app/code/Magento/Paypal/Model/Hostedpro/Request.php
@@ -182,7 +182,7 @@ protected function getAmountData(Order $order)
     private function getNonTaxableAmount(Order $order)
     {
         // PayPal denied transaction with 0 amount
-        $subtotal = $order->getBaseSubtotal() ? : $order->getPayment()->getBaseAmountAuthorized();
+        $subtotal = $order->getBaseSubtotal() ?: $order->getPayment()->getBaseAmountAuthorized();
 
         return [
             'subtotal' => $this->formatPrice($subtotal),
diff --git a/app/code/Magento/Paypal/Model/Ipn.php b/app/code/Magento/Paypal/Model/Ipn.php
index aa019ce276d3b..5571b031ab284 100644
--- a/app/code/Magento/Paypal/Model/Ipn.php
+++ b/app/code/Magento/Paypal/Model/Ipn.php
@@ -11,7 +11,6 @@
 use Exception;
 use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
-use Magento\Paypal\Model\Info;
 
 /**
  * PayPal Instant Payment Notification processor model
diff --git a/app/code/Magento/Paypal/Model/Method/Checks/SpecificationPlugin.php b/app/code/Magento/Paypal/Model/Method/Checks/SpecificationPlugin.php
index b90a2cfbfe045..635243e10dd47 100644
--- a/app/code/Magento/Paypal/Model/Method/Checks/SpecificationPlugin.php
+++ b/app/code/Magento/Paypal/Model/Method/Checks/SpecificationPlugin.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Paypal\Model\Method\Checks;
 
-use Magento\Payment\Model\MethodInterface;
 use Magento\Payment\Model\Checks\SpecificationInterface;
-use Magento\Paypal\Model\Config;
+use Magento\Payment\Model\MethodInterface;
 use Magento\Paypal\Model\Billing\AgreementFactory;
+use Magento\Paypal\Model\Config;
 use Magento\Quote\Model\Quote;
 
 /**
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
index 9d215ca6cbe17..8b4cf16bb3dd4 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
@@ -5,13 +5,12 @@
  */
 namespace Magento\Paypal\Model\Payflow\Service\Request;
 
-use Magento\Framework\Math\Random;
 use Magento\Framework\DataObject;
+use Magento\Framework\Math\Random;
 use Magento\Framework\UrlInterface;
 use Magento\Paypal\Model\Payflow\Transparent;
 use Magento\Paypal\Model\Payflowpro;
 use Magento\Quote\Model\Quote;
-use Magento\Sales\Model\Order\Payment;
 
 /**
  * Class SecureToken
@@ -43,7 +42,6 @@ public function __construct(
         Random $mathRandom,
         Transparent $transparent
     ) {
-
         $this->url = $url;
         $this->mathRandom = $mathRandom;
         $this->transparent = $transparent;
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
index 06a8a5b680bf4..400fa71b83e4a 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Transaction.php
@@ -6,12 +6,12 @@
 namespace Magento\Paypal\Model\Payflow\Service\Response;
 
 use Magento\Framework\DataObject;
+use Magento\Framework\Session\Generic;
 use Magento\Payment\Model\Method\Logger;
 use Magento\Paypal\Model\Payflow\Service\Response\Handler\HandlerInterface;
-use Magento\Framework\Session\Generic;
+use Magento\Paypal\Model\Payflow\Transparent;
 use Magento\Paypal\Model\Payflowpro;
 use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Paypal\Model\Payflow\Transparent;
 use Magento\Quote\Api\PaymentMethodManagementInterface;
 use Magento\Quote\Model\Quote\Payment;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/ResponseValidator.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/ResponseValidator.php
index f79b3048600be..5779476b2a115 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/ResponseValidator.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/ResponseValidator.php
@@ -6,10 +6,10 @@
 namespace Magento\Paypal\Model\Payflow\Service\Response\Validator;
 
 use Magento\Framework\DataObject;
-use Magento\Paypal\Model\Payflow\Transparent;
-use Magento\Paypal\Model\Payflowpro;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Paypal\Model\Payflow\Service\Response\ValidatorInterface;
+use Magento\Paypal\Model\Payflow\Transparent;
+use Magento\Paypal\Model\Payflowpro;
 
 /**
  * Class ResponseValidator
diff --git a/app/code/Magento/Paypal/Model/Payflow/Transparent.php b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
index c161580c1b7f1..8365f93271992 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Transparent.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
@@ -5,18 +5,18 @@
  */
 namespace Magento\Paypal\Model\Payflow;
 
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\State\InvalidTransitionException;
 use Magento\Payment\Helper\Formatter;
 use Magento\Payment\Model\InfoInterface;
-use Magento\Paypal\Model\Payflowpro;
-use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
-use Magento\Sales\Model\Order\Payment;
-use Magento\Paypal\Model\Payflow\Service\Gateway;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Payment\Model\Method\TransparentInterface;
 use Magento\Payment\Model\Method\ConfigInterfaceFactory;
-use Magento\Framework\Exception\State\InvalidTransitionException;
+use Magento\Payment\Model\Method\TransparentInterface;
+use Magento\Paypal\Model\Payflow\Service\Gateway;
 use Magento\Paypal\Model\Payflow\Service\Response\Handler\HandlerInterface;
 use Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator;
+use Magento\Paypal\Model\Payflowpro;
+use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
+use Magento\Sales\Model\Order\Payment;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory;
 
diff --git a/app/code/Magento/Paypal/Model/Payflow/Ui/TokenUiComponentProvider.php b/app/code/Magento/Paypal/Model/Payflow/Ui/TokenUiComponentProvider.php
index 96d29f98e3d31..195af8d9951bd 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Ui/TokenUiComponentProvider.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Ui/TokenUiComponentProvider.php
@@ -8,8 +8,8 @@
 use Magento\Paypal\Model\Payflow\Transparent;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Model\Ui\TokenUiComponentInterface;
-use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
 use Magento\Vault\Model\Ui\TokenUiComponentInterfaceFactory;
+use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
 
 /**
  * Class TokenUiComponentProvider
diff --git a/app/code/Magento/Paypal/Model/Pro.php b/app/code/Magento/Paypal/Model/Pro.php
index 1bb6c48f6ba94..e9dc8346adfd5 100644
--- a/app/code/Magento/Paypal/Model/Pro.php
+++ b/app/code/Magento/Paypal/Model/Pro.php
@@ -10,7 +10,6 @@
 
 use Magento\Paypal\Model\Api\AbstractApi;
 use Magento\Sales\Api\TransactionRepositoryInterface;
-use Magento\Paypal\Model\Info;
 
 /**
  * PayPal Website Payments Pro implementation for payment method instances
diff --git a/app/code/Magento/Paypal/Model/Report/Settlement.php b/app/code/Magento/Paypal/Model/Report/Settlement.php
index cca58e1770791..801d6a5b57769 100644
--- a/app/code/Magento/Paypal/Model/Report/Settlement.php
+++ b/app/code/Magento/Paypal/Model/Report/Settlement.php
@@ -9,7 +9,6 @@
 namespace Magento\Paypal\Model\Report;
 
 use DateTime;
-use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\DirectoryList;
 
 /**
@@ -416,7 +415,7 @@ private function getBodyItems(array $line, array $sectionColumns, array $rowMap)
     {
         $bodyItem = [];
         for ($i = 1, $count = count($line); $i < $count; $i++) {
-            if(isset($rowMap[$sectionColumns[$i]])) {
+            if (isset($rowMap[$sectionColumns[$i]])) {
                 if (in_array($rowMap[$sectionColumns[$i]], $this->dateTimeColumns)) {
                     $line[$i] = $this->formatDateTimeColumns($line[$i]);
                 }
diff --git a/app/code/Magento/Paypal/Model/System/Config/Backend/Cert.php b/app/code/Magento/Paypal/Model/System/Config/Backend/Cert.php
index 600c70cf3c57d..526f2e35c398d 100644
--- a/app/code/Magento/Paypal/Model/System/Config/Backend/Cert.php
+++ b/app/code/Magento/Paypal/Model/System/Config/Backend/Cert.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Paypal\Model\System\Config\Backend;
 
-use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\DirectoryList;
 
 /**
diff --git a/app/code/Magento/Paypal/Observer/AddBillingAgreementToSessionObserver.php b/app/code/Magento/Paypal/Observer/AddBillingAgreementToSessionObserver.php
index 8178d725f6949..06f7199a5e290 100644
--- a/app/code/Magento/Paypal/Observer/AddBillingAgreementToSessionObserver.php
+++ b/app/code/Magento/Paypal/Observer/AddBillingAgreementToSessionObserver.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Paypal\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * PayPal module observer
diff --git a/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php b/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
index 58edf68f3475e..1f3718baa816f 100644
--- a/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
+++ b/app/code/Magento/Paypal/Observer/AddPaypalShortcutsObserver.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Paypal\Observer;
 
-use Magento\Paypal\Helper\Shortcut\Factory;
+use Magento\Framework\Event\Observer as EventObserver;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Paypal\Helper\Shortcut\Factory;
 use Magento\Paypal\Model\Config as PaypalConfig;
-use Magento\Framework\Event\Observer as EventObserver;
 
 /**
  * PayPal module observer
@@ -50,8 +50,7 @@ public function execute(EventObserver $observer)
         /** @var \Magento\Catalog\Block\ShortcutButtons $shortcutButtons */
         $shortcutButtons = $observer->getEvent()->getContainer();
         $blocks = [
-            \Magento\Paypal\Block\Express\InContext\Minicart\Button::class =>
-                PaypalConfig::METHOD_WPS_EXPRESS,
+            \Magento\Paypal\Block\Express\InContext\Minicart\Button::class => PaypalConfig::METHOD_WPS_EXPRESS,
             \Magento\Paypal\Block\Express\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
             \Magento\Paypal\Block\Bml\Shortcut::class => PaypalConfig::METHOD_WPP_EXPRESS,
             \Magento\Paypal\Block\WpsExpress\Shortcut::class => PaypalConfig::METHOD_WPS_EXPRESS,
diff --git a/app/code/Magento/Paypal/Observer/HtmlTransactionIdObserver.php b/app/code/Magento/Paypal/Observer/HtmlTransactionIdObserver.php
index 9f62f52a1ac79..d45583f7bbbaf 100644
--- a/app/code/Magento/Paypal/Observer/HtmlTransactionIdObserver.php
+++ b/app/code/Magento/Paypal/Observer/HtmlTransactionIdObserver.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Paypal\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * PayPal module observer
diff --git a/app/code/Magento/Paypal/Observer/RestrictAdminBillingAgreementUsageObserver.php b/app/code/Magento/Paypal/Observer/RestrictAdminBillingAgreementUsageObserver.php
index 5d3970770199c..bee6193964593 100644
--- a/app/code/Magento/Paypal/Observer/RestrictAdminBillingAgreementUsageObserver.php
+++ b/app/code/Magento/Paypal/Observer/RestrictAdminBillingAgreementUsageObserver.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Paypal\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 class RestrictAdminBillingAgreementUsageObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/Paypal/Observer/SaveOrderAfterSubmitObserver.php b/app/code/Magento/Paypal/Observer/SaveOrderAfterSubmitObserver.php
index 6900176702700..903d3e6abf7ab 100644
--- a/app/code/Magento/Paypal/Observer/SaveOrderAfterSubmitObserver.php
+++ b/app/code/Magento/Paypal/Observer/SaveOrderAfterSubmitObserver.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Paypal\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * PayPal module observer
diff --git a/app/code/Magento/Paypal/Observer/SetResponseAfterSaveOrderObserver.php b/app/code/Magento/Paypal/Observer/SetResponseAfterSaveOrderObserver.php
index 0e05791dc875d..4ed5e78c055f7 100644
--- a/app/code/Magento/Paypal/Observer/SetResponseAfterSaveOrderObserver.php
+++ b/app/code/Magento/Paypal/Observer/SetResponseAfterSaveOrderObserver.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Paypal\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 
 /**
  * PayPal module observer
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/Store/SwitcherPluginTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/Store/SwitcherPluginTest.php
index ed0da1fb0dd4e..53dfbbbc44bcc 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/Store/SwitcherPluginTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/Store/SwitcherPluginTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Paypal\Test\Unit\Block\Adminhtml\Store;
 
-use Magento\Paypal\Block\Adminhtml\Store\SwitcherPlugin as StoreSwitcherBlockPlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Backend\Block\Store\Switcher as StoreSwitcherBlock;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Paypal\Block\Adminhtml\Store\SwitcherPlugin as StoreSwitcherBlockPlugin;
 use Magento\Paypal\Model\Config\StructurePlugin as ConfigStructurePlugin;
 
 class SwitcherPluginTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
index 60451a9827097..de2f84c8677e3 100644
--- a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
@@ -9,7 +9,6 @@
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Session\Generic;
 use Magento\Framework\Session\SessionManager;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Paypal\Controller\Transparent\RequestSecureToken;
 use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
 use Magento\Paypal\Model\Payflow\Transparent;
@@ -63,7 +62,6 @@ class RequestSecureTokenTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-
         $this->contextMock = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Paypal/Test/Unit/Cron/FetchReportsTest.php b/app/code/Magento/Paypal/Test/Unit/Cron/FetchReportsTest.php
index 2f9426e5f902a..ea00ef1456169 100644
--- a/app/code/Magento/Paypal/Test/Unit/Cron/FetchReportsTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Cron/FetchReportsTest.php
@@ -73,7 +73,7 @@ public function testExecuteThrowsException()
             ->willReturn($settlementMock);
 
         $settlementMock->expects($this->once())->method('getSftpCredentials')->with(true)->willReturn($sftpCredentials);
-        $settlementMock->expects($this->any())->method('fetchAndSave')->willThrowException(new \Exception);
+        $settlementMock->expects($this->any())->method('fetchAndSave')->willThrowException(new \Exception());
         $this->logger->expects($this->never())->method('critical');
 
         $this->fetchReports->execute();
diff --git a/app/code/Magento/Paypal/Test/Unit/CustomerData/BillingAgreementTest.php b/app/code/Magento/Paypal/Test/Unit/CustomerData/BillingAgreementTest.php
index 010c3f8f71de6..8798ed50766b6 100644
--- a/app/code/Magento/Paypal/Test/Unit/CustomerData/BillingAgreementTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/CustomerData/BillingAgreementTest.php
@@ -6,11 +6,11 @@
 namespace Magento\Paypal\Test\Unit\CustomerData;
 
 use Magento\Customer\Helper\Session\CurrentCustomer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Paypal\CustomerData\BillingAgreement;
 use Magento\Paypal\Helper\Data;
 use Magento\Paypal\Model\Config;
 use Magento\Paypal\Model\ConfigFactory;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class BillingAgreementTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Paypal/Test/Unit/Helper/BackendTest.php b/app/code/Magento/Paypal/Test/Unit/Helper/BackendTest.php
index fd8a8a3c41f11..372752bdf0564 100644
--- a/app/code/Magento/Paypal/Test/Unit/Helper/BackendTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Helper/BackendTest.php
@@ -149,7 +149,6 @@ private function configurationCountryCodePrepareRequest($request)
      */
     private function configurationCountryCodePrepareConfig($config)
     {
-
         $this->scopeDefiner->expects($this->once())
             ->method('getScope')
             ->willReturn(self::SCOPE);
diff --git a/app/code/Magento/Paypal/Test/Unit/Helper/Shortcut/FactoryTest.php b/app/code/Magento/Paypal/Test/Unit/Helper/Shortcut/FactoryTest.php
index 88bdab81ac20d..e5b9aff2b7e9a 100644
--- a/app/code/Magento/Paypal/Test/Unit/Helper/Shortcut/FactoryTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Helper/Shortcut/FactoryTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Paypal\Test\Unit\Helper\Shortcut;
 
-use Magento\Paypal\Helper\Shortcut\Factory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Paypal\Helper\Shortcut\Factory;
 
 class FactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
index bb25bea63a8bc..7f6398d557cec 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
@@ -6,10 +6,10 @@
 namespace Magento\Paypal\Test\Unit\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\ScopeInterface as ModelScopeInterface;
-use Magento\Payment\Model\MethodInterface;
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Payment\Model\MethodInterface;
+use Magento\Store\Model\ScopeInterface as ModelScopeInterface;
 
 /**
  * Class AbstractConfigTest
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTesting.php b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTesting.php
index ec347096ffcf3..b237205d9ea28 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTesting.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTesting.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Paypal\Test\Unit\Model;
 
-use \Magento\Paypal\Model\AbstractConfig;
+use Magento\Paypal\Model\AbstractConfig;
 
 /**
  * Class AbstractConfigTesting
@@ -13,5 +13,4 @@
  */
 class AbstractConfigTesting extends AbstractConfig
 {
-
 }
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
index c0b2bb4fc1dca..80f90f358b3c3 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
@@ -244,7 +244,7 @@ public function testGetDebugReplacePrivateDataKeys()
      * been completed for this token'. It must does not throws the exception and
      * must returns response array.
      */
-    public function testCallTransactionHasBeenCompleted ()
+    public function testCallTransactionHasBeenCompleted()
     {
         $response =    "\r\n" . 'ACK[7]=Failure&L_ERRORCODE0[5]=10415'
             . '&L_SHORTMESSAGE0[8]=Message.&L_LONGMESSAGE0[15]=Long%20Message.';
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php b/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
index f9bb74dba5b53..f1c4afee9755f 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
@@ -244,8 +244,7 @@ protected function _prepareInvalidModelData($values, $transferDiscount)
     {
         $taxContainer = new \Magento\Framework\DataObject(
             [
-                'base_discount_tax_compensation_amount' =>
-                    $values['base_discount_tax_compensation_amount'],
+                'base_discount_tax_compensation_amount' => $values['base_discount_tax_compensation_amount'],
                 'base_shipping_discount_tax_compensation_amnt' =>
                     $values['base_shipping_discount_tax_compensation_amnt'],
             ]
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php
index 8615b91383aaa..9b81514418825 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/Element/FieldPluginTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Paypal\Test\Unit\Model\Config\Structure\Element;
 
-use Magento\Paypal\Model\Config\Structure\Element\FieldPlugin as FieldConfigStructurePlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\App\RequestInterface;
 use Magento\Config\Model\Config\Structure\Element\Field as FieldConfigStructureMock;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Paypal\Model\Config\Structure\Element\FieldPlugin as FieldConfigStructurePlugin;
 
 class FieldPluginTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php
index 979bb34a782dc..5393063f835b2 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Config/StructurePluginTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Paypal\Test\Unit\Model\Config;
 
-use Magento\Paypal\Model\Config\StructurePlugin as ConfigStructurePlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Config\Model\Config\ScopeDefiner as ConfigScopeDefiner;
-use Magento\Paypal\Helper\Backend as BackendHelper;
 use Magento\Config\Model\Config\Structure as ConfigStructure;
 use Magento\Config\Model\Config\Structure\ElementInterface as ElementConfigStructure;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Paypal\Helper\Backend as BackendHelper;
+use Magento\Paypal\Model\Config\StructurePlugin as ConfigStructurePlugin;
 
 class StructurePluginTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Express/CheckoutTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Express/CheckoutTest.php
index c24aae2598661..d33bc7437d9b7 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Express/CheckoutTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Express/CheckoutTest.php
@@ -8,10 +8,10 @@
 
 namespace Magento\Paypal\Test\Unit\Model\Express;
 
+use Magento\Quote\Api\Data\CartExtensionInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Shipping;
 use Magento\Quote\Model\ShippingAssignment;
-use Magento\Quote\Api\Data\CartExtensionInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Method/Checks/SpecificationPluginTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Method/Checks/SpecificationPluginTest.php
index 1b3cf081685e1..8d3708dcdeea2 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Method/Checks/SpecificationPluginTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Method/Checks/SpecificationPluginTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Paypal\Test\Unit\Model\Method\Checks;
 
-use Magento\Paypal\Model\Method\Checks\SpecificationPlugin;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Paypal\Model\Billing\AgreementFactory as BillingAgreementFactory;
 use Magento\Payment\Model\Checks\SpecificationInterface;
 use Magento\Payment\Model\MethodInterface;
-use Magento\Quote\Model\Quote;
-use Magento\Paypal\Model\ResourceModel\Billing\Agreement\Collection as BillingAgreementCollection;
 use Magento\Paypal\Model\Billing\Agreement as BillingAgreement;
+use Magento\Paypal\Model\Billing\AgreementFactory as BillingAgreementFactory;
+use Magento\Paypal\Model\Method\Checks\SpecificationPlugin;
+use Magento\Paypal\Model\ResourceModel\Billing\Agreement\Collection as BillingAgreementCollection;
+use Magento\Quote\Model\Quote;
 
 class SpecificationPluginTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Request/SecureTokenTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Request/SecureTokenTest.php
index d4a7db25cae89..8b145d83347e0 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Request/SecureTokenTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Request/SecureTokenTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Paypal\Test\Unit\Model\Payflow\Service\Request;
 
-use Magento\Framework\Math\Random;
 use Magento\Framework\DataObject;
+use Magento\Framework\Math\Random;
 use Magento\Framework\UrlInterface;
 use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
 use Magento\Paypal\Model\Payflow\Transparent;
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/CreditCardValidationHandlerTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/CreditCardValidationHandlerTest.php
index d4eee7d49b5fa..5fbbcd9f38ee9 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/CreditCardValidationHandlerTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/CreditCardValidationHandlerTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Paypal\Test\Unit\Model\Payflow\Service\Response\Handler;
 
-use Magento\Framework\DataObject;
 use Magento\Paypal\Model\Info;
 use Magento\Paypal\Model\Payflow\Service\Response\Handler\CreditCardValidationHandler;
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/FraudHandlerTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/FraudHandlerTest.php
index e0a5c8c88c66a..22650caae836a 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/FraudHandlerTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Handler/FraudHandlerTest.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Paypal\Test\Unit\Model\Payflow\Service\Response\Handler;
 
-use Magento\Framework\DataObject;
 use Magento\Payment\Model\InfoInterface;
-use Magento\Paypal\Model\Payflow\Service\Response\Handler\FraudHandler;
 use Magento\Paypal\Model\Info;
+use Magento\Paypal\Model\Payflow\Service\Response\Handler\FraudHandler;
 use Magento\Paypal\Model\Payflowpro;
 
 class FraudHandlerTest extends \PHPUnit\Framework\TestCase
@@ -145,16 +144,11 @@ private function getRulesExpectedDictionary()
         return [
             'Total Purchase Price Ceiling' =>
                 'The purchase amount of 7501 is greater than the ceiling value set of 7500',
-            'Total ItemCeiling' =>
-                '16 items were ordered, which is overthe maximum allowed quantity of 15',
-            'Shipping/BillingMismatch' =>
-                'Thebilling and shipping addresses did not match',
-            'BIN Risk List Match' =>
-                'The card number is in a high risk bin list',
-            'Zip Risk List Match' =>
-                'High risk shipping zip',
-            'USPS Address Validation Failure' =>
-                'The billing address is not a valid USAddress'
+            'Total ItemCeiling' => '16 items were ordered, which is overthe maximum allowed quantity of 15',
+            'Shipping/BillingMismatch' => 'Thebilling and shipping addresses did not match',
+            'BIN Risk List Match' => 'The card number is in a high risk bin list',
+            'Zip Risk List Match' => 'High risk shipping zip',
+            'USPS Address Validation Failure' => 'The billing address is not a valid USAddress'
         ];
     }
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
index 93a1072782448..e564a0c578697 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/TransactionTest.php
@@ -57,7 +57,7 @@ public function testSavePaymentInQuote()
             ]
         );
 
-        $transactionService->savePaymentInQuote(new DataObject);
+        $transactionService->savePaymentInQuote(new DataObject());
     }
 
     /**
@@ -67,7 +67,7 @@ public function gatewayResponseInvariants()
     {
         return [
             "Input data is a string" => ['testInput'],
-            "Input data is an object" => [new \stdClass],
+            "Input data is an object" => [new \stdClass()],
             "Input data is an array" => [['test' => 'input']]
         ];
     }
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/CVV2MatchTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/CVV2MatchTest.php
index 8df9659b59a3d..455e26a898406 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/CVV2MatchTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/CVV2MatchTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Paypal\Test\Unit\Model\Payflow\Service\Response\Validator;
 
+use Magento\Payment\Model\Method\ConfigInterface;
 use Magento\Paypal\Model\Payflow\Service\Response\Validator\CVV2Match;
 use Magento\Paypal\Model\Payflow\Transparent;
-use Magento\Payment\Model\Method\ConfigInterface;
 
 /**
  * Class CVV2MatchTest
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/ResponseValidatorTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/ResponseValidatorTest.php
index 5d7b351c23618..b0ea75f7ac661 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/ResponseValidatorTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Response/Validator/ResponseValidatorTest.php
@@ -6,10 +6,10 @@
 namespace Magento\Paypal\Test\Unit\Model\Payflow\Service\Response\Validator;
 
 use Magento\Framework\DataObject;
+use Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator;
+use Magento\Paypal\Model\Payflow\Service\Response\ValidatorInterface;
 use Magento\Paypal\Model\Payflow\Transparent;
 use Magento\Paypal\Model\Payflowpro;
-use Magento\Paypal\Model\Payflow\Service\Response\ValidatorInterface;
-use Magento\Paypal\Model\Payflow\Service\Response\Validator\ResponseValidator;
 
 /**
  * Class ResponseValidatorTest
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
index 9b67cedb47885..4a82533402ef2 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Paypal\Test\Unit\Model\Payflow;
 
 use Magento\Paypal\Block\Payment\Info;
-use Magento\Paypal\Model\Payflowpro;
 use Magento\Paypal\Model\Payflow\Transparent;
+use Magento\Paypal\Model\Payflowpro;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Model\CreditCardTokenFactory;
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/PayflowConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/PayflowConfigTest.php
index a0c6f1dc880fc..a96fb14e03b48 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/PayflowConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/PayflowConfigTest.php
@@ -7,10 +7,10 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Paypal\Model\PayflowConfig;
-use Magento\Payment\Model\MethodInterface;
 use Magento\Payment\Model\Method\AbstractMethod;
+use Magento\Payment\Model\MethodInterface;
 use Magento\Paypal\Model\Config;
+use Magento\Paypal\Model\PayflowConfig;
 use Magento\Store\Model\ScopeInterface;
 
 /**
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/PayflowExpressTest.php b/app/code/Magento/Paypal/Test/Unit/Model/PayflowExpressTest.php
index 7a96443f3a4f8..9693f7e589dc5 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/PayflowExpressTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/PayflowExpressTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Paypal\Test\Unit\Model;
 
-use Magento\Sales\Model\Order\Payment\Transaction;
 use Magento\Paypal\Model\Payflow;
+use Magento\Sales\Model\Order\Payment\Transaction;
 
 class PayflowExpressTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php b/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php
index 362615e965d1b..85a45cce73ca6 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/PayflowlinkTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Paypal\Test\Unit\Model;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Paypal\Block\Payment\Info;
 use Magento\Paypal\Model\Payflowlink;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php b/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php
index c9689c8601a02..3597a72e2339d 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/PayflowproTest.php
@@ -7,10 +7,10 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DataObject;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\HTTP\ZendClient;
 use Magento\Framework\HTTP\ZendClientFactory;
+use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Model\Method\ConfigInterface;
 use Magento\Payment\Model\Method\ConfigInterfaceFactory;
 use Magento\Paypal\Model\Config;
@@ -19,7 +19,6 @@
 use Magento\Paypal\Model\Payflowpro;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Payment\Model\InfoInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Payment/Method/Billing/AbstractAgreementStub.php b/app/code/Magento/Paypal/Test/Unit/Model/Payment/Method/Billing/AbstractAgreementStub.php
index ecf1549140b60..271fc33ba7a10 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Payment/Method/Billing/AbstractAgreementStub.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Payment/Method/Billing/AbstractAgreementStub.php
@@ -18,10 +18,11 @@ public function getCode()
     {
         return static::STUB_CODE;
     }
-    
+
     /**
      * @param object $quote
      * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function _isAvailable($quote)
     {
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php
index 9cf32b99ff510..5d13d24229c69 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php
@@ -26,7 +26,7 @@ class ProTest extends \PHPUnit\Framework\TestCase
      */
     protected $pro;
     /** @var \PHPUnit_Framework_MockObject_MockObject */
-    protected  $apiMock;
+    protected $apiMock;
 
     protected function setUp()
     {
@@ -212,7 +212,7 @@ protected function getApiFactory(ObjectManager $objectHelper)
         );
         $this->apiMock = $this->getMockBuilder($apiType)
             ->setConstructorArgs($args)
-            ->setMethods(['__wakeup', 'getTransactionId', 'getDataUsingMethod', 'setAuthorizationId', 'setIsCaptureComplete', 'setAmount', ])
+            ->setMethods(['__wakeup', 'getTransactionId', 'getDataUsingMethod', 'setAuthorizationId', 'setIsCaptureComplete', 'setAmount'])
             ->getMock();
 
         $apiFactory->expects(static::any())->method('create')->with($apiType)->willReturn($this->apiMock);
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/additional_info_data.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/additional_info_data.php
index 683359556965e..e486f06a57a7c 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/additional_info_data.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/additional_info_data.php
@@ -78,7 +78,7 @@
             ],
             'last_trans_id' => [
                 'label' => 'Last Transaction ID',
-                'value' => NULL,
+                'value' => null,
             ]
         ],
     ],
@@ -147,7 +147,7 @@
             ],
             'last_trans_id' => [
                 'label' => 'Last Transaction ID',
-                'value' => NULL,
+                'value' => null,
             ]
         ]
     ]
diff --git a/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php b/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
index 7cb521073e309..b09a7208fcf15 100644
--- a/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Observer/AddPaypalShortcutsObserverTest.php
@@ -9,7 +9,6 @@
 use Magento\Catalog\Block\ShortcutInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\Event\Observer;
-use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Layout;
 use Magento\Paypal\Block\Express\InContext\Minicart\Button;
 use Magento\Paypal\Helper\Shortcut\Factory;
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml
index 74c020e4d5e8a..d085ab83d38ad 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml
@@ -1,5 +1,6 @@
 <?php
 use Magento\Vault\Model\Ui\TokenUiComponentProviderInterface;
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml
index f906a08425aa4..a24bb3a818841 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml
@@ -28,7 +28,7 @@
 
         <a class="action-default"
            data-paypal-button="true"
-           href="<?= /* @noEscape */ $block->escapeUrl($block->getSandboxButtonUrl(). '?' . $block->getQuery()) ?>"
+           href="<?= /* @noEscape */ $block->escapeUrl($block->getSandboxButtonUrl() . '?' . $block->getQuery()) ?>"
            target="PPFrame"><?= $block->escapeHtml($block->getSandboxButtonLabel()) ?></a>
     </div>
 </div>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
index cdd4779a2fd87..35f1c45ed04c5 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
@@ -128,7 +128,7 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
         </div>
     <?php endif; ?>
 
-    <?php if($block->isVaultEnabled()): ?>
+    <?php if ($block->isVaultEnabled()): ?>
         <div class="admin__field admin__field-option field-tooltip-content">
             <input type="checkbox"
                    id="<?= /* @noEscape */ $code ?>_vault"
diff --git a/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/success/billing_agreement.phtml b/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/success/billing_agreement.phtml
index adb78ae4c220a..1c78f859e26b2 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/success/billing_agreement.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/success/billing_agreement.phtml
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 /**
  * @var \Magento\Paypal\Block\Checkout\Onepage\Success\BillingAgreement $block
  */
diff --git a/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml b/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml
index ec6f7b4ad985e..0953dbb2d14f0 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
-
 /**
  * @var \Magento\Paypal\Block\Payflow\Link\Iframe $block
  * @see \Magento\Paypal\Block\Payflow\Link\Iframe
diff --git a/app/code/Magento/Paypal/view/frontend/templates/hss/review/button.phtml b/app/code/Magento/Paypal/view/frontend/templates/hss/review/button.phtml
index 1072c6bc30453..de810952fa2e0 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/hss/review/button.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/review/button.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
-
 ?>
 <button type="submit" data-role="review-save" title="<?= $block->escapeHtml(__('Continue')) ?>"
         class="button action checkout primary">
diff --git a/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml b/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
index f0f672492270a..90c562b7e2ba4 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 /**
  * @var \Magento\Paypal\Block\Logo $block
  * @see \Magento\Paypal\Block\Logo
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml
index cef3e2f0565ba..36b89fb33020a 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
-
 /**
  * @var \Magento\Paypal\Block\Payflow\Link\Iframe $block
  * @see \Magento\Paypal\Block\Payflow\Link\Iframe
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml
index 75cc2a09e9444..9daa1b061e51e 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
-
 /**
  * @var \Magento\Paypal\Block\Payflow\Link\Iframe $block
  */
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml b/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
index 934136281746c..faeac6f4edf14 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
@@ -24,9 +24,9 @@ $url = $block->escapeUrl($block->getPaymentAcceptanceMarkHref());
        ); return false;"
    class="action paypal about">
     <?php if ($block->getPaymentWhatIs()) {
-        echo $block->escapeHtml(__($block->getPaymentWhatIs()));
+    echo $block->escapeHtml(__($block->getPaymentWhatIs()));
 } else {
-        echo $block->escapeHtml(__('What is PayPal?'));
+    echo $block->escapeHtml(__('What is PayPal?'));
 } ?>
 </a>
 <!-- PayPal Logo -->
diff --git a/app/code/Magento/Persistent/Controller/Index.php b/app/code/Magento/Persistent/Controller/Index.php
index 3edb8af510a72..3608c1a164046 100644
--- a/app/code/Magento/Persistent/Controller/Index.php
+++ b/app/code/Magento/Persistent/Controller/Index.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Persistent\Controller;
 
-use Magento\Framework\App\Action\Action;
-use Magento\Framework\App\Action\Context;
-use Magento\Persistent\Model\QuoteManager;
 use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
 use Magento\Persistent\Helper\Session as SessionHelper;
+use Magento\Persistent\Model\QuoteManager;
 
 /**
  * Persistent front controller
diff --git a/app/code/Magento/Persistent/Controller/Index/ExpressCheckout.php b/app/code/Magento/Persistent/Controller/Index/ExpressCheckout.php
index 70fd4f9eb2904..d62fdeb26615c 100644
--- a/app/code/Magento/Persistent/Controller/Index/ExpressCheckout.php
+++ b/app/code/Magento/Persistent/Controller/Index/ExpressCheckout.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Persistent\Controller\Index;
 
-use Magento\Persistent\Controller\Index;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Persistent\Controller\Index;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Persistent/Controller/Index/SaveMethod.php b/app/code/Magento/Persistent/Controller/Index/SaveMethod.php
index 4db6f6a4c178d..9f26bcf7a1ff7 100644
--- a/app/code/Magento/Persistent/Controller/Index/SaveMethod.php
+++ b/app/code/Magento/Persistent/Controller/Index/SaveMethod.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Persistent\Controller\Index;
 
-use Magento\Persistent\Controller\Index;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Persistent\Controller\Index;
 
 class SaveMethod extends Index
 {
diff --git a/app/code/Magento/Persistent/Controller/Index/UnsetCookie.php b/app/code/Magento/Persistent/Controller/Index/UnsetCookie.php
index d796b68283a35..7309744d8c01b 100644
--- a/app/code/Magento/Persistent/Controller/Index/UnsetCookie.php
+++ b/app/code/Magento/Persistent/Controller/Index/UnsetCookie.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Persistent\Controller\Index;
 
-use Magento\Persistent\Controller\Index;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Persistent\Controller\Index;
 
 class UnsetCookie extends Index
 {
diff --git a/app/code/Magento/Persistent/Model/Checkout/AddressDataProcessorPlugin.php b/app/code/Magento/Persistent/Model/Checkout/AddressDataProcessorPlugin.php
index 3847ab96f3aeb..ccadf7554f2f7 100644
--- a/app/code/Magento/Persistent/Model/Checkout/AddressDataProcessorPlugin.php
+++ b/app/code/Magento/Persistent/Model/Checkout/AddressDataProcessorPlugin.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Persistent\Model\Checkout;
 
-use Magento\Quote\Api\Data\AddressAdditionalDataInterface as AddressAdditionalData;
-use Magento\Persistent\Helper\Session as PersistentSession;
-use Magento\Persistent\Helper\Data as PersistentHelper;
 use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Persistent\Helper\Data as PersistentHelper;
+use Magento\Persistent\Helper\Session as PersistentSession;
+use Magento\Quote\Api\Data\AddressAdditionalDataInterface as AddressAdditionalData;
 use Magento\Quote\Model\AddressAdditionalDataProcessor;
 
 class AddressDataProcessorPlugin
diff --git a/app/code/Magento/Persistent/Model/Checkout/ConfigProviderPlugin.php b/app/code/Magento/Persistent/Model/Checkout/ConfigProviderPlugin.php
index c7c64a32f030b..20047560df336 100644
--- a/app/code/Magento/Persistent/Model/Checkout/ConfigProviderPlugin.php
+++ b/app/code/Magento/Persistent/Model/Checkout/ConfigProviderPlugin.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Persistent\Model\Checkout;
 
-use Magento\Persistent\Helper\Session as PersistentSession;
-use Magento\Persistent\Helper\Data as PersistentHelper;
 use Magento\Checkout\Model\Session as CheckoutSession;
-use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Persistent\Helper\Data as PersistentHelper;
+use Magento\Persistent\Helper\Session as PersistentSession;
+use Magento\Quote\Model\QuoteIdMaskFactory;
 
 class ConfigProviderPlugin
 {
diff --git a/app/code/Magento/Persistent/Observer/ClearExpiredCronJobObserver.php b/app/code/Magento/Persistent/Observer/ClearExpiredCronJobObserver.php
index e155442c3e1e4..9016a02a63e31 100644
--- a/app/code/Magento/Persistent/Observer/ClearExpiredCronJobObserver.php
+++ b/app/code/Magento/Persistent/Observer/ClearExpiredCronJobObserver.php
@@ -6,8 +6,6 @@
  */
 namespace Magento\Persistent\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
-
 class ClearExpiredCronJobObserver
 {
     /**
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
index 7008a9eb25e5d..e711a39f6f1d6 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/ObserverTest.php
@@ -47,7 +47,6 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->persistentSessionMock = $this->getMockBuilder(\Magento\Persistent\Helper\Session::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/RemoveGuestPersistenceOnEmptyCartObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/RemoveGuestPersistenceOnEmptyCartObserverTest.php
index f1a07e0002bc3..623d9e0b1da72 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/RemoveGuestPersistenceOnEmptyCartObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/RemoveGuestPersistenceOnEmptyCartObserverTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Persistent\Test\Unit\Observer;
 
-use \Magento\Persistent\Observer\RemoveGuestPersistenceOnEmptyCartObserver;
+use Magento\Persistent\Observer\RemoveGuestPersistenceOnEmptyCartObserver;
 
 class RemoveGuestPersistenceOnEmptyCartObserverTest extends \PHPUnit\Framework\TestCase
 {
@@ -125,7 +125,7 @@ public function testExecuteWithEmptyCart()
     public function testExecuteWithNonexistentCart()
     {
         $customerId = 1;
-        $exception = new \Magento\Framework\Exception\NoSuchEntityException;
+        $exception = new \Magento\Framework\Exception\NoSuchEntityException();
 
         $this->persistentSessionMock->expects($this->once())->method('isPersistent')->willReturn(true);
         $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->willReturn(false);
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/RemovePersistentCookieOnRegisterObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/RemovePersistentCookieOnRegisterObserverTest.php
index ef3aa446172c0..67718c1167ddd 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/RemovePersistentCookieOnRegisterObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/RemovePersistentCookieOnRegisterObserverTest.php
@@ -9,7 +9,7 @@
 
 namespace Magento\Persistent\Test\Unit\Observer;
 
-use \Magento\Persistent\Observer\RemovePersistentCookieOnRegisterObserver;
+use Magento\Persistent\Observer\RemovePersistentCookieOnRegisterObserver;
 
 class RemovePersistentCookieOnRegisterObserverTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/ProductAlert/Controller/Add.php b/app/code/Magento/ProductAlert/Controller/Add.php
index 9498fa0e3d802..5f91b602157ce 100644
--- a/app/code/Magento/ProductAlert/Controller/Add.php
+++ b/app/code/Magento/ProductAlert/Controller/Add.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\ProductAlert\Controller;
 
+use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
-use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\App\RequestInterface;
 
 abstract class Add extends Action
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Price.php b/app/code/Magento/ProductAlert/Controller/Add/Price.php
index 6effaacd9624d..64900c8ece243 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Price.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\ProductAlert\Controller\Add;
 
-use Magento\ProductAlert\Controller\Add as AddController;
-use Magento\Framework\App\Action\Context;
-use Magento\Customer\Model\Session as CustomerSession;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\UrlInterface;
+use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\UrlInterface;
+use Magento\ProductAlert\Controller\Add as AddController;
+use Magento\Store\Model\StoreManagerInterface;
 
 class Price extends AddController
 {
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Stock.php b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
index 5b89b4b327ee0..37818522c7ac1 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Stock.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\ProductAlert\Controller\Add;
 
-use Magento\ProductAlert\Controller\Add as AddController;
-use Magento\Framework\App\Action\Context;
-use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\ProductAlert\Controller\Add as AddController;
 
 class Stock extends AddController
 {
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
index 9adf15a2e1347..ea4c965403166 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\ProductAlert\Controller\Unsubscribe;
 
-use Magento\ProductAlert\Controller\Unsubscribe as UnsubscribeController;
-use Magento\Framework\App\Action\Context;
-use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\ProductAlert\Controller\Unsubscribe as UnsubscribeController;
 
 class Price extends UnsubscribeController
 {
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
index eece28e00b808..145c5028dcddf 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ProductAlert\Controller\Unsubscribe;
 
-use Magento\ProductAlert\Controller\Unsubscribe as UnsubscribeController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\ProductAlert\Controller\Unsubscribe as UnsubscribeController;
 
 class PriceAll extends UnsubscribeController
 {
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
index 84ebbaecaaf69..39ee51a089148 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\ProductAlert\Controller\Unsubscribe;
 
-use Magento\ProductAlert\Controller\Unsubscribe as UnsubscribeController;
-use Magento\Framework\App\Action\Context;
-use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\ProductAlert\Controller\Unsubscribe as UnsubscribeController;
 
 class Stock extends UnsubscribeController
 {
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
index 8a6ec715598f9..0b5d6ad2b2694 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\ProductAlert\Controller\Unsubscribe;
 
-use Magento\ProductAlert\Controller\Unsubscribe as UnsubscribeController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\ProductAlert\Controller\Unsubscribe as UnsubscribeController;
 
 class StockAll extends UnsubscribeController
 {
diff --git a/app/code/Magento/ProductAlert/Setup/Recurring.php b/app/code/Magento/ProductAlert/Setup/Recurring.php
index efa8e677aa766..7b175323129d8 100644
--- a/app/code/Magento/ProductAlert/Setup/Recurring.php
+++ b/app/code/Magento/ProductAlert/Setup/Recurring.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\ProductAlert\Setup;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Setup\ExternalFKSetup;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/ReadHandler.php b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/ReadHandler.php
index a6225fa40c1b3..8d1341d811b7f 100644
--- a/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/ReadHandler.php
+++ b/app/code/Magento/ProductVideo/Model/Plugin/Catalog/Product/Gallery/ReadHandler.php
@@ -73,7 +73,7 @@ protected function collectVideoEntriesIds(array $mediaCollection)
     protected function loadVideoDataById(array $ids, $storeId = null)
     {
         $mainTableAlias = $this->resourceModel->getMainTableAlias();
-        $joinConditions = $mainTableAlias.'.value_id = store_value.value_id';
+        $joinConditions = $mainTableAlias . '.value_id = store_value.value_id';
         if (null !== $storeId) {
             $joinConditions = implode(
                 ' AND ',
@@ -135,10 +135,10 @@ protected function addVideoDataToMediaEntries(array $mediaCollection, array $dat
     protected function substituteNullsWithDefaultValues(array $rowData)
     {
         foreach ($this->getVideoProperties(false) as $key) {
-            if (empty($rowData[$key]) && !empty($rowData[$key.'_default'])) {
-                $rowData[$key] = $rowData[$key.'_default'];
+            if (empty($rowData[$key]) && !empty($rowData[$key . '_default'])) {
+                $rowData[$key] = $rowData[$key . '_default'];
             }
-            unset($rowData[$key.'_default']);
+            unset($rowData[$key . '_default']);
         }
 
         return $rowData;
diff --git a/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/ExternalVideoEntryConverter.php b/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/ExternalVideoEntryConverter.php
index 0650777423255..b16bd2f6699b1 100644
--- a/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/ExternalVideoEntryConverter.php
+++ b/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/ExternalVideoEntryConverter.php
@@ -6,10 +6,10 @@
 
 namespace Magento\ProductVideo\Model\Product\Attribute\Media;
 
+use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryExtensionFactory;
 use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
-use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter;
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryExtensionFactory;
+use Magento\Catalog\Model\Product\Attribute\Backend\Media\ImageEntryConverter;
 
 /**
  * Converter for External Video media gallery type
diff --git a/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/VideoEntry.php b/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/VideoEntry.php
index 7eea0512ca354..b8193ae60e96a 100644
--- a/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/VideoEntry.php
+++ b/app/code/Magento/ProductVideo/Model/Product/Attribute/Media/VideoEntry.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\ProductVideo\Model\Product\Attribute\Media;
 
-use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Framework\Api\Data\VideoContentInterface;
+use Magento\Framework\Model\AbstractExtensibleModel;
 
 /**
  * VideoEntry class
diff --git a/app/code/Magento/ProductVideo/Setup/InstallSchema.php b/app/code/Magento/ProductVideo/Setup/InstallSchema.php
index 09da12c93d80b..5895a138ef627 100644
--- a/app/code/Magento/ProductVideo/Setup/InstallSchema.php
+++ b/app/code/Magento/ProductVideo/Setup/InstallSchema.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\ProductVideo\Setup;
 
+use Magento\Catalog\Model\ResourceModel\Product\Gallery;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Catalog\Model\ResourceModel\Product\Gallery;
 
 /**
  * Class InstallSchema adds new table `catalog_product_entity_media_gallery_value_video`
diff --git a/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php b/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php
index 28c6db7d31379..26f611445ee94 100644
--- a/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php
+++ b/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\ProductVideo\Test\Unit\Controller\Adminhtml\Product\Gallery;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
diff --git a/app/code/Magento/ProductVideo/Test/Unit/Observer/ChangeTemplateObserverTest.php b/app/code/Magento/ProductVideo/Test/Unit/Observer/ChangeTemplateObserverTest.php
index 1eaf9b57f476d..796a694ff268d 100644
--- a/app/code/Magento/ProductVideo/Test/Unit/Observer/ChangeTemplateObserverTest.php
+++ b/app/code/Magento/ProductVideo/Test/Unit/Observer/ChangeTemplateObserverTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\ProductVideo\Test\Unit\Observer;
 
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class ChangeTemplateObserverTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Quote/Api/GuestShipmentEstimationInterface.php b/app/code/Magento/Quote/Api/GuestShipmentEstimationInterface.php
index 6c45c75e866c3..36624ed4da2a6 100644
--- a/app/code/Magento/Quote/Api/GuestShipmentEstimationInterface.php
+++ b/app/code/Magento/Quote/Api/GuestShipmentEstimationInterface.php
@@ -12,5 +12,4 @@
  */
 interface GuestShipmentEstimationInterface extends ShipmentEstimationInterface
 {
-
 }
diff --git a/app/code/Magento/Quote/Model/AddressAdditionalData.php b/app/code/Magento/Quote/Model/AddressAdditionalData.php
index c1dcd8edaa935..2ba5312b2f5f6 100644
--- a/app/code/Magento/Quote/Model/AddressAdditionalData.php
+++ b/app/code/Magento/Quote/Model/AddressAdditionalData.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Quote\Model;
 
-use Magento\Quote\Api\Data\AddressAdditionalDataInterface;
 use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Quote\Api\Data\AddressAdditionalDataInterface;
 
 class AddressAdditionalData extends AbstractExtensibleModel implements AddressAdditionalDataInterface
 {
diff --git a/app/code/Magento/Quote/Model/AddressAdditionalDataProcessor.php b/app/code/Magento/Quote/Model/AddressAdditionalDataProcessor.php
index a65d1c6b9049a..e972e1dc2899c 100644
--- a/app/code/Magento/Quote/Model/AddressAdditionalDataProcessor.php
+++ b/app/code/Magento/Quote/Model/AddressAdditionalDataProcessor.php
@@ -6,7 +6,6 @@
 namespace Magento\Quote\Model;
 
 use Magento\Quote\Api\Data\AddressAdditionalDataInterface;
-use Magento\Framework\Model\AbstractExtensibleModel;
 
 class AddressAdditionalDataProcessor
 {
diff --git a/app/code/Magento/Quote/Model/BillingAddressManagement.php b/app/code/Magento/Quote/Model/BillingAddressManagement.php
index 2cbca917c26a1..0f18683d1a9f9 100644
--- a/app/code/Magento/Quote/Model/BillingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/BillingAddressManagement.php
@@ -5,11 +5,10 @@
  */
 namespace Magento\Quote\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
-use Magento\Quote\Model\Quote\Address\BillingAddressPersister;
-use Psr\Log\LoggerInterface as Logger;
 use Magento\Quote\Api\BillingAddressManagementInterface;
-use Magento\Framework\App\ObjectManager;
+use Psr\Log\LoggerInterface as Logger;
 
 /**
  * Quote billing address write service object.
diff --git a/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php b/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
index 9fe69b691424d..9c9899ac594cb 100644
--- a/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
+++ b/app/code/Magento/Quote/Model/Cart/CartTotalRepository.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Quote\Model\Cart;
 
+use Magento\Catalog\Helper\Product\ConfigurationPool;
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\Quote\Api;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\CartTotalRepositoryInterface;
-use Magento\Catalog\Helper\Product\ConfigurationPool;
-use Magento\Framework\Api\DataObjectHelper;
-use Magento\Quote\Model\Cart\Totals\ItemConverter;
 use Magento\Quote\Api\CouponManagementInterface;
+use Magento\Quote\Model\Cart\Totals\ItemConverter;
 
 /**
  * Cart totals data object.
diff --git a/app/code/Magento/Quote/Model/Cart/TotalSegment.php b/app/code/Magento/Quote/Model/Cart/TotalSegment.php
index a40c967b59c96..faa1d13e1cc4c 100644
--- a/app/code/Magento/Quote/Model/Cart/TotalSegment.php
+++ b/app/code/Magento/Quote/Model/Cart/TotalSegment.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Quote\Model\Cart;
 
-use Magento\Quote\Api\Data\TotalSegmentInterface;
 use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Quote\Api\Data\TotalSegmentInterface;
 
 /**
  * Extensible Cart Totals
diff --git a/app/code/Magento/Quote/Model/Cart/Totals.php b/app/code/Magento/Quote/Model/Cart/Totals.php
index e42b72e2eb696..dfc6a07bb0a9e 100644
--- a/app/code/Magento/Quote/Model/Cart/Totals.php
+++ b/app/code/Magento/Quote/Model/Cart/Totals.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Quote\Model\Cart;
 
-use Magento\Quote\Api\Data\TotalsInterface;
 use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Quote\Api\Data\TotalsInterface;
 
 /**
  * Cart Totals
diff --git a/app/code/Magento/Quote/Model/Cart/Totals/Item.php b/app/code/Magento/Quote/Model/Cart/Totals/Item.php
index afb87f1d3a32c..b953d04885d21 100644
--- a/app/code/Magento/Quote/Model/Cart/Totals/Item.php
+++ b/app/code/Magento/Quote/Model/Cart/Totals/Item.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Quote\Model\Cart\Totals;
 
-use Magento\Quote\Api\Data\TotalsItemInterface;
 use Magento\Framework\Api\AbstractExtensibleObject;
+use Magento\Quote\Api\Data\TotalsItemInterface;
 
 /**
  * Cart item totals.
diff --git a/app/code/Magento/Quote/Model/Cart/TotalsAdditionalData.php b/app/code/Magento/Quote/Model/Cart/TotalsAdditionalData.php
index 766d9585d572f..868f08edc9086 100644
--- a/app/code/Magento/Quote/Model/Cart/TotalsAdditionalData.php
+++ b/app/code/Magento/Quote/Model/Cart/TotalsAdditionalData.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Quote\Model\Cart;
 
-use Magento\Quote\Api\Data\TotalsAdditionalDataInterface;
 use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Quote\Api\Data\TotalsAdditionalDataInterface;
 
 /**
  * @inheritDoc
diff --git a/app/code/Magento/Quote/Model/CouponManagement.php b/app/code/Magento/Quote/Model/CouponManagement.php
index 87398ad36cfab..63fb052edd642 100644
--- a/app/code/Magento/Quote/Model/CouponManagement.php
+++ b/app/code/Magento/Quote/Model/CouponManagement.php
@@ -7,10 +7,10 @@
 
 namespace Magento\Quote\Model;
 
-use \Magento\Quote\Api\CouponManagementInterface;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\CouponManagementInterface;
 
 /**
  * Coupon management object.
diff --git a/app/code/Magento/Quote/Model/CustomerManagement.php b/app/code/Magento/Quote/Model/CustomerManagement.php
index 86725bd6211c7..2955d228604b5 100644
--- a/app/code/Magento/Quote/Model/CustomerManagement.php
+++ b/app/code/Magento/Quote/Model/CustomerManagement.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Quote\Model;
 
-use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
 use Magento\Customer\Api\AccountManagementInterface as AccountManagement;
 use Magento\Customer\Api\AddressRepositoryInterface as CustomerAddressRepository;
-use Magento\Quote\Model\Quote as QuoteEntity;
+use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
 use Magento\Framework\App\ObjectManager;
+use Magento\Quote\Model\Quote as QuoteEntity;
 
 /**
  * Class Customer
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestBillingAddressManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestBillingAddressManagement.php
index 3de2e0c3ff3fc..0f50b5a9a19d3 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestBillingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestBillingAddressManagement.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Quote\Model\GuestCart;
 
-use Magento\Quote\Api\GuestBillingAddressManagementInterface;
 use Magento\Quote\Api\BillingAddressManagementInterface;
+use Magento\Quote\Api\GuestBillingAddressManagementInterface;
 use Magento\Quote\Model\QuoteIdMask;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php
index 46c3b9b7a8fdf..3c9096a085bde 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartItemRepository.php
@@ -7,7 +7,6 @@
 namespace Magento\Quote\Model\GuestCart;
 
 use Magento\Quote\Api\Data\CartItemInterface;
-use Magento\Quote\Api\CartItemRepositoryInterface;
 use Magento\Quote\Model\QuoteIdMask;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php
index 0236cb583dac1..179468f4cf964 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartManagement.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Quote\Model\GuestCart;
 
-use Magento\Quote\Api\GuestCartManagementInterface;
 use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Api\GuestCartManagementInterface;
 use Magento\Quote\Model\QuoteIdMask;
 use Magento\Quote\Model\QuoteIdMaskFactory;
-use Magento\Quote\Api\Data\PaymentInterface;
-use Magento\Quote\Api\CartRepositoryInterface;
 
 /**
  * Cart Management class for guest carts.
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartRepository.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartRepository.php
index 665dc0a87c97b..4469b3212d2ea 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCartRepository.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartRepository.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Quote\Model\GuestCart;
 
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\GuestCartRepositoryInterface;
 use Magento\Quote\Model\QuoteIdMask;
-use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 
 /**
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalManagement.php
index 33cb83fa5fbcb..eecc97a2caf69 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartTotalManagement.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Quote\Model\GuestCart;
 
-use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Quote\Api\GuestCartTotalManagementInterface;
+use Magento\Quote\Model\QuoteIdMaskFactory;
 
 /**
  * @inheritDoc
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php
index d2e807e543b2a..33df6c236fb20 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCouponManagement.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Quote\Model\GuestCart;
 
-use Magento\Quote\Api\GuestCouponManagementInterface;
 use Magento\Quote\Api\CouponManagementInterface;
+use Magento\Quote\Api\GuestCouponManagementInterface;
 use Magento\Quote\Model\QuoteIdMask;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestPaymentMethodManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestPaymentMethodManagement.php
index f57a7d2e0ba6e..56926662f3b29 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestPaymentMethodManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestPaymentMethodManagement.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Quote\Model\GuestCart;
 
-use Magento\Quote\Api\PaymentMethodManagementInterface;
 use Magento\Quote\Api\GuestPaymentMethodManagementInterface;
+use Magento\Quote\Api\PaymentMethodManagementInterface;
 use Magento\Quote\Model\QuoteIdMask;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 
diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php b/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php
index e2f31406cfe7e..d9ced04084483 100644
--- a/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestShippingAddressManagement.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Quote\Model\GuestCart;
 
-use Magento\Quote\Model\GuestCart\GuestShippingAddressManagementInterface;
 use Magento\Quote\Model\QuoteIdMask;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Quote\Model\ShippingAddressManagementInterface;
diff --git a/app/code/Magento/Quote/Model/QueryResolver.php b/app/code/Magento/Quote/Model/QueryResolver.php
index ca616d14956cd..fe1bcf1e05e9d 100644
--- a/app/code/Magento/Quote/Model/QueryResolver.php
+++ b/app/code/Magento/Quote/Model/QueryResolver.php
@@ -6,8 +6,8 @@
 namespace Magento\Quote\Model;
 
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\App\ResourceConnection\ConfigInterface;
+use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 
 class QueryResolver
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index 7741d3b0f7657..9c75021bf6d9b 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -9,13 +9,13 @@
 use Magento\Customer\Api\Data\GroupInterface;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Quote\Api\Data\PaymentInterface;
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Address\Total as AddressTotal;
-use Magento\Sales\Model\Status;
-use Magento\Framework\App\ObjectManager;
 use Magento\Sales\Model\OrderIncrementIdChecker;
+use Magento\Sales\Model\Status;
 
 /**
  * Quote model
diff --git a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
index c5b8dc1c4b124..dfc06d7e55aff 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Quote\Model\Quote\Address;
 
+use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Framework\Exception\InputException;
-use Magento\Quote\Api\Data\CartInterface;
-use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\QuoteAddressValidator;
-use Magento\Customer\Api\AddressRepositoryInterface;
 
 class BillingAddressPersister
 {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/ToOrderAddress.php b/app/code/Magento/Quote/Model/Quote/Address/ToOrderAddress.php
index f7f53a93cc5a4..fc817a0c72d57 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/ToOrderAddress.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/ToOrderAddress.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\DataObject\Copy;
 use Magento\Quote\Model\Quote\Address;
-use Magento\Sales\Model\Order\AddressRepository as OrderAddressRepository;
 use Magento\Sales\Api\Data\OrderAddressInterface;
+use Magento\Sales\Model\Order\AddressRepository as OrderAddressRepository;
 
 /**
  * Class ToOrderAddress
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total.php b/app/code/Magento/Quote/Model/Quote/Address/Total.php
index 42224c970ed27..ded0eebb809b5 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total.php
@@ -162,7 +162,7 @@ public function getAllBaseTotalAmounts()
     {
         return $this->baseTotalAmounts;
     }
-    
+
     //@codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php
index a9c4d97760536..520292c9eb380 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/AbstractItem.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Quote\Model\Quote\Item;
 
-use Magento\Quote\Model\Quote\Item;
 use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Quote\Model\Quote\Item;
 
 /**
  * Quote item abstract model
diff --git a/app/code/Magento/Quote/Model/Quote/Item/CartItemPersister.php b/app/code/Magento/Quote/Model/Quote/Item/CartItemPersister.php
index e29364d41b498..44e70067e1012 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/CartItemPersister.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/CartItemPersister.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Quote\Model\Quote\Item;
 
-use Magento\Quote\Api\Data\CartInterface;
-use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\Data\CartItemInterface;
 
 class CartItemPersister
 {
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Compare.php b/app/code/Magento/Quote/Model/Quote/Item/Compare.php
index ddaa636ef32b3..bd88f26f6586e 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Compare.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Compare.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Quote\Model\Quote\Item;
 
-use Magento\Quote\Model\Quote\Item;
-use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\JsonValidator;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Quote\Model\Quote\Item;
 
 /**
  * Compare quote items
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Processor.php b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
index f34591cfad143..1ee68e7880c19 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Processor.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Quote\Model\Quote\Item;
 
-use \Magento\Catalog\Model\Product;
-use Magento\Quote\Model\Quote\ItemFactory;
-use Magento\Quote\Model\Quote\Item;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Framework\App\State;
 use Magento\Framework\DataObject;
 use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Quote\Model\Quote\Item;
+use Magento\Quote\Model\Quote\ItemFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class Processor
diff --git a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
index 32687499274f8..41c816b5000a7 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/ToOrderItem.php
@@ -7,10 +7,10 @@
 namespace Magento\Quote\Model\Quote\Item;
 
 use Magento\Framework\DataObject\Copy;
-use Magento\Quote\Model\Quote\Item;
 use Magento\Quote\Model\Quote\Address\Item as AddressItem;
-use Magento\Sales\Api\Data\OrderItemInterfaceFactory as OrderItemFactory;
+use Magento\Quote\Model\Quote\Item;
 use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Sales\Api\Data\OrderItemInterfaceFactory as OrderItemFactory;
 
 /**
  * Class ToOrderItem
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Updater.php b/app/code/Magento/Quote/Model/Quote/Item/Updater.php
index 6a7a3c1c1839e..fda74e35231ef 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Updater.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Updater.php
@@ -6,8 +6,8 @@
 namespace Magento\Quote\Model\Quote\Item;
 
 use Magento\Catalog\Model\ProductFactory;
-use Magento\Framework\Locale\FormatInterface;
 use Magento\Framework\DataObject\Factory as ObjectFactory;
+use Magento\Framework\Locale\FormatInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Item;
 use Zend\Code\Exception\InvalidArgumentException;
diff --git a/app/code/Magento/Quote/Model/Quote/Payment/ToOrderPayment.php b/app/code/Magento/Quote/Model/Quote/Payment/ToOrderPayment.php
index 3e7974bb433af..f48c632eefb47 100644
--- a/app/code/Magento/Quote/Model/Quote/Payment/ToOrderPayment.php
+++ b/app/code/Magento/Quote/Model/Quote/Payment/ToOrderPayment.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Quote\Model\Quote\Payment;
 
-use Magento\Quote\Model\Quote\Payment;
-use Magento\Sales\Api\OrderPaymentRepositoryInterface as OrderPaymentRepository;
-use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Framework\DataObject\Copy;
 use Magento\Payment\Model\Method\Substitution;
+use Magento\Quote\Model\Quote\Payment;
+use Magento\Sales\Api\Data\OrderPaymentInterface;
+use Magento\Sales\Api\OrderPaymentRepositoryInterface as OrderPaymentRepository;
 
 /**
  * Class ToOrderPayment
diff --git a/app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingAssignmentProcessor.php b/app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingAssignmentProcessor.php
index 9d6f217d7da80..8630f0147e332 100644
--- a/app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingAssignmentProcessor.php
+++ b/app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingAssignmentProcessor.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Quote\Model\Quote\ShippingAssignment;
 
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Api\Data\ShippingAssignmentInterface;
-use Magento\Framework\Exception\InputException;
-use Magento\Quote\Model\ShippingAssignmentFactory;
 use Magento\Quote\Model\Quote\Item\CartItemPersister;
-use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Model\ShippingAssignmentFactory;
 
 class ShippingAssignmentProcessor
 {
diff --git a/app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingProcessor.php b/app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingProcessor.php
index ccad63ab41549..506035f1e247c 100644
--- a/app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingProcessor.php
+++ b/app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingProcessor.php
@@ -7,8 +7,8 @@
 
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Api\Data\ShippingInterface;
-use Magento\Quote\Model\ShippingFactory;
 use Magento\Quote\Model\ShippingAddressManagement;
+use Magento\Quote\Model\ShippingFactory;
 use Magento\Quote\Model\ShippingMethodManagement;
 
 class ShippingProcessor
diff --git a/app/code/Magento/Quote/Model/Quote/TotalsCollector.php b/app/code/Magento/Quote/Model/Quote/TotalsCollector.php
index 8fa03232a0e8d..b4d1baa82f78f 100644
--- a/app/code/Magento/Quote/Model/Quote/TotalsCollector.php
+++ b/app/code/Magento/Quote/Model/Quote/TotalsCollector.php
@@ -264,7 +264,7 @@ public function collectAddressTotals(
             /** @var CollectorInterface $collector */
             $collector->collect($quote, $shippingAssignment, $total);
         }
-        
+
         $this->eventManager->dispatch(
             'sales_quote_address_collect_totals_after',
             [
diff --git a/app/code/Magento/Quote/Model/Quote/TotalsCollectorList.php b/app/code/Magento/Quote/Model/Quote/TotalsCollectorList.php
index 2c682b3dea7b3..8bbee9575efbf 100644
--- a/app/code/Magento/Quote/Model/Quote/TotalsCollectorList.php
+++ b/app/code/Magento/Quote/Model/Quote/TotalsCollectorList.php
@@ -9,7 +9,6 @@
 
 use Magento\Quote\Model\Quote\Address\Total\Collector;
 use Magento\Quote\Model\Quote\Address\Total\CollectorFactory;
-use Magento\Quote\Model\Quote\Address\Total\CollectorInterface;
 
 class TotalsCollectorList
 {
diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
index d3967794b300a..210ed33199f7d 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository.php
@@ -5,20 +5,17 @@
  */
 namespace Magento\Quote\Model;
 
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Framework\Api\Search\FilterGroup;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Api\SortOrder;
+use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Api\Data\CartInterface;
-use Magento\Quote\Model\Quote;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\Api\Search\FilterGroup;
-use Magento\Quote\Model\ResourceModel\Quote\Collection as QuoteCollection;
-use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory as QuoteCollectionFactory;
-use Magento\Framework\Exception\InputException;
-use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
-use Magento\Quote\Model\QuoteRepository\SaveHandler;
 use Magento\Quote\Model\QuoteRepository\LoadHandler;
+use Magento\Quote\Model\QuoteRepository\SaveHandler;
+use Magento\Quote\Model\ResourceModel\Quote\Collection as QuoteCollection;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Quote/Model/QuoteRepository/LoadHandler.php b/app/code/Magento/Quote/Model/QuoteRepository/LoadHandler.php
index 5d220e809ab11..3e213577232d1 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository/LoadHandler.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository/LoadHandler.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Quote\Model\QuoteRepository;
 
+use Magento\Quote\Api\Data\CartExtensionFactory;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor;
-use Magento\Quote\Api\Data\CartExtensionFactory;
 
 class LoadHandler
 {
diff --git a/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php b/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php
index 3eff09faac1f5..39d2284e4eb1e 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php
@@ -6,10 +6,10 @@
 namespace Magento\Quote\Model\QuoteRepository\Plugin;
 
 use Magento\Authorization\Model\UserContextInterface;
-use Magento\Quote\Model\Quote;
 use Magento\Framework\Exception\StateException;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\Quote;
 
 /**
  * The plugin checks if the user has ability to change the quote.
diff --git a/app/code/Magento/Quote/Model/QuoteRepository/SaveHandler.php b/app/code/Magento/Quote/Model/QuoteRepository/SaveHandler.php
index 67310a1cc17cf..eadf6bdfc254f 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository/SaveHandler.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository/SaveHandler.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Quote\Model\QuoteRepository;
 
-use Magento\Quote\Api\Data\CartInterface;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\Data\CartInterface;
 
 class SaveHandler
 {
diff --git a/app/code/Magento/Quote/Model/QuoteValidator.php b/app/code/Magento/Quote/Model/QuoteValidator.php
index 8d46832df8db2..a49f9134ee98e 100644
--- a/app/code/Magento/Quote/Model/QuoteValidator.php
+++ b/app/code/Magento/Quote/Model/QuoteValidator.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Quote\Model;
 
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Quote\Model\Quote as QuoteEntity;
 use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Model\Quote as QuoteEntity;
 use Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage as OrderAmountValidationMessage;
 
 /**
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
index 0487d7e46eb26..6d712ab8c2819 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Quote\Model\ResourceModel\Quote\Item;
 
-use \Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 
 /**
  * Quote item resource collection
diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
index 0e2be5c9e3692..234cc005afdd1 100644
--- a/app/code/Magento/Quote/Model/ShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Quote\Model;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Psr\Log\LoggerInterface as Logger;
diff --git a/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php b/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php
index a13a2dc590def..8036201425848 100644
--- a/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php
+++ b/app/code/Magento/Quote/Model/Webapi/ParamOverriderCartId.php
@@ -7,8 +7,8 @@
 namespace Magento\Quote\Model\Webapi;
 
 use Magento\Authorization\Model\UserContextInterface;
-use Magento\Framework\Webapi\Rest\Request\ParamOverriderInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Webapi\Rest\Request\ParamOverriderInterface;
 use Magento\Quote\Api\CartManagementInterface;
 
 /**
diff --git a/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php b/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php
index 3c03c4db2e59e..1f4f775646ace 100644
--- a/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php
+++ b/app/code/Magento/Quote/Observer/Backend/CustomerQuoteObserver.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Quote\Observer\Backend;
 
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Model\Config\Share as ShareConfig;
-use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class CustomerQuote
diff --git a/app/code/Magento/Quote/Observer/Webapi/SubmitObserver.php b/app/code/Magento/Quote/Observer/Webapi/SubmitObserver.php
index 4f1e66dcc724b..86092e95b4176 100644
--- a/app/code/Magento/Quote/Observer/Webapi/SubmitObserver.php
+++ b/app/code/Magento/Quote/Observer/Webapi/SubmitObserver.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Quote\Observer\Webapi;
 
-use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 
 class SubmitObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/Quote/Setup/ConvertSerializedDataToJson.php b/app/code/Magento/Quote/Setup/ConvertSerializedDataToJson.php
index 8627a8012f2ed..eb50129d84e87 100644
--- a/app/code/Magento/Quote/Setup/ConvertSerializedDataToJson.php
+++ b/app/code/Magento/Quote/Setup/ConvertSerializedDataToJson.php
@@ -8,8 +8,8 @@
 use Magento\Framework\DB\AggregatedFieldDataConverter;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\DB\FieldToConvert;
-use Magento\Framework\DB\Select\QueryModifierFactory;
 use Magento\Framework\DB\Query\Generator;
+use Magento\Framework\DB\Select\QueryModifierFactory;
 
 /**
  * Convert serialized data in quote tables to JSON
diff --git a/app/code/Magento/Quote/Setup/UpgradeData.php b/app/code/Magento/Quote/Setup/UpgradeData.php
index fde232c2e593b..a025261d252a0 100644
--- a/app/code/Magento/Quote/Setup/UpgradeData.php
+++ b/app/code/Magento/Quote/Setup/UpgradeData.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Quote\Setup;
 
-use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
 
 class UpgradeData implements UpgradeDataInterface
 {
diff --git a/app/code/Magento/Quote/Setup/UpgradeSchema.php b/app/code/Magento/Quote/Setup/UpgradeSchema.php
index e9221895e18dc..c4360307cd199 100644
--- a/app/code/Magento/Quote/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Quote/Setup/UpgradeSchema.php
@@ -6,9 +6,9 @@
 namespace Magento\Quote\Setup;
 
 use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
 
 /**
  * Upgrade the Catalog module DB scheme
diff --git a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestShippingMethodManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestShippingMethodManagementTest.php
index fe4ffcab4bc4d..e84e45a003da4 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestShippingMethodManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestShippingMethodManagementTest.php
@@ -7,12 +7,12 @@
 
 namespace Magento\Quote\Test\Unit\Model\GuestCart;
 
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Quote\Model\QuoteIdMask;
 use Magento\Quote\Api\Data\AddressInterface;
-use Magento\Quote\Api\ShipmentEstimationInterface;
 use Magento\Quote\Api\Data\ShippingMethodInterface;
+use Magento\Quote\Api\ShipmentEstimationInterface;
 use Magento\Quote\Model\GuestCart\GuestShippingMethodManagement;
+use Magento\Quote\Model\QuoteIdMask;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class GuestShippingMethodManagementTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Product/Plugin/UpdateQuoteItemsTest.php b/app/code/Magento/Quote/Test/Unit/Model/Product/Plugin/UpdateQuoteItemsTest.php
index 38f303dd23582..f1104041e689a 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Product/Plugin/UpdateQuoteItemsTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Product/Plugin/UpdateQuoteItemsTest.php
@@ -15,7 +15,7 @@ class UpdateQuoteItemsTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\ResourceModel\Quote
      */
-    private $quoteResource ;
+    private $quoteResource;
 
     protected function setUp()
     {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
index e25b770b7a81e..2d1e9390c3d36 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php
@@ -9,26 +9,26 @@
 namespace Magento\Quote\Test\Unit\Model\Quote;
 
 use Magento\Directory\Model\Currency;
+use Magento\Directory\Model\Region;
+use Magento\Directory\Model\RegionFactory;
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Address\Rate;
-use Magento\Quote\Model\ResourceModel\Quote\Address\Rate\CollectionFactory as RateCollectionFactory;
-use Magento\Quote\Model\ResourceModel\Quote\Address\Rate\Collection as RatesCollection;
-use Magento\Shipping\Model\Rate\Result;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Directory\Model\RegionFactory;
-use Magento\Quote\Model\Quote\Address\RateFactory;
+use Magento\Quote\Model\Quote\Address\RateCollectorInterface;
 use Magento\Quote\Model\Quote\Address\RateCollectorInterfaceFactory;
+use Magento\Quote\Model\Quote\Address\RateFactory;
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use Magento\Quote\Model\Quote\Address\RateRequestFactory;
-use Magento\Quote\Model\Quote\Address\RateCollectorInterface;
-use Magento\Quote\Model\ResourceModel\Quote\Address\Item\CollectionFactory;
+use Magento\Quote\Model\Quote\Address\RateResult\AbstractResult;
 use Magento\Quote\Model\ResourceModel\Quote\Address\Item\Collection;
-use Magento\Directory\Model\Region;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Quote\Model\ResourceModel\Quote\Address\Item\CollectionFactory;
+use Magento\Quote\Model\ResourceModel\Quote\Address\Rate\Collection as RatesCollection;
+use Magento\Quote\Model\ResourceModel\Quote\Address\Rate\CollectionFactory as RateCollectionFactory;
+use Magento\Shipping\Model\Rate\Result;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\Data\WebsiteInterface;
-use Magento\Quote\Model\Quote\Address\RateResult\AbstractResult;
-use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Test class for sales quote address model
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/CompareTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/CompareTest.php
index c14d6fa066103..4448d45bc43f0 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/CompareTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/CompareTest.php
@@ -230,7 +230,7 @@ public function testCompareWithEmptyValues()
                     $this->getOptionMock('option-1', $comparedOptionValue)
                 ]
             );
-        
+
         $this->assertTrue($this->helper->compare($this->itemMock, $this->comparedMock));
     }
 }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Payment/ToOrderPaymentTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Payment/ToOrderPaymentTest.php
index ec6c9cb11dbac..fdd559d8ec6e0 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Payment/ToOrderPaymentTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Payment/ToOrderPaymentTest.php
@@ -8,8 +8,8 @@
 
 namespace Magento\Quote\Test\Unit\Model\Quote\Payment;
 
-use Magento\Payment\Model\Method\Substitution;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Payment\Model\Method\Substitution;
 
 /**
  * Class ToOrderPaymentTest tests converter to order payment
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/PaymentTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/PaymentTest.php
index b79c23ff992b6..a6e15b19e65b7 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/PaymentTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/PaymentTest.php
@@ -7,14 +7,14 @@
 
 use Magento\Framework\DataObject;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Payment\Model\Checks\Composite;
 use Magento\Payment\Model\Checks\SpecificationFactory;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Quote\Api\Data\PaymentInterface;
 use Magento\Quote\Model\Quote;
-use \Magento\Quote\Model\Quote\Payment;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Quote\Model\Quote\Payment;
 
 class PaymentTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/RelationTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/RelationTest.php
index a6fd42a66b5e0..9a1be6408be37 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/RelationTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/RelationTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Quote\Test\Unit\Model\Quote;
 
-use Magento\Quote\Model\Quote\Relation;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Quote\Model\Quote\Relation;
 
 class RelationTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/ShippingAssignment/ShippingAssignmentProcessorTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/ShippingAssignment/ShippingAssignmentProcessorTest.php
index 70f5adc70203f..d3bbc7053cb04 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/ShippingAssignment/ShippingAssignmentProcessorTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/ShippingAssignment/ShippingAssignmentProcessorTest.php
@@ -5,18 +5,18 @@
  */
 namespace Magento\Quote\Test\Unit\Model\Quote\ShippingAssignment;
 
-use Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Quote\Model\ShippingAssignmentFactory;
-use Magento\Quote\Model\Quote\ShippingAssignment\ShippingProcessor;
-use Magento\Quote\Model\Quote\Item\CartItemPersister;
 use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Quote\Model\Quote;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Quote\Api\Data\ShippingAssignmentInterface;
-use Magento\Quote\Model\Quote\Address as QuoteAddress;
 use Magento\Quote\Api\Data\ShippingInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address as QuoteAddress;
 use Magento\Quote\Model\Quote\Item as QuoteItem;
-use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Model\Quote\Item\CartItemPersister;
+use Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentProcessor;
+use Magento\Quote\Model\Quote\ShippingAssignment\ShippingProcessor;
+use Magento\Quote\Model\ShippingAssignmentFactory;
 
 class ShippingAssignmentProcessorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/ShippingAssignment/ShippingProcessorTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/ShippingAssignment/ShippingProcessorTest.php
index cff98e11fd4aa..f885d1cdbbec2 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/ShippingAssignment/ShippingProcessorTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/ShippingAssignment/ShippingProcessorTest.php
@@ -40,14 +40,14 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['assign'])
             ->getMock();
-        
+
         $this->shippingMethodManagement = $this->getMockBuilder(ShippingMethodManagement::class)
             ->disableOriginalConstructor()
             ->setMethods(['apply'])
             ->getMock();
-        
+
         $objectManager = new ObjectManager($this);
-        
+
         $this->shippingProcessor = $objectManager->getObject(ShippingProcessor::class, [
             'shippingAddressManagement' => $this->shippingAddressManagement,
             'shippingMethodManagement' => $this->shippingMethodManagement
@@ -67,11 +67,11 @@ public function testSave($method, $carrierCode, $methodCode)
         $quoteId = 1;
 
         $address = $this->getMockForAbstractClass(AddressInterface::class);
-        
+
         $quote->expects(static::exactly(2))
             ->method('getId')
             ->willReturn($quoteId);
-        
+
         $shipping->expects(static::once())
             ->method('getAddress')
             ->willReturn($address);
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php
index f330ebda17317..e79f553cdf2a4 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php
@@ -6,11 +6,11 @@
 namespace Magento\Quote\Test\Unit\Model\QuoteRepository\Plugin;
 
 use Magento\Authorization\Model\UserContextInterface;
-use Magento\Quote\Model\QuoteRepository\Plugin\AccessChangeQuoteControl;
-use Magento\Quote\Model\Quote;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteRepository;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Quote\Model\QuoteRepository\Plugin\AccessChangeQuoteControl;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class AccessChangeQuoteControlTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AuthorizationTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AuthorizationTest.php
index ff874eb7ef405..1f0c3ed1919af 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AuthorizationTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AuthorizationTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Quote\Test\Unit\Model\QuoteRepository\Plugin;
 
-use Magento\Quote\Model\QuoteRepository\Plugin\Authorization;
 use Magento\Authorization\Model\UserContextInterface;
+use Magento\Quote\Model\QuoteRepository\Plugin\Authorization;
 
 /**
  * Class AuthorizationTest
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/SaveHandlerTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/SaveHandlerTest.php
index f6e5e0e84c49a..d038570d190c0 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/SaveHandlerTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/SaveHandlerTest.php
@@ -5,18 +5,18 @@
  */
 namespace Magento\Quote\Test\Unit\Model\QuoteRepository;
 
-use Magento\Quote\Model\QuoteRepository\SaveHandler;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Quote\Model\ResourceModel\Quote as QuoteResourceModel;
-use Magento\Quote\Model\Quote\Item\CartItemPersister;
-use Magento\Quote\Model\Quote\Address\BillingAddressPersister;
-use Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentPersister;
 use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Quote\Api\Data\CartExtensionInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
-use Magento\Quote\Api\Data\CartExtensionInterface;
+use Magento\Quote\Model\Quote\Address\BillingAddressPersister;
 use Magento\Quote\Model\Quote\Item as QuoteItem;
-use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Model\Quote\Item\CartItemPersister;
+use Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentPersister;
+use Magento\Quote\Model\QuoteRepository\SaveHandler;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResourceModel;
 
 class SaveHandlerTest extends \PHPUnit\Framework\TestCase
 {
@@ -126,7 +126,7 @@ protected function setUp()
     public function testSaveForVirtualQuote()
     {
         $quoteItemMock = $this->createQuoteItemMock(false);
-        
+
         $this->quoteMock->expects(static::atLeastOnce())
             ->method('getItems')
             ->willReturn([$quoteItemMock]);
@@ -158,7 +158,7 @@ public function testSaveForVirtualQuote()
             ->method('save')
             ->with($this->quoteMock)
             ->willReturnSelf();
-        
+
         $this->assertSame($this->quoteMock, $this->saveHandler->save($this->quoteMock));
     }
 
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
index 3101c7d0677a9..f995f8206dbd4 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepositoryTest.php
@@ -5,12 +5,11 @@
  */
 namespace Magento\Quote\Test\Unit\Model;
 
-use Magento\Framework\Api\SortOrder;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Framework\Api\SortOrder;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\QuoteRepository\LoadHandler;
 use Magento\Quote\Model\QuoteRepository\SaveHandler;
-use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/Quote/Item/CollectionTest.php b/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/Quote/Item/CollectionTest.php
index b491be16c716d..c4bb280013104 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/Quote/Item/CollectionTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/ResourceModel/Quote/Item/CollectionTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Quote\Test\Unit\Model\ResourceModel\Quote\Item;
 
-use Magento\Quote\Model\ResourceModel\Quote\Item\Collection;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Quote\Model\ResourceModel\Quote\Item\Collection;
 
 /**
  * Class CollectionTest
diff --git a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
index 1870fa9dc81ba..c9398ecc26c55 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/ShippingAddressManagementTest.php
@@ -9,7 +9,8 @@
 
 namespace Magento\Quote\Test\Unit\Model;
 
-use \Magento\Quote\Model\ShippingAddressManagement;
+use Magento\Quote\Model\ShippingAddressManagement;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php b/app/code/Magento/Quote/Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php
index bc47a04a226e1..c63102c28a73c 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Webapi/ParamOverriderCartIdTest.php
@@ -9,7 +9,6 @@
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Model\Webapi\ParamOverriderCartId;
 
 /**
diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
index 2968fba74478b..86c5e6714125c 100644
--- a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
@@ -376,6 +376,5 @@ public function testDispatchWithEmptyShippingAddress()
             ->method('create')
             ->willReturn($this->customerMock);
         $this->model->execute($this->observerMock);
-
     }
 }
diff --git a/app/code/Magento/ReleaseNotification/Controller/Adminhtml/Notification/MarkUserNotified.php b/app/code/Magento/ReleaseNotification/Controller/Adminhtml/Notification/MarkUserNotified.php
index 572fb7695b20f..48e9c0a77b59d 100644
--- a/app/code/Magento/ReleaseNotification/Controller/Adminhtml/Notification/MarkUserNotified.php
+++ b/app/code/Magento/ReleaseNotification/Controller/Adminhtml/Notification/MarkUserNotified.php
@@ -7,10 +7,10 @@
 namespace Magento\ReleaseNotification\Controller\Adminhtml\Notification;
 
 use Magento\Backend\App\Action;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\ReleaseNotification\Model\ResourceModel\Viewer\Logger as NotificationLogger;
-use Magento\Framework\App\ProductMetadataInterface;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php b/app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php
index 07e26bb1a4d8d..01997401e6335 100644
--- a/app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php
+++ b/app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\ReleaseNotification\Model\Condition;
 
-use Magento\ReleaseNotification\Model\ResourceModel\Viewer\Logger;
 use Magento\Backend\Model\Auth\Session;
+use Magento\Framework\App\CacheInterface;
 use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\View\Layout\Condition\VisibilityConditionInterface;
-use Magento\Framework\App\CacheInterface;
+use Magento\ReleaseNotification\Model\ResourceModel\Viewer\Logger;
 
 /**
  * Class CanViewNotification
diff --git a/app/code/Magento/ReleaseNotification/Model/ResourceModel/Viewer/Logger.php b/app/code/Magento/ReleaseNotification/Model/ResourceModel/Viewer/Logger.php
index 967ccabcdb49c..9cf6c57d24e43 100644
--- a/app/code/Magento/ReleaseNotification/Model/ResourceModel/Viewer/Logger.php
+++ b/app/code/Magento/ReleaseNotification/Model/ResourceModel/Viewer/Logger.php
@@ -7,9 +7,9 @@
 
 namespace Magento\ReleaseNotification\Model\ResourceModel\Viewer;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\ReleaseNotification\Model\Viewer\Log;
 use Magento\ReleaseNotification\Model\Viewer\LogFactory;
-use Magento\Framework\App\ResourceConnection;
 
 /**
  * Release notification viewer log data logger.
diff --git a/app/code/Magento/ReleaseNotification/Test/Unit/Controller/Notification/MarkUserNotifiedTest.php b/app/code/Magento/ReleaseNotification/Test/Unit/Controller/Notification/MarkUserNotifiedTest.php
index 894368cbcba01..6c75dcfca5b52 100644
--- a/app/code/Magento/ReleaseNotification/Test/Unit/Controller/Notification/MarkUserNotifiedTest.php
+++ b/app/code/Magento/ReleaseNotification/Test/Unit/Controller/Notification/MarkUserNotifiedTest.php
@@ -7,17 +7,17 @@
 
 namespace Magento\ReleaseNotification\Test\Unit\Controller\Notification;
 
-use Psr\Log\LoggerInterface;
 use Magento\Backend\App\Action\Context;
-use Magento\Backend\Model\Auth\Credential\StorageInterface;
 use Magento\Backend\Model\Auth;
+use Magento\Backend\Model\Auth\Credential\StorageInterface;
+use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\ReleaseNotification\Model\ResourceModel\Viewer\Logger as NotificationLogger;
-use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\ReleaseNotification\Controller\Adminhtml\Notification\MarkUserNotified;
+use Magento\ReleaseNotification\Model\ResourceModel\Viewer\Logger as NotificationLogger;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class MarkUserNotifiedTest
diff --git a/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php b/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
index 3ec00697507c1..893073c3298db 100644
--- a/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
+++ b/app/code/Magento/ReleaseNotification/Test/Unit/Model/Condition/CanViewNotificationTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\ReleaseNotification\Test\Unit\Model\Condition;
 
+use Magento\Backend\Model\Auth\Session;
+use Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\ReleaseNotification\Model\Condition\CanViewNotification;
 use Magento\ReleaseNotification\Model\ResourceModel\Viewer\Logger;
 use Magento\ReleaseNotification\Model\Viewer\Log;
-use Magento\Framework\App\ProductMetadataInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Backend\Model\Auth\Session;
-use Magento\Framework\App\CacheInterface;
 
 /**
  * Class CanViewNotificationTest
diff --git a/app/code/Magento/Reports/Block/Product/Viewed.php b/app/code/Magento/Reports/Block/Product/Viewed.php
index 5f9fdf8533523..0dc4e4046b925 100644
--- a/app/code/Magento/Reports/Block/Product/Viewed.php
+++ b/app/code/Magento/Reports/Block/Product/Viewed.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Reports\Block\Product;
 
-use \Magento\Framework\DataObject\IdentityInterface;
+use Magento\Framework\DataObject\IdentityInterface;
 
 /**
  * Reports Recently Viewed Products Block
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsCsv.php
index 4546f080eb129..0065b5212a336 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsCsv.php
@@ -7,8 +7,8 @@
 namespace Magento\Reports\Controller\Adminhtml\Report\Customer;
 
 use Magento\Backend\Block\Widget\Grid\ExportInterface;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportAccountsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsExcel.php
index 765da53ce99ee..c8bf42be49f42 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportAccountsExcel.php
@@ -7,8 +7,8 @@
 namespace Magento\Reports\Controller\Adminhtml\Report\Customer;
 
 use Magento\Backend\Block\Widget\Grid\ExportInterface;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportAccountsExcel extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersCsv.php
index 4cbcfb39576c5..0addc27467399 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersCsv.php
@@ -7,8 +7,8 @@
 namespace Magento\Reports\Controller\Adminhtml\Report\Customer;
 
 use Magento\Backend\Block\Widget\Grid\ExportInterface;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportOrdersCsv extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersExcel.php
index ea0797c7bdc78..ce85ab2bd5347 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportOrdersExcel.php
@@ -7,8 +7,8 @@
 namespace Magento\Reports\Controller\Adminhtml\Report\Customer;
 
 use Magento\Backend\Block\Widget\Grid\ExportInterface;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportOrdersExcel extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsCsv.php
index 5ea35b77cf175..a753ab8dab1fe 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsCsv.php
@@ -7,8 +7,8 @@
 namespace Magento\Reports\Controller\Adminhtml\Report\Customer;
 
 use Magento\Backend\Block\Widget\Grid\ExportInterface;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportTotalsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsExcel.php
index 3c67785f7a352..86a031f68517d 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Customer/ExportTotalsExcel.php
@@ -7,8 +7,8 @@
 namespace Magento\Reports\Controller\Adminhtml\Report\Customer;
 
 use Magento\Backend\Block\Widget\Grid\ExportInterface;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportTotalsExcel extends \Magento\Reports\Controller\Adminhtml\Report\Customer
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockCsv.php
index 8ff822dbd1b7d..b2afbd42afd26 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Product;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportLowstockCsv extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockExcel.php
index d7c5536a6577d..673e00cd6229d 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportLowstockExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Product;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportLowstockExcel extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldCsv.php
index 409cf05c0f25e..df98f2423620b 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldCsv.php
@@ -7,8 +7,8 @@
 namespace Magento\Reports\Controller\Adminhtml\Report\Product;
 
 use Magento\Backend\Block\Widget\Grid\ExportInterface;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportSoldCsv extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldExcel.php
index 4031c721b8fed..351b76afdb491 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportSoldExcel.php
@@ -7,8 +7,8 @@
 namespace Magento\Reports\Controller\Adminhtml\Report\Product;
 
 use Magento\Backend\Block\Widget\Grid\ExportInterface;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportSoldExcel extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedCsv.php
index 8a10c7cb8c826..29d642364b883 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Product;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportViewedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedExcel.php
index 72aaf51cd6ac5..135bb59d93dd0 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Product/ExportViewedExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Product;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportViewedExcel extends \Magento\Reports\Controller\Adminhtml\Report\Product
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerCsv.php
index 34b8cd2c0fb99..309a3e57faf15 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Review;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportCustomerCsv extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerExcel.php
index 4335e56ffad37..c6525aa59e6db 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportCustomerExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Review;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportCustomerExcel extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductCsv.php
index 0ccb83def4828..d8dadafb6f8a7 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Review;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportProductCsv extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailCsv.php
index c3b30b7f03eb4..991b93ad6297e 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Review;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportProductDetailCsv extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailExcel.php
index 058350c51ab6d..c500a270d593c 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductDetailExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Review;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportProductDetailExcel extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductExcel.php
index 577a247309198..044c7afe2a3e3 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Review/ExportProductExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Review;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportProductExcel extends \Magento\Reports\Controller\Adminhtml\Report\Review
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersCsv.php
index 5fe9e2c441ba0..4ebc20ca7e3c5 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportBestsellersCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersExcel.php
index 8d6f8c2d58703..13c41da112d1a 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportBestsellersExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportBestsellersExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsCsv.php
index c9e8662bf046a..a8a332ea62dcf 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportCouponsCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsExcel.php
index 2d9a0ea9deead..09d511700be9c 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportCouponsExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportCouponsExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedCsv.php
index 7cc93319beb8f..96c66d59cc617 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportInvoicedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedExcel.php
index 914608c80ad54..89670ba265271 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportInvoicedExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportInvoicedExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedCsv.php
index cb35cb9e97e9d..3e5430fc96cdb 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportRefundedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedExcel.php
index 08c26a77961ed..d128c4225db5b 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportRefundedExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportRefundedExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesCsv.php
index 8df9b7cc73bd3..bf34eddd240d4 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportSalesCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesExcel.php
index 2b98e10821a16..945692bcb0d4b 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportSalesExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportSalesExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingCsv.php
index 9de56601717ca..2a78f05702a17 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportShippingCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingExcel.php
index f5fd6a02ff64b..6d556ca1b2479 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportShippingExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportShippingExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxCsv.php
index ab2ce2ecf2888..3e55769e67eaa 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportTaxCsv extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxExcel.php
index d0a7e5987e5a6..038219f87d93f 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales/ExportTaxExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Sales;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportTaxExcel extends \Magento\Reports\Controller\Adminhtml\Report\Sales
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php
index 6923a8ef626d4..1d6483b5ee353 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportAbandonedCsv extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php
index 4cd8237cac1b7..058094b3cb120 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportAbandonedExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportAbandonedExcel extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php
index bbfb271e61148..53c6e81fd2ec8 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductCsv.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportProductCsv extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
 {
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php
index 53538aeb2479f..494e506444414 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Shopcart/ExportProductExcel.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Shopcart;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class ExportProductExcel extends \Magento\Reports\Controller\Adminhtml\Report\Shopcart
 {
diff --git a/app/code/Magento/Reports/Helper/Data.php b/app/code/Magento/Reports/Helper/Data.php
index 411c7dde14c9d..7d098299ca0e9 100644
--- a/app/code/Magento/Reports/Helper/Data.php
+++ b/app/code/Magento/Reports/Helper/Data.php
@@ -10,7 +10,6 @@
 namespace Magento\Reports\Helper;
 
 use Magento\Framework\Data\Collection;
-use Magento\Framework\Stdlib\DateTime;
 
 /**
  * @api
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
index d219aefe81d45..eb6c4de4a5b93 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Reports\Model\ResourceModel\Quote\Item;
 
-use Magento\Framework\App\ResourceConnection;
-
 /**
  * Collection of Magento\Quote\Model\Quote\Item
  *
@@ -195,7 +193,7 @@ protected function getProductData(array $productIds)
         )->joinLeft(
             ['product_price' => $productAttrPrice->getBackend()->getTable()],
             "product_price.{$linkField} = main_table.{$linkField}"
-            ." AND product_price.attribute_id = {$productAttrPriceId}",
+            . " AND product_price.attribute_id = {$productAttrPriceId}",
             ['price' => new \Zend_Db_Expr('product_price.value')]
         )->where("main_table.entity_id IN (?)", $productIds);
 
diff --git a/app/code/Magento/Reports/Setup/Recurring.php b/app/code/Magento/Reports/Setup/Recurring.php
index 6d29d91322d46..149c9626febd3 100644
--- a/app/code/Magento/Reports/Setup/Recurring.php
+++ b/app/code/Magento/Reports/Setup/Recurring.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Reports\Setup;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Setup\ExternalFKSetup;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Reports/Test/Unit/Block/Product/ComparedTest.php b/app/code/Magento/Reports/Test/Unit/Block/Product/ComparedTest.php
index cbc96d2d6b6e8..d1ac92fe5be75 100644
--- a/app/code/Magento/Reports/Test/Unit/Block/Product/ComparedTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Block/Product/ComparedTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Reports\Test\Unit\Block\Product;
 
-use \Magento\Reports\Block\Product\Compared;
-use \Magento\Reports\Model\Product\Index\Factory;
+use Magento\Reports\Block\Product\Compared;
+use Magento\Reports\Model\Product\Index\Factory;
 
 class ComparedTest extends \PHPUnit\Framework\TestCase
 {
@@ -47,7 +47,7 @@ protected function setUp()
      */
     public function testGetModelException()
     {
-        $this->factoryMock->expects($this->once())->method('get')->willThrowException(new \InvalidArgumentException);
+        $this->factoryMock->expects($this->once())->method('get')->willThrowException(new \InvalidArgumentException());
 
         $this->sut->getModel();
     }
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/AccountsTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/AccountsTest.php
index 00e107878e6f0..579c54f3f841d 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/AccountsTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/AccountsTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Customer;
 
-use Magento\Reports\Controller\Adminhtml\Report\Customer\Accounts;
 use Magento\Framework\DataObject;
 use Magento\Framework\Phrase;
+use Magento\Reports\Controller\Adminhtml\Report\Customer\Accounts;
 
 class AccountsTest extends \Magento\Reports\Test\Unit\Controller\Adminhtml\Report\AbstractControllerTest
 {
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/OrdersTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/OrdersTest.php
index 0039f551b94f8..b247b5154b292 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/OrdersTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/OrdersTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Customer;
 
-use Magento\Reports\Controller\Adminhtml\Report\Customer\Orders;
 use Magento\Framework\DataObject;
 use Magento\Framework\Phrase;
+use Magento\Reports\Controller\Adminhtml\Report\Customer\Orders;
 
 class OrdersTest extends \Magento\Reports\Test\Unit\Controller\Adminhtml\Report\AbstractControllerTest
 {
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/TotalsTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/TotalsTest.php
index cd6c38df66db1..d2589aee753b6 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/TotalsTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Customer/TotalsTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Customer;
 
-use Magento\Reports\Controller\Adminhtml\Report\Customer\Totals;
 use Magento\Framework\DataObject;
 use Magento\Framework\Phrase;
+use Magento\Reports\Controller\Adminhtml\Report\Customer\Totals;
 
 class TotalsTest extends \Magento\Reports\Test\Unit\Controller\Adminhtml\Report\AbstractControllerTest
 {
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/DownloadsTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/DownloadsTest.php
index 9f1af7374ce50..060068b2da12d 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/DownloadsTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/DownloadsTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Product;
 
-use Magento\Reports\Controller\Adminhtml\Report\Product\Downloads;
 use Magento\Framework\DataObject;
 use Magento\Framework\Phrase;
+use Magento\Reports\Controller\Adminhtml\Report\Product\Downloads;
 
 class DownloadsTest extends \Magento\Reports\Test\Unit\Controller\Adminhtml\Report\AbstractControllerTest
 {
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsCsvTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsCsvTest.php
index 2f55c406ce208..15393cb73a0e9 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsCsvTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsCsvTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Product;
 
-use Magento\Reports\Controller\Adminhtml\Report\Product\ExportDownloadsCsv;
-
 class ExportDownloadsCsvTest extends \Magento\Reports\Test\Unit\Controller\Adminhtml\Report\AbstractControllerTest
 {
     /**
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsExcelTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsExcelTest.php
index 12e24b8930ea2..966f8f188b218 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsExcelTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportDownloadsExcelTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Product;
 
-use Magento\Reports\Controller\Adminhtml\Report\Product\ExportDownloadsExcel;
-
 class ExportDownloadsExcelTest extends \Magento\Reports\Test\Unit\Controller\Adminhtml\Report\AbstractControllerTest
 {
     /**
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockCsvTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockCsvTest.php
index 0ea71885b958c..d7cd6b9465afb 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockCsvTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockCsvTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Product;
 
-use Magento\Reports\Controller\Adminhtml\Report\Product\ExportLowstockCsv;
-
 class ExportLowstockCsvTest extends \Magento\Reports\Test\Unit\Controller\Adminhtml\Report\AbstractControllerTest
 {
     /**
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockExcelTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockExcelTest.php
index eb8c01708d331..7bf779a675d48 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockExcelTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportLowstockExcelTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Product;
 
-use Magento\Reports\Controller\Adminhtml\Report\Product\ExportLowstockExcel;
-
 class ExportLowstockExcelTest extends \Magento\Reports\Test\Unit\Controller\Adminhtml\Report\AbstractControllerTest
 {
     /**
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldCsvTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldCsvTest.php
index ac2352370ac8e..a5faff39f8e9d 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldCsvTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldCsvTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Product;
 
-use Magento\Reports\Controller\Adminhtml\Report\Product\ExportSoldCsv;
-
 class ExportSoldCsvTest extends \Magento\Reports\Test\Unit\Controller\Adminhtml\Report\AbstractControllerTest
 {
     /**
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldExcelTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldExcelTest.php
index 8e653ce72fadc..db723215307ea 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldExcelTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportSoldExcelTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Product;
 
-use Magento\Reports\Controller\Adminhtml\Report\Product\ExportSoldExcel;
-
 class ExportSoldExcelTest extends \Magento\Reports\Test\Unit\Controller\Adminhtml\Report\AbstractControllerTest
 {
     /**
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedCsvTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedCsvTest.php
index 18b412333bc76..c588e669a0821 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedCsvTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedCsvTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Product;
 
-use Magento\Reports\Controller\Adminhtml\Report\Product\ExportViewedCsv;
-
 class ExportViewedCsvTest extends \Magento\Reports\Test\Unit\Controller\Adminhtml\Report\AbstractControllerTest
 {
     /**
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedExcelTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedExcelTest.php
index e9a6112c1ca6f..d1dfb33780e7f 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedExcelTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ExportViewedExcelTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Product;
 
-use Magento\Reports\Controller\Adminhtml\Report\Product\ExportViewedExcel;
-
 class ExportViewedExcelTest extends \Magento\Reports\Test\Unit\Controller\Adminhtml\Report\AbstractControllerTest
 {
     /**
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/LowstockTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/LowstockTest.php
index 508da7805a8f9..2fdab250a05e9 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/LowstockTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/LowstockTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Product;
 
-use Magento\Reports\Controller\Adminhtml\Report\Product\Lowstock;
 use Magento\Framework\DataObject;
 use Magento\Framework\Phrase;
 
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/SoldTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/SoldTest.php
index 3c89b82ad08da..4a84991ba8a6c 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/SoldTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/SoldTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Product;
 
-use Magento\Reports\Controller\Adminhtml\Report\Product\Sold;
 use Magento\Framework\DataObject;
 use Magento\Framework\Phrase;
 
diff --git a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ViewedTest.php b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ViewedTest.php
index d2d2802f45022..ffefe208d0680 100644
--- a/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ViewedTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Controller/Adminhtml/Report/Product/ViewedTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Reports\Test\Unit\Controller\Adminhtml\Report\Product;
 
-use Magento\Reports\Controller\Adminhtml\Report\Product\Viewed;
 use Magento\Framework\DataObject;
 use Magento\Framework\Phrase;
+use Magento\Reports\Controller\Adminhtml\Report\Product\Viewed;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php
index bf58e214ef4a6..92ece86922219 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php
@@ -485,8 +485,8 @@ public function storesDataProvider()
             'total' => 'SUM(main_table.base_grand_total * main_table.base_to_global_rate)',
             'invoiced' => 'SUM(main_table.base_total_paid * main_table.base_to_global_rate)',
             'refunded' => 'SUM(main_table.base_total_refunded * main_table.base_to_global_rate)',
-            'profit' => 'SUM(text *  main_table.base_to_global_rate) + SUM(text * main_table.base_to_global_rate) '.
-                '- SUM(text * main_table.base_to_global_rate) - SUM(text * main_table.base_to_global_rate) '.
+            'profit' => 'SUM(text *  main_table.base_to_global_rate) + SUM(text * main_table.base_to_global_rate) ' .
+                '- SUM(text * main_table.base_to_global_rate) - SUM(text * main_table.base_to_global_rate) ' .
                 '- SUM(text * main_table.base_to_global_rate)',
         ];
 
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php
index 17e13f9d64bd7..26a82880fbe4d 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Product/ViewedTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Reports\Test\Unit\Model\ResourceModel\Report\Product;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Reports\Model\ResourceModel\Report\Product\Viewed;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php
index 7bb866287d37a..50ee86dc3308a 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php
@@ -5,9 +5,7 @@
  */
 namespace Magento\Reports\Test\Unit\Model\ResourceModel\Report\Quote;
 
-use Magento\Framework\App\ResourceConnection;
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use \Magento\Reports\Model\ResourceModel\Quote\Collection as Collection;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/RequireJs/Test/Unit/Block/Html/Head/ConfigTest.php b/app/code/Magento/RequireJs/Test/Unit/Block/Html/Head/ConfigTest.php
index 0338dd0e6938d..c1fa64e880a35 100644
--- a/app/code/Magento/RequireJs/Test/Unit/Block/Html/Head/ConfigTest.php
+++ b/app/code/Magento/RequireJs/Test/Unit/Block/Html/Head/ConfigTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\RequireJs\Test\Unit\Block\Html\Head;
 
-use \Magento\RequireJs\Block\Html\Head\Config;
+use Magento\RequireJs\Block\Html\Head\Config;
 
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
index 6b6d709cbb608..8b3c8a3822715 100644
--- a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
+++ b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\RequireJs\Test\Unit\Model;
 
-use \Magento\RequireJs\Model\FileManager;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\RequireJs\Model\FileManager;
 
 class FileManagerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product.php b/app/code/Magento/Review/Controller/Adminhtml/Product.php
index 8c4503d8f023e..a4b2add6ac863 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product.php
@@ -8,8 +8,8 @@
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Registry;
-use Magento\Review\Model\ReviewFactory;
 use Magento\Review\Model\RatingFactory;
+use Magento\Review\Model\ReviewFactory;
 
 /**
  * Reviews admin controller
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
index 75015d65e1a18..8cee34c48da75 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
 
 class Delete extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
index a39b22ec080c6..cd16bfcf8f3b1 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
 
 class Edit extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php
index 0dce5b238838d..420254ba03e9a 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Index.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
 
 class Index extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
index c6e9cc81d5814..42a95906d0e5e 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\Registry;
-use Magento\Review\Model\ReviewFactory;
-use Magento\Review\Model\RatingFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\DataObject;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\DataObject;
+use Magento\Framework\Registry;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
+use Magento\Review\Model\RatingFactory;
+use Magento\Review\Model\ReviewFactory;
 
 class JsonProductInfo extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
index c792540000233..e11102c1056f8 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
 
 class MassDelete extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
index 2769a35ba9a48..c0230e0e72782 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
 
 class MassUpdateStatus extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php b/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php
index eca37d3fe24da..dff269ea911a8 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassVisibleIn.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
 
 class MassVisibleIn extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php b/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php
index 5ac3a6a057246..d82dd2f21bcea 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/NewAction.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
 
 class NewAction extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php
index 75eaaaeeef24e..e258cecf2eb67 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Pending.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
 
 class Pending extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
index 1f21a52077bb7..553fb511f6a31 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\Store\Model\Store;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
+use Magento\Store\Model\Store;
 
 class Post extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php
index f1b25c3613d49..7381e806db24b 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/ProductGrid.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Registry;
-use Magento\Review\Model\ReviewFactory;
-use Magento\Review\Model\RatingFactory;
 use Magento\Framework\View\LayoutFactory;
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
+use Magento\Review\Model\RatingFactory;
+use Magento\Review\Model\ReviewFactory;
 
 class ProductGrid extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php
index 5b0ab217e7191..283ed92c03002 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/RatingItems.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Registry;
-use Magento\Review\Model\ReviewFactory;
-use Magento\Review\Model\RatingFactory;
 use Magento\Framework\View\LayoutFactory;
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
+use Magento\Review\Model\RatingFactory;
+use Magento\Review\Model\ReviewFactory;
 
 class RatingItems extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php b/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php
index 017fbc95a8b9a..e35452c634593 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/ReviewGrid.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Registry;
-use Magento\Review\Model\ReviewFactory;
-use Magento\Review\Model\RatingFactory;
 use Magento\Framework\View\LayoutFactory;
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
+use Magento\Review\Model\RatingFactory;
+use Magento\Review\Model\ReviewFactory;
 
 class ReviewGrid extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
index 7159b1825dc4d..a2306f2e70e5b 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Product;
 
-use Magento\Review\Controller\Adminhtml\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Review\Controller\Adminhtml\Product as ProductController;
 
 class Save extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
index 5535c3de26e43..88b0864af202c 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Delete.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Rating;
 
-use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 
 class Delete extends RatingController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php
index 29342a1eee5f5..009ae6d950a5b 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Edit.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Rating;
 
-use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 
 class Edit extends RatingController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php
index 63306e43c30a5..4f338ee9577cd 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Index.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Rating;
 
-use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 
 class Index extends RatingController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php
index 18ff73ad31c5e..c3e759afbd3d8 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/NewAction.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Rating;
 
-use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 
 class NewAction extends RatingController
 {
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
index a4f6faf82e329..50bcbd315e2ca 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating/Save.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Controller\Adminhtml\Rating;
 
-use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Adminhtml\Rating as RatingController;
 
 class Save extends RatingController
 {
diff --git a/app/code/Magento/Review/Controller/Customer.php b/app/code/Magento/Review/Controller/Customer.php
index 52fdf41eeab76..fdcb925fa65fe 100644
--- a/app/code/Magento/Review/Controller/Customer.php
+++ b/app/code/Magento/Review/Controller/Customer.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Review\Controller;
 
+use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
-use Magento\Customer\Model\Session;
 use Magento\Framework\App\RequestInterface;
 
 /**
diff --git a/app/code/Magento/Review/Controller/Customer/Index.php b/app/code/Magento/Review/Controller/Customer/Index.php
index 7d2778ce7570b..ded1599013ec2 100644
--- a/app/code/Magento/Review/Controller/Customer/Index.php
+++ b/app/code/Magento/Review/Controller/Customer/Index.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Controller\Customer;
 
-use Magento\Review\Controller\Customer as CustomerController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Customer as CustomerController;
 
 class Index extends CustomerController
 {
diff --git a/app/code/Magento/Review/Controller/Product/ListAction.php b/app/code/Magento/Review/Controller/Product/ListAction.php
index 26344d125172a..ad3e0e3e53fbf 100644
--- a/app/code/Magento/Review/Controller/Product/ListAction.php
+++ b/app/code/Magento/Review/Controller/Product/ListAction.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Review\Controller\Product;
 
-use Magento\Review\Controller\Product as ProductController;
-use Magento\Review\Model\Review;
 use Magento\Catalog\Model\Product as CatalogProduct;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Product as ProductController;
 
 class ListAction extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Product/ListAjax.php b/app/code/Magento/Review/Controller/Product/ListAjax.php
index 32d608704c241..9ca8b9fcccd0e 100644
--- a/app/code/Magento/Review/Controller/Product/ListAjax.php
+++ b/app/code/Magento/Review/Controller/Product/ListAjax.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Review\Controller\Product;
 
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Review\Controller\Product as ProductController;
-use Magento\Framework\Controller\ResultFactory;
 
 class ListAjax extends ProductController
 {
diff --git a/app/code/Magento/Review/Controller/Product/Post.php b/app/code/Magento/Review/Controller/Product/Post.php
index be18f8fe25bbe..6821c6efbcc8e 100644
--- a/app/code/Magento/Review/Controller/Product/Post.php
+++ b/app/code/Magento/Review/Controller/Product/Post.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Controller\Product;
 
-use Magento\Review\Controller\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Product as ProductController;
 use Magento\Review\Model\Review;
 
 class Post extends ProductController
diff --git a/app/code/Magento/Review/Controller/Product/View.php b/app/code/Magento/Review/Controller/Product/View.php
index 2f1be09092221..6ec7e9db414eb 100644
--- a/app/code/Magento/Review/Controller/Product/View.php
+++ b/app/code/Magento/Review/Controller/Product/View.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Controller\Product;
 
-use Magento\Review\Controller\Product as ProductController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Review\Controller\Product as ProductController;
 use Magento\Review\Model\Review;
 
 class View extends ProductController
diff --git a/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
index 830354796907f..bb503e21be4c3 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Review\Model\ResourceModel\Review\Product;
 
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 
 /**
  * Review Product Collection
diff --git a/app/code/Magento/Review/Test/Unit/Block/Product/ReviewTest.php b/app/code/Magento/Review/Test/Unit/Block/Product/ReviewTest.php
index 243b4e8389923..45db4675a6d55 100644
--- a/app/code/Magento/Review/Test/Unit/Block/Product/ReviewTest.php
+++ b/app/code/Magento/Review/Test/Unit/Block/Product/ReviewTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Review\Test\Unit\Block\Product;
 
+use Magento\Catalog\Model\Product;
 use Magento\Framework\Registry;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\Template\Context;
-use Magento\Catalog\Model\Product;
 use Magento\Review\Block\Product\Review as ReviewBlock;
 use Magento\Review\Model\ResourceModel\Review\Collection;
 use Magento\Review\Model\ResourceModel\Review\CollectionFactory;
diff --git a/app/code/Magento/Review/Test/Unit/Model/RatingTest.php b/app/code/Magento/Review/Test/Unit/Model/RatingTest.php
index c5b20b910b182..7b21c23d8cd59 100644
--- a/app/code/Magento/Review/Test/Unit/Model/RatingTest.php
+++ b/app/code/Magento/Review/Test/Unit/Model/RatingTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Review\Test\Unit\Model;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Review\Model\Review;
 use Magento\Review\Model\Rating;
+use Magento\Review\Model\Review;
 
 class RatingTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/ReviewActionsTest.php b/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/ReviewActionsTest.php
index 70792d38209e4..a08ab2d5b4a36 100644
--- a/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/ReviewActionsTest.php
+++ b/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/ReviewActionsTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Test\Unit\Ui\Component\Listing\Columns;
 
-use Magento\Review\Ui\Component\Listing\Columns\ReviewActions;
 use Magento\Catalog\Test\Unit\Ui\Component\Listing\Columns\AbstractColumnTest;
+use Magento\Review\Ui\Component\Listing\Columns\ReviewActions;
 
 /**
  * Class ReviewActionsTest
diff --git a/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/StatusTest.php b/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/StatusTest.php
index d92d2c3d428fe..bdf141fa9080b 100644
--- a/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/StatusTest.php
+++ b/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/StatusTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Review\Test\Unit\Ui\Component\Listing\Columns;
 
-use Magento\Review\Ui\Component\Listing\Columns\Status;
 use Magento\Catalog\Test\Unit\Ui\Component\Listing\Columns\AbstractColumnTest;
 use Magento\Review\Helper\Data as StatusSource;
+use Magento\Review\Ui\Component\Listing\Columns\Status;
 
 /**
  * Class StatusTest
diff --git a/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/TypeTest.php b/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/TypeTest.php
index d19cc595f4cee..f6a6dc2856a7b 100644
--- a/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/TypeTest.php
+++ b/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/TypeTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Test\Unit\Ui\Component\Listing\Columns;
 
-use Magento\Review\Ui\Component\Listing\Columns\Type;
 use Magento\Catalog\Test\Unit\Ui\Component\Listing\Columns\AbstractColumnTest;
+use Magento\Review\Ui\Component\Listing\Columns\Type;
 
 /**
  * Class TypeTest
diff --git a/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/VisibilityTest.php b/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/VisibilityTest.php
index 1a08982adba77..e4e19f0ab57d2 100644
--- a/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/VisibilityTest.php
+++ b/app/code/Magento/Review/Test/Unit/Ui/Component/Listing/Columns/VisibilityTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Review\Test\Unit\Ui\Component\Listing\Columns;
 
-use Magento\Review\Ui\Component\Listing\Columns\Visibility;
 use Magento\Catalog\Test\Unit\Ui\Component\Listing\Columns\AbstractColumnTest;
+use Magento\Review\Ui\Component\Listing\Columns\Visibility;
 use Magento\Store\Model\System\Store;
 
 /**
diff --git a/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php b/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php
index f618651930dcd..7418c85c6754a 100644
--- a/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php
+++ b/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/Form/Modifier/ReviewTest.php
@@ -6,9 +6,9 @@
 namespace Magento\Review\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier\AbstractModifierTest;
+use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Framework\UrlInterface;
 use Magento\Review\Ui\DataProvider\Product\Form\Modifier\Review;
-use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Ui\DataProvider\Modifier\ModifierInterface;
 
 /**
diff --git a/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/ReviewDataProviderTest.php b/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/ReviewDataProviderTest.php
index 56a492e90c712..f1216aee08ffb 100644
--- a/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/ReviewDataProviderTest.php
+++ b/app/code/Magento/Review/Test/Unit/Ui/DataProvider/Product/ReviewDataProviderTest.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory;
 use Magento\Review\Model\ResourceModel\Review\Product\Collection;
+use Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory;
 use Magento\Review\Ui\DataProvider\Product\ReviewDataProvider;
 
 /**
diff --git a/app/code/Magento/Review/Ui/Component/Listing/Columns/Status.php b/app/code/Magento/Review/Ui/Component/Listing/Columns/Status.php
index 203d925f98d7e..165e03bff3755 100644
--- a/app/code/Magento/Review/Ui/Component/Listing/Columns/Status.php
+++ b/app/code/Magento/Review/Ui/Component/Listing/Columns/Status.php
@@ -6,10 +6,10 @@
 namespace Magento\Review\Ui\Component\Listing\Columns;
 
 use Magento\Framework\Data\OptionSourceInterface;
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Review\Helper\Data as StatusSource;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class Status
diff --git a/app/code/Magento/Review/Ui/Component/Listing/Columns/Visibility.php b/app/code/Magento/Review/Ui/Component/Listing/Columns/Visibility.php
index 322034fd43f93..36fe67c0bf068 100644
--- a/app/code/Magento/Review/Ui/Component/Listing/Columns/Visibility.php
+++ b/app/code/Magento/Review/Ui/Component/Listing/Columns/Visibility.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Review\Ui\Component\Listing\Columns;
 
-use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Store\Model\System\Store;
-use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Store\Model\System\Store;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class Visibility
diff --git a/app/code/Magento/Review/Ui/DataProvider/Product/Form/Modifier/Review.php b/app/code/Magento/Review/Ui/DataProvider/Product/Form/Modifier/Review.php
index 727cd973de32d..711f2691dc983 100644
--- a/app/code/Magento/Review/Ui/DataProvider/Product/Form/Modifier/Review.php
+++ b/app/code/Magento/Review/Ui/DataProvider/Product/Form/Modifier/Review.php
@@ -10,10 +10,10 @@
  */
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
-use Magento\Ui\Component\Form;
-use Magento\Framework\UrlInterface;
-use Magento\Framework\Module\Manager as ModuleManager;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Module\Manager as ModuleManager;
+use Magento\Framework\UrlInterface;
+use Magento\Ui\Component\Form;
 
 /**
  * Review modifier for catalog product form
@@ -102,12 +102,11 @@ public function modifyMeta(array $meta)
                         'collapsible' => true,
                         'opened' => false,
                         'componentType' => Form\Fieldset::NAME,
-                        'sortOrder' =>
-                            $this->getNextGroupSortOrder(
-                                $meta,
-                                static::GROUP_CONTENT,
-                                static::SORT_ORDER
-                            ),
+                        'sortOrder' => $this->getNextGroupSortOrder(
+                            $meta,
+                            static::GROUP_CONTENT,
+                            static::SORT_ORDER
+                        ),
                     ],
                 ],
             ],
diff --git a/app/code/Magento/Review/Ui/DataProvider/Product/ReviewDataProvider.php b/app/code/Magento/Review/Ui/DataProvider/Product/ReviewDataProvider.php
index a9c011d4a4865..f1f05775a2297 100644
--- a/app/code/Magento/Review/Ui/DataProvider/Product/ReviewDataProvider.php
+++ b/app/code/Magento/Review/Ui/DataProvider/Product/ReviewDataProvider.php
@@ -6,10 +6,9 @@
 namespace Magento\Review\Ui\DataProvider\Product;
 
 use Magento\Framework\App\RequestInterface;
-use Magento\Ui\DataProvider\AbstractDataProvider;
-use Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory;
 use Magento\Review\Model\ResourceModel\Review\Product\Collection;
-use Magento\Review\Model\Review;
+use Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory;
+use Magento\Ui\DataProvider\AbstractDataProvider;
 
 /**
  * Class ReviewDataProvider
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
index 80dcce2fd1be4..37b2687eef118 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Items\Column;
 
+use Magento\Quote\Model\Quote\Item\AbstractItem as QuoteItem;
 use Magento\Sales\Model\Order\Creditmemo\Item as CreditmemoItem;
 use Magento\Sales\Model\Order\Invoice\Item as InvoiceItem;
 use Magento\Sales\Model\Order\Item;
-use Magento\Quote\Model\Quote\Item\AbstractItem as QuoteItem;
 
 /**
  * Adminhtml sales order column renderer
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
index b684fe8c62df2..bb56b1184da61 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/AbstractCreate.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Create;
 
-use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
  * Adminhtml sales order create abstract block
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
index d5aff28721534..d15c218a60b47 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/AbstractForm.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
-use Magento\Framework\Convert\ConvertArray;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
index a9f7bf3516517..d47504794dec2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
@@ -12,7 +12,7 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
-class Totals extends \Magento\Sales\Block\Adminhtml\Totals//\Magento\Sales\Block\Adminhtml\Order\AbstractOrder
+class Totals extends \Magento\Sales\Block\Adminhtml\Totals //\Magento\Sales\Block\Adminhtml\Order\AbstractOrder
 {
     /**
      * Initialize order totals array
diff --git a/app/code/Magento/Sales/Block/Order/History.php b/app/code/Magento/Sales/Block/Order/History.php
index 034df4edb5b49..8689d078f8707 100644
--- a/app/code/Magento/Sales/Block/Order/History.php
+++ b/app/code/Magento/Sales/Block/Order/History.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sales\Block\Order;
 
-use \Magento\Framework\App\ObjectManager;
-use \Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
 
 /**
  * Sales order history block
diff --git a/app/code/Magento/Sales/Block/Order/Info.php b/app/code/Magento/Sales/Block/Order/Info.php
index db3dbdbfde40b..53c61dfbd7784 100644
--- a/app/code/Magento/Sales/Block/Order/Info.php
+++ b/app/code/Magento/Sales/Block/Order/Info.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Block\Order;
 
-use Magento\Sales\Model\Order\Address;
-use Magento\Framework\View\Element\Template\Context as TemplateContext;
 use Magento\Framework\Registry;
+use Magento\Framework\View\Element\Template\Context as TemplateContext;
 use Magento\Payment\Helper\Data as PaymentHelper;
+use Magento\Sales\Model\Order\Address;
 use Magento\Sales\Model\Order\Address\Renderer as AddressRenderer;
 
 /**
diff --git a/app/code/Magento/Sales/Controller/AbstractController/OrderLoader.php b/app/code/Magento/Sales/Controller/AbstractController/OrderLoader.php
index 15bbba7a34cb4..bbc7ba4212794 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/OrderLoader.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/OrderLoader.php
@@ -7,9 +7,9 @@
 namespace Magento\Sales\Controller\AbstractController;
 
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Registry;
 use Magento\Framework\Controller\Result\ForwardFactory;
 use Magento\Framework\Controller\Result\RedirectFactory;
+use Magento\Framework\Registry;
 
 class OrderLoader implements OrderLoaderInterface
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php
index 83486704984f7..2366fff4e18fe 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/Pdfcreditmemos.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo;
 
-use Magento\Framework\App\ResponseInterface;
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Magento\Sales\Model\Order\Pdf\Creditmemo;
 use Magento\Framework\Stdlib\DateTime\DateTime;
-use Magento\Backend\App\Action\Context;
-use Magento\Framework\App\Response\Http\FileFactory;
-use Magento\Ui\Component\MassAction\Filter;
+use Magento\Sales\Model\Order\Pdf\Creditmemo;
 use Magento\Sales\Model\ResourceModel\Order\Creditmemo\CollectionFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * Class Pdfcreditmemos
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php
index d6c94feb57606..78f7bb4818bea 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Creditmemo/AbstractCreditmemo/PrintAction.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
 
 class PrintAction extends \Magento\Backend\App\Action
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php
index a949ceca53961..cbc3bb5bb3526 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/Pdfinvoices.php
@@ -6,15 +6,15 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice;
 
-use Magento\Framework\App\ResponseInterface;
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Magento\Ui\Component\MassAction\Filter;
-use Magento\Sales\Model\Order\Pdf\Invoice;
 use Magento\Framework\Stdlib\DateTime\DateTime;
-use Magento\Framework\App\Response\Http\FileFactory;
-use Magento\Backend\App\Action\Context;
+use Magento\Sales\Model\Order\Pdf\Invoice;
 use Magento\Sales\Model\ResourceModel\Order\Invoice\CollectionFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php
index 2421267aa753d..2312087bafc9a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice/PrintAction.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 abstract class PrintAction extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order.php b/app/code/Magento/Sales/Controller/Adminhtml/Order.php
index c2299374c798c..c85ca223fc1cb 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order.php
@@ -6,10 +6,10 @@
 namespace Magento\Sales\Controller\Adminhtml;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\OrderManagementInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Exception\InputException;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
index dc994e554b394..1ce1f82d435f0 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddressSave.php
@@ -9,21 +9,21 @@
 use Magento\Backend\App\Action\Context;
 use Magento\Backend\Model\View\Result\Redirect;
 use Magento\Directory\Model\RegionFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Registry;
+use Magento\Framework\Translate\InlineInterface;
+use Magento\Framework\View\Result\LayoutFactory;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Sales\Api\Data\OrderAddressInterface;
 use Magento\Sales\Api\OrderManagementInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
-use Magento\Sales\Api\Data\OrderAddressInterface;
 use Magento\Sales\Controller\Adminhtml\Order;
 use Magento\Sales\Model\Order\Address as AddressModel;
 use Psr\Log\LoggerInterface;
-use Magento\Framework\Registry;
-use Magento\Framework\App\Response\Http\FileFactory;
-use Magento\Framework\Translate\InlineInterface;
-use Magento\Framework\View\Result\PageFactory;
-use Magento\Framework\Controller\Result\JsonFactory;
-use Magento\Framework\View\Result\LayoutFactory;
-use Magento\Framework\Controller\Result\RawFactory;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
index 1343b77bcd0ae..f0dbeec660ca8 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
@@ -6,8 +6,8 @@
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
 use Magento\Backend\App\Action;
-use Magento\Framework\View\Result\PageFactory;
 use Magento\Backend\Model\View\Result\ForwardFactory;
+use Magento\Framework\View\Result\PageFactory;
 
 /**
  * Adminhtml sales orders creation process controller
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php
index 6a9d0a5dcb8ed..4e784e03eb99d 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlock.php
@@ -7,8 +7,8 @@
 
 use Magento\Backend\App\Action;
 use Magento\Backend\Model\View\Result\ForwardFactory;
-use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Framework\View\Result\PageFactory;
 
 class LoadBlock extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php
index 995a6c216d3c2..6858cc869ceaf 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php
@@ -8,9 +8,9 @@
 use Magento\Backend\App\Action;
 use Magento\Backend\Model\View\Result\ForwardFactory;
 use Magento\Framework\View\Result\PageFactory;
-use Magento\Sales\Model\Order\Reorder\UnavailableProductsProvider;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Helper\Reorder as ReorderHelper;
+use Magento\Sales\Model\Order\Reorder\UnavailableProductsProvider;
 
 class Reorder extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php
index 01119c3aa88a1..04f99e1682fe5 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create/ShowUpdateResult.php
@@ -7,8 +7,8 @@
 
 use Magento\Backend\App\Action;
 use Magento\Backend\Model\View\Result\ForwardFactory;
-use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Framework\View\Result\PageFactory;
 
 class ShowUpdateResult extends \Magento\Sales\Controller\Adminhtml\Order\Create
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintAction.php
index bf1f70fc18611..8b66bbed3d0e5 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/PrintAction.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Creditmemo;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Backend\App\Action;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
 
 class PrintAction extends \Magento\Sales\Controller\Adminhtml\Creditmemo\AbstractCreditmemo\PrintAction
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
index 057e72b6176d3..5d6d553ad0be4 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/CreditmemoLoader.php
@@ -8,7 +8,7 @@
 
 use Magento\Framework\DataObject;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
-use \Magento\Sales\Model\Order\CreditmemoFactory;
+use Magento\Sales\Model\Order\CreditmemoFactory;
 
 /**
  * Class CreditmemoLoader
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php
index 9483abf6354cb..105a4bd519581 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddComment.php
@@ -6,15 +6,15 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
+use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Sales\Model\Order\Email\Sender\InvoiceCommentSender;
-use Magento\Sales\Model\Order\Invoice;
-use Magento\Backend\App\Action;
 use Magento\Framework\Registry;
-use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\View\Result\PageFactory;
-use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Sales\Model\Order\Email\Sender\InvoiceCommentSender;
+use Magento\Sales\Model\Order\Invoice;
 
 class AddComment extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
index c45a1982784e1..9be54de83ca28 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php
@@ -11,8 +11,8 @@
 use Magento\Framework\Registry;
 use Magento\Sales\Model\Order\Email\Sender\InvoiceSender;
 use Magento\Sales\Model\Order\Email\Sender\ShipmentSender;
-use Magento\Sales\Model\Order\ShipmentFactory;
 use Magento\Sales\Model\Order\Invoice;
+use Magento\Sales\Model\Order\ShipmentFactory;
 use Magento\Sales\Model\Service\InvoiceService;
 
 /**
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
index cdb4114f70976..07ec22e52edd7 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQty.php
@@ -6,13 +6,13 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\Controller\Result\JsonFactory;
-use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\Controller\Result\RawFactory;
-use Magento\Backend\App\Action\Context;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Registry;
+use Magento\Framework\View\Result\PageFactory;
 use Magento\Sales\Model\Service\InvoiceService;
 
 /**
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php
index 78a413d5636e8..e3336d296a84c 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php
@@ -6,9 +6,9 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
-use Magento\Framework\View\Result\PageFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Registry;
+use Magento\Framework\View\Result\PageFactory;
 
 class View extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php
index 2ba8467ff6864..b26fee4daa7d6 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassCancel.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Backend\App\Action\Context;
-use Magento\Ui\Component\MassAction\Filter;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 class MassCancel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
index e894957dc8b6c..3bfffe83ae2ac 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassHold.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Backend\App\Action\Context;
-use Magento\Ui\Component\MassAction\Filter;
-use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Sales\Api\OrderManagementInterface;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * Class MassHold
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php
index ebd6ff4a79b06..6f5edfd9b34f5 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Backend\App\Action\Context;
-use Magento\Ui\Component\MassAction\Filter;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 class MassUnhold extends AbstractMassAction
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php
index f96e2fd09c2b0..af8a210cd4759 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfcreditmemos.php
@@ -5,17 +5,16 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
-use Magento\Framework\App\ResponseInterface;
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Magento\Ui\Component\MassAction\Filter;
-use Magento\Sales\Model\Order\Pdf\Creditmemo;
-use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\App\Response\Http\FileFactory;
-use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Sales\Model\Order\Pdf\Creditmemo;
 use Magento\Sales\Model\ResourceModel\Order\Creditmemo\CollectionFactory;
-use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * Class Pdfcreditmemos
@@ -79,7 +78,6 @@ public function __construct(
      */
     protected function massAction(AbstractCollection $collection)
     {
-
         $creditmemoCollection = $this->collectionFactory->create()->setOrderFilter(['in' => $collection->getAllIds()]);
         if (!$creditmemoCollection->getSize()) {
             $this->messageManager->addError(__('There are no printable documents related to selected orders.'));
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
index d68cfe696b0ef..77db09f59e9c8 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfdocs.php
@@ -5,20 +5,20 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
-use Magento\Framework\App\ResponseInterface;
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Sales\Model\Order\Pdf\Creditmemo;
 use Magento\Sales\Model\Order\Pdf\Invoice;
-use Magento\Backend\App\Action\Context;
-use Magento\Framework\App\Response\Http\FileFactory;
-use Magento\Ui\Component\MassAction\Filter;
 use Magento\Sales\Model\Order\Pdf\Shipment;
-use Magento\Sales\Model\Order\Pdf\Creditmemo;
-use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory as OrderCollectionFactory;
-use Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory as ShipmentCollectionFactory;
-use Magento\Sales\Model\ResourceModel\Order\Invoice\CollectionFactory as InvoiceCollectionFactory;
 use Magento\Sales\Model\ResourceModel\Order\Creditmemo\CollectionFactory as CreditmemoCollectionFactory;
+use Magento\Sales\Model\ResourceModel\Order\Invoice\CollectionFactory as InvoiceCollectionFactory;
+use Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory as ShipmentCollectionFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * Class Pdfdocs
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php
index fee124a91410d..389e440637936 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfinvoices.php
@@ -5,17 +5,16 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
-use Magento\Framework\App\ResponseInterface;
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Magento\Ui\Component\MassAction\Filter;
-use Magento\Sales\Model\Order\Pdf\Invoice;
-use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\App\Response\Http\FileFactory;
-use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Sales\Model\Order\Pdf\Invoice;
 use Magento\Sales\Model\ResourceModel\Order\Invoice\CollectionFactory;
-use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php
index 1aa5bfdb83878..8e74a9dd4780f 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Pdfshipments.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
-use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Response\Http\FileFactory;
-use Magento\Ui\Component\MassAction\Filter;
-use Magento\Sales\Model\Order\Pdf\Shipment;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Framework\Stdlib\DateTime\DateTime;
-use Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory as ShipmentCollectionFactory;
+use Magento\Sales\Model\Order\Pdf\Shipment;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory as ShipmentCollectionFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php
index 982ee53cb0ff2..341f9c974a95e 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Assign.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Status;
 
-use Magento\Framework\Registry;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
 use Magento\Framework\View\Result\PageFactory;
 
 class Assign extends \Magento\Sales\Controller\Adminhtml\Order\Status
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php
index 69e051b20c4dd..324f86364873a 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Edit.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Status;
 
-use Magento\Framework\Registry;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
 use Magento\Framework\View\Result\PageFactory;
 
 class Edit extends \Magento\Sales\Controller\Adminhtml\Order\Status
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php
index 110402ee27070..1df54d9a8e015 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/Index.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Status;
 
-use Magento\Framework\Registry;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
 use Magento\Framework\View\Result\PageFactory;
 
 class Index extends \Magento\Sales\Controller\Adminhtml\Order\Status
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/NewAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/NewAction.php
index c24758d2f1ba4..b34080e73a4a1 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/NewAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Status/NewAction.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Status;
 
-use Magento\Framework\Registry;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
 use Magento\Framework\View\Result\PageFactory;
 
 class NewAction extends \Magento\Sales\Controller\Adminhtml\Order\Status
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php
index 7be17f865312e..405145780d212 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/View.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
-use Magento\Backend\App\Action;
-
 class View extends \Magento\Sales\Controller\Adminhtml\Order
 {
     /**
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php
index b10dca908fe6a..b9a757572f6ce 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/Pdfshipments.php
@@ -7,14 +7,14 @@
 namespace Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment;
 
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Magento\Ui\Component\MassAction\Filter;
-use Magento\Sales\Model\Order\Pdf\Shipment;
 use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Sales\Model\Order\Pdf\Shipment;
 use Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory;
+use Magento\Ui\Component\MassAction\Filter;
 
 abstract class Pdfshipments extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php
index da8646a0c30b2..010388240b43f 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Shipment/AbstractShipment/PrintAction.php
@@ -7,10 +7,10 @@
 namespace Magento\Sales\Controller\Adminhtml\Shipment\AbstractShipment;
 
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\App\ResponseInterface;
+use Magento\Backend\Model\View\Result\ForwardFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Response\Http\FileFactory;
-use Magento\Backend\Model\View\Result\ForwardFactory;
+use Magento\Framework\App\ResponseInterface;
 
 abstract class PrintAction extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php
index d5c1186964076..a448b06bf3d28 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Transactions.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Sales\Controller\Adminhtml;
 
-use Magento\Backend\App\Action;
 use Magento\Framework\Registry;
-use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\View\Result\LayoutFactory;
+use Magento\Framework\View\Result\PageFactory;
 use Magento\Sales\Api\OrderPaymentRepositoryInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
index 0deddd9fb6ec5..5a15ad71fdbcf 100644
--- a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
+++ b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
@@ -7,9 +7,9 @@
 
 namespace Magento\Sales\Controller\Download;
 
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\Action\Context;
 use Magento\Catalog\Model\Product\Type\AbstractType;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\Result\ForwardFactory;
 
 /**
diff --git a/app/code/Magento/Sales/Controller/Guest/View.php b/app/code/Magento/Sales/Controller/Guest/View.php
index 9e96a15ed2c12..fb4e1040a018b 100644
--- a/app/code/Magento/Sales/Controller/Guest/View.php
+++ b/app/code/Magento/Sales/Controller/Guest/View.php
@@ -6,9 +6,9 @@
 namespace Magento\Sales\Controller\Guest;
 
 use Magento\Framework\App\Action;
-use Magento\Sales\Helper\Guest as GuestHelper;
-use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Sales\Helper\Guest as GuestHelper;
 
 class View extends Action\Action
 {
diff --git a/app/code/Magento/Sales/Controller/Order/History.php b/app/code/Magento/Sales/Controller/Order/History.php
index 23e8208d8b198..84ba1cb7f3165 100644
--- a/app/code/Magento/Sales/Controller/Order/History.php
+++ b/app/code/Magento/Sales/Controller/Order/History.php
@@ -6,9 +6,9 @@
  */
 namespace Magento\Sales\Controller\Order;
 
-use Magento\Sales\Controller\OrderInterface;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
+use Magento\Sales\Controller\OrderInterface;
 
 class History extends \Magento\Framework\App\Action\Action implements OrderInterface
 {
diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php
index dd8845008d79e..8d80f7a12b35c 100644
--- a/app/code/Magento/Sales/Helper/Guest.php
+++ b/app/code/Magento/Sales/Helper/Guest.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Stdlib\Cookie\CookieSizeLimitReachedException;
 use Magento\Framework\Stdlib\Cookie\FailureToSendException;
-use \Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order;
 
 /**
  * Sales module base helper
@@ -128,7 +128,7 @@ public function __construct(
         $this->resultRedirectFactory = $resultRedirectFactory;
         $this->orderRepository = $orderRepository ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Sales\Api\OrderRepositoryInterface::class);
-        $this->searchCriteriaBuilder = $searchCriteria?: \Magento\Framework\App\ObjectManager::getInstance()
+        $this->searchCriteriaBuilder = $searchCriteria ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Api\SearchCriteriaBuilder::class);
         parent::__construct(
             $context
diff --git a/app/code/Magento/Sales/Model/AbstractNotifier.php b/app/code/Magento/Sales/Model/AbstractNotifier.php
index dfa7e12c083a4..58c76df6269ec 100644
--- a/app/code/Magento/Sales/Model/AbstractNotifier.php
+++ b/app/code/Magento/Sales/Model/AbstractNotifier.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Sales\Model;
 
-use Psr\Log\LoggerInterface as Logger;
 use Magento\Sales\Model\Order\Email\Sender;
 use Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory;
+use Psr\Log\LoggerInterface as Logger;
 
 /**
  * Class Notifier
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 8ea09e6fb3d42..2107709f1eafb 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -1343,7 +1343,7 @@ protected function _setQuoteAddress(\Magento\Quote\Model\Quote\Address $address,
         $data = isset($data['region']) && is_array($data['region']) ? array_merge($data, $data['region']) : $data;
 
         $addressForm = $this->_metadataFormFactory->create(
-            
+
             AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
             'adminhtml_customer_address',
             $data,
@@ -1766,7 +1766,7 @@ public function _prepareCustomer()
                 ->setWebsiteId($store->getWebsiteId())
                 ->setCreatedAt(null);
             $customer = $this->_validateCustomerData($customer);
-        } else if (!$customer->getId()) {
+        } elseif (!$customer->getId()) {
             /** Create new customer */
             $customerBillingAddressDataObject = $this->getBillingAddress()->exportCustomerAddress();
             $customer->setSuffix($customerBillingAddressDataObject->getSuffix())
diff --git a/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php b/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php
index 8ba0b5b071395..7a12cca130a5a 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/EmailSender.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Model\AdminOrder;
 
-use Psr\Log\LoggerInterface as Logger;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
+use Psr\Log\LoggerInterface as Logger;
 
 /**
  * Class EmailSender
diff --git a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
index 8a7bd0260df0f..8af0b761be93f 100644
--- a/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
+++ b/app/code/Magento/Sales/Model/CronJob/CleanExpiredOrders.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sales\Model\CronJob;
 
-use Magento\Store\Model\StoresConfig;
 use Magento\Sales\Model\Order;
+use Magento\Store\Model\StoresConfig;
 
 class CleanExpiredOrders
 {
diff --git a/app/code/Magento/Sales/Model/Order/AddressRepository.php b/app/code/Magento/Sales/Model/Order/AddressRepository.php
index 96dc531a82bf4..27ea310ecf9d9 100644
--- a/app/code/Magento/Sales/Model/Order/AddressRepository.php
+++ b/app/code/Magento/Sales/Model/Order/AddressRepository.php
@@ -6,12 +6,12 @@
 namespace Magento\Sales\Model\Order;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Sales\Model\ResourceModel\Metadata;
-use Magento\Sales\Api\Data\OrderAddressSearchResultInterfaceFactory as SearchResultFactory;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Sales\Api\Data\OrderAddressSearchResultInterfaceFactory as SearchResultFactory;
+use Magento\Sales\Model\ResourceModel\Metadata;
 
 /**
  * Repository class for @see \Magento\Sales\Api\Data\OrderAddressInterface
@@ -95,7 +95,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
         $searchResult = $this->searchResultFactory->create();
         $this->collectionProcessor->process($searchCriteria, $searchResult);
         $searchResult->setSearchCriteria($searchCriteria);
-        
+
         return $searchResult;
     }
 
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index 0d0e0d23496b7..b79b80537fee0 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -14,7 +14,6 @@
 use Magento\Sales\Api\Data\CreditmemoInterface;
 use Magento\Sales\Model\AbstractModel;
 use Magento\Sales\Model\EntityInterface;
-use Magento\Sales\Model\Order\InvoiceFactory;
 
 /**
  * Order creditmemo model
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
index ecd5670a319e7..a0896a91204e3 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Sales\Model\Order\Creditmemo\Sender;
 
-use Magento\Sales\Model\Order\Email\Sender;
-use Magento\Sales\Model\Order\Creditmemo\SenderInterface;
 use Magento\Framework\DataObject;
+use Magento\Sales\Model\Order\Creditmemo\SenderInterface;
+use Magento\Sales\Model\Order\Email\Sender;
 
 /**
  * Email notification sender for Creditmemo.
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoNotifier.php b/app/code/Magento/Sales/Model/Order/CreditmemoNotifier.php
index 3b0193362564c..27cc3596f7a4b 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoNotifier.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoNotifier.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Sales\Model\Order;
 
-use Psr\Log\LoggerInterface as Logger;
 use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
 use Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory;
+use Psr\Log\LoggerInterface as Logger;
 
 /**
  * Class CreditmemoNotifier
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php b/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
index b866b0de0abfc..7dbb47d0c2e11 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
@@ -7,13 +7,12 @@
 namespace Magento\Sales\Model\Order;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Sales\Model\ResourceModel\Order\Creditmemo as Resource;
-use Magento\Sales\Model\ResourceModel\Metadata;
-use Magento\Sales\Api\Data\CreditmemoSearchResultInterfaceFactory as SearchResultFactory;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Sales\Api\Data\CreditmemoSearchResultInterfaceFactory as SearchResultFactory;
+use Magento\Sales\Model\ResourceModel\Metadata;
 
 /**
  * Repository class for @see \Magento\Sales\Api\Data\CreditmemoInterface
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender.php b/app/code/Magento/Sales/Model/Order/Email/Sender.php
index 8ada6a3f321d2..f7eb61067b1a2 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender.php
@@ -6,9 +6,9 @@
 namespace Magento\Sales\Model\Order\Email;
 
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address\Renderer;
 use Magento\Sales\Model\Order\Email\Container\IdentityInterface;
 use Magento\Sales\Model\Order\Email\Container\Template;
-use Magento\Sales\Model\Order\Address\Renderer;
 
 /**
  * Class Sender
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
index ce72f0fee7786..888f454b69a19 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoCommentSender.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Sales\Model\Order\Email\Sender;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address\Renderer;
 use Magento\Sales\Model\Order\Creditmemo;
 use Magento\Sales\Model\Order\Email\Container\CreditmemoCommentIdentity;
 use Magento\Sales\Model\Order\Email\Container\Template;
 use Magento\Sales\Model\Order\Email\NotifySender;
-use Magento\Sales\Model\Order\Address\Renderer;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\DataObject;
 
 /**
  * Class CreditmemoCommentSender
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
index 8004483583114..105fc6e8c06c8 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/CreditmemoSender.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Sales\Model\Order\Email\Sender;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Payment\Helper\Data as PaymentHelper;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address\Renderer;
 use Magento\Sales\Model\Order\Creditmemo;
 use Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity;
 use Magento\Sales\Model\Order\Email\Container\Template;
 use Magento\Sales\Model\Order\Email\Sender;
 use Magento\Sales\Model\ResourceModel\Order\Creditmemo as CreditmemoResource;
-use Magento\Sales\Model\Order\Address\Renderer;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\DataObject;
 
 /**
  * Class CreditmemoSender
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
index 62d13eb8ce681..703bb59e135fe 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceCommentSender.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Sales\Model\Order\Email\Sender;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address\Renderer;
 use Magento\Sales\Model\Order\Email\Container\InvoiceCommentIdentity;
 use Magento\Sales\Model\Order\Email\Container\Template;
 use Magento\Sales\Model\Order\Email\NotifySender;
 use Magento\Sales\Model\Order\Invoice;
-use Magento\Sales\Model\Order\Address\Renderer;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\DataObject;
 
 /**
  * Class InvoiceCommentSender
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
index 994fd79945cfd..346d99f3b6c3f 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Sales\Model\Order\Email\Sender;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Payment\Helper\Data as PaymentHelper;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address\Renderer;
 use Magento\Sales\Model\Order\Email\Container\InvoiceIdentity;
 use Magento\Sales\Model\Order\Email\Container\Template;
 use Magento\Sales\Model\Order\Email\Sender;
 use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\ResourceModel\Order\Invoice as InvoiceResource;
-use Magento\Sales\Model\Order\Address\Renderer;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\DataObject;
 
 /**
  * Class InvoiceSender
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
index 98cb9304a494b..5d1936f1f5db8 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderCommentSender.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Sales\Model\Order\Email\Sender;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address\Renderer;
 use Magento\Sales\Model\Order\Email\Container\OrderCommentIdentity;
 use Magento\Sales\Model\Order\Email\Container\Template;
 use Magento\Sales\Model\Order\Email\NotifySender;
-use Magento\Sales\Model\Order\Address\Renderer;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\DataObject;
 
 /**
  * Class OrderCommentSender
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
index e98f400973c6d..bc390860209e2 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/OrderSender.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Sales\Model\Order\Email\Sender;
 
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Payment\Helper\Data as PaymentHelper;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address\Renderer;
 use Magento\Sales\Model\Order\Email\Container\OrderIdentity;
 use Magento\Sales\Model\Order\Email\Container\Template;
 use Magento\Sales\Model\Order\Email\Sender;
 use Magento\Sales\Model\ResourceModel\Order as OrderResource;
-use Magento\Sales\Model\Order\Address\Renderer;
-use Magento\Framework\Event\ManagerInterface;
 
 /**
  * Class OrderSender
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
index 664f8ec9fc7e5..91a240a55dc32 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Sales\Model\Order\Email\Sender;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address\Renderer;
 use Magento\Sales\Model\Order\Email\Container\ShipmentCommentIdentity;
 use Magento\Sales\Model\Order\Email\Container\Template;
 use Magento\Sales\Model\Order\Email\NotifySender;
 use Magento\Sales\Model\Order\Shipment;
-use Magento\Sales\Model\Order\Address\Renderer;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\DataObject;
 
 /**
  * Class ShipmentCommentSender
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
index 6729c746f5565..860c699760212 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Sales\Model\Order\Email\Sender;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Payment\Helper\Data as PaymentHelper;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address\Renderer;
 use Magento\Sales\Model\Order\Email\Container\ShipmentIdentity;
 use Magento\Sales\Model\Order\Email\Container\Template;
 use Magento\Sales\Model\Order\Email\Sender;
 use Magento\Sales\Model\Order\Shipment;
 use Magento\Sales\Model\ResourceModel\Order\Shipment as ShipmentResource;
-use Magento\Sales\Model\Order\Address\Renderer;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\DataObject;
 
 /**
  * Class ShipmentSender
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
index aa0687bee504f..088196fa83390 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Sales\Model\Order\Invoice\Sender;
 
+use Magento\Framework\DataObject;
 use Magento\Sales\Model\Order\Email\Sender;
 use Magento\Sales\Model\Order\Invoice\SenderInterface;
-use Magento\Framework\DataObject;
 
 /**
  * Email notification sender for Invoice.
diff --git a/app/code/Magento/Sales/Model/Order/InvoiceNotifier.php b/app/code/Magento/Sales/Model/Order/InvoiceNotifier.php
index a5005a9afea0b..a8bfb7e2b1da5 100644
--- a/app/code/Magento/Sales/Model/Order/InvoiceNotifier.php
+++ b/app/code/Magento/Sales/Model/Order/InvoiceNotifier.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Sales\Model\Order;
 
-use Psr\Log\LoggerInterface as Logger;
 use Magento\Sales\Model\Order\Email\Sender\InvoiceSender;
 use Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory;
+use Psr\Log\LoggerInterface as Logger;
 
 /**
  * Class InvoiceNotifier
diff --git a/app/code/Magento/Sales/Model/Order/InvoiceRepository.php b/app/code/Magento/Sales/Model/Order/InvoiceRepository.php
index db8cb2e1d88c8..d9930be9ce3ba 100644
--- a/app/code/Magento/Sales/Model/Order/InvoiceRepository.php
+++ b/app/code/Magento/Sales/Model/Order/InvoiceRepository.php
@@ -7,10 +7,10 @@
 namespace Magento\Sales\Model\Order;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Sales\Api\InvoiceRepositoryInterface;
-use Magento\Sales\Model\ResourceModel\Metadata;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\InvoiceSearchResultInterfaceFactory as SearchResultFactory;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Model\ResourceModel\Metadata;
 
 /**
  * Class InvoiceRepository
diff --git a/app/code/Magento/Sales/Model/Order/ItemRepository.php b/app/code/Magento/Sales/Model/Order/ItemRepository.php
index 8ded805546c8a..fc3fb0a4cc1b1 100644
--- a/app/code/Magento/Sales/Model/Order/ItemRepository.php
+++ b/app/code/Magento/Sales/Model/Order/ItemRepository.php
@@ -6,16 +6,15 @@
 namespace Magento\Sales\Model\Order;
 
 use Magento\Catalog\Api\Data\ProductOptionExtensionFactory;
-use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Catalog\Model\ProductOptionFactory;
 use Magento\Catalog\Model\ProductOptionProcessorInterface;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\DataObject\Factory as DataObjectFactory;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\OrderItemInterface;
-use Magento\Sales\Api\Data\OrderItemSearchResultInterface;
 use Magento\Sales\Api\Data\OrderItemSearchResultInterfaceFactory;
 use Magento\Sales\Api\OrderItemRepositoryInterface;
 use Magento\Sales\Model\ResourceModel\Metadata;
diff --git a/app/code/Magento/Sales/Model/Order/OrderValidator.php b/app/code/Magento/Sales/Model/Order/OrderValidator.php
index 1b04e6ca8c362..880b85a993d11 100644
--- a/app/code/Magento/Sales/Model/Order/OrderValidator.php
+++ b/app/code/Magento/Sales/Model/Order/OrderValidator.php
@@ -6,7 +6,6 @@
 namespace Magento\Sales\Model\Order;
 
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Exception\DocumentValidationException;
 
 /**
  * Class OrderValidator
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index ee93afb12e3a2..e82d5b05f4fa5 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -10,13 +10,13 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Sales\Api\CreditmemoManagementInterface as CreditmemoManager;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment\Info;
 use Magento\Sales\Model\Order\Payment\Transaction;
 use Magento\Sales\Model\Order\Payment\Transaction\ManagerInterface;
-use Magento\Sales\Api\CreditmemoManagementInterface as CreditmemoManager;
 
 /**
  * Order payment information
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Info.php b/app/code/Magento/Sales/Model/Order/Payment/Info.php
index 063b3eaa71f1b..8efa98abde328 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Info.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Info.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Sales\Model\Order\Payment;
 
-use Magento\Sales\Model\AbstractModel;
-use Magento\Payment\Model\Method\Substitution;
 use Magento\Payment\Model\InfoInterface;
+use Magento\Payment\Model\Method\Substitution;
+use Magento\Sales\Model\AbstractModel;
 
 /**
  *
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Processor.php b/app/code/Magento/Sales/Model/Order/Payment/Processor.php
index 5f06aef2eebf2..538ac38bd448f 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Processor.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Processor.php
@@ -7,7 +7,6 @@
 
 use Magento\Sales\Api\Data\InvoiceInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
-use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\Order\Payment\Operations\AuthorizeOperation;
 use Magento\Sales\Model\Order\Payment\Operations\CaptureOperation;
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php
index 98cf1babdc92d..578c9a90485cd 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php
@@ -24,7 +24,7 @@ class AuthorizeCommand implements CommandInterface
     public function __construct(StatusResolver $statusResolver = null)
     {
         $this->statusResolver = $statusResolver
-            ? : ObjectManager::getInstance()->get(StatusResolver::class);
+            ?: ObjectManager::getInstance()->get(StatusResolver::class);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php
index 0e4135a1bf814..e7d8d13a9e810 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php
@@ -24,7 +24,7 @@ class CaptureCommand implements CommandInterface
     public function __construct(StatusResolver $statusResolver = null)
     {
         $this->statusResolver = $statusResolver
-            ? : ObjectManager::getInstance()->get(StatusResolver::class);
+            ?: ObjectManager::getInstance()->get(StatusResolver::class);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/OrderCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/OrderCommand.php
index 2a7e7145f6886..5b4e3e5ce7a3f 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/OrderCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/OrderCommand.php
@@ -24,7 +24,7 @@ class OrderCommand implements CommandInterface
     public function __construct(StatusResolver $statusResolver = null)
     {
         $this->statusResolver = $statusResolver
-            ? : ObjectManager::getInstance()->get(StatusResolver::class);
+            ?: ObjectManager::getInstance()->get(StatusResolver::class);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
index ee12b459118c1..8ab768c38f552 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
@@ -24,7 +24,7 @@ class RegisterCaptureNotificationCommand implements CommandInterface
     public function __construct(StatusResolver $statusResolver = null)
     {
         $this->statusResolver = $statusResolver
-            ? : ObjectManager::getInstance()->get(StatusResolver::class);
+            ?: ObjectManager::getInstance()->get(StatusResolver::class);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
index a2f1d6bcdfbcc..2bcc1fd50dbfa 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
@@ -13,14 +13,11 @@
 use Magento\Framework\Data\Collection;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\TransactionInterface;
-use Magento\Sales\Api\OrderPaymentRepositoryInterface;
-use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Api\Data\TransactionSearchResultInterfaceFactory as SearchResultFactory;
 use Magento\Sales\Api\TransactionRepositoryInterface;
 use Magento\Sales\Model\EntityStorage;
 use Magento\Sales\Model\EntityStorageFactory;
-use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\ResourceModel\Metadata;
-use Magento\Sales\Api\Data\TransactionSearchResultInterfaceFactory as SearchResultFactory;
 use Magento\Sales\Model\ResourceModel\Order\Payment\Transaction as TransactionResource;
 
 /**
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
index 1b80d08e68cda..f11e73a3345af 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -1055,12 +1055,12 @@ public function drawLineBlocks(\Zend_Pdf_Page $page, array $draw, array $pageSet
 
     /**
      * Set page font.
-     * 
+     *
      * column array format
      * font         string; font style, optional: bold, italic, regular
      * font_file    string; path to font file (optional for use your custom font)
      * font_size    int; font size (default 10)
-     * 
+     *
      * @param \Zend_Pdf_Page $page
      * @param array $column
      * @return \Zend_Pdf_Resource_Font
diff --git a/app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php b/app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php
index dd70c6b5481df..40e087d4724db 100644
--- a/app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php
+++ b/app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sales\Model\Order\Reorder;
 
-use Magento\Sales\Model\Order\Item;
 use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Sales\Model\Order\Item;
 
 /**
  * Class for checking availability of different product types
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
index 0a393548069f5..f1dfa116d03ff 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Sales\Model\Order\Shipment\Sender;
 
+use Magento\Framework\DataObject;
 use Magento\Sales\Model\Order\Email\Sender;
 use Magento\Sales\Model\Order\Shipment\SenderInterface;
-use Magento\Framework\DataObject;
 
 /**
  * Email notification sender for Shipment.
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/TrackRepository.php b/app/code/Magento/Sales/Model/Order/Shipment/TrackRepository.php
index 5bcf579a1cbf4..5f938be4af64e 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/TrackRepository.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/TrackRepository.php
@@ -49,7 +49,6 @@ public function __construct(
         ShipmentTrackSearchResultInterfaceFactory $searchResultFactory,
         CollectionProcessorInterface $collectionProcessor
     ) {
-
         $this->trackResource = $trackResource;
         $this->trackFactory = $trackFactory;
         $this->searchResultFactory = $searchResultFactory;
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
index c0a3f84e8846d..f544dba1e71c8 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentDocumentFactory.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Sales\Model\Order;
 
+use Magento\Framework\EntityManager\HydratorPool;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Sales\Api\Data\ShipmentCommentCreationInterface;
+use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
 use Magento\Sales\Api\Data\ShipmentInterface;
 use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
 use Magento\Sales\Api\Data\ShipmentPackageCreationInterface;
 use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
-use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Sales\Model\Order\Shipment\TrackFactory;
-use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Api\Data\ShipmentCommentCreationInterface;
-use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
-use Magento\Sales\Api\Data\OrderItemInterface;
 
 /**
  * Class ShipmentDocumentFactory
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
index 642f8647ef56b..adfe1c5bf149e 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
@@ -5,9 +5,7 @@
  */
 namespace Magento\Sales\Model\Order;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 
 /**
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentRepository.php b/app/code/Magento/Sales/Model/Order/ShipmentRepository.php
index d39d27746c92e..9b22fa47378d9 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentRepository.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentRepository.php
@@ -6,12 +6,12 @@
 namespace Magento\Sales\Model\Order;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Sales\Model\ResourceModel\Metadata;
-use Magento\Sales\Api\Data\ShipmentSearchResultInterfaceFactory as SearchResultFactory;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Sales\Api\Data\ShipmentSearchResultInterfaceFactory as SearchResultFactory;
+use Magento\Sales\Model\ResourceModel\Metadata;
 
 /**
  * Repository class for @see \Magento\Sales\Api\Data\ShipmentInterface
diff --git a/app/code/Magento/Sales/Model/Order/Shipping.php b/app/code/Magento/Sales/Model/Order/Shipping.php
index 8fddb1ff19061..faba57249cf83 100644
--- a/app/code/Magento/Sales/Model/Order/Shipping.php
+++ b/app/code/Magento/Sales/Model/Order/Shipping.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sales\Model\Order;
 
-use Magento\Sales\Api\Data\ShippingInterface;
 use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Sales\Api\Data\ShippingInterface;
 
 class Shipping extends AbstractExtensibleModel implements ShippingInterface
 {
diff --git a/app/code/Magento/Sales/Model/Order/ShippingTotal.php b/app/code/Magento/Sales/Model/Order/ShippingTotal.php
index 8002fdf2ec1db..4b1d04c1746f1 100644
--- a/app/code/Magento/Sales/Model/Order/ShippingTotal.php
+++ b/app/code/Magento/Sales/Model/Order/ShippingTotal.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sales\Model\Order;
 
-use Magento\Sales\Api\Data\TotalInterface;
 use Magento\Framework\Model\AbstractExtensibleModel;
+use Magento\Sales\Api\Data\TotalInterface;
 
 class ShippingTotal extends AbstractExtensibleModel implements TotalInterface
 {
diff --git a/app/code/Magento/Sales/Model/Order/Status/HistoryRepository.php b/app/code/Magento/Sales/Model/Order/Status/HistoryRepository.php
index e6d9cdd3d5e01..3570a4312c75f 100644
--- a/app/code/Magento/Sales/Model/Order/Status/HistoryRepository.php
+++ b/app/code/Magento/Sales/Model/Order/Status/HistoryRepository.php
@@ -49,7 +49,6 @@ public function __construct(
         OrderStatusHistorySearchResultInterfaceFactory $searchResultFactory,
         CollectionProcessorInterface $collectionProcessor
     ) {
-
         $this->historyResource = $historyResource;
         $this->historyFactory = $historyFactory;
         $this->searchResultFactory = $searchResultFactory;
diff --git a/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php b/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php
index b109b87e61bbf..8ce448d06b8f2 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/CanInvoice.php
@@ -44,7 +44,7 @@ private function isStateReadyForInvoice(OrderInterface $order)
             $order->getState() === Order::STATE_CLOSED
         ) {
             return false;
-        };
+        }
 
         return true;
     }
diff --git a/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrder.php b/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrder.php
index 5396abcb5e9b1..e2376f7b05d84 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrder.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/InvoiceOrder.php
@@ -12,7 +12,6 @@
 use Magento\Sales\Model\Order\Invoice\InvoiceValidatorInterface;
 use Magento\Sales\Model\Order\InvoiceQuantityValidator;
 use Magento\Sales\Model\Order\OrderValidatorInterface;
-use Magento\Sales\Model\ValidatorResultInterface;
 use Magento\Sales\Model\ValidatorResultMerger;
 
 /**
diff --git a/app/code/Magento/Sales/Model/Order/Validation/RefundInvoice.php b/app/code/Magento/Sales/Model/Order/Validation/RefundInvoice.php
index 2b3960fdb75a4..3bf08fe0b46cb 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/RefundInvoice.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/RefundInvoice.php
@@ -8,17 +8,18 @@
 use Magento\Sales\Api\Data\CreditmemoInterface;
 use Magento\Sales\Api\Data\InvoiceInterface;
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Model\Order\Invoice\InvoiceValidatorInterface;
 use Magento\Sales\Model\Order\Creditmemo\CreditmemoValidatorInterface;
 use Magento\Sales\Model\Order\Creditmemo\Item\Validation\CreationQuantityValidator;
 use Magento\Sales\Model\Order\Creditmemo\ItemCreationValidatorInterface;
 use Magento\Sales\Model\Order\Creditmemo\Validation\QuantityValidator;
 use Magento\Sales\Model\Order\Creditmemo\Validation\TotalsValidator;
+use Magento\Sales\Model\Order\Invoice\InvoiceValidatorInterface;
 use Magento\Sales\Model\Order\OrderValidatorInterface;
 use Magento\Sales\Model\ValidatorResultMerger;
 
 /**
  * Class RefundInvoice
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class RefundInvoice implements RefundInvoiceInterface
 {
diff --git a/app/code/Magento/Sales/Model/Order/Validation/ShipOrder.php b/app/code/Magento/Sales/Model/Order/Validation/ShipOrder.php
index f043475d4ea8c..dbee1f8f93cdc 100644
--- a/app/code/Magento/Sales/Model/Order/Validation/ShipOrder.php
+++ b/app/code/Magento/Sales/Model/Order/Validation/ShipOrder.php
@@ -7,9 +7,9 @@
 
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\ShipmentInterface;
-use Magento\Sales\Model\Order\Shipment\Validation\QuantityValidator;
 use Magento\Sales\Model\Order\OrderValidatorInterface;
 use Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface;
+use Magento\Sales\Model\Order\Shipment\Validation\QuantityValidator;
 use Magento\Sales\Model\Order\Shipment\Validation\TrackValidator;
 use Magento\Sales\Model\ValidatorResultMerger;
 
@@ -61,6 +61,7 @@ public function __construct(
      * @param array $packages
      * @param \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface|null $arguments
      * @return \Magento\Sales\Model\ValidatorResultInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function validate(
         $order,
diff --git a/app/code/Magento/Sales/Model/OrderNotifier.php b/app/code/Magento/Sales/Model/OrderNotifier.php
index b4ae3449156ac..ab7f1f67b88fd 100644
--- a/app/code/Magento/Sales/Model/OrderNotifier.php
+++ b/app/code/Magento/Sales/Model/OrderNotifier.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Sales\Model;
 
-use Psr\Log\LoggerInterface as Logger;
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 use Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory;
+use Psr\Log\LoggerInterface as Logger;
 
 /**
  * Class OrderNotifier
diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php
index 26e833c44d70a..616730cebac88 100644
--- a/app/code/Magento/Sales/Model/OrderRepository.php
+++ b/app/code/Magento/Sales/Model/OrderRepository.php
@@ -6,6 +6,7 @@
 namespace Magento\Sales\Model;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\OrderExtensionFactory;
@@ -15,7 +16,6 @@
 use Magento\Sales\Api\Data\ShippingAssignmentInterface;
 use Magento\Sales\Model\Order\ShippingAssignmentBuilder;
 use Magento\Sales\Model\ResourceModel\Metadata;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Repository class
diff --git a/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php b/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
index 1b781890e0f7f..6b95daa0563d6 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
@@ -8,8 +8,8 @@
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\AbstractDb;
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite;
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
-use Magento\SalesSequence\Model\Manager;
 use Magento\Sales\Model\EntityInterface;
+use Magento\SalesSequence\Model\Manager;
 
 /**
  * Abstract sales entity provides to its children knowledge about eventPrefix and eventObject
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php
index 82d436cb6e047..d6f88af860acf 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Grid/Collection.php
@@ -6,8 +6,8 @@
 namespace Magento\Sales\Model\ResourceModel\Grid;
 
 use Magento\Framework\Api\Search\SearchResultInterface;
-use Magento\Framework\Search\AggregationInterface;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Magento\Framework\Search\AggregationInterface;
 
 /**
  * Class Collection
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Order.php
index fd69f3b1a52a3..73f3daf803a8a 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order.php
@@ -5,14 +5,13 @@
  */
 namespace Magento\Sales\Model\ResourceModel;
 
-use Magento\Framework\App\ResourceConnection as AppResource;
 use Magento\Framework\Math\Random;
-use Magento\SalesSequence\Model\Manager;
+use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite;
+use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
 use Magento\Sales\Model\ResourceModel\EntityAbstract as SalesResource;
 use Magento\Sales\Model\ResourceModel\Order\Handler\State as StateHandler;
 use Magento\Sales\Model\Spi\OrderResourceInterface;
-use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
-use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite;
+use Magento\SalesSequence\Model\Manager;
 
 /**
  * Flat sales order resource
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Address.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Address.php
index c55f734311674..162a49f255990 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Address.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Address.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order;
 
+use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
 use Magento\Sales\Model\ResourceModel\EntityAbstract as SalesResource;
 use Magento\Sales\Model\Spi\OrderAddressResourceInterface;
-use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
 
 /**
  * Flat sales order address resource
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
index 8af6c03b44275..20ed40185a7d3 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Model\ResourceModel\Order\Address;
 
 use Magento\Sales\Api\Data\OrderAddressSearchResultInterface;
-use \Magento\Sales\Model\ResourceModel\Order\Collection\AbstractCollection;
+use Magento\Sales\Model\ResourceModel\Order\Collection\AbstractCollection;
 
 /**
  * Flat sales order payment collection
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php
index 5ecbbd777a14e..d17f5726c6a89 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo.php
@@ -5,11 +5,7 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order;
 
-use Magento\Framework\App\ResourceConnection as AppResource;
-use Magento\SalesSequence\Model\Manager;
-use Magento\Sales\Model\ResourceModel\Attribute;
 use Magento\Sales\Model\ResourceModel\EntityAbstract as SalesResource;
-use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
 use Magento\Sales\Model\Spi\CreditmemoResourceInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php
index 5d9e69eb3db4b..4f8395fcf1120 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Comment.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order\Creditmemo;
 
-use Magento\Sales\Model\ResourceModel\EntityAbstract;
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
+use Magento\Sales\Model\ResourceModel\EntityAbstract;
 use Magento\Sales\Model\Spi\CreditmemoCommentResourceInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice.php
index 848f88118ed32..47f20ed6f6e89 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice.php
@@ -5,11 +5,7 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order;
 
-use Magento\Framework\App\ResourceConnection;
-use Magento\SalesSequence\Model\Manager;
-use Magento\Sales\Model\ResourceModel\Attribute;
 use Magento\Sales\Model\ResourceModel\EntityAbstract as SalesResource;
-use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
 use Magento\Sales\Model\Spi\InvoiceResourceInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php
index eb4f9c43f1d58..b728b04e3c318 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Comment.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order\Invoice;
 
-use Magento\Sales\Model\ResourceModel\EntityAbstract;
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
+use Magento\Sales\Model\ResourceModel\EntityAbstract;
 use Magento\Sales\Model\Spi\InvoiceCommentResourceInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php
index 9c261fa31bc25..5f751fa04a9fa 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php
@@ -18,7 +18,7 @@ class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvide
      * @inheritdoc
      */
     protected $document = Document::class;
-    
+
     /**
      * Initialize dependencies.
      *
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Relation.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Relation.php
index fb689401890c8..cc9e1cb931bc1 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Relation.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Relation.php
@@ -7,8 +7,8 @@
 namespace Magento\Sales\Model\ResourceModel\Order\Invoice;
 
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationInterface;
-use Magento\Sales\Model\ResourceModel\Order\Invoice\Item as InvoiceItemResource;
 use Magento\Sales\Model\ResourceModel\Order\Invoice\Comment as InvoiceCommentResource;
+use Magento\Sales\Model\ResourceModel\Order\Invoice\Item as InvoiceItemResource;
 
 /**
  * Class Relation
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php
index 10191ba42ee76..c32b161067093 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Item/Collection.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order\Item;
 
-use \Magento\Sales\Model\ResourceModel\Order\Collection\AbstractCollection;
+use Magento\Sales\Model\ResourceModel\Order\Collection\AbstractCollection;
 
 /**
  * Flat sales order payment collection
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment.php
index 1574f6e47c7cc..ab828c1d96e10 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Payment.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Sales\Model\ResourceModel\EntityAbstract as SalesResource;
 
 /**
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php
index d2d45b62250ed..ce976e3565de6 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment.php
@@ -5,9 +5,6 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order;
 
-use Magento\Framework\App\ResourceConnection as AppResource;
-use Magento\SalesSequence\Model\Manager;
-use Magento\Sales\Model\ResourceModel\Attribute;
 use Magento\Sales\Model\ResourceModel\EntityAbstract as SalesResource;
 use Magento\Sales\Model\Spi\ShipmentResourceInterface;
 
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php
index f8ff8268e4118..460023c705b75 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Comment.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order\Shipment;
 
-use Magento\Sales\Model\ResourceModel\EntityAbstract;
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
+use Magento\Sales\Model\ResourceModel\EntityAbstract;
 use Magento\Sales\Model\Spi\ShipmentCommentResourceInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
index 9c8671d02c578..25ca216ab56b9 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Relation.php
@@ -7,8 +7,8 @@
 namespace Magento\Sales\Model\ResourceModel\Order\Shipment;
 
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationInterface;
-use Magento\Sales\Model\ResourceModel\Order\Shipment\Item as ShipmentItemResource;
 use Magento\Sales\Model\ResourceModel\Order\Shipment\Comment as ShipmentCommentResource;
+use Magento\Sales\Model\ResourceModel\Order\Shipment\Item as ShipmentItemResource;
 use Magento\Sales\Model\ResourceModel\Order\Shipment\Track as ShipmentTrackResource;
 
 /**
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php
index 4879df7d5f44a..0716115508bb6 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Track.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order\Shipment;
 
-use Magento\Sales\Model\ResourceModel\EntityAbstract as SalesResource;
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
+use Magento\Sales\Model\ResourceModel\EntityAbstract as SalesResource;
 use Magento\Sales\Model\Spi\ShipmentTrackResourceInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php
index 140ffdea262be..6b3804940b657 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php
@@ -5,12 +5,7 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order;
 
-use Magento\Framework\App\ResourceConnection;
-use Psr\Log\LoggerInterface as LogWriter;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\SalesSequence\Model\Manager;
-use \Magento\Sales\Model\ResourceModel\EntityAbstract;
-use \Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
 
 /**
  * Order status resource model
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php
index 95fa9e11ce509..f00f468a06b62 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status/History.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order\Status;
 
+use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
 use Magento\Sales\Model\Order\Status\History\Validator;
 use Magento\Sales\Model\ResourceModel\EntityAbstract;
-use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
 use Magento\Sales\Model\Spi\OrderStatusHistoryResourceInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Sale/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Sale/Collection.php
index 82839684b08b7..d63ce762417b3 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Sale/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Sale/Collection.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Sale;
 
-use Magento\Framework\Data\Collection\EntityFactory;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
+use Magento\Framework\Data\Collection\EntityFactory;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface as Logger;
 
 /**
diff --git a/app/code/Magento/Sales/Model/ShipOrder.php b/app/code/Magento/Sales/Model/ShipOrder.php
index 2cc4c9b241172..1e546fed93644 100644
--- a/app/code/Magento/Sales/Model/ShipOrder.php
+++ b/app/code/Magento/Sales/Model/ShipOrder.php
@@ -11,9 +11,9 @@
 use Magento\Sales\Api\ShipOrderInterface;
 use Magento\Sales\Model\Order\Config as OrderConfig;
 use Magento\Sales\Model\Order\OrderStateResolverInterface;
-use Magento\Sales\Model\Order\ShipmentDocumentFactory;
 use Magento\Sales\Model\Order\Shipment\NotifierInterface;
 use Magento\Sales\Model\Order\Shipment\OrderRegistrarInterface;
+use Magento\Sales\Model\Order\ShipmentDocumentFactory;
 use Magento\Sales\Model\Order\Validation\ShipOrderInterface as ShipOrderValidator;
 use Psr\Log\LoggerInterface;
 
diff --git a/app/code/Magento/Sales/Observer/GridProcessAddressChange.php b/app/code/Magento/Sales/Observer/GridProcessAddressChange.php
index 488461a16ae16..b958f96f8f2ea 100644
--- a/app/code/Magento/Sales/Observer/GridProcessAddressChange.php
+++ b/app/code/Magento/Sales/Observer/GridProcessAddressChange.php
@@ -7,8 +7,8 @@
 namespace Magento\Sales\Observer;
 
 use Magento\Framework\Event\Observer as EventObserver;
-use Magento\Sales\Model\ResourceModel\GridPool;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Sales\Model\ResourceModel\GridPool;
 
 /**
  * Class GridProcessAddressChange
diff --git a/app/code/Magento/Sales/Setup/UpgradeSchema.php b/app/code/Magento/Sales/Setup/UpgradeSchema.php
index 5dbf71e69e9b8..350e523c2d569 100644
--- a/app/code/Magento/Sales/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Sales/Setup/UpgradeSchema.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Sales\Setup;
 
-use Magento\Framework\Setup\UpgradeSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/View/Tab/HistoryTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/View/Tab/HistoryTest.php
index 5f9ae5c88cf87..37c686e69f5cd 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/View/Tab/HistoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/View/Tab/HistoryTest.php
@@ -90,7 +90,7 @@ public function testGetItemCommentIsNotSet()
 
     public function testGetItemCreatedAtDate()
     {
-        $date = new \DateTime;
+        $date = new \DateTime();
         $item = ['created_at' => $date ];
 
         $this->localeDateMock->expects($this->once())
@@ -103,7 +103,7 @@ public function testGetItemCreatedAtDate()
 
     public function testGetItemCreatedAtTime()
     {
-        $date = new \DateTime;
+        $date = new \DateTime();
         $item = ['created_at' => $date ];
 
         $this->localeDateMock->expects($this->once())
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php
index f71d98f94a82a..17c6219088841 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Invoice/AbstractInvoice/EmailTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Invoice\AbstractInvoice;
 
-use \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Email;
-
 use Magento\Framework\App\Action\Context;
+
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\Email;
 
 /**
  * Class EmailTest
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php
index 1fdd9759f5045..64f977cb72f65 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php
@@ -16,10 +16,10 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Controller\Adminhtml\Order\Create\Reorder;
+use Magento\Sales\Helper\Reorder as ReorderHelper;
 use Magento\Sales\Model\AdminOrder\Create;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Reorder\UnavailableProductsProvider;
-use Magento\Sales\Helper\Reorder as ReorderHelper;
 
 /**
  * Class ReorderTest
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php
index 83b897656d185..85631ced899e4 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CancelTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Invoice;
 
-use Magento\Backend\App\Action;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Sales\Api\InvoiceRepositoryInterface;
 
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php
index 0fabc24dd4421..588331c804e4a 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/CaptureTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Invoice;
 
-use Magento\Backend\App\Action;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Sales\Api\InvoiceRepositoryInterface;
 
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/PrintActionTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/PrintActionTest.php
index 29c0bd85c3619..ef2d654a365a1 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/PrintActionTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/PrintActionTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Invoice;
 
-use Magento\Backend\App\Action;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php
index 6bd02f0c16317..27d2736546d5d 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Invoice/SaveTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order\Invoice;
 
-use Magento\Backend\App\Action;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
diff --git a/app/code/Magento/Sales/Test/Unit/Cron/CleanExpiredQuotesTest.php b/app/code/Magento/Sales/Test/Unit/Cron/CleanExpiredQuotesTest.php
index fd20e0cb7d94a..9565b843ef0ce 100644
--- a/app/code/Magento/Sales/Test/Unit/Cron/CleanExpiredQuotesTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Cron/CleanExpiredQuotesTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Cron;
 
-use \Magento\Sales\Cron\CleanExpiredQuotes;
+use Magento\Sales\Cron\CleanExpiredQuotes;
 
 /**
  * Tests Magento\Sales\Cron\CleanExpiredQuotes
diff --git a/app/code/Magento/Sales/Test/Unit/Helper/AdminTest.php b/app/code/Magento/Sales/Test/Unit/Helper/AdminTest.php
index 180cfca0bc3cb..52c861e02c6a4 100644
--- a/app/code/Magento/Sales/Test/Unit/Helper/AdminTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Helper/AdminTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Sales\Test\Unit\Helper;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
diff --git a/app/code/Magento/Sales/Test/Unit/Helper/ReorderTest.php b/app/code/Magento/Sales/Test/Unit/Helper/ReorderTest.php
index cf97abbb4e97c..b34b6d9d65c59 100644
--- a/app/code/Magento/Sales/Test/Unit/Helper/ReorderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Helper/ReorderTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Sales\Test\Unit\Helper;
 
-use \Magento\Sales\Helper\Reorder;
+use Magento\Sales\Helper\Reorder;
 
 class ReorderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
index b284a529d2a15..a8790fe0bd618 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
@@ -25,7 +25,6 @@
 use Magento\Quote\Model\Quote\Item;
 use Magento\Quote\Model\Quote\Item\Updater;
 use Magento\Sales\Model\AdminOrder\Create;
-use Magento\Sales\Model\AdminOrder\Product;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/EmailSenderTest.php
index ccc0bfe309f0c..1536ee65e424c 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/EmailSenderTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\AdminOrder;
 
-use \Magento\Sales\Model\AdminOrder\EmailSender;
+use Magento\Sales\Model\AdminOrder\EmailSender;
 
 class EmailSenderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportBestsellersDataTest.php b/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportBestsellersDataTest.php
index 755391ade192d..05736bfb1d836 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportBestsellersDataTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportBestsellersDataTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\CronJob;
 
-use \Magento\Sales\Model\CronJob\AggregateSalesReportBestsellersData;
+use Magento\Sales\Model\CronJob\AggregateSalesReportBestsellersData;
 
 /**
  * Tests Magento\Sales\Model\CronJob\AggregateSalesReportBestsellersDataTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportInvoicedDataTest.php b/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportInvoicedDataTest.php
index f7a94377f9e71..67cbc373afe04 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportInvoicedDataTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportInvoicedDataTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\CronJob;
 
-use \Magento\Sales\Model\CronJob\AggregateSalesReportInvoicedData;
+use Magento\Sales\Model\CronJob\AggregateSalesReportInvoicedData;
 
 /**
  * Tests Magento\Sales\Model\CronJob\AggregateSalesReportInvoicedDataTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportOrderDataTest.php b/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportOrderDataTest.php
index c223beb1d866c..cb66fd23cf4b8 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportOrderDataTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportOrderDataTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\CronJob;
 
-use \Magento\Sales\Model\CronJob\AggregateSalesReportOrderData;
+use Magento\Sales\Model\CronJob\AggregateSalesReportOrderData;
 
 /**
  * Tests Magento\Sales\Model\CronJob\AggregateSalesReportOrderDataTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportRefundedDataTest.php b/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportRefundedDataTest.php
index c3559e5851e99..d7b3555bf3e63 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportRefundedDataTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/CronJob/AggregateSalesReportRefundedDataTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\CronJob;
 
-use \Magento\Sales\Model\CronJob\AggregateSalesReportRefundedData;
+use Magento\Sales\Model\CronJob\AggregateSalesReportRefundedData;
 
 /**
  * Tests Magento\Sales\Model\CronJob\AggregateSalesReportRefundedDataTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/InvoiceOrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/InvoiceOrderTest.php
index 014e0e28b49ee..ded1609e1a385 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/InvoiceOrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/InvoiceOrderTest.php
@@ -12,16 +12,16 @@
 use Magento\Sales\Api\Data\InvoiceInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\InvoiceOrder;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Config as OrderConfig;
 use Magento\Sales\Model\Order\Invoice\NotifierInterface;
 use Magento\Sales\Model\Order\InvoiceDocumentFactory;
 use Magento\Sales\Model\Order\InvoiceRepository;
 use Magento\Sales\Model\Order\OrderStateResolverInterface;
-use Magento\Sales\Model\Order\Validation\InvoiceOrderInterface;
 use Magento\Sales\Model\Order\PaymentAdapterInterface;
+use Magento\Sales\Model\Order\Validation\InvoiceOrderInterface;
 use Magento\Sales\Model\ValidatorResultInterface;
-use Magento\Sales\Model\InvoiceOrder;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/InvoiceRepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/InvoiceRepositoryTest.php
index 5309c2064c5a7..f7bae8765ef4a 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/InvoiceRepositoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/InvoiceRepositoryTest.php
@@ -32,7 +32,7 @@ class InvoiceRepositoryTest extends \PHPUnit\Framework\TestCase
      * @var CollectionProcessorInterface |\PHPUnit_Framework_MockObject_MockObject
      */
     private $collectionProcessorMock;
-    
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Address/RendererTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Address/RendererTest.php
index 41161379eea2a..00bbc3492a9fd 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Address/RendererTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Address/RendererTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Address;
 
-use Magento\Sales\Model\Order\Address\Renderer as OrderAddressRenderer;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Customer\Block\Address\Renderer\RendererInterface as CustomerAddressBlockRenderer;
 use Magento\Customer\Model\Address\Config as CustomerAddressConfig;
+use Magento\Framework\DataObject;
 use Magento\Framework\Event\ManagerInterface as EventManager;
-use Magento\Sales\Model\Order\Address as OrderAddress;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Sales\Model\Order;
-use Magento\Customer\Block\Address\Renderer\RendererInterface as CustomerAddressBlockRenderer;
-use Magento\Framework\DataObject;
+use Magento\Sales\Model\Order\Address as OrderAddress;
+use Magento\Sales\Model\Order\Address\Renderer as OrderAddressRenderer;
 
 class RendererTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Item/Validation/CreateQuantityValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Item/Validation/CreateQuantityValidatorTest.php
index c911af3044e5d..9362f6ffbacfe 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Item/Validation/CreateQuantityValidatorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Item/Validation/CreateQuantityValidatorTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Creditmemo\Item\Validation;
 
-use Magento\Sales\Api\OrderItemRepositoryInterface;
-use Magento\Sales\Model\Order\Creditmemo\Item\Validation\CreationQuantityValidator;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderItemRepositoryInterface;
+use Magento\Sales\Model\Order\Creditmemo\Item\Validation\CreationQuantityValidator;
 use Magento\Sales\Model\Order\Item;
 
 /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoDocumentFactoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoDocumentFactoryTest.php
index cb65b70b82718..e356039eb3526 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoDocumentFactoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoDocumentFactoryTest.php
@@ -5,20 +5,20 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order;
 
+use Magento\Framework\EntityManager\HydratorInterface;
+use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Sales\Api\Data\CreditmemoCommentInterfaceFactory;
-use Magento\Sales\Api\OrderRepositoryInterface;
-use Magento\Sales\Model\Order\CreditmemoDocumentFactory;
+use Magento\Sales\Api\Data\CreditmemoCommentCreationInterface;
 use Magento\Sales\Api\Data\CreditmemoCommentInterface;
-use Magento\Sales\Model\Order;
-use Magento\Sales\Model\Order\Invoice;
+use Magento\Sales\Api\Data\CreditmemoCommentInterfaceFactory;
+use Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface;
 use Magento\Sales\Api\Data\CreditmemoInterface;
 use Magento\Sales\Api\Data\CreditmemoItemCreationInterface;
-use Magento\Sales\Api\Data\CreditmemoCommentCreationInterface;
-use Magento\Framework\EntityManager\HydratorPool;
-use Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\CreditmemoDocumentFactory;
 use Magento\Sales\Model\Order\CreditmemoFactory;
-use Magento\Framework\EntityManager\HydratorInterface;
+use Magento\Sales\Model\Order\Invoice;
 
 /**
  * Class CreditmemoDocumentFactoryTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php
index 0b65c2d972d32..d0c665667f348 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php
@@ -8,10 +8,10 @@
 
 namespace Magento\Sales\Test\Unit\Model\Order;
 
-use Magento\Sales\Model\ResourceModel\OrderFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Item\CollectionFactory;
 use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Item\Collection as ItemCollection;
+use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Item\CollectionFactory;
+use Magento\Sales\Model\ResourceModel\OrderFactory;
 
 /**
  * Class CreditmemoTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
index 8e670ec610f30..9d179c025f0ea 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Email\Container;
 
-use \Magento\Sales\Model\Order\Email\Container\CreditmemoCommentIdentity;
+use Magento\Sales\Model\Order\Email\Container\CreditmemoCommentIdentity;
 
 class CreditmemoCommentIdentityTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoIdentityTest.php
index 19a9e23ac9305..10eadc76e42f5 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/CreditmemoIdentityTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Email\Container;
 
-use \Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity;
+use Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity;
 
 class CreditmemoIdentityTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceCommentIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
index 6d4ed5a874abe..dbbaef1a522f0 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Email\Container;
 
-use \Magento\Sales\Model\Order\Email\Container\InvoiceCommentIdentity;
+use Magento\Sales\Model\Order\Email\Container\InvoiceCommentIdentity;
 
 class InvoiceCommentIdentityTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceIdentityTest.php
index d481b06458be1..79c64c32c2e33 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/InvoiceIdentityTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Email\Container;
 
-use \Magento\Sales\Model\Order\Email\Container\InvoiceIdentity;
+use Magento\Sales\Model\Order\Email\Container\InvoiceIdentity;
 
 class InvoiceIdentityTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderCommentIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderCommentIdentityTest.php
index d67cc1f8b9064..5784fc5c383d8 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderCommentIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderCommentIdentityTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Email\Container;
 
-use \Magento\Sales\Model\Order\Email\Container\OrderCommentIdentity;
+use Magento\Sales\Model\Order\Email\Container\OrderCommentIdentity;
 
 class OrderCommentIdentityTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderIdentityTest.php
index 554c1d19691cc..3fb4089f56dbe 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/OrderIdentityTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Email\Container;
 
-use \Magento\Sales\Model\Order\Email\Container\OrderIdentity;
+use Magento\Sales\Model\Order\Email\Container\OrderIdentity;
 
 class OrderIdentityTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentCommentIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
index 9fba660087807..54d3d8ee934e5 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Email\Container;
 
-use \Magento\Sales\Model\Order\Email\Container\ShipmentCommentIdentity;
+use Magento\Sales\Model\Order\Email\Container\ShipmentCommentIdentity;
 
 class ShipmentCommentIdentityTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentIdentityTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentIdentityTest.php
index d3e869a8d8137..23608b66e9aed 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentIdentityTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/ShipmentIdentityTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Email\Container;
 
-use \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity;
+use Magento\Sales\Model\Order\Email\Container\ShipmentIdentity;
 
 class ShipmentIdentityTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/TemplateTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/TemplateTest.php
index 6cebe8ac32236..0f80618b322d8 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/TemplateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Container/TemplateTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Email\Container;
 
-use \Magento\Sales\Model\Order\Email\Container\Template;
+use Magento\Sales\Model\Order\Email\Container\Template;
 
 class TemplateTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php
index e5d6cacb25637..ffcb69afe880a 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderCommentSenderTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Email\Sender;
 
-use \Magento\Sales\Model\Order\Email\Sender\OrderCommentSender;
+use Magento\Sales\Model\Order\Email\Sender\OrderCommentSender;
 
 class OrderCommentSenderTest extends AbstractSenderTest
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceTest.php
index 0517da8b85cf0..ee2038b57dd97 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/InvoiceTest.php
@@ -9,12 +9,11 @@
 namespace Magento\Sales\Test\Unit\Model\Order;
 
 use Magento\Sales\Api\Data\InvoiceInterface;
+use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Invoice;
+use Magento\Sales\Model\ResourceModel\Order\Invoice\Collection as InvoiceCollection;
 use Magento\Sales\Model\ResourceModel\OrderFactory;
-use Magento\Sales\Model\Order;
-use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Sales\Model\ResourceModel\Order\Invoice\Collection as InvoiceCollection;
 
 /**
  * Class InvoiceTest
@@ -203,7 +202,6 @@ public function testGetStore()
         $store = $this->helperManager->getObject(\Magento\Store\Model\Store::class, []);
         $this->order->expects($this->once())->method('getStore')->willReturn($store);
         $this->assertEquals($store, $this->model->getStore());
-
     }
 
     public function testGetShippingAddress()
@@ -211,7 +209,6 @@ public function testGetShippingAddress()
         $address = $this->helperManager->getObject(\Magento\Sales\Model\Order\Address::class, []);
         $this->order->expects($this->once())->method('getShippingAddress')->willReturn($address);
         $this->assertEquals($address, $this->model->getShippingAddress());
-
     }
 
     /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
index 03a388410f335..4fde533429bd6 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ItemTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Sales\Test\Unit\Model\Order;
 
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Sales\Model\Order;
 use Magento\Sales\Model\ResourceModel\OrderFactory;
-use \Magento\Sales\Model\Order;
 
 /**
  * Class ItemTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php
index 293c2eea1231d..f1f07c41f16e1 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Sales\Test\Unit\Model\Order\Payment;
 
-use Magento\Payment\Model\Method;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Payment\Model\Method;
 
 class InfoTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Operations/CaptureOperationTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Operations/CaptureOperationTest.php
index a2165e6792c45..7fa84bed41b78 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Operations/CaptureOperationTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Operations/CaptureOperationTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Sales\Test\Unit\Model\Order\Payment\Operations;
 
-use Magento\Framework\ObjectManager\ObjectManager;
-use Magento\Payment\Model\Method;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class CaptureOperationTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Reorder/OrderProductAvailabilityCheckerTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Reorder/OrderProductAvailabilityCheckerTest.php
index 45b8b82bf8ae8..9d778e5a80cc8 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Reorder/OrderProductAvailabilityCheckerTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Reorder/OrderProductAvailabilityCheckerTest.php
@@ -6,10 +6,10 @@
 namespace Magento\Sales\Test\Unit\Model\Order\Reorder;
 
 use Magento\ConfigurableProductSales\Model\Order\Reorder\OrderedProductAvailabilityChecker as ConfigurableChecker;
+use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Model\Order\Item;
 use Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityChecker;
 use Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityCheckerInterface;
-use Magento\Sales\Api\Data\OrderItemInterface;
 
 /**
  * Class OrderProductAvailabilityCheckerTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Reorder/UnavailableProductsProviderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Reorder/UnavailableProductsProviderTest.php
index 8949309646d3b..e56db9f14c6cf 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Reorder/UnavailableProductsProviderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Reorder/UnavailableProductsProviderTest.php
@@ -6,10 +6,10 @@
 namespace Magento\Sales\Test\Unit\Model\Order\Reorder;
 
 use Magento\Sales\Model\Config;
+use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Item;
 use Magento\Sales\Model\Order\Reorder\OrderedProductAvailabilityChecker;
 use Magento\Sales\Model\Order\Reorder\UnavailableProductsProvider;
-use Magento\Sales\Model\Order;
 
 /**
  * Class UnavailableProductsProviderTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Validation/QuantityValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Validation/QuantityValidatorTest.php
index d7fc647572a4f..e7c11489bb521 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Validation/QuantityValidatorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Validation/QuantityValidatorTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Shipment\Validation;
 
-use Magento\Sales\Model\Order\Shipment\Validation\QuantityValidator;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Sales\Api\Data\ShipmentInterface;
 use Magento\Sales\Api\Data\ShipmentItemInterface;
+use Magento\Sales\Model\Order\Shipment\Validation\QuantityValidator;
 
 /**
  * Class QuantityValidatorTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Validation/TrackValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Validation/TrackValidatorTest.php
index 8171887d2e3e8..6806016d2f3d8 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Validation/TrackValidatorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Validation/TrackValidatorTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Shipment\Validation;
 
-use Magento\Sales\Model\Order\Shipment\Validation\TrackValidator;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Sales\Api\Data\ShipmentInterface;
 use Magento\Sales\Api\Data\ShipmentTrackInterface;
+use Magento\Sales\Model\Order\Shipment\Validation\TrackValidator;
 
 /**
  * Class TrackValidatorTest
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php
index e681edf3e542f..48c0d9f3ce574 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/ShipmentDocumentFactoryTest.php
@@ -5,17 +5,17 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order;
 
+use Magento\Framework\EntityManager\HydratorInterface;
 use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Sales\Api\Data\ShipmentCommentCreationInterface;
+use Magento\Sales\Api\Data\ShipmentInterface;
 use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
 use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
-use Magento\Sales\Model\Order\ShipmentFactory;
-use Magento\Sales\Model\Order\ShipmentDocumentFactory;
 use Magento\Sales\Model\Order;
-use Magento\Sales\Api\Data\ShipmentInterface;
-use Magento\Sales\Model\Order\Shipment\TrackFactory;
 use Magento\Sales\Model\Order\Shipment\Track;
-use Magento\Framework\EntityManager\HydratorInterface;
+use Magento\Sales\Model\Order\Shipment\TrackFactory;
+use Magento\Sales\Model\Order\ShipmentDocumentFactory;
+use Magento\Sales\Model\Order\ShipmentFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Status/History/ValidatorTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Status/History/ValidatorTest.php
index b72a9363eb8f7..dec5ff1d738cf 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Status/History/ValidatorTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Status/History/ValidatorTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Status\History;
 
-use \Magento\Sales\Model\Order\Status\History\Validator;
+use Magento\Sales\Model\Order\Status\History\Validator;
 
 class ValidatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Total/Config/BaseTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Total/Config/BaseTest.php
index 5b80e24999224..27b8d0c8d6bc0 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Total/Config/BaseTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Total/Config/BaseTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Model\Order\Total\AbstractTotal;
 
 class BaseTest extends \PHPUnit\Framework\TestCase
 {
@@ -51,18 +52,16 @@ protected function setUp()
 
     public function testGetTotalModels()
     {
-        $total = $this->getMockForAbstractClass(\Magento\Sales\Model\Order\Total\AbstractTotal::class);
+        $total = $this->getMockForAbstractClass(AbstractTotal::class);
         $this->salesConfig->expects($this->once())->method('getGroupTotals')->will(
             $this->returnValue([
-                'some_code' =>
-                    ['instance' => \Magento\Sales\Model\Order\Total\AbstractTotal::class, 'sort_order' => 1903],
-                'other_code' =>
-                    ['instance' => \Magento\Sales\Model\Order\Total\AbstractTotal::class, 'sort_order' => 1723],
+                'some_code' => ['instance' => AbstractTotal::class, 'sort_order' => 1903],
+                'other_code' => ['instance' => AbstractTotal::class, 'sort_order' => 1723],
             ])
         );
 
         $this->orderTotalFactory->expects($this->any())->method('create')
-            ->with(\Magento\Sales\Model\Order\Total\AbstractTotal::class)
+            ->with(AbstractTotal::class)
             ->will($this->returnValue($total));
 
         $sortedCodes = ['other_code', 'some_code'];
@@ -88,15 +87,13 @@ public function testGetTotalModelsInvalidTotalModel()
     {
         $this->salesConfig->expects($this->once())->method('getGroupTotals')->will(
             $this->returnValue([
-                'some_code' =>
-                    ['instance' => \Magento\Sales\Model\Order\Total\AbstractTotal::class, 'sort_order' => 1903],
-                'other_code' =>
-                    ['instance' => \Magento\Sales\Model\Order\Total\AbstractTotal::class, 'sort_order' => 1723],
+                'some_code' => ['instance' => AbstractTotal::class, 'sort_order' => 1903],
+                'other_code' => ['instance' => AbstractTotal::class, 'sort_order' => 1723],
             ])
         );
 
         $this->orderTotalFactory->expects($this->any())->method('create')
-            ->with(\Magento\Sales\Model\Order\Total\AbstractTotal::class)
+            ->with(AbstractTotal::class)
             ->will($this->returnValue($this));
 
         $this->object->getTotalModels();
@@ -104,18 +101,16 @@ public function testGetTotalModelsInvalidTotalModel()
 
     public function testGetTotalUnserializeCachedCollectorCodes()
     {
-        $total = $this->getMockForAbstractClass(\Magento\Sales\Model\Order\Total\AbstractTotal::class);
+        $total = $this->getMockForAbstractClass(AbstractTotal::class);
         $this->salesConfig->expects($this->any())->method('getGroupTotals')->will(
             $this->returnValue([
-                'some_code' =>
-                    ['instance' => \Magento\Sales\Model\Order\Total\AbstractTotal::class, 'sort_order' => 1903],
-                'other_code' =>
-                    ['instance' => \Magento\Sales\Model\Order\Total\AbstractTotal::class, 'sort_order' => 1723],
+                'some_code' => ['instance' => AbstractTotal::class, 'sort_order' => 1903],
+                'other_code' => ['instance' => AbstractTotal::class, 'sort_order' => 1723],
             ])
         );
 
         $this->orderTotalFactory->expects($this->any())->method('create')
-            ->with(\Magento\Sales\Model\Order\Total\AbstractTotal::class)
+            ->with(AbstractTotal::class)
             ->will($this->returnValue($total));
 
         $sortedCodes = ['other_code', 'some_code'];
@@ -136,20 +131,17 @@ public function testGetTotalUnserializeCachedCollectorCodes()
 
     public function testGetTotalModelsSortingSubroutine()
     {
-        $total = $this->getMockForAbstractClass(\Magento\Sales\Model\Order\Total\AbstractTotal::class);
+        $total = $this->getMockForAbstractClass(AbstractTotal::class);
         $this->salesConfig->expects($this->once())->method('getGroupTotals')->will(
             $this->returnValue([
-                'some_code' =>
-                    ['instance' => \Magento\Sales\Model\Order\Total\AbstractTotal::class, 'sort_order' => 1903],
-                'other_code' =>
-                    ['instance' => \Magento\Sales\Model\Order\Total\AbstractTotal::class, 'sort_order' => 1112],
-                'big_order' =>
-                    ['instance' => \Magento\Sales\Model\Order\Total\AbstractTotal::class, 'sort_order' => 3000],
+                'some_code' => ['instance' => AbstractTotal::class, 'sort_order' => 1903],
+                'other_code' => ['instance' => AbstractTotal::class, 'sort_order' => 1112],
+                'big_order' => ['instance' => AbstractTotal::class, 'sort_order' => 3000],
             ])
         );
 
         $this->orderTotalFactory->expects($this->any())->method('create')
-            ->with(\Magento\Sales\Model\Order\Total\AbstractTotal::class)
+            ->with(AbstractTotal::class)
             ->will($this->returnValue($total));
 
         $this->assertSame(
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Plugin/AuthorizationTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Plugin/AuthorizationTest.php
index fad343a875751..da70ac9ba894d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Plugin/AuthorizationTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Plugin/AuthorizationTest.php
@@ -6,9 +6,9 @@
 namespace Magento\Sales\Test\Unit\Model\ResourceModel\Order\Plugin;
 
 use Magento\Authorization\Model\UserContextInterface;
-use Magento\Sales\Model\ResourceModel\Order as ResourceOrder;
-use Magento\Sales\Model\Order;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\ResourceModel\Order as ResourceOrder;
 use Magento\Sales\Model\ResourceModel\Order\Plugin\Authorization;
 
 class AuthorizationTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ShipOrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/ShipOrderTest.php
index e6eac3d0a3ed5..9f5da40564412 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ShipOrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ShipOrderTest.php
@@ -18,12 +18,12 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Config as OrderConfig;
 use Magento\Sales\Model\Order\OrderStateResolverInterface;
-use Magento\Sales\Model\Order\ShipmentDocumentFactory;
 use Magento\Sales\Model\Order\Shipment\NotifierInterface;
 use Magento\Sales\Model\Order\Shipment\OrderRegistrarInterface;
+use Magento\Sales\Model\Order\ShipmentDocumentFactory;
 use Magento\Sales\Model\Order\Validation\ShipOrderInterface;
-use Magento\Sales\Model\ValidatorResultInterface;
 use Magento\Sales\Model\ShipOrder;
+use Magento\Sales\Model\ValidatorResultInterface;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Status/ListStatusTest.php b/app/code/Magento/Sales/Test/Unit/Model/Status/ListStatusTest.php
index aa7a45f5874ba..fac91cae9a78d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Status/ListStatusTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Status/ListStatusTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Status;
 
-use \Magento\Sales\Model\Status\ListStatus;
-
 use Magento\CatalogInventory\Helper\Data;
 
+use Magento\Sales\Model\Status\ListStatus;
+
 class ListStatusTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Sales\Model\Status\ListStatus */
diff --git a/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php b/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php
index c79b06da60c4e..118338e4c56a3 100644
--- a/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/AddressTest.php
@@ -6,7 +6,6 @@
 namespace Magento\Sales\Test\Unit\Ui\Component\Listing\Column;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Sales\Ui\Component\Listing\Column\Address;
 
 /**
diff --git a/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/CustomerGroupTest.php b/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/CustomerGroupTest.php
index ccb1be4d2f319..0ca932d6b03f6 100644
--- a/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/CustomerGroupTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/CustomerGroupTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sales\Test\Unit\Ui\Component\Listing\Column;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Sales\Ui\Component\Listing\Column\CustomerGroup;
 
 /**
diff --git a/app/code/Magento/Sales/Ui/Component/DataProvider/Document.php b/app/code/Magento/Sales/Ui/Component/DataProvider/Document.php
index 3030a16cc18b9..5e85aa655fad0 100644
--- a/app/code/Magento/Sales/Ui/Component/DataProvider/Document.php
+++ b/app/code/Magento/Sales/Ui/Component/DataProvider/Document.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Ui\Component\DataProvider;
 
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Sales\Model\Order\Invoice;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Sales\Model\Order\Invoice;
 
 /**
  * Class Document
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php
index d900bb7ba670f..ca454941d58ce 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Address.php
@@ -6,10 +6,9 @@
 namespace Magento\Sales\Ui\Component\Listing\Column;
 
 use Magento\Framework\Escaper;
-use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class Address
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Creditmemo/State.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Creditmemo/State.php
index 86b86f1984e77..575e31d678692 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Creditmemo/State.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Creditmemo/State.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Ui\Component\Listing\Column\Creditmemo;
 
-use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class State
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php
index 1144321ac0b56..59f8e43283c64 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/CustomerGroup.php
@@ -5,12 +5,11 @@
  */
 namespace Magento\Sales\Ui\Component\Listing\Column;
 
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class CustomerGroup
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Invoice/State.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Invoice/State.php
index 174a81e90e2a0..f5cb341ee6979 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Invoice/State.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Invoice/State.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Ui\Component\Listing\Column\Invoice;
 
-use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class State
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/PaymentMethod.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/PaymentMethod.php
index e107301886373..0ad70bba0f69a 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/PaymentMethod.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/PaymentMethod.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Ui\Component\Listing\Column;
 
-use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Payment\Helper\Data;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class PaymentMethod
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
index 2c7d655471b66..c69ae47a09a34 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Ui\Component\Listing\Column;
 
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
  * Class Price
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/PurchasedPrice.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/PurchasedPrice.php
index 80906a98b29ae..8d8fc5c7ae4cb 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/PurchasedPrice.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/PurchasedPrice.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Ui\Component\Listing\Column;
 
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Framework\Pricing\PriceCurrencyInterface;
 
 /**
  * Class Price
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php
index 2fd792fb4ae25..942ebbb8dff1e 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Status.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sales\Ui\Component\Listing\Column;
 
-use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Sales\Model\ResourceModel\Order\Status\CollectionFactory;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class Status
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
index 13433846d6ac4..b3158c5f21556 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
@@ -10,7 +10,7 @@
 
 <div class="admin__page-section-title">
     <span class="title"><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
-    <?php if($block->getButtonsHtml()): ?>
+    <?php if ($block->getButtonsHtml()): ?>
         <div class="actions"><?= $block->getButtonsHtml() ?></div>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
index 686e311292ac7..c033e231fd25c 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -60,12 +60,12 @@ endif; ?>
                         class="admin__control-select">
                     <option value=""><?= /* @escapeNotVerified */ __('Add New Address') ?></option>
                     <?php foreach ($block->getAddressCollection() as $_address): ?>
-                        <?php //if($block->getAddressAsString($_address)!=$block->getAddressAsString($block->getAddress())): ?>
+                        <?php //if($block->getAddressAsString($_address)!=$block->getAddressAsString($block->getAddress())):?>
                         <option
                             value="<?= /* @escapeNotVerified */ $_address->getId() ?>"<?php if ($_address->getId() == $block->getAddressId()): ?> selected="selected"<?php endif; ?>>
                             <?= /* @escapeNotVerified */ $block->getAddressAsString($_address) ?>
                         </option>
-                        <?php //endif; ?>
+                        <?php //endif;?>
                     <?php endforeach; ?>
                 </select>
             </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
index 02cf697b0e74a..283e4eb836172 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
@@ -170,8 +170,8 @@
                     <?php $hasMessageError = false; ?>
                     <?php foreach ($_item->getMessage(false) as $messageError):?>
                         <?php if (!empty($messageError)) {
-                            $hasMessageError = true;
-                        }
+                        $hasMessageError = true;
+                    }
                         ?>
                     <?php endforeach; ?>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
index 92139896273da..59f34dc62da66 100755
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
@@ -28,8 +28,8 @@ $taxAmount = $block->getTotal()->getValue();
         <?php $isTop = 1; ?>
         <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
                 <?php if (isset($info['hidden']) && $info['hidden']) {
-                    continue;
-                } ?>
+    continue;
+} ?>
                 <?php $percent = $info['percent']; ?>
                 <?php $amount = $info['amount']; ?>
                 <?php $rates = $info['rates']; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
index fcf4ccad7060b..2fab00b1dcd7b 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
@@ -45,10 +45,10 @@
             <?php endif; ?>
             <?php $i = 0; foreach ($_items as $_item): ?>
                 <?php if ($_item->getOrderItem()->getParentItem()) {
-                continue;
-            } else {
-                $i++;
-            } ?>
+    continue;
+} else {
+    $i++;
+} ?>
                 <tbody class="<?= /* @escapeNotVerified */ $i%2 ? 'even' : 'odd' ?>">
                     <?= $block->getItemHtml($_item) ?>
                     <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
index d77f2fbde22e4..cb23fae551bd1 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
@@ -28,10 +28,10 @@
                 </thead>
                 <?php $i = 0; foreach ($_items as $_item): ?>
                     <?php if ($_item->getOrderItem()->getParentItem()) {
-                        continue;
-                    } else {
-                        $i++;
-                    } ?>
+    continue;
+} else {
+    $i++;
+} ?>
                     <tbody class="<?= /* @escapeNotVerified */ $i%2 ? 'even' : 'odd' ?>">
                         <?= $block->getItemHtml($_item) ?>
                         <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
index fa5ea0568011b..5616caba18a88 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
@@ -40,10 +40,10 @@
                 <?php $_items = $block->getInvoice()->getAllItems() ?>
                 <?php $_i = 0; foreach ($_items as $_item): ?>
                 <?php if ($_item->getOrderItem()->getParentItem()) {
-                    continue;
-                } else {
-                    $_i++;
-                } ?>
+    continue;
+} else {
+    $_i++;
+} ?>
                     <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'even' : 'odd' ?>">
                         <?= $block->getItemHtml($_item) ?>
                         <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
index 63f33dbb74bad..3ec6147d60e46 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
@@ -23,10 +23,10 @@
         <?php $_items = $block->getInvoice()->getAllItems() ?>
         <?php $i = 0; foreach ($_items as $_item): ?>
             <?php if ($_item->getOrderItem()->getParentItem()) {
-            continue;
-        } else {
-            $i++;
-        } ?>
+    continue;
+} else {
+    $i++;
+} ?>
             <tbody class="<?= /* @escapeNotVerified */ $i%2 ? 'even' : 'odd' ?>">
                 <?= $block->getItemHtml($_item) ?>
                 <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
index 284597027468d..9e13e917a2c53 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
@@ -38,8 +38,8 @@ $_fullInfo  = $block->getFullTaxInfo();
     <?php if (isset($_fullInfo[0]['rates'])): ?>
         <?php foreach ($_fullInfo as $info): ?>
             <?php if (isset($info['hidden']) && $info['hidden']) {
-                continue;
-            } ?>
+    continue;
+} ?>
             <?php
             $percent    = $info['percent'];
             $amount     = $info['amount'];
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
index dc62bce78ea1e..dfae1e1a46f8e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
@@ -27,10 +27,10 @@ $_order = $block->getOrder() ?>
         <?php $_items = $block->getItemsCollection();?>
         <?php $i = 0; foreach ($_items as $_item):?>
             <?php if ($_item->getParentItem()) {
-                continue;
-            } else {
-                $i++;
-            }?>
+                    continue;
+                } else {
+                    $i++;
+                }?>
             <tbody class="<?= /* @noEscape */ $i%2 ? 'even' : 'odd' ?>">
                 <?= $block->getItemHtml($_item) ?>
                 <?= $block->getItemExtraInfoHtml($_item) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
index e43d32760febb..0de68cb81f453 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
@@ -12,7 +12,7 @@
     <table class="data table table-order-items" id="my-orders-table" summary="<?= /* @escapeNotVerified */ __('Items Ordered') ?>">
         <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Ordered') ?></caption>
         <thead>
-            <?php if($block->isPagerDisplayed()): ?>
+            <?php if ($block->isPagerDisplayed()): ?>
                 <tr>
                     <td colspan="5" data-block="order-items-pager-top" class="order-pager-wrapper order-pager-wrapper-top">
                         <?= $block->getPagerHtml() ?>
@@ -30,7 +30,9 @@
         <?php $items = $block->getItems(); ?>
         <?php $giftMessage = ''?>
         <?php foreach ($items as $item): ?>
-            <?php if ($item->getParentItem()) continue; ?>
+            <?php if ($item->getParentItem()) {
+    continue;
+} ?>
             <tbody>
                 <?= $block->getItemHtml($item) ?>
                 <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $item) && $item->getGiftMessageId()): ?>
@@ -65,7 +67,7 @@
             </tbody>
         <?php endforeach; ?>
         <tfoot>
-            <?php if($block->isPagerDisplayed()): ?>
+            <?php if ($block->isPagerDisplayed()): ?>
                 <tr>
                     <td colspan="5" data-block="order-items-pager-bottom" class="order-pager-wrapper order-pager-wrapper-bottom">
                         <?= $block->getPagerHtml() ?>
diff --git a/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockOrder.php b/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockOrder.php
index bc0c61962ae97..2ee5a71a02f80 100644
--- a/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockOrder.php
+++ b/app/code/Magento/SalesInventory/Model/Plugin/Order/ReturnToStockOrder.php
@@ -6,10 +6,10 @@
 namespace Magento\SalesInventory\Model\Plugin\Order;
 
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\SalesInventory\Model\Order\ReturnProcessor;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Api\RefundOrderInterface;
+use Magento\SalesInventory\Model\Order\ReturnProcessor;
 
 /**
  * Class ReturnToStock
diff --git a/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/InvoiceRefundCreationArguments.php b/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/InvoiceRefundCreationArguments.php
index 1e27f6fd091f9..e4376918aace4 100644
--- a/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/InvoiceRefundCreationArguments.php
+++ b/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/InvoiceRefundCreationArguments.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\SalesInventory\Model\Plugin\Order\Validation;
 
-use Magento\Sales\Api\Data\InvoiceInterface;
-use Magento\Sales\Model\Order\Validation\RefundInvoiceInterface;
 use Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface;
 use Magento\Sales\Api\Data\CreditmemoInterface;
+use Magento\Sales\Api\Data\InvoiceInterface;
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\SalesInventory\Model\Order\ReturnValidator;
+use Magento\Sales\Model\Order\Validation\RefundInvoiceInterface;
 use Magento\Sales\Model\ValidatorResultInterface;
+use Magento\SalesInventory\Model\Order\ReturnValidator;
 
 /**
  * Class CreditmemoCreationArguments
diff --git a/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/OrderRefundCreationArguments.php b/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/OrderRefundCreationArguments.php
index d31e3caae3b44..9d22f34ed7999 100644
--- a/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/OrderRefundCreationArguments.php
+++ b/app/code/Magento/SalesInventory/Model/Plugin/Order/Validation/OrderRefundCreationArguments.php
@@ -10,8 +10,8 @@
 use Magento\Sales\Api\Data\CreditmemoInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Model\Order\Validation\RefundOrderInterface;
-use Magento\SalesInventory\Model\Order\ReturnValidator;
 use Magento\Sales\Model\ValidatorResultInterface;
+use Magento\SalesInventory\Model\Order\ReturnValidator;
 
 /**
  * Class OrderRefundCreationArguments
diff --git a/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnProcessorTest.php b/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnProcessorTest.php
index fb2fcfaaa9b30..1543e03b8f3f8 100644
--- a/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnProcessorTest.php
+++ b/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnProcessorTest.php
@@ -12,9 +12,9 @@
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Api\OrderItemRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\SalesInventory\Model\Order\ReturnProcessor;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\SalesInventory\Model\Order\ReturnProcessor;
 
 /**
  * Class ReturnProcessorTest
diff --git a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockOrderTest.php b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockOrderTest.php
index a0882a5b82225..5e394d1e8365f 100644
--- a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockOrderTest.php
+++ b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockOrderTest.php
@@ -7,15 +7,15 @@
 namespace Magento\SalesInventory\Test\Unit\Model\Plugin\Order;
 
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\SalesInventory\Model\Order\ReturnProcessor;
-use Magento\SalesInventory\Model\Plugin\Order\ReturnToStockOrder;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
-use Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface;
 use Magento\Sales\Api\Data\CreditmemoCreationArgumentsExtensionInterface;
+use Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface;
 use Magento\Sales\Api\Data\CreditmemoInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Api\RefundOrderInterface;
+use Magento\SalesInventory\Model\Order\ReturnProcessor;
+use Magento\SalesInventory\Model\Plugin\Order\ReturnToStockOrder;
 
 /**
  * Class ReturnToStockOrderTest
diff --git a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/InvoiceRefundCreationArgumentsTest.php b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/InvoiceRefundCreationArgumentsTest.php
index 2ee8f81a2aa88..8fc5fd3601e18 100644
--- a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/InvoiceRefundCreationArgumentsTest.php
+++ b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/InvoiceRefundCreationArgumentsTest.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\SalesInventory\Test\Unit\Model\Plugin\Order\Validation;
 
-use Magento\SalesInventory\Model\Order\ReturnValidator;
-use Magento\SalesInventory\Model\Plugin\Order\Validation\InvoiceRefundCreationArguments;
-use Magento\Sales\Model\ValidatorResultInterface;
-use Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface;
 use Magento\Sales\Api\Data\CreditmemoCreationArgumentsExtensionInterface;
+use Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface;
 use Magento\Sales\Api\Data\CreditmemoInterface;
 use Magento\Sales\Api\Data\InvoiceInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Model\Order\Validation\RefundInvoiceInterface;
+use Magento\Sales\Model\ValidatorResultInterface;
+use Magento\SalesInventory\Model\Order\ReturnValidator;
+use Magento\SalesInventory\Model\Plugin\Order\Validation\InvoiceRefundCreationArguments;
 
 /**
  * Class InvoiceRefundCreatetionArgumentsTest
diff --git a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/OrderRefundCreationArgumentsTest.php b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/OrderRefundCreationArgumentsTest.php
index d5b1f1647340f..2f98a70b3ebf2 100644
--- a/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/OrderRefundCreationArgumentsTest.php
+++ b/app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/Validation/OrderRefundCreationArgumentsTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\SalesInventory\Test\Unit\Model\Plugin\Order\Validation;
 
-use Magento\SalesInventory\Model\Order\ReturnValidator;
-use Magento\SalesInventory\Model\Plugin\Order\Validation\OrderRefundCreationArguments;
-use Magento\Sales\Model\Order\Validation\RefundOrderInterface;
-use Magento\Sales\Model\ValidatorResultInterface;
-use Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface;
 use Magento\Sales\Api\Data\CreditmemoCreationArgumentsExtensionInterface;
+use Magento\Sales\Api\Data\CreditmemoCreationArgumentsInterface;
 use Magento\Sales\Api\Data\CreditmemoInterface;
 use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order\Validation\RefundOrderInterface;
+use Magento\Sales\Model\ValidatorResultInterface;
+use Magento\SalesInventory\Model\Order\ReturnValidator;
+use Magento\SalesInventory\Model\Plugin\Order\Validation\OrderRefundCreationArguments;
 
 /**
  * Class OrderRefundCreatetionArgumentsTest
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
index 297db7d96939d..8eb736d5871f1 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\SalesRule\Controller\Adminhtml\Promo\Quote;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\SalesRule\Model\CouponGenerator;
 
 class Generate extends \Magento\SalesRule\Controller\Adminhtml\Promo\Quote
diff --git a/app/code/Magento/SalesRule/Model/Converter/ToDataModel.php b/app/code/Magento/SalesRule/Model/Converter/ToDataModel.php
index 74a23f4d25e60..19927ba1752de 100644
--- a/app/code/Magento/SalesRule/Model/Converter/ToDataModel.php
+++ b/app/code/Magento/SalesRule/Model/Converter/ToDataModel.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\SalesRule\Model\Converter;
 
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\SalesRule\Api\Data\RuleExtensionFactory;
 use Magento\SalesRule\Api\Data\RuleExtensionInterface;
-use Magento\SalesRule\Model\Data\Condition;
 use Magento\SalesRule\Api\Data\RuleInterface;
+use Magento\SalesRule\Model\Data\Condition;
 use Magento\SalesRule\Model\Data\Rule as RuleDataModel;
 use Magento\SalesRule\Model\Rule;
-use Magento\Framework\Serialize\Serializer\Json;
 
 class ToDataModel
 {
diff --git a/app/code/Magento/SalesRule/Model/Converter/ToModel.php b/app/code/Magento/SalesRule/Model/Converter/ToModel.php
index ce288c75a46f6..d9dc46570839d 100644
--- a/app/code/Magento/SalesRule/Model/Converter/ToModel.php
+++ b/app/code/Magento/SalesRule/Model/Converter/ToModel.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\SalesRule\Model\Converter;
 
-use Magento\SalesRule\Model\Data\Condition;
 use Magento\SalesRule\Api\Data\RuleInterface;
+use Magento\SalesRule\Model\Data\Condition;
 use Magento\SalesRule\Model\Data\Rule as RuleDataModel;
 use Magento\SalesRule\Model\Rule;
 
diff --git a/app/code/Magento/SalesRule/Model/CouponRepository.php b/app/code/Magento/SalesRule/Model/CouponRepository.php
index 99d6727a8be29..fb9b2d40cb980 100644
--- a/app/code/Magento/SalesRule/Model/CouponRepository.php
+++ b/app/code/Magento/SalesRule/Model/CouponRepository.php
@@ -8,7 +8,6 @@
 
 use Magento\Framework\Api\Search\FilterGroup;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Framework\Api\SortOrder;
 use Magento\SalesRule\Model\ResourceModel\Coupon\Collection;
 
 /**
diff --git a/app/code/Magento/SalesRule/Model/Data/Rule.php b/app/code/Magento/SalesRule/Model/Data/Rule.php
index 72465b285032e..15f9ebd7e67f6 100644
--- a/app/code/Magento/SalesRule/Model/Data/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Data/Rule.php
@@ -8,7 +8,6 @@
 namespace Magento\SalesRule\Model\Data;
 
 use Magento\SalesRule\Api\Data\ConditionInterface;
-use Magento\SalesRule\Api\Data\RuleInterface;
 
 /**
  * Class Rule
diff --git a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
index 9705808c88a01..9eb7f21ed1374 100644
--- a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
+++ b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\SalesRule\Model\Plugin;
 
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Customer\Model\Session;
 use Magento\SalesRule\Model\ResourceModel\Rule as RuleResource;
 
 class QuoteConfigProductAttributes
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php b/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
index 193a949108103..8f5f294d52dc2 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/ReadHandler.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Model\ResourceModel;
 
-use Magento\SalesRule\Model\ResourceModel\Rule;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
 
@@ -42,6 +41,7 @@ public function __construct(
      * @param array $arguments
      * @return array
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
     {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php
index 540ba7e2ea55a..e8483147d9b78 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php
@@ -129,7 +129,7 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
                     ) . ' + ' . $connection->getIfNullSql(
                         'base_tax_invoiced - ' . $connection->getIfNullSql('base_tax_refunded', 0),
                         0
-                    )   . ') * base_to_global_rate)',
+                    ) . ') * base_to_global_rate)',
                     0
                 ),
             ];
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php b/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
index 685de1b581fb4..a99e0973fdc5c 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/SaveHandler.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesRule\Model\ResourceModel;
 
-use Magento\SalesRule\Model\ResourceModel\Rule;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
 
@@ -42,6 +41,7 @@ public function __construct(
      * @param array $arguments
      * @return array
      * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
     {
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CalculatorFactory.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CalculatorFactory.php
index 7551ccb5dda14..a13d14a3c0e2c 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CalculatorFactory.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CalculatorFactory.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\SalesRule\Model\Rule\Action\Discount;
 
+use Magento\SalesRule\Model\Rule;
+
 class CalculatorFactory
 {
     /**
@@ -18,16 +20,12 @@ class CalculatorFactory
      * @var array
      */
     protected $classByType = [
-        \Magento\SalesRule\Model\Rule::TO_PERCENT_ACTION =>
-            \Magento\SalesRule\Model\Rule\Action\Discount\ToPercent::class,
-        \Magento\SalesRule\Model\Rule::BY_PERCENT_ACTION =>
-            \Magento\SalesRule\Model\Rule\Action\Discount\ByPercent::class,
-        \Magento\SalesRule\Model\Rule::TO_FIXED_ACTION => \Magento\SalesRule\Model\Rule\Action\Discount\ToFixed::class,
-        \Magento\SalesRule\Model\Rule::BY_FIXED_ACTION => \Magento\SalesRule\Model\Rule\Action\Discount\ByFixed::class,
-        \Magento\SalesRule\Model\Rule::CART_FIXED_ACTION =>
-            \Magento\SalesRule\Model\Rule\Action\Discount\CartFixed::class,
-        \Magento\SalesRule\Model\Rule::BUY_X_GET_Y_ACTION =>
-            \Magento\SalesRule\Model\Rule\Action\Discount\BuyXGetY::class,
+        Rule::TO_PERCENT_ACTION => ToPercent::class,
+        Rule::BY_PERCENT_ACTION => ByPercent::class,
+        Rule::TO_FIXED_ACTION => ToFixed::class,
+        Rule::BY_FIXED_ACTION => ByFixed::class,
+        Rule::CART_FIXED_ACTION => CartFixed::class,
+        Rule::BUY_X_GET_Y_ACTION => BuyXGetY::class,
     ];
 
     /**
diff --git a/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php b/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php
index b57daac1f0d58..516b871e5d9fb 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Metadata/ValueProvider.php
@@ -5,12 +5,11 @@
  */
 namespace Magento\SalesRule\Model\Rule\Metadata;
 
-use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
-use Magento\SalesRule\Model\Rule;
-use Magento\Store\Model\System\Store;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Convert\DataObject;
+use Magento\SalesRule\Model\Rule;
+use Magento\Store\Model\System\Store;
 
 /**
  * Metadata provider for sales rule edit form.
diff --git a/app/code/Magento/SalesRule/Model/RuleRepository.php b/app/code/Magento/SalesRule/Model/RuleRepository.php
index a2279db85aa1f..15113d36f0227 100644
--- a/app/code/Magento/SalesRule/Model/RuleRepository.php
+++ b/app/code/Magento/SalesRule/Model/RuleRepository.php
@@ -8,7 +8,6 @@
 use Magento\Framework\Api\Search\FilterGroup;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
-use Magento\Framework\Api\SortOrder;
 use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
 
 /**
diff --git a/app/code/Magento/SalesRule/Setup/UpgradeSchema.php b/app/code/Magento/SalesRule/Setup/UpgradeSchema.php
index c39536d121064..dc56d6723fbcd 100644
--- a/app/code/Magento/SalesRule/Setup/UpgradeSchema.php
+++ b/app/code/Magento/SalesRule/Setup/UpgradeSchema.php
@@ -6,10 +6,10 @@
 
 namespace Magento\SalesRule\Setup;
 
-use Magento\Framework\Setup\UpgradeSchemaInterface;
+use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\DB\Ddl\Table;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
 
 /**
  * Upgrade the SalesRule module DB scheme
diff --git a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
index fb01476ed6b34..09f2cd8ef1f27 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Block/Adminhtml/Promo/Quote/Edit/DeleteButtonTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\SalesRule\Test\Unit\Block\Adminhtml\Promo\Quote\Edit;
 
-use Magento\SalesRule\Model\RegistryConstants;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\SalesRule\Model\RegistryConstants;
 
 class DeleteButtonTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToDataModelTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToDataModelTest.php
index 82868b3723c75..d230e6aa9735c 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToDataModelTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Converter/ToDataModelTest.php
@@ -248,7 +248,6 @@ public function testToDataModel()
 
     public function testArrayToConditionDataModel()
     {
-
         $array=[
             'type' => \Magento\SalesRule\Model\Rule\Condition\Combine::class,
             'attribute' => null,
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
index 0d6c09b7f6141..a4893ac059939 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/ReadHandlerTest.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\SalesRule\Test\Unit\Model\ResourceModel;
 
-use Magento\SalesRule\Model\ResourceModel\ReadHandler;
-use Magento\SalesRule\Model\ResourceModel\Rule;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\SalesRule\Api\Data\RuleInterface;
+use Magento\SalesRule\Model\ResourceModel\Rule;
 
 /**
  * Class ReadHandlerTest
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php
index 528db1ea0b891..ffa6840e28558 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Rule/DateApplierTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\SalesRule\Test\Unit\Model\ResourceModel\Rule;
 
-use Magento\SalesRule\Model\ResourceModel\Rule\DateApplier;
-
 /**
  * Class DateApplierTest
  */
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/SaveHandlerTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/SaveHandlerTest.php
index 1ef899c77750c..ffc2aae7ff4aa 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/SaveHandlerTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/SaveHandlerTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\SalesRule\Test\Unit\Model\ResourceModel;
 
-use Magento\SalesRule\Model\ResourceModel\SaveHandler;
-use Magento\SalesRule\Model\ResourceModel\Rule;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\SalesRule\Api\Data\RuleInterface;
+use Magento\SalesRule\Model\ResourceModel\Rule;
+use Magento\SalesRule\Model\ResourceModel\SaveHandler;
 
 /**
  * Class SaveHandlerTest
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php
index 0bce282747b16..c67820e503253 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php
@@ -5,21 +5,20 @@
  */
 namespace Magento\SalesRule\Test\Unit\Model\Rule\Condition;
 
-use \Magento\Framework\DB\Adapter\AdapterInterface;
-use \Magento\Framework\DB\Select;
-use \Magento\Framework\Model\AbstractModel;
+use Magento\Backend\Helper\Data;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ResourceModel\Product;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\AbstractEntity;
+use Magento\Eav\Model\Entity\AttributeLoaderInterface;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Locale\FormatInterface;
 use Magento\Quote\Model\Quote\Item\AbstractItem;
-use \Magento\Rule\Model\Condition\Context;
-use \Magento\Backend\Helper\Data;
-use \Magento\Eav\Model\Config;
-use \Magento\Catalog\Model\ProductFactory;
-use \Magento\Catalog\Api\ProductRepositoryInterface;
-use \Magento\Eav\Model\Entity\AbstractEntity;
-use \Magento\Catalog\Model\ResourceModel\Product;
-use \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection;
-use \Magento\Framework\Locale\FormatInterface;
-use \Magento\Eav\Model\Entity\AttributeLoaderInterface;
-use \Magento\SalesRule\Model\Rule\Condition\Product as SalesRuleProduct;
+use Magento\Rule\Model\Condition\Context;
+use Magento\SalesRule\Model\Rule\Condition\Product as SalesRuleProduct;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Metadata/_files/MetaData.php b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Metadata/_files/MetaData.php
index f288792d36ddb..6f8d9b14c60f6 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Metadata/_files/MetaData.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Metadata/_files/MetaData.php
@@ -6,18 +6,13 @@
 
 return [
     'rule_information' => [
-        'children' =>
-            [
+        'children' => [
                 'website_ids' => ['arguments' => ['data' => ['config' => ['options' => []]]]],
                 'is_active' => [
-                    'arguments' =>
-                        [
-                            'data' =>
-                                [
-                                    'config' =>
-                                        [
-                                            'options' =>
-                                                [
+                    'arguments' => [
+                            'data' => [
+                                    'config' => [
+                                            'options' => [
                                                     [
                                                         'label' => __('Active'),
                                                         'value' => '1',
@@ -34,12 +29,9 @@
                 'customer_group_ids' => ['arguments' => ['data' => ['config' => ['options' => []]]]],
                 'coupon_type' => [
                     'arguments' => [
-                        'data' =>
-                            [
-                                'config' =>
-                                    [
-                                        'options' =>
-                                            [
+                        'data' => [
+                                'config' => [
+                                        'options' => [
                                                 [
                                                     'label' => 'couponType1',
                                                     'value' => 'key1',
@@ -54,14 +46,10 @@
                     ],
                 ],
                 'is_rss' => [
-                    'arguments' =>
-                        [
-                            'data' =>
-                                [
-                                    'config' =>
-                                        [
-                                            'options' =>
-                                                [
+                    'arguments' => [
+                            'data' => [
+                                    'config' => [
+                                            'options' => [
                                                     [
                                                         'label' => __('Yes'),
                                                         'value' => '1',
@@ -78,17 +66,12 @@
             ],
     ],
     'actions' => [
-        'children' =>
-            [
+        'children' => [
                 'simple_action' => [
-                    'arguments' =>
-                        [
-                            'data' =>
-                                [
-                                    'config' =>
-                                        [
-                                            'options' =>
-                                                [
+                    'arguments' => [
+                            'data' => [
+                                    'config' => [
+                                            'options' => [
                                                     [
                                                         'label' => __('Percent of product price discount'),
                                                         'value' => 'by_percent',
@@ -115,14 +98,10 @@
                 'discount_amount' => ['arguments' => ['data' => ['config' => ['value' => '0']]]],
                 'discount_qty' => ['arguments' => ['data' => ['config' => ['value' => '0']]]],
                 'apply_to_shipping' => [
-                    'arguments' =>
-                        [
-                            'data' =>
-                                [
-                                    'config' =>
-                                        [
-                                            'options' =>
-                                                [
+                    'arguments' => [
+                            'data' => [
+                                    'config' => [
+                                            'options' => [
                                                     [
                                                         'label' => __('Yes'),
                                                         'value' => '1'
@@ -137,15 +116,11 @@
                         ],
                 ],
                 'stop_rules_processing' => [
-                    'arguments' =>
-                        [
-                            'data' =>
-                                [
-                                    'config' =>
-                                        [
+                    'arguments' => [
+                            'data' => [
+                                    'config' => [
 
-                                            'options' =>
-                                                [
+                                            'options' => [
                                                     [
                                                         'label' => __('Yes'),
                                                         'value' => '1'
diff --git a/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php b/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
index 10cf903d0baed..88158c09eb2e4 100644
--- a/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
+++ b/app/code/Magento/SalesSequence/Model/ResourceModel/Meta.php
@@ -8,9 +8,9 @@
 use Magento\Framework\Exception\LocalizedException as Exception;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Model\ResourceModel\Db\Context as DatabaseContext;
-use Magento\SalesSequence\Model\ResourceModel\Profile as ResourceProfile;
 use Magento\SalesSequence\Model\MetaFactory;
 use Magento\SalesSequence\Model\Profile as ModelProfile;
+use Magento\SalesSequence\Model\ResourceModel\Profile as ResourceProfile;
 
 /**
  * Class Meta represents metadata for sequence as sequence table and store id
diff --git a/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php b/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
index 368bdf6c26f16..4f1788b0ca353 100644
--- a/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
+++ b/app/code/Magento/SalesSequence/Model/ResourceModel/Profile.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\SalesSequence\Model\ResourceModel;
 
-use Magento\SalesSequence\Model\Meta as ModelMeta;
 use Magento\Framework\Model\ResourceModel\Db\Context as DatabaseContext;
 use Magento\SalesSequence\Model\ProfileFactory;
 
diff --git a/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php b/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
index cc828e7d36a45..952ebb014d538 100644
--- a/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
+++ b/app/code/Magento/SalesSequence/Observer/SequenceCreatorObserver.php
@@ -6,10 +6,10 @@
 namespace Magento\SalesSequence\Observer;
 
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 use Magento\SalesSequence\Model\Builder;
-use Magento\SalesSequence\Model\EntityPool;
 use Magento\SalesSequence\Model\Config;
-use Magento\Framework\Event\ObserverInterface;
+use Magento\SalesSequence\Model\EntityPool;
 
 /**
  * Class CreateSequence
diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataRemoveCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataRemoveCommand.php
index 5e10b6c6e5930..ad72d81d64e3f 100644
--- a/app/code/Magento/SampleData/Console/Command/SampleDataRemoveCommand.php
+++ b/app/code/Magento/SampleData/Console/Command/SampleDataRemoveCommand.php
@@ -6,17 +6,17 @@
 
 namespace Magento\SampleData\Console\Command;
 
+use Composer\Console\Application;
+use Composer\Console\ApplicationFactory;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\SampleData\Model\Dependency;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\ArrayInputFactory;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\SampleData\Model\Dependency;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\ArrayInputFactory;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem;
-use Composer\Console\Application;
-use Composer\Console\ApplicationFactory;
 
 /**
  * Command for remove Sample Data packages
diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataResetCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataResetCommand.php
index e454800af66b6..1fe8a50c0ff36 100644
--- a/app/code/Magento/SampleData/Console/Command/SampleDataResetCommand.php
+++ b/app/code/Magento/SampleData/Console/Command/SampleDataResetCommand.php
@@ -6,10 +6,10 @@
 
 namespace Magento\SampleData\Console\Command;
 
+use Magento\SampleData\Model\Dependency;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\SampleData\Model\Dependency;
 
 /**
  * Command for reset Sample Data modules version
diff --git a/app/code/Magento/SampleData/Model/Dependency.php b/app/code/Magento/SampleData/Model/Dependency.php
index 19b4fe8e1568c..02c2cfffbc6c6 100644
--- a/app/code/Magento/SampleData/Model/Dependency.php
+++ b/app/code/Magento/SampleData/Model/Dependency.php
@@ -7,9 +7,9 @@
 
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Composer\ComposerInformation;
-use Magento\Framework\Filesystem;
 use Magento\Framework\Config\Composer\Package;
 use Magento\Framework\Config\Composer\PackageFactory;
+use Magento\Framework\Filesystem;
 
 /**
  * Sample Data dependency
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Edit.php b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Edit.php
index 506976247327f..c570bb1417dd5 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Edit.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Edit.php
@@ -66,10 +66,10 @@ public function execute()
 
         // 2. Initial checking
         if ($groupId && (!$synGroup->getGroupId())) {
-                $this->messageManager->addError(__('This synonyms group no longer exists.'));
-                /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
-                $resultRedirect = $this->resultRedirectFactory->create();
-                return $resultRedirect->setPath('*/*/');
+            $this->messageManager->addError(__('This synonyms group no longer exists.'));
+            /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+            $resultRedirect = $this->resultRedirectFactory->create();
+            return $resultRedirect->setPath('*/*/');
         }
 
         // 3. Set entered data if was error when we do save
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
index 3a1b80df2ea7e..dff5c96da45cc 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
-use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Search\Controller\Adminhtml\Term as TermController;
 
 class Delete extends TermController
 {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
index 85e14ae9fe0b0..b892ae1825fe2 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
-use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\Registry;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Registry;
+use Magento\Search\Controller\Adminhtml\Term as TermController;
 
 class Edit extends TermController
 {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php
index 75173381b5239..45a6bd58a35db 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
-use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Response\Http\FileFactory;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Search\Controller\Adminhtml\Term as TermController;
 
 class ExportSearchCsv extends TermController
 {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php
index e3859bc5aefd2..6b5678105cc1d 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
-use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Response\Http\FileFactory;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Search\Controller\Adminhtml\Term as TermController;
 
 class ExportSearchExcel extends TermController
 {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
index b38d883b8faae..1946b17ea2b99 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
-use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Search\Controller\Adminhtml\Term as TermController;
 
 class MassDelete extends TermController
 {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php
index 8565c03724c65..2e1b0f7eea3c9 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
-use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Search\Controller\Adminhtml\Term as TermController;
 
 class NewAction extends TermController
 {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php
index fb4964717e565..aba9c637b53d4 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Report.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
-use Magento\Reports\Controller\Adminhtml\Index as ReportsIndexController;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Reports\Controller\Adminhtml\Index as ReportsIndexController;
 
 class Report extends ReportsIndexController
 {
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
index 42e9373a20fe2..742007874063f 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Term/Save.php
@@ -7,9 +7,9 @@
 
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\Search\Model\QueryFactory;
-use Magento\Search\Controller\Adminhtml\Term as TermController;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Search\Controller\Adminhtml\Term as TermController;
+use Magento\Search\Model\QueryFactory;
 
 class Save extends TermController
 {
diff --git a/app/code/Magento/Search/Controller/Ajax/Suggest.php b/app/code/Magento/Search/Controller/Ajax/Suggest.php
index 307f4df163243..2845eed6a409c 100644
--- a/app/code/Magento/Search/Controller/Ajax/Suggest.php
+++ b/app/code/Magento/Search/Controller/Ajax/Suggest.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
-use Magento\Search\Model\AutocompleteInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Search\Model\AutocompleteInterface;
 
 class Suggest extends Action
 {
diff --git a/app/code/Magento/Search/Controller/Term/Popular.php b/app/code/Magento/Search/Controller/Term/Popular.php
index acc1ce324567e..62ffa8c4bc08b 100644
--- a/app/code/Magento/Search/Controller/Term/Popular.php
+++ b/app/code/Magento/Search/Controller/Term/Popular.php
@@ -9,8 +9,8 @@
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\RequestInterface;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Store\Model\ScopeInterface;
 
 class Popular extends Action
 {
diff --git a/app/code/Magento/Search/Helper/Data.php b/app/code/Magento/Search/Helper/Data.php
index e813d7342761f..375cc18d4895b 100644
--- a/app/code/Magento/Search/Helper/Data.php
+++ b/app/code/Magento/Search/Helper/Data.php
@@ -10,9 +10,9 @@
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\Escaper;
 use Magento\Framework\Stdlib\StringUtils;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Search\Model\Query as SearchQuery;
 use Magento\Search\Model\QueryFactory;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Search helper
diff --git a/app/code/Magento/Search/Model/Query.php b/app/code/Magento/Search/Model/Query.php
index 404d93f76da6d..49e28b3eb0b85 100644
--- a/app/code/Magento/Search/Model/Query.php
+++ b/app/code/Magento/Search/Model/Query.php
@@ -5,16 +5,15 @@
  */
 namespace Magento\Search\Model;
 
-use Magento\Framework\App\ResourceConnection;
-use Magento\Search\Model\ResourceModel\Query\Collection as QueryCollection;
-use Magento\Search\Model\ResourceModel\Query\CollectionFactory as QueryCollectionFactory;
-use Magento\Search\Model\SearchCollectionInterface as Collection;
-use Magento\Search\Model\SearchCollectionFactory as CollectionFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Data\Collection\AbstractDb as DbCollection;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Registry;
+use Magento\Search\Model\ResourceModel\Query\Collection as QueryCollection;
+use Magento\Search\Model\ResourceModel\Query\CollectionFactory as QueryCollectionFactory;
+use Magento\Search\Model\SearchCollectionFactory as CollectionFactory;
+use Magento\Search\Model\SearchCollectionInterface as Collection;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
diff --git a/app/code/Magento/Search/Model/QueryFactory.php b/app/code/Magento/Search/Model/QueryFactory.php
index 2122451742402..47b768ebe1173 100644
--- a/app/code/Magento/Search/Model/QueryFactory.php
+++ b/app/code/Magento/Search/Model/QueryFactory.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Search\Model;
 
-use Magento\Search\Helper\Data;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Stdlib\StringUtils as StdlibString;
+use Magento\Search\Helper\Data;
 
 /**
  * @api
diff --git a/app/code/Magento/Search/Model/ResourceModel/Query.php b/app/code/Magento/Search/Model/ResourceModel/Query.php
index 54849ffec5558..d78fac6049417 100644
--- a/app/code/Magento/Search/Model/ResourceModel/Query.php
+++ b/app/code/Magento/Search/Model/ResourceModel/Query.php
@@ -8,7 +8,6 @@
 
 namespace Magento\Search\Model\ResourceModel;
 
-use Magento\Framework\DB\Select;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Search\Model\Query as QueryModel;
diff --git a/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php b/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php
index e34c841f32bd1..37137fed6fe17 100644
--- a/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php
+++ b/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php
@@ -130,7 +130,6 @@ public function setQueryFilter($query)
      */
     public function setPopularQueryFilter($storeIds = null)
     {
-
         $this->getSelect()->reset(
             \Magento\Framework\DB\Select::FROM
         )->reset(
diff --git a/app/code/Magento/Search/Model/Synonym/DataProvider.php b/app/code/Magento/Search/Model/Synonym/DataProvider.php
index a30bf13ca9ff8..c3457d4576d32 100644
--- a/app/code/Magento/Search/Model/Synonym/DataProvider.php
+++ b/app/code/Magento/Search/Model/Synonym/DataProvider.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Search\Model\Synonym;
 
-use Magento\Search\Model\ResourceModel\SynonymGroup\CollectionFactory;
 use Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool;
+use Magento\Search\Model\ResourceModel\SynonymGroup\CollectionFactory;
 
 /**
  * Class DataProvider
diff --git a/app/code/Magento/Search/Model/SynonymReader.php b/app/code/Magento/Search/Model/SynonymReader.php
index 202931665f493..9ee1f0bcbf9cc 100644
--- a/app/code/Magento/Search/Model/SynonymReader.php
+++ b/app/code/Magento/Search/Model/SynonymReader.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Search\Model;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Data\Collection\AbstractDb as DbCollection;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Ajax/SuggestTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Ajax/SuggestTest.php
index 608e57d3e412b..b7f4bedda7092 100644
--- a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Ajax/SuggestTest.php
+++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Ajax/SuggestTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Search\Test\Unit\Controller\Adminhtml\Ajax;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class SuggestTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/ExportSearchCsvTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/ExportSearchCsvTest.php
index ce0dc6400b146..a67b545cd62f6 100644
--- a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/ExportSearchCsvTest.php
+++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/ExportSearchCsvTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Search\Test\Unit\Controller\Adminhtml\Term;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class ExportSearchCsvTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/IndexTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/IndexTest.php
index 340220661c99e..69cff35fe141e 100644
--- a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/IndexTest.php
+++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/IndexTest.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Search\Test\Unit\Controller\Adminhtml\Term;
 
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Backend\Model\View\Result\Page;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\Page\Config;
 use Magento\Framework\View\Page\Title;
diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php
index efda8f52fcfe9..959f1542310f1 100644
--- a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php
+++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/MassDeleteTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Search\Test\Unit\Controller\Adminhtml\Term;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class MassDeleteTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/ReportTest.php b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/ReportTest.php
index f4a71ba7219d0..d4bedba79608e 100644
--- a/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/ReportTest.php
+++ b/app/code/Magento/Search/Test/Unit/Controller/Adminhtml/Term/ReportTest.php
@@ -6,13 +6,13 @@
  */
 namespace Magento\Search\Test\Unit\Controller\Adminhtml\Term;
 
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Backend\App\Action\Context;
 use Magento\Backend\Model\View\Result\Page;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\Page\Config;
 use Magento\Framework\View\Page\Title;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Backend\App\Action\Context;
 use Magento\Search\Controller\Adminhtml\Term\Report;
 
 class ReportTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Search/Test/Unit/Model/AutocompleteTest.php b/app/code/Magento/Search/Test/Unit/Model/AutocompleteTest.php
index 9b4c7426113cd..b91bee83af95d 100644
--- a/app/code/Magento/Search/Test/Unit/Model/AutocompleteTest.php
+++ b/app/code/Magento/Search/Test/Unit/Model/AutocompleteTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Search\Test\Unit\Model;
 
-use Magento\Search\Model\Autocomplete;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Search\Model\Autocomplete;
 use Magento\Search\Model\Autocomplete\DataProviderInterface;
 
 class AutocompleteTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Search/Test/Unit/Model/EngineResolverTest.php b/app/code/Magento/Search/Test/Unit/Model/EngineResolverTest.php
index 9c384f783bf7a..7aebafd3df5f4 100755
--- a/app/code/Magento/Search/Test/Unit/Model/EngineResolverTest.php
+++ b/app/code/Magento/Search/Test/Unit/Model/EngineResolverTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Search\Test\Unit\Model;
 
-use Magento\Search\Model\EngineResolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Search\Model\EngineResolver;
 
 class EngineResolverTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Search/Test/Unit/Model/QueryFactoryTest.php b/app/code/Magento/Search/Test/Unit/Model/QueryFactoryTest.php
index 3df457b0d4497..672df380c952c 100644
--- a/app/code/Magento/Search/Test/Unit/Model/QueryFactoryTest.php
+++ b/app/code/Magento/Search/Test/Unit/Model/QueryFactoryTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Search\Test\Unit\Model;
 
-use Magento\Search\Helper\Data;
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Search\Model\QueryFactory;
 use Magento\Framework\Stdlib\StringUtils;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Search\Helper\Data;
 use Magento\Search\Model\Query;
+use Magento\Search\Model\QueryFactory;
 
 /**
  * Class QueryFactoryTest tests Magento\Search\Model\QueryFactory
diff --git a/app/code/Magento/Search/Test/Unit/Model/SearchEngine/MenuBuilderTest.php b/app/code/Magento/Search/Test/Unit/Model/SearchEngine/MenuBuilderTest.php
index 8e51631976bd8..c5c18d07f4753 100644
--- a/app/code/Magento/Search/Test/Unit/Model/SearchEngine/MenuBuilderTest.php
+++ b/app/code/Magento/Search/Test/Unit/Model/SearchEngine/MenuBuilderTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Search\Test\Unit\Model\SearchEngine;
 
-use Magento\Backend\Model\Menu;
-use Magento\Backend\Model\Menu\Builder;
 use Magento\Framework\Search\SearchEngine\ConfigInterface;
 use Magento\Search\Model\EngineResolver;
 
diff --git a/app/code/Magento/Search/Ui/Component/Listing/Column/StoreView.php b/app/code/Magento/Search/Ui/Component/Listing/Column/StoreView.php
index 1a66d9242b343..44c6cdbba07ab 100644
--- a/app/code/Magento/Search/Ui/Component/Listing/Column/StoreView.php
+++ b/app/code/Magento/Search/Ui/Component/Listing/Column/StoreView.php
@@ -5,11 +5,10 @@
  */
 namespace Magento\Search\Ui\Component\Listing\Column;
 
-use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class StoreView
@@ -65,7 +64,6 @@ public function prepareDataSource(array $dataSource)
      */
     protected function prepareItem(array $item)
     {
-
         if ($item['store_id'] == \Magento\Store\Model\Store::DEFAULT_STORE_ID) {
             return __('All Store Views');
         }
diff --git a/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php b/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php
index 8cc9b809ff888..82af48ab6867d 100644
--- a/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php
+++ b/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Search\Ui\Component\Listing\Column;
 
+use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Framework\UrlInterface;
 
 /**
  * Class SynonymActions provides grid actions for synonyms
diff --git a/app/code/Magento/Search/Ui/Component/Listing/Column/Website.php b/app/code/Magento/Search/Ui/Component/Listing/Column/Website.php
index 216e0b3877ddb..69254f4ba8172 100644
--- a/app/code/Magento/Search/Ui/Component/Listing/Column/Website.php
+++ b/app/code/Magento/Search/Ui/Component/Listing/Column/Website.php
@@ -5,12 +5,10 @@
  */
 namespace Magento\Search\Ui\Component\Listing\Column;
 
-use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Store\Model\System\Store as SystemStore;
-use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class Website
diff --git a/app/code/Magento/Search/Ui/Component/Listing/Column/Website/Options.php b/app/code/Magento/Search/Ui/Component/Listing/Column/Website/Options.php
index ede04b6d3db70..1bb992383b27e 100644
--- a/app/code/Magento/Search/Ui/Component/Listing/Column/Website/Options.php
+++ b/app/code/Magento/Search/Ui/Component/Listing/Column/Website/Options.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Search\Ui\Component\Listing\Column\Website;
 
-use Magento\Framework\Escaper;
 use Magento\Framework\Data\OptionSourceInterface;
+use Magento\Framework\Escaper;
 use Magento\Store\Model\System\Store as SystemStore;
 
 class Options implements OptionSourceInterface
diff --git a/app/code/Magento/Security/Model/AdminSessionsManager.php b/app/code/Magento/Security/Model/AdminSessionsManager.php
index af690f1899e7b..3b6ab14fac591 100644
--- a/app/code/Magento/Security/Model/AdminSessionsManager.php
+++ b/app/code/Magento/Security/Model/AdminSessionsManager.php
@@ -6,7 +6,7 @@
 namespace Magento\Security\Model;
 
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
-use \Magento\Security\Model\ResourceModel\AdminSessionInfo\CollectionFactory;
+use Magento\Security\Model\ResourceModel\AdminSessionInfo\CollectionFactory;
 
 /**
  * Admin Sessions Manager Model
@@ -195,7 +195,7 @@ public function getLogoutReasonMessageByStatus($statusCode)
             case AdminSessionInfo::LOGGED_OUT_BY_LOGIN:
                 $reasonMessage = __(
                     'Someone logged into this account from another device or browser.'
-                    .' Your current session is terminated.'
+                    . ' Your current session is terminated.'
                 );
                 break;
             case AdminSessionInfo::LOGGED_OUT_MANUALLY:
diff --git a/app/code/Magento/Security/Model/Plugin/LoginController.php b/app/code/Magento/Security/Model/Plugin/LoginController.php
index ab9c6e2857bce..27ca064d0b82f 100644
--- a/app/code/Magento/Security/Model/Plugin/LoginController.php
+++ b/app/code/Magento/Security/Model/Plugin/LoginController.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Security\Model\Plugin;
 
-use Magento\Security\Model\AdminSessionsManager;
 use Magento\Backend\Controller\Adminhtml\Auth\Login;
+use Magento\Security\Model\AdminSessionsManager;
 
 /**
  * Magento\Backend\Controller\Adminhtml\Auth\Login decorator
diff --git a/app/code/Magento/Security/Setup/UpgradeSchema.php b/app/code/Magento/Security/Setup/UpgradeSchema.php
index 4fdf12f672e94..99faba8021a51 100644
--- a/app/code/Magento/Security/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Security/Setup/UpgradeSchema.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Security\Setup;
 
-use Magento\Framework\Setup\UpgradeSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
 
 /**
  * Upgrade the Catalog module DB scheme
diff --git a/app/code/Magento/Security/Test/Unit/Controller/Adminhtml/Session/ActivityTest.php b/app/code/Magento/Security/Test/Unit/Controller/Adminhtml/Session/ActivityTest.php
index acd2263017ee8..14023c25e8201 100644
--- a/app/code/Magento/Security/Test/Unit/Controller/Adminhtml/Session/ActivityTest.php
+++ b/app/code/Magento/Security/Test/Unit/Controller/Adminhtml/Session/ActivityTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Security\Test\Unit\Controller\Adminhtml\Session;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Framework\Phrase;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Test class for \Magento\Security\Controller\Adminhtml\Session\Activity testing
diff --git a/app/code/Magento/Security/Test/Unit/Model/ResourceModel/PasswordResetRequestEvent/CollectionFactoryTest.php b/app/code/Magento/Security/Test/Unit/Model/ResourceModel/PasswordResetRequestEvent/CollectionFactoryTest.php
index 525693631e86f..04a2f69110693 100644
--- a/app/code/Magento/Security/Test/Unit/Model/ResourceModel/PasswordResetRequestEvent/CollectionFactoryTest.php
+++ b/app/code/Magento/Security/Test/Unit/Model/ResourceModel/PasswordResetRequestEvent/CollectionFactoryTest.php
@@ -9,8 +9,8 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Security\Model\Config\Source\ResetMethod;
 use Magento\Security\Model\ConfigInterface;
-use Magento\Security\Model\ResourceModel\PasswordResetRequestEvent\CollectionFactory;
 use Magento\Security\Model\ResourceModel\PasswordResetRequestEvent\Collection;
+use Magento\Security\Model\ResourceModel\PasswordResetRequestEvent\CollectionFactory;
 
 class CollectionFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml b/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml
index 88a3ff433a033..5372d459280de 100644
--- a/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml
+++ b/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml
@@ -20,7 +20,7 @@ $sessionInfoCollection = $block->getSessionInfoCollection();
         if ($block->areMultipleSessionsActive()) {
             echo $block->escapeHtml(__(
                 'This administrator account is open in more than one location. '
-                .'Note that other locations might be different browsers or sessions on the same computer.'
+                . 'Note that other locations might be different browsers or sessions on the same computer.'
             ));
         } ?>
     </div>
diff --git a/app/code/Magento/SendFriend/Controller/Product.php b/app/code/Magento/SendFriend/Controller/Product.php
index 732bcef8b957a..72ea4f44b1311 100644
--- a/app/code/Magento/SendFriend/Controller/Product.php
+++ b/app/code/Magento/SendFriend/Controller/Product.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\SendFriend\Controller;
 
-use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\NotFoundException;
 
 /**
  * Email to a Friend Product Controller
diff --git a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
index 72dcf00d17c7d..4b6238b45c244 100644
--- a/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
+++ b/app/code/Magento/SendFriend/Controller/Product/Sendmail.php
@@ -8,8 +8,8 @@
 
 namespace Magento\SendFriend\Controller\Product;
 
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 class Sendmail extends \Magento\SendFriend\Controller\Product
 {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php
index 0ac36110d7e6b..f66ee4e4506df 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddComment.php
@@ -6,9 +6,9 @@
  */
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
-use Magento\Sales\Model\Order\Email\Sender\ShipmentCommentSender;
 use Magento\Backend\App\Action;
 use Magento\Framework\View\Result\LayoutFactory;
+use Magento\Sales\Model\Order\Email\Sender\ShipmentCommentSender;
 
 class AddComment extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/MassPrintShippingLabel.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/MassPrintShippingLabel.php
index bfe3dc1f94f06..dcc87f05eaa93 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/MassPrintShippingLabel.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/MassPrintShippingLabel.php
@@ -6,17 +6,16 @@
  */
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
-use Magento\Backend\App\Action;
-use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Magento\Ui\Component\MassAction\Filter;
 use Magento\Backend\App\Action\Context;
-use Magento\Shipping\Model\Shipping\LabelGenerator;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Response\Http\FileFactory;
-use Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory as ShipmentCollectionFactory;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory as ShipmentCollectionFactory;
+use Magento\Shipping\Model\Shipping\LabelGenerator;
+use Magento\Ui\Component\MassAction\Filter;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php
index 323cbde977d64..3b06870de6688 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintLabel.php
@@ -7,8 +7,8 @@
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
 use Magento\Backend\App\Action;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class PrintLabel extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintPackage.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintPackage.php
index bba3fb417e18f..afb8f7f5c55bf 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintPackage.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/PrintPackage.php
@@ -7,8 +7,8 @@
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
 use Magento\Backend\App\Action;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class PrintPackage extends \Magento\Backend\App\Action
 {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
index 5eca94bce562b..adc81ce2c10d7 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
-use Magento\Backend\App\Action;
 use Magento\Sales\Model\Order\Shipment\Validation\QuantityValidator;
 
 /**
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php
index c4094a63ec527..7e14db31149d7 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php
@@ -9,13 +9,13 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Registry;
+use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
+use Magento\Sales\Api\Data\ShipmentItemCreationInterfaceFactory;
 use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
 use Magento\Sales\Api\Data\ShipmentTrackCreationInterfaceFactory;
-use Magento\Sales\Api\Data\ShipmentItemCreationInterfaceFactory;
-use Magento\Sales\Api\ShipmentRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Api\ShipmentRepositoryInterface;
 use Magento\Sales\Model\Order\ShipmentDocumentFactory;
-use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
 
 /**
  * Class ShipmentLoader
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Shipment/MassPrintShippingLabel.php b/app/code/Magento/Shipping/Controller/Adminhtml/Shipment/MassPrintShippingLabel.php
index e57a4ca87ae10..d71278ae9858d 100644
--- a/app/code/Magento/Shipping/Controller/Adminhtml/Shipment/MassPrintShippingLabel.php
+++ b/app/code/Magento/Shipping/Controller/Adminhtml/Shipment/MassPrintShippingLabel.php
@@ -6,16 +6,15 @@
  */
 namespace Magento\Shipping\Controller\Adminhtml\Shipment;
 
-use Magento\Backend\App\Action;
-use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-use Magento\Ui\Component\MassAction\Filter;
 use Magento\Backend\App\Action\Context;
-use Magento\Shipping\Model\Shipping\LabelGenerator;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Magento\Sales\Model\ResourceModel\Order\Shipment\CollectionFactory;
+use Magento\Shipping\Model\Shipping\LabelGenerator;
+use Magento\Ui\Component\MassAction\Filter;
 
 class MassPrintShippingLabel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index d42da53263ca4..fc30c51f170b7 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -6,10 +6,10 @@
 namespace Magento\Shipping\Model\Carrier;
 
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Xml\Security;
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use Magento\Quote\Model\Quote\Address\RateResult\Error;
 use Magento\Shipping\Model\Shipment\Request;
-use Magento\Framework\Xml\Security;
 
 /**
  * Abstract online shipping carrier model
diff --git a/app/code/Magento/Shipping/Model/ShipmentNotifier.php b/app/code/Magento/Shipping/Model/ShipmentNotifier.php
index 6a317c068bbc4..0084b67788fc9 100644
--- a/app/code/Magento/Shipping/Model/ShipmentNotifier.php
+++ b/app/code/Magento/Shipping/Model/ShipmentNotifier.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Shipping\Model;
 
-use Psr\Log\LoggerInterface as Logger;
 use Magento\Sales\Model\Order\Email\Sender\ShipmentSender;
 use Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory;
+use Psr\Log\LoggerInterface as Logger;
 
 /**
  * Class ShipmentNotifier
diff --git a/app/code/Magento/Shipping/Model/Shipping/Labels.php b/app/code/Magento/Shipping/Model/Shipping/Labels.php
index b1709b0a16998..6aa0cbece116f 100644
--- a/app/code/Magento/Shipping/Model/Shipping/Labels.php
+++ b/app/code/Magento/Shipping/Model/Shipping/Labels.php
@@ -10,8 +10,8 @@
 
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Sales\Model\Order\Shipment;
 use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Model\Order\Shipment;
 use Magento\Shipping\Model\Shipment\Request;
 use Magento\Store\Model\ScopeInterface;
 use Magento\User\Model\User;
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
index 2bffe74baa9b0..b84a0f8a9b336 100644
--- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/AddTrackTest.php
@@ -10,6 +10,7 @@
 
 use Magento\Backend\App\Action;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
 /**
  * Class AddTrackTest
  *
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
index 491a1e01f1720..9e9cd6a716a17 100644
--- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/SaveTest.php
@@ -9,11 +9,11 @@
 namespace Magento\Shipping\Test\Unit\Controller\Adminhtml\Order\Shipment;
 
 use Magento\Backend\App\Action;
-use Magento\Sales\Model\ValidatorResultInterface;
-use Magento\Sales\Model\Order\Email\Sender\ShipmentSender;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Sales\Model\Order\Email\Sender\ShipmentSender;
 use Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface;
 use Magento\Sales\Model\Order\Shipment\Validation\QuantityValidator;
+use Magento\Sales\Model\ValidatorResultInterface;
 
 /**
  * Class SaveTest
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/ShipmentLoaderTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/ShipmentLoaderTest.php
index 83dd9595cc43b..4e2e2ae126b21 100644
--- a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/ShipmentLoaderTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/ShipmentLoaderTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Shipping\Test\Unit\Controller\Adminhtml\Order;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
+use Magento\Sales\Api\Data\ShipmentItemCreationInterfaceFactory;
 use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
 use Magento\Sales\Api\Data\ShipmentTrackCreationInterfaceFactory;
-use Magento\Sales\Api\Data\ShipmentItemCreationInterfaceFactory;
 use Magento\Sales\Model\Order\ShipmentDocumentFactory;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader;
 
 /**
diff --git a/app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php b/app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php
index 37439082b9111..9e45bbcc661bc 100644
--- a/app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Model/Carrier/AbstractCarrierOnlineTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Shipping\Test\Unit\Model\Carrier;
 
-use \Magento\Shipping\Model\Carrier\AbstractCarrierOnline;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 use Magento\Quote\Model\Quote\Address\RateRequest;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Shipping\Model\Carrier\AbstractCarrierOnline;
 
 class AbstractCarrierOnlineTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Shipping/Test/Unit/Model/ShipmentTest.php b/app/code/Magento/Shipping/Test/Unit/Model/ShipmentTest.php
index ef83917909bcd..98164045204f9 100644
--- a/app/code/Magento/Shipping/Test/Unit/Model/ShipmentTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Model/ShipmentTest.php
@@ -8,7 +8,6 @@
 
 namespace Magento\Shipping\Test\Unit\Model;
 
-use \Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
diff --git a/app/code/Magento/Shipping/Test/Unit/Model/Shipping/LabelGeneratorTest.php b/app/code/Magento/Shipping/Test/Unit/Model/Shipping/LabelGeneratorTest.php
index f97d8bb3c9400..d5e106426c8f8 100644
--- a/app/code/Magento/Shipping/Test/Unit/Model/Shipping/LabelGeneratorTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Model/Shipping/LabelGeneratorTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Shipping\Test\Unit\Model\Shipping;
 
-use Magento\Framework\DataObject;
-use Magento\Sales\Model\Order\Shipment;
 use Magento\Store\Model\ScopeInterface;
 
 /**
diff --git a/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php b/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php
index 727675407b8a0..ba031e60f1544 100644
--- a/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Model/ShippingTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Shipping\Test\Unit\Model;
 
-use \Magento\Shipping\Model\Shipping;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 use Magento\Quote\Model\Quote\Address\RateRequest;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Shipping\Model\Shipping;
 
 class ShippingTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
index a1f2d2741839b..e9c36fcfe5449 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
@@ -80,4 +80,4 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
         jQuery(document).data('packagingInited', true);
     });
 </script>
-<?php include ($block->getTemplateFile('Magento_Shipping::order/packaging/popup_content.phtml')) ?>
+<?php include $block->getTemplateFile('Magento_Shipping::order/packaging/popup_content.phtml')?>
diff --git a/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php
index 7964d6b1af397..a0bd803974510 100644
--- a/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php
+++ b/app/code/Magento/Signifyd/Block/Adminhtml/System/Config/Field/WebhookUrl.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Signifyd\Block\Adminhtml\System\Config\Field;
 
-use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 
diff --git a/app/code/Magento/Signifyd/Model/CaseManagement.php b/app/code/Magento/Signifyd/Model/CaseManagement.php
index 1913f1e7a17b3..f25eab6d0a353 100644
--- a/app/code/Magento/Signifyd/Model/CaseManagement.php
+++ b/app/code/Magento/Signifyd/Model/CaseManagement.php
@@ -7,12 +7,12 @@
 
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\DB\Adapter\DuplicateException;
+use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Signifyd\Api\CaseManagementInterface;
 use Magento\Signifyd\Api\CaseRepositoryInterface;
 use Magento\Signifyd\Api\Data\CaseInterface;
 use Magento\Signifyd\Api\Data\CaseInterfaceFactory;
-use Magento\Framework\Exception\AlreadyExistsException;
-use Magento\Framework\DB\Adapter\DuplicateException;
 
 /**
  *
diff --git a/app/code/Magento/Signifyd/Model/CaseRepository.php b/app/code/Magento/Signifyd/Model/CaseRepository.php
index ea3ea3e67aafd..1f03cc7598f65 100644
--- a/app/code/Magento/Signifyd/Model/CaseRepository.php
+++ b/app/code/Magento/Signifyd/Model/CaseRepository.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Signifyd\Model;
 
-use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Signifyd\Api\CaseRepositoryInterface;
 use Magento\Signifyd\Api\Data\CaseInterface;
 use Magento\Signifyd\Api\Data\CaseInterfaceFactory;
diff --git a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php
index 5415044b5edc4..3060699ddd161 100644
--- a/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php
+++ b/app/code/Magento/Signifyd/Model/CaseServices/UpdatingServiceFactory.php
@@ -6,8 +6,8 @@
 namespace Magento\Signifyd\Model\CaseServices;
 
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Signifyd\Model\MessageGenerators\GeneratorFactory;
 use Magento\Signifyd\Model\Config;
+use Magento\Signifyd\Model\MessageGenerators\GeneratorFactory;
 
 /**
  * Creates instance of case updating service configured with specific message generator.
diff --git a/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php b/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php
index 4080aee453f18..6b9eee688cb43 100644
--- a/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php
+++ b/app/code/Magento/Signifyd/Model/Guarantee/CreationService.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Signifyd\Model\Guarantee;
 
-use Magento\Framework\Exception\AlreadyExistsException;
-use Magento\Framework\Exception\NotFoundException;
 use Magento\Signifyd\Api\CaseManagementInterface;
 use Magento\Signifyd\Api\GuaranteeCreationServiceInterface;
 use Magento\Signifyd\Model\CaseServices\UpdatingServiceFactory;
diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php
index 103cb9fc1e2d3..18cb58e9be0eb 100644
--- a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php
+++ b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorException.php
@@ -15,5 +15,4 @@
  */
 class GeneratorException extends LocalizedException
 {
-
 }
diff --git a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorFactory.php b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorFactory.php
index 66e02a3803950..7604807932276 100644
--- a/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorFactory.php
+++ b/app/code/Magento/Signifyd/Model/MessageGenerators/GeneratorFactory.php
@@ -6,7 +6,6 @@
 namespace Magento\Signifyd\Model\MessageGenerators;
 
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Signifyd\Model\MessageGeneratorInterface;
 
 /**
  * Creates instance of message generator based on received type of message.
diff --git a/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php b/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php
index a26beda520944..78ef56c060ef6 100644
--- a/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php
+++ b/app/code/Magento/Signifyd/Model/PaymentVerificationFactory.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Signifyd\Model;
 
+use Magento\Framework\Exception\ConfigurationMismatchException;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Payment\Api\PaymentVerificationInterface;
 use Magento\Payment\Gateway\ConfigInterface;
-use Magento\Framework\Exception\ConfigurationMismatchException;
 
 /**
  * Creates verification service for provided payment method, or PaymentVerificationInterface::class
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php
index 2ab4395e1990d..8e3bb63f979e7 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestBuilder.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Signifyd\Model\SignifydGateway\Client;
 
-use Magento\Framework\HTTP\ZendClient;
-
 /**
  * Class RequestBuilder
  * Creates HTTP client, sends request to Signifyd and handles response
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php
index 38128a799fd59..f2dc397562700 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/RequestSender.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Signifyd\Model\SignifydGateway\Client;
 
-use Magento\Signifyd\Model\SignifydGateway\Debugger\DebuggerFactory;
-use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
 use Magento\Framework\HTTP\ZendClient;
+use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
+use Magento\Signifyd\Model\SignifydGateway\Debugger\DebuggerFactory;
 
 /**
  * Class RequestSender
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php
index 614e59b7c29a2..3fab3d7877422 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Client/ResponseHandler.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Signifyd\Model\SignifydGateway\Client;
 
-use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
 use Magento\Framework\Json\DecoderInterface;
+use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
 
 /**
  * Class ResponseHandler
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/Log.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/Log.php
index 4b7258180f53e..0041fb1e45de5 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/Log.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Debugger/Log.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Signifyd\Model\SignifydGateway\Debugger;
 
-use Psr\Log\LoggerInterface;
 use Exception;
+use Psr\Log\LoggerInterface;
 
 /**
  * Debugger writes information about request, response and possible exception to standard system log.
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php
index ddcaa6cd696f2..d74d14ae3404f 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Gateway.php
@@ -6,7 +6,6 @@
 namespace Magento\Signifyd\Model\SignifydGateway;
 
 use Magento\Signifyd\Model\SignifydGateway\Request\CreateCaseBuilderInterface;
-use Magento\Signifyd\Model\SignifydGateway\ApiClient;
 
 /**
  * Signifyd Gateway.
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php b/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php
index 666217f8ccc85..e40e7c9017636 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/GatewayException.php
@@ -10,5 +10,4 @@
  */
 class GatewayException extends \Exception
 {
-
 }
diff --git a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php
index 858ce0f0f3287..ba9cfe9b5341a 100644
--- a/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php
+++ b/app/code/Magento/Signifyd/Model/SignifydGateway/Request/PurchaseBuilder.php
@@ -10,9 +10,9 @@
 use Magento\Framework\Intl\DateTimeFactory;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Model\Order;
+use Magento\Signifyd\Model\PaymentMethodMapper\PaymentMethodMapper;
 use Magento\Signifyd\Model\PaymentVerificationFactory;
 use Magento\Signifyd\Model\SignifydOrderSessionId;
-use Magento\Signifyd\Model\PaymentMethodMapper\PaymentMethodMapper;
 
 /**
  * Prepare data related to purchase event represented in case creation request.
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/CommentsHistoryUpdaterTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/CommentsHistoryUpdaterTest.php
index 5cbb3d8d93cdd..56db3580e1df4 100644
--- a/app/code/Magento/Signifyd/Test/Unit/Model/CommentsHistoryUpdaterTest.php
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/CommentsHistoryUpdaterTest.php
@@ -7,11 +7,11 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Sales\Api\Data\OrderStatusHistoryInterface;
+use Magento\Sales\Api\OrderStatusHistoryRepositoryInterface;
 use Magento\Sales\Model\Order\Status\HistoryFactory;
 use Magento\Signifyd\Api\Data\CaseInterface;
 use Magento\Signifyd\Model\CommentsHistoryUpdater;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Sales\Api\OrderStatusHistoryRepositoryInterface;
 
 /**
  * Contains tests for comments history updater class.
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/CustomerOrdersTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/CustomerOrdersTest.php
index 02d3b4b9ad7a7..b08b29cf72ba8 100644
--- a/app/code/Magento/Signifyd/Test/Unit/Model/CustomerOrdersTest.php
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/CustomerOrdersTest.php
@@ -10,10 +10,10 @@
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Sales\Api\Data\OrderSearchResultInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order;
 use Magento\Signifyd\Model\CustomerOrders;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Sales\Api\OrderRepositoryInterface;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreationServiceTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreationServiceTest.php
index a22bfe12222a6..d1ff9c6dc75a0 100644
--- a/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreationServiceTest.php
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/Guarantee/CreationServiceTest.php
@@ -13,8 +13,8 @@
 use Magento\Signifyd\Model\Guarantee\CreationService;
 use Magento\Signifyd\Model\SignifydGateway\Gateway;
 use Magento\Signifyd\Model\SignifydGateway\GatewayException;
+use PHPUnit\Framework\TestCase as TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use \PHPUnit\Framework\TestCase as TestCase;
 use Psr\Log\LoggerInterface;
 
 class CreationServiceTest extends TestCase
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/GeneratorFactoryTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/GeneratorFactoryTest.php
index 50f87df3b694f..8ae64ea6d9c82 100644
--- a/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/GeneratorFactoryTest.php
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/MessageGenerators/GeneratorFactoryTest.php
@@ -7,9 +7,9 @@
 
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Signifyd\Model\MessageGenerators\PatternGenerator;
 use Magento\Signifyd\Model\MessageGenerators\CaseRescore;
 use Magento\Signifyd\Model\MessageGenerators\GeneratorFactory;
+use Magento\Signifyd\Model\MessageGenerators\PatternGenerator;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/XmlToArrayConfigConverterTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/XmlToArrayConfigConverterTest.php
index 319229e326c4b..76ddfb8103da2 100644
--- a/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/XmlToArrayConfigConverterTest.php
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentMethodMapper/XmlToArrayConfigConverterTest.php
@@ -5,9 +5,8 @@
  */
 namespace Magento\Signifyd\Test\Unit\Model\PaymentMethodMapper;
 
-use Magento\Signifyd\Model\PaymentMethodMapper\XmlToArrayConfigConverter;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\Config\Dom\ValidationSchemaException;
+use Magento\Signifyd\Model\PaymentMethodMapper\XmlToArrayConfigConverter;
 
 class XmlToArrayConfigConverterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/PaymentVerificationFactoryTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentVerificationFactoryTest.php
index b0f9239d43bfa..84877788223f2 100644
--- a/app/code/Magento/Signifyd/Test/Unit/Model/PaymentVerificationFactoryTest.php
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/PaymentVerificationFactoryTest.php
@@ -6,11 +6,11 @@
 namespace Magento\Signifyd\Test\Unit\Model;
 
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Payment\Api\PaymentVerificationInterface;
+use Magento\Payment\Gateway\ConfigInterface;
 use Magento\Signifyd\Model\PaymentVerificationFactory;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Payment\Gateway\ConfigInterface;
 
 class PaymentVerificationFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/HttpClientFactoryTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/HttpClientFactoryTest.php
index 776e8a75b9646..f1fb29fe0d5be 100644
--- a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/HttpClientFactoryTest.php
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/HttpClientFactoryTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Signifyd\Test\Unit\Model\SignifydGateway\Client;
 
-use Magento\Signifyd\Model\SignifydGateway\Client\HttpClientFactory;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Signifyd\Model\Config;
 use Magento\Framework\HTTP\ZendClient;
 use Magento\Framework\HTTP\ZendClientFactory;
 use Magento\Framework\Json\EncoderInterface;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Signifyd\Model\Config;
+use Magento\Signifyd\Model\SignifydGateway\Client\HttpClientFactory;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class HttpClientFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/ResponseHandlerTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/ResponseHandlerTest.php
index bf0c6ee238d5f..98c39954569a8 100644
--- a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/ResponseHandlerTest.php
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Client/ResponseHandlerTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Signifyd\Test\Unit\Model\SignifydGateway\Client;
 
-use Magento\Signifyd\Model\SignifydGateway\Client\ResponseHandler;
 use Magento\Framework\Json\DecoderInterface;
-use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use \Zend_Http_Response as Response;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
+use Magento\Signifyd\Model\SignifydGateway\Client\ResponseHandler;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Zend_Http_Response as Response;
 
 class ResponseHandlerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php
index f7aa65f842b91..0b359ee34a051 100644
--- a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/GatewayTest.php
@@ -5,13 +5,12 @@
  */
 namespace Magento\Signifyd\Test\Unit\Model\SignifydGateway;
 
-use \PHPUnit\Framework\TestCase as TestCase;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
+use Magento\Signifyd\Model\SignifydGateway\ApiClient;
 use Magento\Signifyd\Model\SignifydGateway\Gateway;
 use Magento\Signifyd\Model\SignifydGateway\GatewayException;
 use Magento\Signifyd\Model\SignifydGateway\Request\CreateCaseBuilderInterface;
-use Magento\Signifyd\Model\SignifydGateway\ApiClient;
-use Magento\Signifyd\Model\SignifydGateway\ApiCallException;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class GatewayTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookMessageReaderTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookMessageReaderTest.php
index 0dfdf4980fb58..71090029089ec 100644
--- a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookMessageReaderTest.php
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookMessageReaderTest.php
@@ -6,10 +6,10 @@
 namespace Magento\Signifyd\Test\Unit\Model\SignifydGateway\Response;
 
 use Magento\Framework\Json\DecoderInterface;
-use Magento\Signifyd\Model\SignifydGateway\Response\WebhookRequest;
-use Magento\Signifyd\Model\SignifydGateway\Response\WebhookMessageReader;
 use Magento\Signifyd\Model\SignifydGateway\Response\WebhookMessage;
 use Magento\Signifyd\Model\SignifydGateway\Response\WebhookMessageFactory;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookMessageReader;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookRequest;
 
 /**
  * Class WebhookMessageReaderTest
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookRequestValidatorTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookRequestValidatorTest.php
index 5ae6b95a77548..6b396701a9775 100644
--- a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookRequestValidatorTest.php
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydGateway/Response/WebhookRequestValidatorTest.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\Json\DecoderInterface;
 use Magento\Signifyd\Model\Config;
-use Magento\Signifyd\Model\SignifydGateway\Response\WebhookRequestValidator;
 use Magento\Signifyd\Model\SignifydGateway\Response\WebhookRequest;
+use Magento\Signifyd\Model\SignifydGateway\Response\WebhookRequestValidator;
 
 /**
  * Class WebhookRequestValidatorTest
diff --git a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydOrderSessionIdTest.php b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydOrderSessionIdTest.php
index 9d3061f240c21..1f9ee573ca2e9 100644
--- a/app/code/Magento/Signifyd/Test/Unit/Model/SignifydOrderSessionIdTest.php
+++ b/app/code/Magento/Signifyd/Test/Unit/Model/SignifydOrderSessionIdTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Signifyd\Test\Unit\Model;
 
-use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Framework\DataObject\IdentityGeneratorInterface;
 use Magento\Signifyd\Model\SignifydOrderSessionId;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
diff --git a/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php b/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php
index 1e6234a8e27a9..95b29bb06bc42 100644
--- a/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php
+++ b/app/code/Magento/Signifyd/Ui/Component/Listing/Column/Guarantee/Options.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Signifyd\Ui\Component\Listing\Column\Guarantee;
 
-use Magento\Framework\Escaper;
 use Magento\Framework\Data\OptionSourceInterface;
+use Magento\Framework\Escaper;
 use Magento\Signifyd\Api\Data\CaseInterface;
 
 /**
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
index ffc2bf5f6d1cf..096bb25350dc1 100644
--- a/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Grid/Renderer/Link.php
@@ -10,7 +10,6 @@
  */
 namespace Magento\Sitemap\Block\Adminhtml\Grid\Renderer;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
 use Magento\Framework\App\ObjectManager;
 
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
index 8d7caca12b96f..f554e0c8c7f56 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
@@ -6,8 +6,8 @@
 namespace Magento\Sitemap\Model\ResourceModel\Catalog;
 
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-use Magento\Store\Model\Store;
 use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\Store;
 
 /**
  * Sitemap resource product collection model
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index cad8023bd2794..769bee4b0d3be 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -10,8 +10,8 @@
 
 use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
 use Magento\Framework\App\ObjectManager;
-use Magento\Robots\Model\Config\Value;
 use Magento\Framework\DataObject;
+use Magento\Robots\Model\Config\Value;
 
 /**
  * Sitemap model
diff --git a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/DeleteTest.php b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/DeleteTest.php
index ed004fe88b318..84e59287f2966 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/DeleteTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/DeleteTest.php
@@ -103,7 +103,7 @@ public function testExecuteCannotFindSitemap()
             ->setMethods(['load'])
             ->getMock();
 
-        $sitemapMock->expects($this->once())->method('load')->with($id)->willThrowException(new \Exception);
+        $sitemapMock->expects($this->once())->method('load')->with($id)->willThrowException(new \Exception());
         $this->sitemapFactoryMock->expects($this->once())->method('create')->willReturn($sitemapMock);
         $this->responseMock->expects($this->once())->method('setRedirect');
         $this->messageManagerMock->expects($this->any())
diff --git a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php
index 36e3aa0312627..72c8112ef78ce 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Controller/Adminhtml/Sitemap/SaveTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sitemap\Test\Unit\Controller\Adminhtml\Sitemap;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class SaveTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sitemap/Test/Unit/Helper/DataTest.php b/app/code/Magento/Sitemap/Test/Unit/Helper/DataTest.php
index 2bfee08352b47..327d70c690677 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Helper/DataTest.php
@@ -6,10 +6,9 @@
 
 namespace Magento\Sitemap\Test\Unit\Helper;
 
-use \Magento\Sitemap\Helper\Data;
+use Magento\Sitemap\Helper\Data;
 
 use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class DataTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
index 4f55653fad311..e865e6ef158d6 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
@@ -518,11 +518,7 @@ protected function _getModelMock($mockBeforeSave = false)
             $methods[] = 'beforeSave';
         }
 
-        $this->_sitemapCategoryMock->expects(
-            $this->any()
-        )->method(
-            'getCollection'
-        )->will(
+        $this->_sitemapCategoryMock->expects($this->any())->method('getCollection')->will(
             $this->returnValue(
                 [
                     new \Magento\Framework\DataObject(
@@ -536,11 +532,7 @@ protected function _getModelMock($mockBeforeSave = false)
         );
 
         $storeBaseMediaUrl = 'http://store.com/pub/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/';
-        $this->_sitemapProductMock->expects(
-            $this->any()
-        )->method(
-            'getCollection'
-        )->will(
+        $this->_sitemapProductMock->expects($this->any())->method('getCollection')->will(
             $this->returnValue(
                 [
                     new \Magento\Framework\DataObject(
@@ -555,15 +547,18 @@ protected function _getModelMock($mockBeforeSave = false)
                                     'collection' => [
                                         new \Magento\Framework\DataObject(
                                             [
-                                                'url' => $storeBaseMediaUrl.'i/m/image1.png',
+                                                'url' => $storeBaseMediaUrl . 'i/m/image1.png',
                                                 'caption' => 'caption & > title < "'
                                             ]
                                         ),
                                         new \Magento\Framework\DataObject(
-                                            ['url' => $storeBaseMediaUrl.'i/m/image_no_caption.png', 'caption' => null]
+                                            [
+                                                'url' => $storeBaseMediaUrl . 'i/m/image_no_caption.png',
+                                                'caption' => null
+                                            ]
                                         ),
                                     ],
-                                    'thumbnail' => $storeBaseMediaUrl.'t/h/thumbnail.jpg',
+                                    'thumbnail' => $storeBaseMediaUrl . 't/h/thumbnail.jpg',
                                     'title' => 'Product & > title < "',
                                 ]
                             ),
diff --git a/app/code/Magento/Store/Api/StoreConfigManagerInterface.php b/app/code/Magento/Store/Api/StoreConfigManagerInterface.php
index dc5af79734c7a..d6b8e67665852 100644
--- a/app/code/Magento/Store/Api/StoreConfigManagerInterface.php
+++ b/app/code/Magento/Store/Api/StoreConfigManagerInterface.php
@@ -5,9 +5,6 @@
  */
 namespace Magento\Store\Api;
 
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Store\Model\StoreIsInactiveException;
-
 /**
  * Store config manager interface
  *
diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php
index 66fec992b38d7..95699b07c61a1 100644
--- a/app/code/Magento/Store/App/Action/Plugin/Context.php
+++ b/app/code/Magento/Store/App/Action/Plugin/Context.php
@@ -6,13 +6,13 @@
 
 namespace Magento\Store\App\Action\Plugin;
 
+use Magento\Framework\App\Action\AbstractAction;
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Phrase;
 use Magento\Store\Api\StoreCookieManagerInterface;
 use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\App\Action\AbstractAction;
-use Magento\Framework\App\RequestInterface;
 
 /**
  * Class ContextPlugin
diff --git a/app/code/Magento/Store/App/Config/Type/Scopes.php b/app/code/Magento/Store/App/Config/Type/Scopes.php
index 9fbecc4db303e..bc06bcff3df10 100644
--- a/app/code/Magento/Store/App/Config/Type/Scopes.php
+++ b/app/code/Magento/Store/App/Config/Type/Scopes.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Store\App\Config\Type;
 
-use Magento\Framework\App\Config\ConfigTypeInterface;
 use Magento\Framework\App\Config\ConfigSourceInterface;
+use Magento\Framework\App\Config\ConfigTypeInterface;
 use Magento\Framework\DataObject;
 use Magento\Store\Model\ScopeInterface;
 
diff --git a/app/code/Magento/Store/App/FrontController/Plugin/DefaultStore.php b/app/code/Magento/Store/App/FrontController/Plugin/DefaultStore.php
index 58340c6cc35aa..bea1c0e35772e 100644
--- a/app/code/Magento/Store/App/FrontController/Plugin/DefaultStore.php
+++ b/app/code/Magento/Store/App/FrontController/Plugin/DefaultStore.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Store\App\FrontController\Plugin;
 
-use \Magento\Store\Model\StoreResolver\ReaderList;
-use \Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreResolver\ReaderList;
 
 /**
  * Plugin to set default store for admin area.
diff --git a/app/code/Magento/Store/Console/Command/StoreListCommand.php b/app/code/Magento/Store/Console/Command/StoreListCommand.php
index aaaa8afb76fd2..68c2c7cfca724 100644
--- a/app/code/Magento/Store/Console/Command/StoreListCommand.php
+++ b/app/code/Magento/Store/Console/Command/StoreListCommand.php
@@ -6,9 +6,9 @@
  */
 namespace Magento\Store\Console\Command;
 
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
 
 /**
  * Class StoreListCommand
diff --git a/app/code/Magento/Store/Console/Command/WebsiteListCommand.php b/app/code/Magento/Store/Console/Command/WebsiteListCommand.php
index ce0359d1bb799..b52e14d318efd 100644
--- a/app/code/Magento/Store/Console/Command/WebsiteListCommand.php
+++ b/app/code/Magento/Store/Console/Command/WebsiteListCommand.php
@@ -6,9 +6,9 @@
  */
 namespace Magento\Store\Console\Command;
 
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Command\Command;
 
 /**
  * Class WebsiteListCommand
diff --git a/app/code/Magento/Store/Controller/Store/SwitchAction.php b/app/code/Magento/Store/Controller/Store/SwitchAction.php
index aa023e400460f..d4efdcde19fb5 100644
--- a/app/code/Magento/Store/Controller/Store/SwitchAction.php
+++ b/app/code/Magento/Store/Controller/Store/SwitchAction.php
@@ -14,8 +14,8 @@
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreIsInactiveException;
-use Magento\Store\Model\StoreResolver;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\StoreResolver;
 
 /**
  * Switch current store view.
diff --git a/app/code/Magento/Store/Model/Address/Renderer.php b/app/code/Magento/Store/Model/Address/Renderer.php
index 1d0fdd7284848..22f9cae18c080 100644
--- a/app/code/Magento/Store/Model/Address/Renderer.php
+++ b/app/code/Magento/Store/Model/Address/Renderer.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Store\Model\Address;
 
+use Magento\Framework\DataObject;
 use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Framework\Filter\FilterManager;
-use Magento\Framework\DataObject;
 
 /**
  * Class Renderer used for formatting a store address
diff --git a/app/code/Magento/Store/Model/Config/Importer.php b/app/code/Magento/Store/Model/Config/Importer.php
index baeab939d4437..454d59fc0371b 100644
--- a/app/code/Magento/Store/Model/Config/Importer.php
+++ b/app/code/Magento/Store/Model/Config/Importer.php
@@ -10,9 +10,9 @@
 use Magento\Framework\Exception\State\InvalidTransitionException;
 use Magento\Store\Model\Config\Importer\DataDifferenceCalculator;
 use Magento\Store\Model\Config\Importer\Processor\ProcessorFactory;
+use Magento\Store\Model\ResourceModel\Website;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Model\ResourceModel\Website;
 
 /**
  * Imports stores, websites and groups from transmitted data.
diff --git a/app/code/Magento/Store/Model/Config/Importer/Processor/Update.php b/app/code/Magento/Store/Model/Config/Importer/Processor/Update.php
index 35f3957b168d7..132a4edaec476 100644
--- a/app/code/Magento/Store/Model/Config/Importer/Processor/Update.php
+++ b/app/code/Magento/Store/Model/Config/Importer/Processor/Update.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Store\Model\Config\Importer\Processor;
 
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\RuntimeException;
 use Magento\Store\Model\Config\Importer\DataDifferenceCalculator;
@@ -12,7 +13,6 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreFactory;
 use Magento\Store\Model\WebsiteFactory;
-use Magento\Framework\Event\ManagerInterface;
 
 /**
  * The process for updating of existing entities.
diff --git a/app/code/Magento/Store/Model/Config/Processor/Fallback.php b/app/code/Magento/Store/Model/Config/Processor/Fallback.php
index 91926cd23f9cf..be226ce1a6c3e 100644
--- a/app/code/Magento/Store/Model/Config/Processor/Fallback.php
+++ b/app/code/Magento/Store/Model/Config/Processor/Fallback.php
@@ -8,14 +8,9 @@
 use Magento\Framework\App\Config\Spi\PostProcessorInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Store\Api\Data\StoreInterface;
-use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\App\Config\Type\Scopes;
 use Magento\Store\Model\ResourceModel\Store;
-use Magento\Store\Model\ResourceModel\Store\AllStoresCollectionFactory;
 use Magento\Store\Model\ResourceModel\Website;
-use Magento\Store\Model\ResourceModel\Website\AllWebsitesCollection;
-use Magento\Store\Model\ResourceModel\Website\AllWebsitesCollectionFactory;
 
 /**
  * Fallback through different scopes and merge them
diff --git a/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/DefaultScope.php b/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/DefaultScope.php
index 953724321913b..6e56f1a4ed85e 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/DefaultScope.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/DefaultScope.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Store\Model\Config\Reader\Source\Dynamic;
 
-use Magento\Framework\App\Config\Scope\Converter;
-use Magento\Store\Model\ResourceModel\Config\Collection\ScopedFactory;
 use Magento\Framework\App\Config\Reader\Source\SourceInterface;
+use Magento\Framework\App\Config\Scope\Converter;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ResourceModel\Config\Collection\ScopedFactory;
 
 /**
  * Class for retrieving configuration from DB by default scope
@@ -42,6 +42,7 @@ public function __construct(
      *
      * @param string|null $scopeCode
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function get($scopeCode = null)
     {
diff --git a/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Store.php b/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Store.php
index f588ab83626d8..d44cc86ad5c42 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Store.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Store.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Store\Model\Config\Reader\Source\Dynamic;
 
+use Magento\Framework\App\Config\Reader\Source\SourceInterface;
 use Magento\Framework\App\Config\Scope\Converter;
 use Magento\Store\Model\ResourceModel\Config\Collection\ScopedFactory;
-use Magento\Framework\App\Config\Reader\Source\SourceInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\WebsiteFactory;
diff --git a/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Website.php b/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Website.php
index 9cdd5e2763c3e..42dacec2868a4 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Website.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Source/Dynamic/Website.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Store\Model\Config\Reader\Source\Dynamic;
 
+use Magento\Framework\App\Config\Reader\Source\SourceInterface;
 use Magento\Framework\App\Config\Scope\Converter;
 use Magento\Store\Model\ResourceModel\Config\Collection\ScopedFactory;
-use Magento\Framework\App\Config\Reader\Source\SourceInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\WebsiteFactory;
 
diff --git a/app/code/Magento/Store/Model/DefaultStoreScopeProvider.php b/app/code/Magento/Store/Model/DefaultStoreScopeProvider.php
index b39032bf96d75..970336e25ab31 100644
--- a/app/code/Magento/Store/Model/DefaultStoreScopeProvider.php
+++ b/app/code/Magento/Store/Model/DefaultStoreScopeProvider.php
@@ -6,9 +6,8 @@
 
 namespace Magento\Store\Model;
 
-use Magento\Framework\Model\Entity\ScopeProviderInterface;
-use Magento\Store\Model\Store;
 use Magento\Framework\Model\Entity\ScopeFactory;
+use Magento\Framework\Model\Entity\ScopeProviderInterface;
 
 /**
  * Class StoreScope
diff --git a/app/code/Magento/Store/Model/GroupRepository.php b/app/code/Magento/Store/Model/GroupRepository.php
index a828e503d814d..9a73b65bf82a1 100644
--- a/app/code/Magento/Store/Model/GroupRepository.php
+++ b/app/code/Magento/Store/Model/GroupRepository.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Store\Model;
 
+use Magento\Framework\App\Config;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\App\Config;
 
 /**
  * Information Expert in store groups handling
diff --git a/app/code/Magento/Store/Model/HeaderProvider/Hsts.php b/app/code/Magento/Store/Model/HeaderProvider/Hsts.php
index 623fbed57e6c6..af611903de076 100644
--- a/app/code/Magento/Store/Model/HeaderProvider/Hsts.php
+++ b/app/code/Magento/Store/Model/HeaderProvider/Hsts.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Store\Model\HeaderProvider;
 
-use \Magento\Store\Model\Store;
+use Magento\Store\Model\Store;
 
 /**
  * Adds an Strict-Transport-Security (HSTS) header to HTTP responses.
diff --git a/app/code/Magento/Store/Model/HeaderProvider/UpgradeInsecure.php b/app/code/Magento/Store/Model/HeaderProvider/UpgradeInsecure.php
index a0bd015c15061..992e1b910a806 100644
--- a/app/code/Magento/Store/Model/HeaderProvider/UpgradeInsecure.php
+++ b/app/code/Magento/Store/Model/HeaderProvider/UpgradeInsecure.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Store\Model\HeaderProvider;
 
-use \Magento\Store\Model\Store;
+use Magento\Store\Model\Store;
 
 /**
  * Adds an Content-Security-Policy header to HTTP responses.
diff --git a/app/code/Magento/Store/Model/Plugin/StoreCookie.php b/app/code/Magento/Store/Model/Plugin/StoreCookie.php
index 612d35e136d7e..007dcf8de770f 100644
--- a/app/code/Magento/Store/Model/Plugin/StoreCookie.php
+++ b/app/code/Magento/Store/Model/Plugin/StoreCookie.php
@@ -6,14 +6,14 @@
 
 namespace Magento\Store\Model\Plugin;
 
+use InvalidArgumentException;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Api\StoreCookieManagerInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\Store\Model\StoreIsInactiveException;
-use Magento\Framework\Exception\NoSuchEntityException;
-use \InvalidArgumentException;
 use Magento\Store\Api\StoreResolverInterface;
-use Magento\Framework\App\ObjectManager;
+use Magento\Store\Model\StoreIsInactiveException;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class StoreCookie
diff --git a/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php b/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php
index 5b3a74d5d8d39..cf6fe69a5cac2 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php
@@ -150,8 +150,7 @@ public function joinGroupAndStore()
                     \Magento\Framework\DB\Select::SQL_ASC
                 ) // view is admin
                 ->addOrder('store_table.sort_order', \Magento\Framework\DB\Select::SQL_ASC) // view sort order
-                ->addOrder('store_table.name', \Magento\Framework\DB\Select::SQL_ASC)       // view name
-            ;
+                ->addOrder('store_table.name', \Magento\Framework\DB\Select::SQL_ASC);       // view name
         }
         return $this;
     }
diff --git a/app/code/Magento/Store/Model/ScopeTreeProvider.php b/app/code/Magento/Store/Model/ScopeTreeProvider.php
index cb7d0d3b3ffee..4f6d1931a54df 100644
--- a/app/code/Magento/Store/Model/ScopeTreeProvider.php
+++ b/app/code/Magento/Store/Model/ScopeTreeProvider.php
@@ -7,9 +7,6 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ScopeTreeProviderInterface;
-use Magento\Store\Model\Group;
-use Magento\Store\Model\Store;
-use Magento\Store\Model\Website;
 
 class ScopeTreeProvider implements ScopeTreeProviderInterface
 {
diff --git a/app/code/Magento/Store/Model/ScopeValidator.php b/app/code/Magento/Store/Model/ScopeValidator.php
index 1e14f95e7bb8b..e22e895105fce 100644
--- a/app/code/Magento/Store/Model/ScopeValidator.php
+++ b/app/code/Magento/Store/Model/ScopeValidator.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Store\Model;
 
-use Magento\Framework\App\ScopeValidatorInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\App\ScopeResolverPool;
+use Magento\Framework\App\ScopeValidatorInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 class ScopeValidator implements ScopeValidatorInterface
 {
diff --git a/app/code/Magento/Store/Model/StoreRepository.php b/app/code/Magento/Store/Model/StoreRepository.php
index 35871312da816..65df47fccffae 100644
--- a/app/code/Magento/Store/Model/StoreRepository.php
+++ b/app/code/Magento/Store/Model/StoreRepository.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Store\Model;
 
+use Magento\Framework\App\Config;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\App\Config;
 
 /**
  * Information Expert in stores handling
diff --git a/app/code/Magento/Store/Model/StoreScopeProvider.php b/app/code/Magento/Store/Model/StoreScopeProvider.php
index b0d831804de03..6ab1f57448804 100644
--- a/app/code/Magento/Store/Model/StoreScopeProvider.php
+++ b/app/code/Magento/Store/Model/StoreScopeProvider.php
@@ -6,9 +6,8 @@
 
 namespace Magento\Store\Model;
 
-use Magento\Framework\Model\Entity\ScopeProviderInterface;
-use Magento\Store\Model\Store;
 use Magento\Framework\Model\Entity\ScopeFactory;
+use Magento\Framework\Model\Entity\ScopeProviderInterface;
 
 /**
  * Class StoreScope
diff --git a/app/code/Magento/Store/Model/WebsiteRepository.php b/app/code/Magento/Store/Model/WebsiteRepository.php
index 94fd59c7634df..58f62ab30c857 100644
--- a/app/code/Magento/Store/Model/WebsiteRepository.php
+++ b/app/code/Magento/Store/Model/WebsiteRepository.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Store\Model;
 
+use Magento\Framework\App\Config;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\ResourceModel\Website\CollectionFactory;
-use Magento\Framework\App\Config;
 
 /**
  * Information Expert in store websites handling
diff --git a/app/code/Magento/Store/Test/Unit/App/Config/Type/ScopesTest.php b/app/code/Magento/Store/Test/Unit/App/Config/Type/ScopesTest.php
index 851c9943373e8..113f38f3fff06 100644
--- a/app/code/Magento/Store/Test/Unit/App/Config/Type/ScopesTest.php
+++ b/app/code/Magento/Store/Test/Unit/App/Config/Type/ScopesTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Store\Test\Unit\App\Config\Type;
 
 use Magento\Framework\App\Config\ConfigSourceInterface;
-use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\App\Config\Type\Scopes;
 
diff --git a/app/code/Magento/Store/Test/Unit/Console/Command/StoreListCommandTest.php b/app/code/Magento/Store/Test/Unit/Console/Command/StoreListCommandTest.php
index 4f848def8c353..cc3bd7cfec961 100644
--- a/app/code/Magento/Store/Test/Unit/Console/Command/StoreListCommandTest.php
+++ b/app/code/Magento/Store/Test/Unit/Console/Command/StoreListCommandTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Store\Test\Unit\Console\Command;
 
+use Magento\Framework\Console\Cli;
 use Magento\Store\Console\Command\StoreListCommand;
-use Symfony\Component\Console\Tester\CommandTester;
+use Magento\Store\Model\Store;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Helper\TableHelper;
-use Magento\Store\Model\Store;
-use Magento\Framework\Console\Cli;
+use Symfony\Component\Console\Tester\CommandTester;
 
 /**
  * @package Magento\Store\Test\Unit\Console\Command
diff --git a/app/code/Magento/Store/Test/Unit/Console/Command/WebsiteListCommandTest.php b/app/code/Magento/Store/Test/Unit/Console/Command/WebsiteListCommandTest.php
index 3978f49522224..094552ad470a6 100644
--- a/app/code/Magento/Store/Test/Unit/Console/Command/WebsiteListCommandTest.php
+++ b/app/code/Magento/Store/Test/Unit/Console/Command/WebsiteListCommandTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Store\Test\Unit\Console\Command;
 
+use Magento\Framework\Console\Cli;
+use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\Store\Console\Command\WebsiteListCommand;
-use Symfony\Component\Console\Tester\CommandTester;
+use Magento\Store\Model\Website;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Helper\TableHelper;
-use Magento\Store\Model\Website;
-use Magento\Framework\Console\Cli;
-use Magento\Store\Api\WebsiteRepositoryInterface;
+use Symfony\Component\Console\Tester\CommandTester;
 
 /**
  * @package Magento\Store\Test\Unit\Console\Command
diff --git a/app/code/Magento/Store/Test/Unit/Controller/Store/SwitchActionTest.php b/app/code/Magento/Store/Test/Unit/Controller/Store/SwitchActionTest.php
index 1e7b2691a0084..105197774bf2a 100644
--- a/app/code/Magento/Store/Test/Unit/Controller/Store/SwitchActionTest.php
+++ b/app/code/Magento/Store/Test/Unit/Controller/Store/SwitchActionTest.php
@@ -6,12 +6,10 @@
 namespace Magento\Store\Test\Unit\Controller\Store;
 
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Api\StoreCookieManagerInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\Store\Model\Store;
-use Magento\Store\Model\StoreResolver;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Test class for \Magento\Store\Controller\Store\SwitchAction
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/UpdateTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/UpdateTest.php
index 3b0b932e31d46..4d53c3e0a5cde 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/UpdateTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/UpdateTest.php
@@ -5,20 +5,20 @@
  */
 namespace Magento\Store\Test\Unit\Model\Config\Importer\Processor;
 
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Store\Model\Config\Importer\DataDifferenceCalculator;
 use Magento\Store\Model\Config\Importer\Processor\Update;
 use Magento\Store\Model\Group;
 use Magento\Store\Model\GroupFactory;
+use Magento\Store\Model\ResourceModel\Group as GroupResource;
+use Magento\Store\Model\ResourceModel\Store as StoreResource;
+use Magento\Store\Model\ResourceModel\Website as WebsiteResource;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreFactory;
 use Magento\Store\Model\Website;
-use Magento\Store\Model\ResourceModel\Website as WebsiteResource;
 use Magento\Store\Model\WebsiteFactory;
-use Magento\Store\Model\ResourceModel\Group as GroupResource;
-use Magento\Store\Model\ResourceModel\Store as StoreResource;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
-use Magento\Store\Model\Store;
-use Magento\Framework\Event\ManagerInterface;
 
 /**
  * Test for Update processor.
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Dynamic/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Dynamic/StoreTest.php
index 640847d4d7c60..99831342f3bab 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Dynamic/StoreTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Dynamic/StoreTest.php
@@ -6,15 +6,15 @@
 namespace Magento\Store\Test\Unit\Model\Config\Reader\Source\Dynamic;
 
 use Magento\Framework\App\Config\Scope\Converter;
+use Magento\Framework\DataObject;
+use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\Config\Reader\Source\Dynamic\Store as StoreSource;
+use Magento\Store\Model\Config\Reader\Source\Dynamic\Website as WebsiteSource;
 use Magento\Store\Model\ResourceModel\Config\Collection\ScopedFactory;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\WebsiteFactory;
-use Magento\Store\Model\Website;
-use Magento\Store\Model\Config\Reader\Source\Dynamic\Website as WebsiteSource;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Api\Data\StoreInterface;
-use Magento\Framework\DataObject;
+use Magento\Store\Model\Website;
+use Magento\Store\Model\WebsiteFactory;
 
 /**
  * Class StoreTest
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Dynamic/WebsiteTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Dynamic/WebsiteTest.php
index 588b876dffaa1..0c11698ae814d 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Dynamic/WebsiteTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Dynamic/WebsiteTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Store\Test\Unit\Model\Config\Reader\Source\Dynamic;
 
+use Magento\Framework\App\Config\Scope\Converter;
 use Magento\Framework\DataObject;
+use Magento\Store\Model\Config\Reader\Source\Dynamic\DefaultScope;
 use Magento\Store\Model\Config\Reader\Source\Dynamic\Website as WebsiteSource;
-use Magento\Framework\App\Config\Scope\Converter;
 use Magento\Store\Model\ResourceModel\Config\Collection\ScopedFactory;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\WebsiteFactory;
 use Magento\Store\Model\Website;
-use Magento\Store\Model\Config\Reader\Source\Dynamic\DefaultScope;
+use Magento\Store\Model\WebsiteFactory;
 
 /**
  * Class WebsiteTest
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Initial/DefaultScopeTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Initial/DefaultScopeTest.php
index 5d24e76717e31..2f96ad3d835ed 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Initial/DefaultScopeTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Initial/DefaultScopeTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Store\Test\Unit\Model\Config\Reader\Source\Initial;
 
+use Magento\Framework\App\Config\Scope\Converter;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\Config\Reader\Source\Initial\DefaultScope;
-use Magento\Framework\App\Config\Scope\Converter;
 
 class DefaultScopeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Initial/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Initial/StoreTest.php
index 089a931a931cb..1edefb607050c 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Initial/StoreTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Initial/StoreTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Store\Test\Unit\Model\Config\Reader\Source\Initial;
 
-use Magento\Store\Model\Config\Reader\Source\Initial\Store;
 use Magento\Framework\App\Config\Initial;
+use Magento\Framework\App\Config\Scope\Converter;
+use Magento\Store\Model\Config\Reader\Source\Initial\Store;
 use Magento\Store\Model\Config\Reader\Source\Initial\Website;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\App\Config\Scope\Converter;
 
 class StoreTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Initial/WebsiteTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Initial/WebsiteTest.php
index 9826dd94be58c..dad00a4144fd5 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Initial/WebsiteTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Config/Reader/Source/Initial/WebsiteTest.php
@@ -6,9 +6,9 @@
 namespace Magento\Store\Test\Unit\Model\Config\Reader\Source\Initial;
 
 use Magento\Framework\App\Config\Initial;
+use Magento\Framework\App\Config\Scope\Converter;
 use Magento\Store\Model\Config\Reader\Source\Initial\DefaultScope;
 use Magento\Store\Model\Config\Reader\Source\Initial\Website;
-use Magento\Framework\App\Config\Scope\Converter;
 
 class WebsiteTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Store/Test/Unit/Model/HeaderProvider/HstsTest.php b/app/code/Magento/Store/Test/Unit/Model/HeaderProvider/HstsTest.php
index cc56c68a344d8..4b124d505d0f4 100644
--- a/app/code/Magento/Store/Test/Unit/Model/HeaderProvider/HstsTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/HeaderProvider/HstsTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Store\Test\Unit\Model\HeaderProvider;
 
-use \Magento\Store\Model\HeaderProvider\Hsts;
-use \Magento\Store\Model\Store;
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use \Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Store\Model\HeaderProvider\Hsts;
+use Magento\Store\Model\Store;
 
 class HstsTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Store/Test/Unit/Model/HeaderProvider/UpgradeInsecureTest.php b/app/code/Magento/Store/Test/Unit/Model/HeaderProvider/UpgradeInsecureTest.php
index cf85fb633bbca..bc7d3ea63dfb8 100644
--- a/app/code/Magento/Store/Test/Unit/Model/HeaderProvider/UpgradeInsecureTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/HeaderProvider/UpgradeInsecureTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Store\Test\Unit\Model\HeaderProvider;
 
-use \Magento\Store\Model\HeaderProvider\UpgradeInsecure;
-use \Magento\Store\Model\Store;
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use \Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Store\Model\HeaderProvider\UpgradeInsecure;
+use Magento\Store\Model\Store;
 
 class UpgradeInsecureTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Store/Test/Unit/Model/Message/EmptyGroupCategoryTest.php b/app/code/Magento/Store/Test/Unit/Model/Message/EmptyGroupCategoryTest.php
index 1318739f9683f..667d8d7891717 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Message/EmptyGroupCategoryTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Message/EmptyGroupCategoryTest.php
@@ -6,11 +6,11 @@
 namespace Magento\Store\Test\Unit\Model\Message;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Store\Model\Message\EmptyGroupCategory;
 use Magento\Framework\UrlInterface;
-use Magento\Store\Model\ResourceModel\Group\Collection;
 use Magento\Store\Model\Group;
+use Magento\Store\Model\Message\EmptyGroupCategory;
+use Magento\Store\Model\ResourceModel\Group\Collection;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class EmptyGroupCategoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Store/Test/Unit/Model/PathConfigTest.php b/app/code/Magento/Store/Test/Unit/Model/PathConfigTest.php
index 1fee23a64a66f..13b8885ed0f46 100644
--- a/app/code/Magento/Store/Test/Unit/Model/PathConfigTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/PathConfigTest.php
@@ -8,10 +8,10 @@
 
 namespace Magento\Store\Test\Unit\Model;
 
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\StoreManagerInterface;
 
 class PathConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php b/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php
index e56b5c7fcaa19..77ab3bd470f7c 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Plugin/StoreCookieTest.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Store\Test\Unit\Model\Plugin;
 
+use InvalidArgumentException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Api\StoreResolverInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreIsInactiveException;
-use \InvalidArgumentException;
 
 /**
  * Unit tests for \Magento\Store\Model\Plugin\StoreCookie class.
@@ -121,7 +121,7 @@ public function testBeforeDispatchNoSuchEntity()
             ->willReturn($storeCode);
         $this->storeRepositoryMock->expects($this->once())
             ->method('getActiveStoreByCode')
-            ->willThrowException(new NoSuchEntityException);
+            ->willThrowException(new NoSuchEntityException());
         $this->storeCookieManagerMock->expects($this->once())
             ->method('deleteStoreCookie')
             ->with($this->storeMock);
@@ -144,7 +144,7 @@ public function testBeforeDispatchStoreIsInactive()
             ->willReturn($storeCode);
         $this->storeRepositoryMock->expects($this->once())
             ->method('getActiveStoreByCode')
-            ->willThrowException(new StoreIsInactiveException);
+            ->willThrowException(new StoreIsInactiveException());
         $this->storeCookieManagerMock->expects($this->once())
             ->method('deleteStoreCookie')
             ->with($this->storeMock);
@@ -167,7 +167,7 @@ public function testBeforeDispatchInvalidArgument()
             ->willReturn($storeCode);
         $this->storeRepositoryMock->expects($this->once())
             ->method('getActiveStoreByCode')
-            ->willThrowException(new InvalidArgumentException);
+            ->willThrowException(new InvalidArgumentException());
         $this->storeCookieManagerMock->expects($this->once())
             ->method('deleteStoreCookie')
             ->with($this->storeMock);
diff --git a/app/code/Magento/Store/Test/Unit/Model/Resolver/GroupTest.php b/app/code/Magento/Store/Test/Unit/Model/Resolver/GroupTest.php
index 9817bd532c18a..675727cb0e622 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Resolver/GroupTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Resolver/GroupTest.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Store\Test\Unit\Model\Resolver;
 
-use \Magento\Store\Model\Resolver\Group;
+use Magento\Store\Model\Resolver\Group;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
diff --git a/app/code/Magento/Store/Test/Unit/Model/Resolver/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/Resolver/StoreTest.php
index 958cfdea37bab..dcdd482f20383 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Resolver/StoreTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Resolver/StoreTest.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Store\Test\Unit\Model\Resolver;
 
-use \Magento\Store\Model\Resolver\Store;
+use Magento\Store\Model\Resolver\Store;
 
 /**
  * Test class for \Magento\Store\Model\Resolver\Store
diff --git a/app/code/Magento/Store/Test/Unit/Model/Resolver/WebsiteTest.php b/app/code/Magento/Store/Test/Unit/Model/Resolver/WebsiteTest.php
index c5b3dbaff99be..6b71ae5ac8b41 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Resolver/WebsiteTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Resolver/WebsiteTest.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Store\Test\Unit\Model\Resolver;
 
-use \Magento\Store\Model\Resolver\Website;
+use Magento\Store\Model\Resolver\Website;
 
 /**
  * Test class for \Magento\Store\Model\Resolver\Website
diff --git a/app/code/Magento/Store/Test/Unit/Model/ScopeFallbackResolverTest.php b/app/code/Magento/Store/Test/Unit/Model/ScopeFallbackResolverTest.php
index 008e479d0a513..85c0f911cfea4 100644
--- a/app/code/Magento/Store/Test/Unit/Model/ScopeFallbackResolverTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/ScopeFallbackResolverTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Store\Test\Unit\Model;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Api\Data\GroupInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\ScopeFallbackResolver;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class ScopeFallbackResolverTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Store/Test/Unit/Model/ScopeTreeProviderTest.php b/app/code/Magento/Store/Test/Unit/Model/ScopeTreeProviderTest.php
index 1b4cb0b8d5f27..853dcff1e5539 100644
--- a/app/code/Magento/Store/Test/Unit/Model/ScopeTreeProviderTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/ScopeTreeProviderTest.php
@@ -5,15 +5,12 @@
  */
 namespace Magento\Store\Test\Unit\Model;
 
-use Magento\Store\Api\Data\WebsiteInterface;
-use Magento\Store\Api\Data\GroupInterface;
-use Magento\Store\Api\Data\StoreInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\Group;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\ScopeTreeProvider;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\Website;
 
 class ScopeTreeProviderTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Store/Test/Unit/Model/ScopeTypeNormalizerTest.php b/app/code/Magento/Store/Test/Unit/Model/ScopeTypeNormalizerTest.php
index 1f724293037f6..42ba96884aefe 100644
--- a/app/code/Magento/Store/Test/Unit/Model/ScopeTypeNormalizerTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/ScopeTypeNormalizerTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Store\Test\Unit\Model;
 
-use Magento\Store\Model\ScopeTypeNormalizer;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\ScopeTypeNormalizer;
 
 class ScopeTypeNormalizerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Store/Test/Unit/Model/StoreManagerTest.php b/app/code/Magento/Store/Test/Unit/Model/StoreManagerTest.php
index ad3b927258717..b5a7b953553b3 100644
--- a/app/code/Magento/Store/Test/Unit/Model/StoreManagerTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/StoreManagerTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Store\Test\Unit\Model;
 
-use Magento\Framework\App\DeploymentConfig;
-
 class StoreManagerTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Store/Test/Unit/Model/StoreRepositoryTest.php b/app/code/Magento/Store/Test/Unit/Model/StoreRepositoryTest.php
index 03b886459a7cc..09e6e07f6711b 100644
--- a/app/code/Magento/Store/Test/Unit/Model/StoreRepositoryTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/StoreRepositoryTest.php
@@ -6,15 +6,13 @@
 
 namespace Magento\Store\Test\Unit\Model;
 
-use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\App\Config;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\Store\Model\ResourceModel\Store\Collection;
 use Magento\Store\Model\ResourceModel\Store\CollectionFactory;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreFactory;
 use Magento\Store\Model\StoreRepository;
-use Magento\Framework\App\Config;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Store/Ui/Component/Listing/Column/Store.php b/app/code/Magento/Store/Ui/Component/Listing/Column/Store.php
index 41acd496676d4..0ce735ff66876 100644
--- a/app/code/Magento/Store/Ui/Component/Listing/Column/Store.php
+++ b/app/code/Magento/Store/Ui/Component/Listing/Column/Store.php
@@ -8,9 +8,9 @@
 use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Store\Model\StoreManagerInterface as StoreManager;
 use Magento\Store\Model\System\Store as SystemStore;
 use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Store\Model\StoreManagerInterface as StoreManager;
 
 /**
  * Class Store
diff --git a/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php b/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
index 1fc13390e30b5..6d0dce395e4be 100644
--- a/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
+++ b/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Store\Ui\Component\Listing\Column\Store;
 
-use Magento\Framework\Escaper;
 use Magento\Framework\Data\OptionSourceInterface;
+use Magento\Framework\Escaper;
 use Magento\Store\Model\System\Store as SystemStore;
 
 /**
diff --git a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
index c4f8a31430963..b604ecc9d0aa8 100644
--- a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
+++ b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Store\Url\Plugin;
 
-use \Magento\Store\Model\Store;
-use \Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+use Magento\Store\Model\Store;
 
 /**
  * Plugin for \Magento\Framework\Url\RouteParamsResolver
diff --git a/app/code/Magento/Store/Url/Plugin/SecurityInfo.php b/app/code/Magento/Store/Url/Plugin/SecurityInfo.php
index bfca3e7341ef2..a66504eb13fac 100644
--- a/app/code/Magento/Store/Url/Plugin/SecurityInfo.php
+++ b/app/code/Magento/Store/Url/Plugin/SecurityInfo.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Store\Url\Plugin;
 
-use \Magento\Store\Model\Store;
-use \Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+use Magento\Store\Model\Store;
 
 /**
  * Plugin for \Magento\Framework\Url\SecurityInfo
diff --git a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatch.php b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatch.php
index d6f8e1b7f39c6..25cef8fee5511 100644
--- a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatch.php
+++ b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/AbstractSwatch.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options;
 
-use \Magento\Swatches\Model\Swatch as SwatchModel;
-
 /**
  * Backend swatch abstract block
  */
@@ -114,7 +112,7 @@ public function getStoreOptionValues($storeId)
             $this->addCollectionStoreFilter($valuesCollection, $storeId);
             $valuesCollection->getSelect()->joinLeft(
                 ['swatch_table' => $valuesCollection->getTable('eav_attribute_option_swatch')],
-                'swatch_table.option_id = main_table.option_id AND swatch_table.store_id = '.$storeId,
+                'swatch_table.option_id = main_table.option_id AND swatch_table.store_id = ' . $storeId,
                 'swatch_table.value AS label'
             );
             $valuesCollection->load();
diff --git a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php
index 66ecd06c646e7..d35073919a888 100644
--- a/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php
+++ b/app/code/Magento/Swatches/Block/Adminhtml/Attribute/Edit/Options/Visual.php
@@ -95,10 +95,10 @@ protected function reformatSwatchLabels($swatchStoreValue = null)
         $newSwatch = [];
         foreach ($swatchStoreValue as $key => $value) {
             if ($value[0] == '#') {
-                $newSwatch[$key] = 'background: '.$value;
+                $newSwatch[$key] = 'background: ' . $value;
             } elseif ($value[0] == '/') {
                 $mediaUrl = $this->swatchHelper->getSwatchMediaUrl();
-                $newSwatch[$key] = 'background: url('.$mediaUrl.$value.'); background-size: cover;';
+                $newSwatch[$key] = 'background: url(' . $mediaUrl . $value . '); background-size: cover;';
             }
         }
         return $newSwatch;
diff --git a/app/code/Magento/Swatches/Block/Adminhtml/Product/Attribute/Edit/Form.php b/app/code/Magento/Swatches/Block/Adminhtml/Product/Attribute/Edit/Form.php
index d8a1bedbf108d..72d62cb696172 100644
--- a/app/code/Magento/Swatches/Block/Adminhtml/Product/Attribute/Edit/Form.php
+++ b/app/code/Magento/Swatches/Block/Adminhtml/Product/Attribute/Edit/Form.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Swatches\Block\Adminhtml\Product\Attribute\Edit;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\CollectionFactory as ElementCollectionFactory;
 use Magento\Framework\Data\Form\Element\Factory;
 use Magento\Framework\Data\Form\FormKey;
-use Magento\Swatches\Model\Swatch;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\App\ObjectManager;
+use Magento\Swatches\Model\Swatch;
 
 /**
  * Class Form
diff --git a/app/code/Magento/Swatches/Block/LayeredNavigation/RenderLayered.php b/app/code/Magento/Swatches/Block/LayeredNavigation/RenderLayered.php
index fc13372520945..45331d9d5025e 100644
--- a/app/code/Magento/Swatches/Block/LayeredNavigation/RenderLayered.php
+++ b/app/code/Magento/Swatches/Block/LayeredNavigation/RenderLayered.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Swatches\Block\LayeredNavigation;
 
-use Magento\Eav\Model\Entity\Attribute;
+use Magento\Catalog\Model\Layer\Filter\Item as FilterItem;
 use Magento\Catalog\Model\ResourceModel\Layer\Filter\AttributeFactory;
-use Magento\Framework\View\Element\Template;
+use Magento\Eav\Model\Entity\Attribute;
 use Magento\Eav\Model\Entity\Attribute\Option;
-use Magento\Catalog\Model\Layer\Filter\Item as FilterItem;
+use Magento\Framework\View\Element\Template;
 
 /**
  * Class RenderLayered Render Swatches at Layered Navigation
diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
index dfd3d6ce15f71..f605bdb80c6d7 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
@@ -11,6 +11,7 @@
 use Magento\ConfigurableProduct\Helper\Data;
 use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
 use Magento\Customer\Helper\Session\CurrentCustomer;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Json\EncoderInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Stdlib\ArrayUtils;
@@ -18,7 +19,6 @@
 use Magento\Swatches\Helper\Data as SwatchData;
 use Magento\Swatches\Helper\Media;
 use Magento\Swatches\Model\Swatch;
-use Magento\Framework\App\ObjectManager;
 use Magento\Swatches\Model\SwatchAttributesProvider;
 
 /**
diff --git a/app/code/Magento/Swatches/Model/SwatchAttributesProvider.php b/app/code/Magento/Swatches/Model/SwatchAttributesProvider.php
index d5a1b402c9fd3..96f2c27f22e27 100644
--- a/app/code/Magento/Swatches/Model/SwatchAttributesProvider.php
+++ b/app/code/Magento/Swatches/Model/SwatchAttributesProvider.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Swatches\Model;
 
-use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
 
 /**
diff --git a/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php b/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php
index cfef5ab499e5d..5bd070b4b6286 100644
--- a/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php
+++ b/app/code/Magento/Swatches/Observer/AddFieldsToAttributeObserver.php
@@ -6,9 +6,9 @@
 namespace Magento\Swatches\Observer;
 
 use Magento\Config\Model\Config\Source;
-use Magento\Framework\Module\Manager;
 use Magento\Framework\Event\Observer as EventObserver;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Module\Manager;
 
 /**
  * Observer model
diff --git a/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php b/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php
index 3a517bd835146..9bbda447967f7 100644
--- a/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php
+++ b/app/code/Magento/Swatches/Observer/AddSwatchAttributeTypeObserver.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Swatches\Observer;
 
-use Magento\Config\Model\Config\Source;
-use Magento\Framework\Module\Manager;
 use Magento\Framework\Event\Observer as EventObserver;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Module\Manager;
 
 /**
  * Observer model
diff --git a/app/code/Magento/Swatches/Plugin/Catalog/CacheInvalidate.php b/app/code/Magento/Swatches/Plugin/Catalog/CacheInvalidate.php
index 621a68df5cdfe..d7860f11bd14c 100644
--- a/app/code/Magento/Swatches/Plugin/Catalog/CacheInvalidate.php
+++ b/app/code/Magento/Swatches/Plugin/Catalog/CacheInvalidate.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Swatches\Plugin\Catalog;
 
-use \Magento\Framework\App\Cache\Type\Block;
-use \Magento\Framework\App\Cache\Type\Collection;
+use Magento\Framework\App\Cache\Type\Block;
+use Magento\Framework\App\Cache\Type\Collection;
 
 class CacheInvalidate
 {
diff --git a/app/code/Magento/Swatches/Setup/InstallData.php b/app/code/Magento/Swatches/Setup/InstallData.php
index eab2fd68607bd..6afc5c4b7b2f4 100644
--- a/app/code/Magento/Swatches/Setup/InstallData.php
+++ b/app/code/Magento/Swatches/Setup/InstallData.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Swatches\Setup;
 
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Eav\Setup\EavSetup;
 
 /**
  * Class InstallData
diff --git a/app/code/Magento/Swatches/Setup/UpgradeData.php b/app/code/Magento/Swatches/Setup/UpgradeData.php
index 880422a371abd..64bf7ac99aaea 100644
--- a/app/code/Magento/Swatches/Setup/UpgradeData.php
+++ b/app/code/Magento/Swatches/Setup/UpgradeData.php
@@ -5,18 +5,18 @@
  */
 namespace Magento\Swatches\Setup;
 
-use Magento\Framework\Setup\UpgradeDataInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Catalog\Model\Product;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Store\Model\Store;
 use Magento\Swatches\Model\Swatch;
 use Zend_Db;
 use Zend_Db_Expr;
-use Magento\Framework\DB\FieldDataConverterFactory;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Upgrade Data script
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/FormTest.php b/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/FormTest.php
index aad8741735813..a8b655f7b62a1 100644
--- a/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/FormTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Block/Adminhtml/Product/Attribute/Edit/FormTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Swatches\Test\Unit\Block\Adminhtml\Product\Attribute\Edit;
 
-use Magento\Swatches\Model\Swatch;
-
 class FormTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
index 5b971d9a99a3b..e0789081def82 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
@@ -12,7 +12,7 @@ $stores = $block->getStoresSortedBySortOrder();
 ?>
 <fieldset class="admin__fieldset fieldset">
     <legend class="legend">
-        <span><?= $block->escapeHtml( __('Manage Swatch (Values of Your Attribute)')) ?></span>
+        <span><?= $block->escapeHtml(__('Manage Swatch (Values of Your Attribute)')) ?></span>
     </legend><br />
     <div class="admin__control-table-wrapper" id="swatch-visual-options-panel">
         <table class="data-table clearfix" cellspacing="0">
@@ -67,7 +67,7 @@ $stores = $block->getStoresSortedBySortOrder();
                 <input class="input-radio" type="<%- data.intype %>" name="defaultvisual[]" value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
             </td>
             <td class="swatches-visual-col col-default <%- data.empty_class %>">
-                <?php //@todo add logic getting swatch value from db */ ?>
+                <?php //@todo add logic getting swatch value from db */?>
                 <input id="swatch_visual_value_<%- data.id %>" type="hidden" name="swatchvisual[value][<%- data.id %>]" value="<%- data.defaultswatch0 %>" />
                 <div class="swatch_window" id="swatch_window_option_<%- data.id %>" style="<%- data.swatch0 %>"></div>
                 <div class="swatch_sub-menu_container" id="swatch_container_option_<%- data.id %>">
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index 3492f83fd1828..fab9bf87d2cb6 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -17,7 +17,8 @@
             <a href="<?= /* @escapeNotVerified */ $label['link'] ?>"
                aria-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
                class="swatch-option-link-layered">
-                <?php if (isset($swatchData['swatches'][$option]['type'])) { ?>
+                <?php if (isset($swatchData['swatches'][$option]['type'])) {
+    ?>
                     <?php switch ($swatchData['swatches'][$option]['type']) {
                         case '3':
                             ?>
@@ -69,7 +70,8 @@
                                     ><?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?></div>
                             <?php    break;
                     } ?>
-                <?php } ?>
+                <?php
+} ?>
             </a>
         <?php endforeach; ?>
     </div>
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php b/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php
index 471f56cc4432b..9ae8b4e6a0b2b 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Tax\Block\Adminhtml\Items\Price;
 
+use Magento\Quote\Model\Quote\Item\AbstractItem as QuoteItem;
 use Magento\Sales\Model\Order\Creditmemo\Item as CreditmemoItem;
 use Magento\Sales\Model\Order\Invoice\Item as InvoiceItem;
 use Magento\Sales\Model\Order\Item;
-use Magento\Quote\Model\Quote\Item\AbstractItem as QuoteItem;
 use Magento\Tax\Block\Item\Price\Renderer as ItemPriceRenderer;
 use Magento\Tax\Helper\Data as TaxHelper;
 
@@ -46,6 +46,7 @@ class Renderer extends \Magento\Backend\Block\Template
      * @param TaxHelper $taxHelper
      * @param ItemPriceRenderer $itemPriceRenderer
      * @param array $data
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
index 80cc9673a0d38..9cf96bc21e962 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Add.php
@@ -11,8 +11,6 @@
  */
 namespace Magento\Tax\Block\Adminhtml\Rate\Toolbar;
 
-use Magento\Framework\View\Element\Template;
-
 /**
  * @api
  * @since 100.0.2
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxLoad.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxLoad.php
index 2b0e966bf8c01..a2002f3254fc0 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxLoad.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/AjaxLoad.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Rate;
 
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 class AjaxLoad extends \Magento\Tax\Controller\Adminhtml\Rate
 {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php
index 1c5013c34c6e9..465eb8cd2eebe 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Rate;
 
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 class Delete extends \Magento\Tax\Controller\Adminhtml\Rate
 {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Edit.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Edit.php
index f215ef7b9d261..2172009215a19 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Edit.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Edit.php
@@ -6,9 +6,9 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Rate;
 
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Tax\Controller\RegistryConstants;
-use Magento\Framework\Controller\ResultFactory;
 
 class Edit extends \Magento\Tax\Controller\Adminhtml\Rate
 {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Save.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Save.php
index fa86fbd740446..7f76a08ad583e 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Save.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Save.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Rate;
 
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 class Save extends \Magento\Tax\Controller\Adminhtml\Rate
 {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/AjaxLoadRates.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/AjaxLoadRates.php
index 4d40e20ce7b8e..386d12024bb0c 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/AjaxLoadRates.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/AjaxLoadRates.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Rule;
 
-use Magento\Framework\App\Action\Context;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\Tax\Model\Rate\Provider as RatesProvider;
-use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Tax\Model\Calculation\Rate;
+use Magento\Tax\Model\Rate\Provider as RatesProvider;
 
 /**
  * Class AjaxLoadRates is intended to load existing
@@ -58,7 +58,7 @@ public function execute()
             if (!empty($ratesFilter)) {
                 $this->searchCriteriaBuilder->addFilter(
                     Rate::KEY_CODE,
-                    '%'.$ratesFilter.'%',
+                    '%' . $ratesFilter . '%',
                     'like'
                 );
             }
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index f77ecc956f26d..fa60ea2f815d1 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -5,18 +5,17 @@
  */
 namespace Magento\Tax\Helper;
 
-use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Store\Model\Store;
 use Magento\Customer\Model\Address;
-use Magento\Tax\Model\Config;
-use Magento\Customer\Model\Session as CustomerSession;
-use Magento\Tax\Api\OrderTaxManagementInterface;
-use Magento\Sales\Model\Order\Invoice;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Sales\Model\EntityInterface;
 use Magento\Sales\Model\Order\Creditmemo;
+use Magento\Sales\Model\Order\Invoice;
+use Magento\Store\Model\Store;
 use Magento\Tax\Api\Data\OrderTaxDetailsItemInterface;
-use Magento\Sales\Model\EntityInterface;
-use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\App\ObjectManager;
+use Magento\Tax\Api\OrderTaxManagementInterface;
+use Magento\Tax\Model\Config;
 
 /**
  * Tax helper
diff --git a/app/code/Magento/Tax/Model/Calculation/GrandTotalDetails.php b/app/code/Magento/Tax/Model/Calculation/GrandTotalDetails.php
index f0a7a182c2dc0..208a7ba174704 100644
--- a/app/code/Magento/Tax/Model/Calculation/GrandTotalDetails.php
+++ b/app/code/Magento/Tax/Model/Calculation/GrandTotalDetails.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Tax\Model\Calculation;
 
-use Magento\Tax\Api\Data\GrandTotalDetailsInterface;
 use Magento\Framework\Api\AbstractSimpleObject;
+use Magento\Tax\Api\Data\GrandTotalDetailsInterface;
 
 /**
  * Grand Total Tax Details Model
diff --git a/app/code/Magento/Tax/Model/Calculation/GrandTotalRates.php b/app/code/Magento/Tax/Model/Calculation/GrandTotalRates.php
index be7fe9c5473be..80b6fdea5b98a 100644
--- a/app/code/Magento/Tax/Model/Calculation/GrandTotalRates.php
+++ b/app/code/Magento/Tax/Model/Calculation/GrandTotalRates.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Tax\Model\Calculation;
 
-use Magento\Tax\Api\Data\GrandTotalRatesInterface;
 use Magento\Framework\Api\AbstractSimpleObject;
+use Magento\Tax\Api\Data\GrandTotalRatesInterface;
 
 /**
  * Grand Total Tax Details Model
diff --git a/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php b/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php
index 75923748e14cf..00c0e7101d4ca 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rule/Validator.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Tax\Model\Calculation\Rule;
 
-use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Tax\Model\ClassModel as TaxClassModel;
 use Magento\Tax\Model\ClassModelRegistry;
diff --git a/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php b/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php
index 0ba5e8822ed67..be82549d306dd 100644
--- a/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php
+++ b/app/code/Magento/Tax/Model/Quote/GrandTotalDetailsPlugin.php
@@ -5,9 +5,8 @@
  */
 namespace Magento\Tax\Model\Quote;
 
-use Magento\Quote\Api\Data\TotalSegmentExtensionFactory;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\App\ObjectManager;
+use Magento\Quote\Api\Data\TotalSegmentExtensionFactory;
 
 class GrandTotalDetailsPlugin
 {
@@ -94,7 +93,6 @@ public function afterProcess(
         array $totalSegments,
         array $addressTotals = []
     ) {
-
         if (!array_key_exists($this->code, $addressTotals)) {
             return $totalSegments;
         }
diff --git a/app/code/Magento/Tax/Model/Quote/ToOrderConverter.php b/app/code/Magento/Tax/Model/Quote/ToOrderConverter.php
index 8764748f1bfdd..aacc942fe130c 100644
--- a/app/code/Magento/Tax/Model/Quote/ToOrderConverter.php
+++ b/app/code/Magento/Tax/Model/Quote/ToOrderConverter.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Tax\Model\Quote;
 
-use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Quote\Model\Quote\Address\ToOrder as QuoteAddressToOrder;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
+use Magento\Quote\Model\Quote\Address\ToOrder as QuoteAddressToOrder;
+use Magento\Sales\Api\Data\OrderInterface;
 
 class ToOrderConverter
 {
diff --git a/app/code/Magento/Tax/Model/Rate/Provider.php b/app/code/Magento/Tax/Model/Rate/Provider.php
index 0edf46c320a9e..e46e2e66645fe 100644
--- a/app/code/Magento/Tax/Model/Rate/Provider.php
+++ b/app/code/Magento/Tax/Model/Rate/Provider.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Tax\Model\Rate;
 
+use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Convert\DataObject as Converter;
 use Magento\Tax\Api\TaxRateRepositoryInterface;
-use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Tax\Model\Calculation\Rate;
 
 /**
diff --git a/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php b/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php
index c563ee1b3084e..81f4377dccd21 100644
--- a/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php
+++ b/app/code/Magento/Tax/Model/Sales/Order/TaxManagement.php
@@ -8,10 +8,9 @@
 namespace Magento\Tax\Model\Sales\Order;
 
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterfaceFactory as TaxDetailsDataObjectFactory;
-use Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface as AppliedTax;
-use Magento\Tax\Model\Sales\Order\Tax;
 use Magento\Sales\Model\Order\Tax\Item;
+use Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterface as AppliedTax;
+use Magento\Tax\Api\Data\OrderTaxDetailsAppliedTaxInterfaceFactory as TaxDetailsDataObjectFactory;
 
 class TaxManagement implements \Magento\Tax\Api\OrderTaxManagementInterface
 {
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
index 7752911ceb22f..e6be84e526f88 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -8,21 +8,19 @@
 
 namespace Magento\Tax\Model\Sales\Total\Quote;
 
-use Magento\Customer\Api\Data\AddressInterfaceFactory as CustomerAddressFactory;
 use Magento\Customer\Api\Data\AddressInterface as CustomerAddress;
+use Magento\Customer\Api\Data\AddressInterfaceFactory as CustomerAddressFactory;
 use Magento\Customer\Api\Data\RegionInterfaceFactory as CustomerAddressRegionFactory;
-use Magento\Framework\DataObject;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
 use Magento\Quote\Model\Quote\Address\Total\AbstractTotal;
 use Magento\Quote\Model\Quote\Item\AbstractItem;
 use Magento\Store\Model\Store;
+use Magento\Tax\Api\Data\QuoteDetailsInterface;
 use Magento\Tax\Api\Data\QuoteDetailsInterfaceFactory;
-use Magento\Tax\Api\Data\TaxClassKeyInterfaceFactory;
 use Magento\Tax\Api\Data\TaxClassKeyInterface;
 use Magento\Tax\Api\Data\TaxDetailsInterface;
 use Magento\Tax\Api\Data\TaxDetailsItemInterface;
-use Magento\Tax\Api\Data\QuoteDetailsInterface;
-use Magento\Quote\Api\Data\ShippingAssignmentInterface;
 
 /**
  * Tax totals calculation model
@@ -531,7 +529,7 @@ protected function processProductItems(
         $total->setSubtotalInclTax($subtotalInclTax);
         $total->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);
         $total->setBaseSubtotalInclTax($baseSubtotalInclTax);
-        $shippingAssignment->getShipping()->getAddress()->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);;
+        $shippingAssignment->getShipping()->getAddress()->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);
 
         return $this;
     }
@@ -546,7 +544,7 @@ protected function processProductItems(
     protected function processAppliedTaxes(
         QuoteAddress\Total $total,
         ShippingAssignmentInterface $shippingAssignment,
-        Array $itemsByType
+        array $itemsByType
     ) {
         $total->setAppliedTaxes([]);
         $allAppliedTaxesArray = [];
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php
index 16a55dbfac3e2..2c7a84de78fad 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Shipping.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Tax\Model\Sales\Total\Quote;
 
-use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\Quote\Model\Quote\Address;
 
 class Shipping extends CommonTaxCollector
 {
@@ -58,6 +58,7 @@ public function collect(
      * @param \Magento\Quote\Model\Quote $quote
      * @param Address\Total $total
      * @return array|null
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Subtotal.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Subtotal.php
index e60926b96fe49..9e8d8e016adc0 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Subtotal.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Subtotal.php
@@ -9,8 +9,8 @@
  */
 namespace Magento\Tax\Model\Sales\Total\Quote;
 
-use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\Quote\Model\Quote\Address;
 
 class Subtotal extends CommonTaxCollector
 {
@@ -61,6 +61,7 @@ public function collect(
      * @param Address\Total $total
      * @return null
      * @codeCoverageIgnore
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
diff --git a/app/code/Magento/Tax/Model/System/Message/Notification/DiscountErrors.php b/app/code/Magento/Tax/Model/System/Message/Notification/DiscountErrors.php
index ff16e350580a0..4406ce07a9396 100644
--- a/app/code/Magento/Tax/Model/System/Message/Notification/DiscountErrors.php
+++ b/app/code/Magento/Tax/Model/System/Message/Notification/DiscountErrors.php
@@ -92,7 +92,7 @@ public function getText()
             );
             $messageDetails .= "</p>";
         }
-        
+
         return $messageDetails;
     }
 
diff --git a/app/code/Magento/Tax/Model/TaxCalculation.php b/app/code/Magento/Tax/Model/TaxCalculation.php
index ac18dfec6c7ed..c27f4ad2ae694 100644
--- a/app/code/Magento/Tax/Model/TaxCalculation.php
+++ b/app/code/Magento/Tax/Model/TaxCalculation.php
@@ -6,19 +6,18 @@
 
 namespace Magento\Tax\Model;
 
-use Magento\Tax\Api\TaxCalculationInterface;
-use Magento\Tax\Api\TaxClassManagementInterface;
-use Magento\Tax\Api\Data\TaxDetailsItemInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Tax\Api\Data\QuoteDetailsItemInterface;
 use Magento\Tax\Api\Data\TaxDetailsInterfaceFactory;
+use Magento\Tax\Api\Data\TaxDetailsItemInterface;
 use Magento\Tax\Api\Data\TaxDetailsItemInterfaceFactory;
+use Magento\Tax\Api\TaxCalculationInterface;
+use Magento\Tax\Api\TaxClassManagementInterface;
 use Magento\Tax\Model\Calculation\AbstractCalculator;
 use Magento\Tax\Model\Calculation\CalculatorFactory;
-use Magento\Tax\Model\Config;
 use Magento\Tax\Model\TaxDetails\AppliedTax;
 use Magento\Tax\Model\TaxDetails\AppliedTaxRate;
 use Magento\Tax\Model\TaxDetails\TaxDetails;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Tax/Model/TaxConfigProvider.php b/app/code/Magento/Tax/Model/TaxConfigProvider.php
index db53ba6a171c1..ed4ae440e4ad1 100644
--- a/app/code/Magento/Tax/Model/TaxConfigProvider.php
+++ b/app/code/Magento/Tax/Model/TaxConfigProvider.php
@@ -6,9 +6,9 @@
 namespace Magento\Tax\Model;
 
 use Magento\Checkout\Model\ConfigProviderInterface;
-use Magento\Tax\Helper\Data as TaxHelper;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Tax\Helper\Data as TaxHelper;
 
 class TaxConfigProvider implements ConfigProviderInterface
 {
diff --git a/app/code/Magento/Tax/Model/TaxRateCollection.php b/app/code/Magento/Tax/Model/TaxRateCollection.php
index 218682ffb6688..97178dd16a5d3 100644
--- a/app/code/Magento/Tax/Model/TaxRateCollection.php
+++ b/app/code/Magento/Tax/Model/TaxRateCollection.php
@@ -6,13 +6,13 @@
 
 namespace Magento\Tax\Model;
 
-use Magento\Tax\Api\TaxRateRepositoryInterface;
-use Magento\Framework\Data\Collection\EntityFactory;
 use Magento\Framework\Api\AbstractServiceCollection;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SortOrderBuilder;
+use Magento\Framework\Data\Collection\EntityFactory;
 use Magento\Tax\Api\Data\TaxRateInterface as TaxRate;
+use Magento\Tax\Api\TaxRateRepositoryInterface;
 
 /**
  * Tax rate collection for a grid backed by Services
diff --git a/app/code/Magento/Tax/Model/TaxRuleCollection.php b/app/code/Magento/Tax/Model/TaxRuleCollection.php
index 33aaf3b22b6d6..5bdd0714faaf1 100644
--- a/app/code/Magento/Tax/Model/TaxRuleCollection.php
+++ b/app/code/Magento/Tax/Model/TaxRuleCollection.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Tax\Model;
 
-use Magento\Framework\Data\Collection\EntityFactory;
 use Magento\Framework\Api\AbstractServiceCollection;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
diff --git a/app/code/Magento/Tax/Model/TaxRuleRepository.php b/app/code/Magento/Tax/Model/TaxRuleRepository.php
index 9317519c57961..66522ceeadc91 100644
--- a/app/code/Magento/Tax/Model/TaxRuleRepository.php
+++ b/app/code/Magento/Tax/Model/TaxRuleRepository.php
@@ -8,13 +8,13 @@
 
 use Magento\Framework\Api\Search\FilterGroup;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Tax\Api\Data\TaxRuleInterface;
-use Magento\Tax\Api\TaxRuleRepositoryInterface;
 use Magento\Tax\Api\Data\TaxRuleSearchResultsInterfaceFactory;
+use Magento\Tax\Api\TaxRuleRepositoryInterface;
 use Magento\Tax\Model\Calculation\RuleFactory;
 use Magento\Tax\Model\Calculation\TaxRuleRegistry;
 use Magento\Tax\Model\ResourceModel\Calculation\Rule as ResourceRule;
diff --git a/app/code/Magento/Tax/Observer/GetPriceConfigurationObserver.php b/app/code/Magento/Tax/Observer/GetPriceConfigurationObserver.php
index 21828c35a81dc..6f2e08980ce44 100644
--- a/app/code/Magento/Tax/Observer/GetPriceConfigurationObserver.php
+++ b/app/code/Magento/Tax/Observer/GetPriceConfigurationObserver.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Tax\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Catalog\Pricing\Price\BasePrice;
 use Magento\Catalog\Pricing\Price\RegularPrice;
+use Magento\Framework\Event\ObserverInterface;
 
 class GetPriceConfigurationObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/Tax/Setup/InstallData.php b/app/code/Magento/Tax/Setup/InstallData.php
index 31d0798847db5..c60f72def9ea6 100644
--- a/app/code/Magento/Tax/Setup/InstallData.php
+++ b/app/code/Magento/Tax/Setup/InstallData.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Tax\Setup;
 
+use Magento\Directory\Model\RegionFactory;
 use Magento\Framework\Setup\InstallDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Directory\Model\RegionFactory;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Tax/Setup/UpgradeData.php b/app/code/Magento/Tax/Setup/UpgradeData.php
index 5ede9cb6180e4..79bdb10e64b99 100644
--- a/app/code/Magento/Tax/Setup/UpgradeData.php
+++ b/app/code/Magento/Tax/Setup/UpgradeData.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Tax\Setup;
 
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Directory\Model\RegionFactory;
 use Magento\Framework\Api\Search\SearchCriteriaFactory;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Tax\Api\TaxRateRepositoryInterface;
 
 /**
@@ -73,7 +73,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
         $setup->startSetup();
 
         if (version_compare($context->getVersion(), '2.0.1', '<')) {
-             //Update the tax_class_id attribute in the 'catalog_eav_attribute' table
+            //Update the tax_class_id attribute in the 'catalog_eav_attribute' table
             $taxSetup->updateAttribute(
                 \Magento\Catalog\Model\Product::ENTITY,
                 'tax_class_id',
diff --git a/app/code/Magento/Tax/Test/Unit/Block/Adminhtml/Rule/Edit/FormTest.php b/app/code/Magento/Tax/Test/Unit/Block/Adminhtml/Rule/Edit/FormTest.php
index 59e63de9d8010..4e2e8e0263405 100644
--- a/app/code/Magento/Tax/Test/Unit/Block/Adminhtml/Rule/Edit/FormTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Block/Adminhtml/Rule/Edit/FormTest.php
@@ -8,11 +8,11 @@
 use Magento\Backend\Block\Template\Context;
 use Magento\Framework\Data\FormFactory;
 use Magento\Framework\Registry;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\UrlInterface;
 use Magento\Tax\Api\TaxClassRepositoryInterface;
 use Magento\Tax\Api\TaxRuleRepositoryInterface;
 use Magento\Tax\Block\Adminhtml\Rule\Edit\Form;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Tax\Model\Rate\Source;
 use Magento\Tax\Model\TaxClass\Source\Customer;
 use Magento\Tax\Model\TaxClass\Source\Product;
diff --git a/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Rate/AjaxLoadTest.php b/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Rate/AjaxLoadTest.php
index c547438d92f2a..69a0afac81e23 100644
--- a/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Rate/AjaxLoadTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Rate/AjaxLoadTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Tax\Test\Unit\Controller\Adminhtml\Rate;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Test for AjaxLoadTest
@@ -74,8 +74,7 @@ public function testExecute()
         $rateMock = $objectManager->getObject(
             \Magento\Tax\Model\Calculation\Rate::class,
             [
-                'data' =>
-                    [
+                'data' => [
                         'tax_country_id' => 'US',
                         'tax_region_id' => 2,
                         'tax_postcode' => null,
@@ -111,8 +110,7 @@ public function testExecute()
 
         $jsonObject->expects($this->once())
             ->method('setData')
-            ->with(['success' => true, 'error_message' => '', 'result'=>
-                $returnArray,
+            ->with(['success' => true, 'error_message' => '', 'result'=> $returnArray,
             ]);
 
         $this->resultFactory->expects($this->any())
@@ -140,7 +138,7 @@ public function testExecute()
     public function testExecuteLocalizedException()
     {
         $taxRateId=999;
-        $exceptionMessage='No such entity with taxRateId = '.$taxRateId;
+        $exceptionMessage='No such entity with taxRateId = ' . $taxRateId;
         $noSuchEntityEx= new NoSuchEntityException(__($exceptionMessage));
 
         $objectManager = new ObjectManager($this);
diff --git a/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Rule/AjaxLoadRatesTest.php b/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Rule/AjaxLoadRatesTest.php
index bf1b130a433f0..f6c4a34c9593a 100644
--- a/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Rule/AjaxLoadRatesTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Rule/AjaxLoadRatesTest.php
@@ -13,8 +13,8 @@
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Tax\Model\Rate\Provider as RatesProvider;
 use Magento\Tax\Controller\Adminhtml\Rule\AjaxLoadRates;
+use Magento\Tax\Model\Rate\Provider as RatesProvider;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/Tax/Test/Unit/Helper/DataTest.php b/app/code/Magento/Tax/Test/Unit/Helper/DataTest.php
index 51b1118af415c..918f3cef3718e 100644
--- a/app/code/Magento/Tax/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Helper/DataTest.php
@@ -270,7 +270,7 @@ function ($arg) {
         foreach ($result as $index => $appliedTax) {
             $expectedTax = $expectedResults[$index];
             foreach ($appliedTax as $attr => $value) {
-                $this->assertEquals($expectedTax[$attr], $value, "The ".$attr." of tax does not match");
+                $this->assertEquals($expectedTax[$attr], $value, "The " . $attr . " of tax does not match");
             }
         }
     }
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/CalculatorFactoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/CalculatorFactoryTest.php
index 706701be33a16..8bdf87c85616c 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/CalculatorFactoryTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/CalculatorFactoryTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Tax\Test\Unit\Model\Calculation;
 
-use \Magento\Tax\Model\Calculation\CalculatorFactory;
-
 use Magento\Customer\Api\Data\AddressInterface as CustomerAddress;
+
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Tax\Model\Calculation\CalculatorFactory;
 
 /**
  * Test class for \Magento\Tax\Model\CalculatorFactory
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseCalculatorTest.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseCalculatorTest.php
index 186bb5346401d..f3dfd3f88ed6d 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseCalculatorTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseCalculatorTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Unit\Model\Calculation;
 
-use \Magento\Tax\Model\Calculation\RowBaseCalculator;
+use Magento\Tax\Model\Calculation\RowBaseCalculator;
 
 /**
  * Class RowBaseCalculatorTest
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Config/TaxClassTest.php b/app/code/Magento/Tax/Test/Unit/Model/Config/TaxClassTest.php
index 635286b96a429..ed8b34840f9c6 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Config/TaxClassTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Config/TaxClassTest.php
@@ -12,6 +12,7 @@
 namespace Magento\Tax\Test\Unit\Model\Config;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 class TaxClassTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/Tax/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Tax/Test/Unit/Model/ConfigTest.php
index 131406b02b27c..6d155cbcd801a 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/ConfigTest.php
@@ -11,7 +11,7 @@
  */
 namespace Magento\Tax\Test\Unit\Model;
 
-use \Magento\Tax\Model\Config;
+use Magento\Tax\Model\Config;
 
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
index 912f42af0d3cd..7247b90762182 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Unit\Model\Plugin;
 
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class OrderSaveTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php b/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php
index e5bd728e180f6..80ba78d1e2c80 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Quote/GrandTotalDetailsPluginTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Unit\Model\Quote;
 
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php b/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
index 23ce032764a8f..81773725f1180 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Quote/ToOrderConverterTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Unit\Model\Quote;
 
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class ToOrderConverterTest
@@ -149,7 +149,7 @@ public function testAfterConvertNullExtensionAttribute(
             ->willReturn($itemsAppliedTaxes);
 
         $orderExtensionAttributeMock = $this->setupOrderExtensionAttributeMock();
-        
+
         $orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Order/TaxManagementTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Order/TaxManagementTest.php
index 5117288bb6b34..8bb43b99630ab 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Order/TaxManagementTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Order/TaxManagementTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Tax\Test\Unit\Model\Sales\Order;
 
-use \Magento\Tax\Model\Sales\Order\TaxManagement;
-
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
+use Magento\Tax\Model\Sales\Order\TaxManagement;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php
index bc13d86c479e9..4d9f0b1f71dbc 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/ShippingTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Tax\Test\Unit\Model\Sales\Total\Quote;
 
-use \Magento\Tax\Model\Sales\Total\Quote\Shipping;
+use Magento\Tax\Model\Sales\Total\Quote\Shipping;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php
index feee41c342069..9963aaeeb27ba 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Sales/Total/Quote/TaxTest.php
@@ -8,13 +8,13 @@
 
 namespace Magento\Tax\Test\Unit\Model\Sales\Total\Quote;
 
-use \Magento\Tax\Model\Sales\Total\Quote\Tax;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Test class for \Magento\Tax\Model\Sales\Total\Quote\Tax
  */
 use Magento\Tax\Model\Calculation;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Tax\Model\Sales\Total\Quote\Tax;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -708,7 +708,7 @@ public function dataProviderFetchArray()
             ],
             'item_id' => '1',
             'item_type' => 'product',
-            'associated_item_id' => NULL,
+            'associated_item_id' => null,
             'process' => 0,
         ];
 
diff --git a/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/ApplyDiscountOnPricesTest.php b/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/ApplyDiscountOnPricesTest.php
index f8cd3fce693a6..8f14fb69dd8e8 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/ApplyDiscountOnPricesTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/ApplyDiscountOnPricesTest.php
@@ -8,13 +8,13 @@
 
 namespace Magento\Tax\Test\Unit\Model\System\Message\Notification;
 
-use Magento\Tax\Model\Config as TaxConfig;
-use Magento\Tax\Model\System\Message\Notification\ApplyDiscountOnPrices as ApplyDiscountOnPricesNotification;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Tax\Model\Config as TaxConfig;
+use Magento\Tax\Model\System\Message\Notification\ApplyDiscountOnPrices as ApplyDiscountOnPricesNotification;
 
 /**
  * Test class for @see \Magento\Tax\Model\System\Message\Notification\ApplyDiscountOnPrices
diff --git a/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/DiscountErrorsTest.php b/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/DiscountErrorsTest.php
index 3486368e498eb..183ebd632ae30 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/DiscountErrorsTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/DiscountErrorsTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Tax\Test\Unit\Model\System\Message\Notification;
 
-use Magento\Tax\Model\Config as TaxConfig;
-use Magento\Tax\Model\System\Message\Notification\DiscountErrors as DiscountErrorsNotification;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Tax\Model\Config as TaxConfig;
+use Magento\Tax\Model\System\Message\Notification\DiscountErrors as DiscountErrorsNotification;
 
 /**
  * Test class for @see \Magento\Tax\Model\System\Message\Notification\DiscountErrors
diff --git a/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/RoundingErrorsTest.php b/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/RoundingErrorsTest.php
index 7a29469a9c993..75f928554e769 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/RoundingErrorsTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/System/Message/Notification/RoundingErrorsTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Tax\Test\Unit\Model\System\Message\Notification;
 
-use Magento\Tax\Model\Config as TaxConfig;
-use Magento\Tax\Model\System\Message\Notification\RoundingErrors as RoundingErrorsNotification;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Tax\Model\Config as TaxConfig;
+use Magento\Tax\Model\System\Message\Notification\RoundingErrors as RoundingErrorsNotification;
 
 /**
  * Test class for @see \Magento\Tax\Model\System\Message\Notification\RoundingErrors
diff --git a/app/code/Magento/Tax/Test/Unit/Model/System/Message/NotificationsTest.php b/app/code/Magento/Tax/Test/Unit/Model/System/Message/NotificationsTest.php
index 3cf1421ebcf37..b535d9fa19421 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/System/Message/NotificationsTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/System/Message/NotificationsTest.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Tax\Test\Unit\Model\System\Message;
 
-use Magento\Tax\Model\Config as TaxConfig;
-use Magento\Tax\Model\System\Message\Notifications;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Tax\Model\Config as TaxConfig;
 use Magento\Tax\Model\System\Message\NotificationInterface;
+use Magento\Tax\Model\System\Message\Notifications;
 
 /**
  * Test class for @see \Magento\Tax\Model\System\Message\Notifications
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxAddressManagerTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxAddressManagerTest.php
index ec640b74f8985..aee88729e8889 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxAddressManagerTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxAddressManagerTest.php
@@ -7,7 +7,7 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Tax\Model\TaxAddressManager;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class TaxAddressManagerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/ManagementTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/ManagementTest.php
index e8b0a0c8d2141..2c934c16fd522 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/ManagementTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/ManagementTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Unit\Model\TaxClass;
 
-use \Magento\Tax\Model\TaxClass\Management;
+use Magento\Tax\Model\TaxClass\Management;
 
 class ManagementTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxConfigProviderTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxConfigProviderTest.php
index fc63b94f51fa6..54fb28a7629d4 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxConfigProviderTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxConfigProviderTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Tax\Test\Unit\Model;
 
-use \Magento\Tax\Model\Config;
+use Magento\Tax\Model\Config;
 
 class TaxConfigProviderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxRateCollectionTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxRateCollectionTest.php
index ee95487c45a13..1ae0e06e9a33c 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxRateCollectionTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxRateCollectionTest.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Tax\Test\Unit\Model;
 
-use \Magento\Tax\Model\TaxRateCollection;
- 
+use Magento\Tax\Model\TaxRateCollection;
+
 class TaxRateCollectionTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var TaxRateCollection
      */
     protected $model;
-    
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleCollectionTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleCollectionTest.php
index f5f367d564804..ace0fbc86e264 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleCollectionTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleCollectionTest.php
@@ -13,7 +13,7 @@
 use Magento\Tax\Api\Data\TaxRateSearchResultsInterface;
 use Magento\Tax\Api\TaxRuleRepositoryInterface;
 use Magento\Tax\Model\Calculation\Rule;
-use \Magento\Tax\Model\TaxRuleCollection;
+use Magento\Tax\Model\TaxRuleCollection;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class TaxRuleCollectionTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
index f4151cd18ba66..aeab49385e80f 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
@@ -5,12 +5,11 @@
  */
 namespace Magento\Tax\Test\Unit\Model;
 
-use Magento\Framework\Api\SortOrder;
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use \Magento\Tax\Model\TaxRuleRepository;
+use Magento\Tax\Model\TaxRuleRepository;
 
 /**
  * Class TaxRuleRepositoryTest
diff --git a/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php b/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
index 14d678d02366b..d2b76087ce968 100644
--- a/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Observer/AfterAddressSaveObserverTest.php
@@ -77,7 +77,7 @@ protected function setUp()
             ->setMethods(['isCatalogPriceDisplayAffectedByTax'])
             ->disableOriginalConstructor()
             ->getMock();
-        
+
         $this->addressManagerMock = $this->getMockBuilder(TaxAddressManagerInterface::class)
             ->setMethods(['setDefaultAddressAfterSave', 'setDefaultAddressAfterLogIn'])
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php b/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php
index aaaf72b986240..183bafe0ba3f2 100644
--- a/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Tax\Test\Unit\Observer;
 
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class UpdateProductOptionsObserverTest extends \PHPUnit\Framework\TestCase
 {
@@ -24,7 +24,6 @@ public function testUpdateProductOptions(
         $priceIncludesTax,
         $displayPriceExcludingTax
     ) {
-
         $frameworkObject= new \Magento\Framework\DataObject();
         $frameworkObject->setAdditionalOptions([]);
 
@@ -64,18 +63,18 @@ public function testUpdateProductOptions(
             ->method('getEvent')
             ->will($this->returnValue($eventObject));
 
-         $objectManager = new ObjectManager($this);
-         $taxObserverObject = $objectManager->getObject(
-             \Magento\Tax\Observer\UpdateProductOptionsObserver::class,
-             [
-                 'taxData' => $taxData,
-                 'registry' => $registry,
-             ]
-         );
+        $objectManager = new ObjectManager($this);
+        $taxObserverObject = $objectManager->getObject(
+            \Magento\Tax\Observer\UpdateProductOptionsObserver::class,
+            [
+                'taxData' => $taxData,
+                'registry' => $registry,
+            ]
+        );
 
-         $taxObserverObject->execute($observerObject);
+        $taxObserverObject->execute($observerObject);
 
-         $this->assertEquals($expected, $frameworkObject->getAdditionalOptions());
+        $this->assertEquals($expected, $frameworkObject->getAdditionalOptions());
     }
 
     /**
@@ -87,7 +86,7 @@ public function dataProviderUpdateProductOptions()
             [
                 'expected' => [
                     'calculationAlgorithm' => 'TOTAL_BASE_CALCULATION',
-                    'optionTemplate' => '<%= data.label %><% if (data.finalPrice.value) '.
+                    'optionTemplate' => '<%= data.label %><% if (data.finalPrice.value) ' .
                         '{ %> +<%= data.finalPrice.formatted %> (Excl. tax: <%= data.basePrice.formatted %>)<% } %>',
                 ],
                 'displayBothPrices' => true,
@@ -97,7 +96,7 @@ public function dataProviderUpdateProductOptions()
             [
                 'expected' => [
                     'calculationAlgorithm' => 'TOTAL_BASE_CALCULATION',
-                    'optionTemplate' => '<%= data.label %><% if (data.basePrice.value) '.
+                    'optionTemplate' => '<%= data.label %><% if (data.basePrice.value) ' .
                         '{ %> +<%= data.basePrice.formatted %><% } %>',
                 ],
                 'displayBothPrices' => false,
diff --git a/app/code/Magento/Tax/Test/Unit/Pricing/AdjustmentTest.php b/app/code/Magento/Tax/Test/Unit/Pricing/AdjustmentTest.php
index a92aa6a0d05eb..4988d691686a7 100644
--- a/app/code/Magento/Tax/Test/Unit/Pricing/AdjustmentTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Pricing/AdjustmentTest.php
@@ -6,9 +6,7 @@
 
 namespace Magento\Tax\Test\Unit\Pricing;
 
-use \Magento\Tax\Pricing\Adjustment;
-
-use Magento\Framework\Pricing\SaleableInterface;
+use Magento\Tax\Pricing\Adjustment;
 
 class AdjustmentTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php b/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php
index 4cf3f4d339e18..cf69959acfa48 100644
--- a/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php
@@ -8,13 +8,13 @@
 use Magento\Catalog\Api\Data\ProductRender\PriceInfoExtensionInterface;
 use Magento\Catalog\Api\Data\ProductRender\PriceInfoExtensionInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface;
+use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductRenderInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductRender\FormattedPriceInfoBuilder;
 use Magento\Catalog\Pricing\Price\FinalPrice;
 use Magento\Framework\Pricing\Amount\AmountInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Catalog\Api\Data\ProductRender\PriceInfoInterfaceFactory;
 use Magento\Tax\Ui\DataProvider\Product\Listing\Collector\Tax;
 
 class TaxTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
index 5409aa1822bdf..de89bcc2b6216 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -41,8 +41,8 @@
     <?php $isTop = 1; ?>
     <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
         <?php if (isset($info['hidden']) && $info['hidden']) {
-            continue;
-        } ?>
+    continue;
+} ?>
         <?php $percent = $info['percent']; ?>
         <?php $amount = $info['amount']; ?>
         <?php $rates = $info['rates']; ?>
diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php
index 958274c555b13..4d1b45bc32617 100644
--- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php
+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\TaxImportExport\Controller\Adminhtml\Rate;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultFactory;
 
 class ExportCsv extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php
index e31f0fa0723f1..73c13ba911cfc 100644
--- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php
+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\TaxImportExport\Controller\Adminhtml\Rate;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultFactory;
 
 class ExportXml extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
diff --git a/app/code/Magento/TaxImportExport/Test/Unit/Controller/Adminhtml/Rate/ExportPostTest.php b/app/code/Magento/TaxImportExport/Test/Unit/Controller/Adminhtml/Rate/ExportPostTest.php
index 79309f6fbd520..c8a8e29e72e7f 100644
--- a/app/code/Magento/TaxImportExport/Test/Unit/Controller/Adminhtml/Rate/ExportPostTest.php
+++ b/app/code/Magento/TaxImportExport/Test/Unit/Controller/Adminhtml/Rate/ExportPostTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\TaxImportExport\Test\Unit\Controller\Adminhtml\Rate;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class ExportPostTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExportHeader.phtml b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExportHeader.phtml
index 223b3e9888eea..75f04eae82159 100644
--- a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExportHeader.phtml
+++ b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExportHeader.phtml
@@ -2,4 +2,4 @@
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
- */;
+ */
diff --git a/app/code/Magento/Theme/Api/Data/DesignConfigDataInterface.php b/app/code/Magento/Theme/Api/Data/DesignConfigDataInterface.php
index 6ce93a5ea3bee..d74e10591e69f 100644
--- a/app/code/Magento/Theme/Api/Data/DesignConfigDataInterface.php
+++ b/app/code/Magento/Theme/Api/Data/DesignConfigDataInterface.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Theme\Api\Data;
 
-use Magento\Theme\Api\Data\DesignConfigDataExtensionInterface;
-
 /**
  * Interface DesignConfigDataInterface
  * @api
diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php
index 5b0c2eaf04c45..f8df094ab903b 100644
--- a/app/code/Magento/Theme/Block/Html/Header/Logo.php
+++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php
@@ -94,7 +94,7 @@ public function getLogoWidth()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        return (int)$this->_data['logo_width'] ? : (int)$this->getLogoImgWidth();
+        return (int)$this->_data['logo_width'] ?: (int)$this->getLogoImgWidth();
     }
 
     /**
@@ -110,7 +110,7 @@ public function getLogoHeight()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        return (int)$this->_data['logo_height'] ? : (int)$this->getLogoImgHeight();
+        return (int)$this->_data['logo_height'] ?: (int)$this->getLogoImgHeight();
     }
 
     /**
diff --git a/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php b/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php
index 540fd962a4f2e..ac3306888968b 100644
--- a/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php
+++ b/app/code/Magento/Theme/Console/Command/ThemeUninstallCommand.php
@@ -7,23 +7,23 @@
 namespace Magento\Theme\Console\Command;
 
 use Magento\Framework\App\Cache;
-use Magento\Framework\App\MaintenanceMode;
 use Magento\Framework\App\Console\MaintenanceModeEnabler;
+use Magento\Framework\App\MaintenanceMode;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\State\CleanupFiles;
 use Magento\Framework\Composer\ComposerInformation;
 use Magento\Framework\Composer\DependencyChecker;
+use Magento\Framework\Setup\BackupRollbackFactory;
 use Magento\Theme\Model\Theme\Data\Collection;
+use Magento\Theme\Model\Theme\ThemeDependencyChecker;
 use Magento\Theme\Model\Theme\ThemePackageInfo;
 use Magento\Theme\Model\Theme\ThemeUninstaller;
-use Magento\Theme\Model\Theme\ThemeDependencyChecker;
+use Magento\Theme\Model\ThemeValidator;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
-use Magento\Framework\Setup\BackupRollbackFactory;
-use Magento\Theme\Model\ThemeValidator;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Command for uninstalling theme and backup-code feature
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/Edit.php b/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/Edit.php
index 2b1eaf1fdea1e..7bd8a8bfa0a7e 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/Edit.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/Edit.php
@@ -9,10 +9,10 @@
 use Magento\Backend\App\Action\Context;
 use Magento\Backend\Model\View\Result\Page as ResultPage;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ScopeResolverPool;
 use Magento\Framework\App\ScopeValidatorInterface as ScopeValidator;
 use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
 use Magento\Framework\View\Result\PageFactory as ResultPageFactory;
-use Magento\Framework\App\ScopeResolverPool;
 
 /**
  * Edit action controller
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/Save.php b/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/Save.php
index 657fbb25795d9..81427f12f6d22 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/Save.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/Design/Config/Save.php
@@ -6,11 +6,11 @@
 namespace Magento\Theme\Controller\Adminhtml\Design\Config;
 
 use Magento\Backend\App\Action;
-use Magento\Framework\App\Request\DataPersistorInterface;
-use Magento\Theme\Model\DesignConfigRepository;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Theme\Model\Data\Design\ConfigFactory;
+use Magento\Theme\Model\DesignConfigRepository;
 
 /**
  * Save action controller
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php
index 40bbc8f51d20f..ad074deaf5eb8 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCss.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Theme\Controller\Adminhtml\System\Design\Theme;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 /**
  * Class DownloadCss
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php
index 3dccbb405de65..618c327a6f1df 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/DownloadCustomCss.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Theme\Controller\Adminhtml\System\Design\Theme;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 /**
  * Class DownloadCustomCss
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php
index 0b7641cf9210c..300f74c0ce109 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Wysiwyg/Files/PreviewImage.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResponseInterface;
 
 class PreviewImage extends \Magento\Theme\Controller\Adminhtml\System\Design\Wysiwyg\Files
 {
diff --git a/app/code/Magento/Theme/Model/Data/Design/Config/Data.php b/app/code/Magento/Theme/Model/Data/Design/Config/Data.php
index cd57623e27cf2..b4789e0c447ca 100644
--- a/app/code/Magento/Theme/Model/Data/Design/Config/Data.php
+++ b/app/code/Magento/Theme/Model/Data/Design/Config/Data.php
@@ -6,8 +6,8 @@
 namespace Magento\Theme\Model\Data\Design\Config;
 
 use Magento\Framework\Api\AbstractExtensibleObject;
-use Magento\Theme\Api\Data\DesignConfigDataInterface;
 use Magento\Theme\Api\Data\DesignConfigDataExtensionInterface;
+use Magento\Theme\Api\Data\DesignConfigDataInterface;
 
 class Data extends AbstractExtensibleObject implements DesignConfigDataInterface
 {
diff --git a/app/code/Magento/Theme/Model/Data/Design/ConfigFactory.php b/app/code/Magento/Theme/Model/Data/Design/ConfigFactory.php
index 84aae4f7e51fe..4a059f365b1a8 100644
--- a/app/code/Magento/Theme/Model/Data/Design/ConfigFactory.php
+++ b/app/code/Magento/Theme/Model/Data/Design/ConfigFactory.php
@@ -7,15 +7,15 @@
 
 use Magento\Framework\App\ScopeValidatorInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Theme\Api\Data\DesignConfigDataInterface;
-use Magento\Theme\Api\Data\DesignConfigExtension;
-use Magento\Theme\Api\Data\DesignConfigInterfaceFactory;
-use Magento\Theme\Model\Design\Config\MetadataProviderInterface;
 use Magento\Theme\Api\Data\DesignConfigDataInterfaceFactory;
+use Magento\Theme\Api\Data\DesignConfigExtension;
 use Magento\Theme\Api\Data\DesignConfigExtensionFactory;
 use Magento\Theme\Api\Data\DesignConfigInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Theme\Api\Data\DesignConfigInterfaceFactory;
+use Magento\Theme\Model\Design\Config\MetadataProviderInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Theme/Model/Design.php b/app/code/Magento/Theme/Model/Design.php
index ddd4894f4e875..c7e9b96b6ded0 100644
--- a/app/code/Magento/Theme/Model/Design.php
+++ b/app/code/Magento/Theme/Model/Design.php
@@ -7,9 +7,9 @@
 
 use Magento\Framework\App\DesignInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
-use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 
 /**
diff --git a/app/code/Magento/Theme/Model/Design/Backend/Favicon.php b/app/code/Magento/Theme/Model/Design/Backend/Favicon.php
index 2d53b11eea6cb..70b1420878ced 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/Favicon.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/Favicon.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Theme\Model\Design\Backend;
 
-use Magento\Framework\Filesystem;
-
 class Favicon extends Image
 {
     /**
diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index 1e32cb36b4aea..cd51fef2a67da 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Theme\Model\Design\Backend;
 
-use Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface;
 use Magento\Config\Model\Config\Backend\File as BackendFile;
+use Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface;
 use Magento\Framework\App\Cache\TypeListInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
@@ -89,9 +89,9 @@ public function beforeSave()
         $values = $this->getValue();
         $value = reset($values) ?: [];
         if (!isset($value['file'])) {
-             throw new LocalizedException(
-                 __('%1 does not contain field \'file\'', $this->getData('field_config/field'))
-             );
+            throw new LocalizedException(
+                __('%1 does not contain field \'file\'', $this->getData('field_config/field'))
+            );
         }
         if (isset($value['exists'])) {
             $this->setValue($value['file']);
@@ -189,7 +189,7 @@ protected function getStoreMediaUrl($fileName)
             $urlType = ['_type' => empty($baseUrl['type']) ? 'link' : (string)$baseUrl['type']];
             $baseUrl = $baseUrl['value'] . '/';
         }
-        return $this->urlBuilder->getBaseUrl($urlType) . $baseUrl  . $fileName;
+        return $this->urlBuilder->getBaseUrl($urlType) . $baseUrl . $fileName;
     }
 
     /**
diff --git a/app/code/Magento/Theme/Model/Design/Config/DataProvider.php b/app/code/Magento/Theme/Model/Design/Config/DataProvider.php
index 4cc6e81c3b84f..d2e54b64b37ca 100644
--- a/app/code/Magento/Theme/Model/Design/Config/DataProvider.php
+++ b/app/code/Magento/Theme/Model/Design/Config/DataProvider.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Theme\Model\Design\Config;
 
+use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
 use Magento\Framework\App\Config\ScopeCodeResolver;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\RequestInterface;
 use Magento\Theme\Model\ResourceModel\Design\Config\Collection;
 use Magento\Theme\Model\ResourceModel\Design\Config\CollectionFactory;
 use Magento\Ui\DataProvider\AbstractDataProvider;
-use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
-use Magento\Framework\App\RequestInterface;
 
 class DataProvider extends AbstractDataProvider
 {
diff --git a/app/code/Magento/Theme/Model/Design/Config/DataProvider/MetadataLoader.php b/app/code/Magento/Theme/Model/Design/Config/DataProvider/MetadataLoader.php
index 39e922eea9a36..a26178a4cbb4b 100644
--- a/app/code/Magento/Theme/Model/Design/Config/DataProvider/MetadataLoader.php
+++ b/app/code/Magento/Theme/Model/Design/Config/DataProvider/MetadataLoader.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ScopeFallbackResolverInterface;
-use Magento\Theme\Api\DesignConfigRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Theme\Api\DesignConfigRepositoryInterface;
 
 class MetadataLoader
 {
diff --git a/app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php b/app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php
index 1e574d525b457..78fbf84117aae 100644
--- a/app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php
+++ b/app/code/Magento/Theme/Model/Design/Config/FileUploader/FileProcessor.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Theme\Model\Design\Config\FileUploader;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\UrlInterface;
 use Magento\MediaStorage\Model\File\UploaderFactory;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Theme\Model\Design\Backend\File;
 use Magento\Theme\Model\Design\BackendModelFactory;
 use Magento\Theme\Model\Design\Config\MetadataProvider;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
-use Magento\Framework\UrlInterface;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Theme/Model/Design/Config/Plugin.php b/app/code/Magento/Theme/Model/Design/Config/Plugin.php
index de6b2027ccb88..ed48c114df1bd 100644
--- a/app/code/Magento/Theme/Model/Design/Config/Plugin.php
+++ b/app/code/Magento/Theme/Model/Design/Config/Plugin.php
@@ -6,10 +6,10 @@
 namespace Magento\Theme\Model\Design\Config;
 
 use Magento\Framework\Event\ManagerInterface as EventManager;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface as StoreManager;
-use Magento\Theme\Model\DesignConfigRepository;
 use Magento\Theme\Api\Data\DesignConfigInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Theme\Model\DesignConfigRepository;
 
 class Plugin
 {
diff --git a/app/code/Magento/Theme/Model/Design/Config/Storage.php b/app/code/Magento/Theme/Model/Design/Config/Storage.php
index c97114f963a09..b73662fdf326d 100644
--- a/app/code/Magento/Theme/Model/Design/Config/Storage.php
+++ b/app/code/Magento/Theme/Model/Design/Config/Storage.php
@@ -7,9 +7,9 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Config\Value;
-use Magento\Theme\Api\Data\DesignConfigInterface;
-use Magento\Framework\DB\TransactionFactory;
 use Magento\Framework\App\Config\ValueInterface;
+use Magento\Framework\DB\TransactionFactory;
+use Magento\Theme\Api\Data\DesignConfigInterface;
 use Magento\Theme\Model\Data\Design\ConfigFactory;
 use Magento\Theme\Model\Design\BackendModelFactory;
 
diff --git a/app/code/Magento/Theme/Model/Design/Config/Validator.php b/app/code/Magento/Theme/Model/Design/Config/Validator.php
index d0fed000d1390..b93401ce0e46f 100644
--- a/app/code/Magento/Theme/Model/Design/Config/Validator.php
+++ b/app/code/Magento/Theme/Model/Design/Config/Validator.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Theme\Model\Design\Config;
 
-use \Magento\Framework\Exception\LocalizedException;
-use \Magento\Theme\Api\Data\DesignConfigInterface;
-use \Magento\Theme\Api\Data\DesignConfigDataInterface;
-use \Magento\Framework\Mail\TemplateInterfaceFactory as TemplateFactory;
-use \Magento\Framework\Filter\Template;
-use \Magento\Framework\Filter\Template\Tokenizer\Parameter as ParameterTokenizer;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filter\Template;
+use Magento\Framework\Filter\Template\Tokenizer\Parameter as ParameterTokenizer;
+use Magento\Framework\Mail\TemplateInterfaceFactory as TemplateFactory;
+use Magento\Theme\Api\Data\DesignConfigDataInterface;
+use Magento\Theme\Api\Data\DesignConfigInterface;
 
 /**
  * Design configuration validator
@@ -79,7 +79,7 @@ public function validate(DesignConfigInterface $designConfig)
                                 ["templateName" => $name]
                             )
                         );
-                    };
+                    }
                 }
             }
         }
diff --git a/app/code/Magento/Theme/Model/DesignConfigRepository.php b/app/code/Magento/Theme/Model/DesignConfigRepository.php
index 9664a4eb6fa79..351b6db5fd3d7 100644
--- a/app/code/Magento/Theme/Model/DesignConfigRepository.php
+++ b/app/code/Magento/Theme/Model/DesignConfigRepository.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Theme\Model;
 
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Theme\Api\Data\DesignConfigInterface;
 use Magento\Theme\Api\DesignConfigRepositoryInterface;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Theme\Model\Data\Design\Config as DesignConfig;
 use Magento\Theme\Model\Design\Config\Storage as ConfigStorage;
 
diff --git a/app/code/Magento/Theme/Model/Indexer/Design/Config.php b/app/code/Magento/Theme/Model/Indexer/Design/Config.php
index 43b58257b343c..f5e996665d7fc 100644
--- a/app/code/Magento/Theme/Model/Indexer/Design/Config.php
+++ b/app/code/Magento/Theme/Model/Indexer/Design/Config.php
@@ -8,11 +8,11 @@
 use Magento\Framework\Indexer\ActionInterface;
 use Magento\Framework\Indexer\FieldsetPool;
 use Magento\Framework\Indexer\HandlerPool;
-use Magento\Theme\Model\ResourceModel\Design\Config\Scope\CollectionFactory;
-use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Framework\Indexer\IndexStructureInterface;
-use Magento\Framework\Indexer\StructureFactory;
+use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Framework\Indexer\SaveHandlerFactory;
+use Magento\Framework\Indexer\StructureFactory;
+use Magento\Theme\Model\ResourceModel\Design\Config\Scope\CollectionFactory;
 
 class Config implements ActionInterface
 {
diff --git a/app/code/Magento/Theme/Model/Theme/Plugin/Registration.php b/app/code/Magento/Theme/Model/Theme/Plugin/Registration.php
index 05030c56c2ee0..29ac0018f04ba 100644
--- a/app/code/Magento/Theme/Model/Theme/Plugin/Registration.php
+++ b/app/code/Magento/Theme/Model/Theme/Plugin/Registration.php
@@ -7,13 +7,13 @@
 
 use Magento\Backend\App\AbstractAction;
 use Magento\Framework\App\RequestInterface;
-use Magento\Theme\Model\Theme\Registration as ThemeRegistration;
-use Magento\Framework\Exception\LocalizedException;
-use Psr\Log\LoggerInterface;
 use Magento\Framework\App\State as AppState;
-use Magento\Theme\Model\Theme\Collection as ThemeCollection;
-use Magento\Theme\Model\ResourceModel\Theme\Collection as ThemeLoader;
 use Magento\Framework\Config\Theme;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Theme\Model\ResourceModel\Theme\Collection as ThemeLoader;
+use Magento\Theme\Model\Theme\Collection as ThemeCollection;
+use Magento\Theme\Model\Theme\Registration as ThemeRegistration;
+use Psr\Log\LoggerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Theme/Model/Theme/Registration.php b/app/code/Magento/Theme/Model/Theme/Registration.php
index 5cd44680effce..ab93ef23491bf 100644
--- a/app/code/Magento/Theme/Model/Theme/Registration.php
+++ b/app/code/Magento/Theme/Model/Theme/Registration.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Theme\Model\Theme;
 
-use Magento\Framework\Filesystem;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\View\Design\ThemeInterface;
 
diff --git a/app/code/Magento/Theme/Model/Theme/ThemeProvider.php b/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
index cd3f7f8a2dc0e..1f2b982be6355 100644
--- a/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
+++ b/app/code/Magento/Theme/Model/Theme/ThemeProvider.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Theme\Model\Theme;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\View\Design\Theme\ListInterface;
-use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Provide data for theme grid and for theme edit page
diff --git a/app/code/Magento/Theme/Model/Uploader/Service.php b/app/code/Magento/Theme/Model/Uploader/Service.php
index 4fc14522da169..c18190ac7ca3c 100644
--- a/app/code/Magento/Theme/Model/Uploader/Service.php
+++ b/app/code/Magento/Theme/Model/Uploader/Service.php
@@ -7,8 +7,6 @@
  */
 namespace Magento\Theme\Model\Uploader;
 
-use Magento\Framework\Convert\DataSize;
-use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\DirectoryList;
 
 class Service
diff --git a/app/code/Magento/Theme/Model/View/Design.php b/app/code/Magento/Theme/Model/View/Design.php
index 98f7665400dd8..c992c180d1fde 100644
--- a/app/code/Magento/Theme/Model/View/Design.php
+++ b/app/code/Magento/Theme/Model/View/Design.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Theme\Model\View;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
 
 /**
diff --git a/app/code/Magento/Theme/Observer/ApplyThemeCustomizationObserver.php b/app/code/Magento/Theme/Observer/ApplyThemeCustomizationObserver.php
index e2566adff1b78..549cb1c5ac25a 100644
--- a/app/code/Magento/Theme/Observer/ApplyThemeCustomizationObserver.php
+++ b/app/code/Magento/Theme/Observer/ApplyThemeCustomizationObserver.php
@@ -6,10 +6,9 @@
 
 namespace Magento\Theme\Observer;
 
-use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Theme\Model\Theme;
-use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * Theme Observer model
diff --git a/app/code/Magento/Theme/Setup/UpgradeData.php b/app/code/Magento/Theme/Setup/UpgradeData.php
index 366e5387b46e5..58111079bab2d 100644
--- a/app/code/Magento/Theme/Setup/UpgradeData.php
+++ b/app/code/Magento/Theme/Setup/UpgradeData.php
@@ -10,9 +10,9 @@
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\Select\QueryModifierFactory;
 use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Theme\Model\Data\Design\Config;
 
 /**
diff --git a/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php b/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php
index 2ae889e69bb12..5bb1102367ec8 100644
--- a/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Console/Command/ThemeUninstallCommandTest.php
@@ -7,12 +7,12 @@
 namespace Magento\Theme\Test\Unit\Console\Command;
 
 use Magento\Framework\App\Console\MaintenanceModeEnabler;
+use Magento\Framework\Setup\BackupRollbackFactory;
 use Magento\Theme\Console\Command\ThemeUninstallCommand;
+use Magento\Theme\Model\Theme\ThemeDependencyChecker;
 use Magento\Theme\Model\Theme\themePackageInfo;
 use Magento\Theme\Model\Theme\ThemeUninstaller;
-use Magento\Theme\Model\Theme\ThemeDependencyChecker;
 use Symfony\Component\Console\Tester\CommandTester;
-use Magento\Framework\Setup\BackupRollbackFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/Design/Config/FileUploader/SaveTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/Design/Config/FileUploader/SaveTest.php
index b0cc5033e0e51..3d414bc01b582 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/Design/Config/FileUploader/SaveTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/Design/Config/FileUploader/SaveTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Theme\Test\Unit\Controller\Adminhtml\Design\Config\FileUploader;
 
-use Magento\Theme\Controller\Adminhtml\Design\Config\FileUploader\Save;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Theme\Controller\Adminhtml\Design\Config\FileUploader\Save;
 
 class SaveTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/IndexTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/IndexTest.php
index ccccfd1f24e73..820ddd02f5a61 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/IndexTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Wysiwyg/Files/IndexTest.php
@@ -28,10 +28,10 @@ protected function setUp()
 
     public function testExecute()
     {
-        $this->view ->expects($this->once())
+        $this->view->expects($this->once())
             ->method('loadLayout')
             ->with('overlay_popup');
-        $this->view ->expects($this->once())
+        $this->view->expects($this->once())
             ->method('renderLayout');
 
         $this->controller->execute();
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php
index 60457fc1436c0..a47568c52c7aa 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\Result\Redirect;
-use Magento\Framework\Json\Helper\Data;
 use Magento\Framework\Message\Collection;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Message\MessageInterface;
@@ -93,7 +92,7 @@ public function testAfterRenderResult()
             ],
         ];
         $messages = array_merge($existingMessages, $messages);
-        
+
         /** @var Redirect|\PHPUnit_Framework_MockObject_MockObject $resultMock */
         $resultMock = $this->getMockBuilder(Redirect::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ExceptionsTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ExceptionsTest.php
index e0bb302c9f56e..b03bc3426b723 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ExceptionsTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ExceptionsTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Design\Backend;
 
+use Magento\Framework\App\Area;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\App\Area;
 
 class ExceptionsTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
index b49b3cb797651..4726315ff4170 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Design\Backend;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\UrlInterface;
 use Magento\Theme\Model\Design\Backend\File;
-use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/BackendModelFactoryTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/BackendModelFactoryTest.php
index 19bbbd0c8b65f..eb84cbce33e4f 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/BackendModelFactoryTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/BackendModelFactoryTest.php
@@ -49,7 +49,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['setValue'])
             ->getMock();
-        
+
         $this->model = new \Magento\Theme\Model\Design\BackendModelFactory(
             $this->objectManagerMock,
             $this->metadataProviderMock,
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Config/DataProvider/DataLoaderTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/DataProvider/DataLoaderTest.php
index 4e26942cdfb65..4225647ddd6a7 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Config/DataProvider/DataLoaderTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/DataProvider/DataLoaderTest.php
@@ -6,7 +6,6 @@
 namespace Magento\Theme\Test\Unit\Model\Design\Config\DataProvider;
 
 use Magento\Framework\App\Request\Http;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Theme\Model\Design\Config\DataProvider\DataLoader;
 
 class DataLoaderTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Config/DataProviderTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/DataProviderTest.php
index f9ad058e00e73..f3668ce1e572c 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Config/DataProviderTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/DataProviderTest.php
@@ -9,9 +9,7 @@
 use Magento\Framework\App\Config\ScopeCodeResolver;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Theme\Model\Design\Config\DataLoader;
 use Magento\Theme\Model\Design\Config\DataProvider;
-use Magento\Theme\Model\Design\Config\MetadataLoader;
 use Magento\Theme\Model\ResourceModel\Design\Config\Collection;
 
 /**
diff --git a/app/code/Magento/Theme/Test/Unit/Model/DesignConfigRepositoryTest.php b/app/code/Magento/Theme/Test/Unit/Model/DesignConfigRepositoryTest.php
index b8c72867e8cc2..b2b64dc8fb2ae 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/DesignConfigRepositoryTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/DesignConfigRepositoryTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Theme\Test\Unit\Model;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Theme\Model\Data\Design\Config;
 use Magento\Theme\Model\DesignConfigRepository;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class DesignConfigRepositoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php b/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php
index fcec3ca521807..4296ebe50cb42 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Favicon;
 
-use \Magento\Theme\Model\Favicon\Favicon;
 use Magento\Config\Model\Config\Backend\Image\Favicon as ImageFavicon;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Theme\Model\Favicon\Favicon;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
index ff66a21dab836..719a894360ff8 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
@@ -76,8 +76,7 @@ protected function setUp()
             $handlerPool,
             $collectionFactory,
             [
-                'fieldsets' => ['test_fieldset' =>
-                    [
+                'fieldsets' => ['test_fieldset' => [
                         'fields' => [
                             'first_field' => [
                                 'name' => 'firstField',
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/Customization/ConfigTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/Customization/ConfigTest.php
index ab49af97f3c96..6cbcf76474fe1 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Theme/Customization/ConfigTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/Customization/ConfigTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Theme\Customization;
 
-use \Magento\Theme\Model\Theme\Customization\Config;
+use Magento\Theme\Model\Theme\Customization\Config;
 
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/Customization/File/CustomCssTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/Customization/File/CustomCssTest.php
index eb30dfd69dcd4..8187f7485c76f 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Theme/Customization/File/CustomCssTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/Customization/File/CustomCssTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Theme\Customization\File;
 
-use \Magento\Theme\Model\Theme\Customization\File\CustomCss;
+use Magento\Theme\Model\Theme\Customization\File\CustomCss;
 
 class CustomCssTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/Image/PathTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/Image/PathTest.php
index 90616946de449..ad9f823339d87 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Theme/Image/PathTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/Image/PathTest.php
@@ -11,10 +11,10 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Theme\Image;
 
-use \Magento\Theme\Model\Theme\Image\Path;
-
 use Magento\Framework\App\Filesystem\DirectoryList;
+
 use Magento\Framework\View\Design\Theme\Image\PathInterface;
+use Magento\Theme\Model\Theme\Image\Path;
 
 class PathTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/Plugin/RegistrationTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/Plugin/RegistrationTest.php
index 190a6edf55900..1701881f71233 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Theme/Plugin/RegistrationTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/Plugin/RegistrationTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Theme\Plugin;
 
-use Magento\Theme\Model\Theme\Plugin\Registration;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
+use Magento\Theme\Model\Theme\Plugin\Registration;
 
 class RegistrationTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/SingleFileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/SingleFileTest.php
index 355dda758408e..1f3349f3bdefa 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Theme/SingleFileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/SingleFileTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Theme;
 
-use \Magento\Theme\Model\Theme\SingleFile;
+use Magento\Theme\Model\Theme\SingleFile;
 
 class SingleFileTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php
index 5cb265d3d628b..a3fb4fde65f2d 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/Source/ThemeTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Theme\Source;
 
-use \Magento\Theme\Model\Theme\Source\Theme;
+use Magento\Theme\Model\Theme\Source\Theme;
 
 class ThemeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Url/Plugin/SignatureTest.php b/app/code/Magento/Theme/Test/Unit/Model/Url/Plugin/SignatureTest.php
index 3d90724b495c3..c61b84afe5c10 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Url/Plugin/SignatureTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Url/Plugin/SignatureTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Url\Plugin;
 
-use \Magento\Theme\Model\Url\Plugin\Signature;
+use Magento\Theme\Model\Url\Plugin\Signature;
 
 class SignatureTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Theme/Test/Unit/Ui/Component/Design/Config/SearchRobots/ResetButtonTest.php b/app/code/Magento/Theme/Test/Unit/Ui/Component/Design/Config/SearchRobots/ResetButtonTest.php
index a72b184a6fa36..0002bc3e8d82e 100644
--- a/app/code/Magento/Theme/Test/Unit/Ui/Component/Design/Config/SearchRobots/ResetButtonTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Ui/Component/Design/Config/SearchRobots/ResetButtonTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Theme\Test\Unit\Ui\Component\Design\Config\SearchRobots;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponent\Processor;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Theme\Ui\Component\Design\Config\SearchRobots\ResetButton;
-use Magento\Framework\View\Element\UiComponent\Processor;
 use Magento\Ui\Component\Form\Field;
 
 class ResetButtonTest extends \PHPUnit\Framework\TestCase
@@ -77,7 +77,7 @@ public function setUp()
             $this->scopeConfigMock
         );
     }
-    
+
     public function testPrepare()
     {
         $robotsContent = "Content";
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
index 69ff4c8909f8c..6141b3db2f5ef 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
@@ -12,7 +12,7 @@
 $cssClass = $block->getCssClass() ? ' ' . $block->getCssClass() : '';
 $title = '';
 if (trim($block->getPageHeading())) {
-    $title = '<span class="base" data-ui-id="page-title-wrapper" ' .  $block->getAddBaseAttribute() . '>'
+    $title = '<span class="base" data-ui-id="page-title-wrapper" ' . $block->getAddBaseAttribute() . '>'
         . $block->escapeHtml($block->getPageHeading()) . '</span>';
 }
 ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/text.phtml b/app/code/Magento/Theme/view/frontend/templates/text.phtml
index 4c4b38132c880..7d00235c0362c 100644
--- a/app/code/Magento/Theme/view/frontend/templates/text.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/text.phtml
@@ -10,6 +10,6 @@ if (!empty($attr)) {
     foreach ($block->getAttributes() as $attribute => $value) {
         $attributes .= ' ' . $attribute . '="' . $value . '"';
     }
-};
+}
 echo
     '<' . $block->getTag() . $attributes . '>' . $block->getText() . '</' . $block->getTag() . '>';
diff --git a/app/code/Magento/Translation/Model/Js/Config.php b/app/code/Magento/Translation/Model/Js/Config.php
index f0aad7a83ece7..a19b22a8d6593 100644
--- a/app/code/Magento/Translation/Model/Js/Config.php
+++ b/app/code/Magento/Translation/Model/Js/Config.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Translation\Model\Js;
 
-use Magento\Framework\Translate\Js\Config as FrameworkJsConfig;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Translate\Js\Config as FrameworkJsConfig;
 
 /**
  * Js Translation config
diff --git a/app/code/Magento/Translation/Model/ResourceModel/Translate.php b/app/code/Magento/Translation/Model/ResourceModel/Translate.php
index cf379254d4320..f1469e828b33b 100644
--- a/app/code/Magento/Translation/Model/ResourceModel/Translate.php
+++ b/app/code/Magento/Translation/Model/ResourceModel/Translate.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Translation\Model\ResourceModel;
 
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Config;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
 use Magento\Translation\App\Config\Type\Translation;
 
 class Translate extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb implements
diff --git a/app/code/Magento/Translation/Model/Source/InitialTranslationSource.php b/app/code/Magento/Translation/Model/Source/InitialTranslationSource.php
index 0540d5d64c308..a134073e08469 100644
--- a/app/code/Magento/Translation/Model/Source/InitialTranslationSource.php
+++ b/app/code/Magento/Translation/Model/Source/InitialTranslationSource.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Translation\Model\Source;
 
+use Magento\Framework\App\Config\ConfigSourceInterface;
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\DataObject;
 use Magento\Store\Model\StoreManager;
-use Magento\Translation\Model\ResourceModel\TranslateFactory;
 use Magento\Translation\Model\ResourceModel\Translate;
-use Magento\Framework\App\Config\ConfigSourceInterface;
-use Magento\Framework\DataObject;
+use Magento\Translation\Model\ResourceModel\TranslateFactory;
 
 /**
  * Class for reading translations from DB
diff --git a/app/code/Magento/Translation/Test/Unit/App/Config/Type/TranslationTest.php b/app/code/Magento/Translation/Test/Unit/App/Config/Type/TranslationTest.php
index 6b262b9e9f93c..8915cdd48415c 100644
--- a/app/code/Magento/Translation/Test/Unit/App/Config/Type/TranslationTest.php
+++ b/app/code/Magento/Translation/Test/Unit/App/Config/Type/TranslationTest.php
@@ -5,12 +5,8 @@
  */
 namespace Magento\Translation\Test\Unit\App\Config\Type;
 
-use Magento\Authorizenet\Helper\Backend\Data;
-use Magento\Framework\App\Cache\Type\Translate;
 use Magento\Framework\App\Config\ConfigSourceInterface;
-use Magento\Framework\Cache\FrontendInterface;
 use Magento\Translation\App\Config\Type\Translation;
-use Magento\Framework\DataObject;
 
 /**
  * @covers \Magento\Translation\App\Config\Type\Translation
diff --git a/app/code/Magento/Translation/Test/Unit/Console/Command/UninstallLanguageCommandTest.php b/app/code/Magento/Translation/Test/Unit/Console/Command/UninstallLanguageCommandTest.php
index ff39e0d4fa606..5f08631eb5cb3 100644
--- a/app/code/Magento/Translation/Test/Unit/Console/Command/UninstallLanguageCommandTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Console/Command/UninstallLanguageCommandTest.php
@@ -6,13 +6,13 @@
 
 namespace Magento\Translation\Test\Unit\Console\Command;
 
+use Magento\Framework\App\Cache;
+use Magento\Framework\Composer\ComposerInformation;
 use Magento\Framework\Composer\DependencyChecker;
 use Magento\Framework\Composer\Remove;
-use Magento\Framework\Composer\ComposerInformation;
-use Magento\Framework\App\Cache;
-use Symfony\Component\Console\Tester\CommandTester;
-use Magento\Translation\Console\Command\UninstallLanguageCommand;
 use Magento\Framework\Setup\BackupRollbackFactory;
+use Magento\Translation\Console\Command\UninstallLanguageCommand;
+use Symfony\Component\Console\Tester\CommandTester;
 
 class UninstallLanguageCommandTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Inline/ConfigTest.php b/app/code/Magento/Translation/Test/Unit/Model/Inline/ConfigTest.php
index efe68e45156e2..84a3ae2968b03 100644
--- a/app/code/Magento/Translation/Test/Unit/Model/Inline/ConfigTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Model/Inline/ConfigTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Translation\Test\Unit\Model\Inline;
 
-use \Magento\Translation\Model\Inline\Config;
+use Magento\Translation\Model\Inline\Config;
 
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Inline/ParserTest.php b/app/code/Magento/Translation/Test/Unit/Model/Inline/ParserTest.php
index e11618831552f..80b3bec4243f8 100644
--- a/app/code/Magento/Translation/Test/Unit/Model/Inline/ParserTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Model/Inline/ParserTest.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Translation\Test\Unit\Model\Inline;
 
-use Magento\Translation\Model\Inline\Parser;
+use Magento\Framework\App\Cache\TypeListInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Translate\InlineInterface;
-use Magento\Framework\App\Cache\TypeListInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
-use Magento\Translation\Model\ResourceModel\StringUtilsFactory;
-use Magento\Translation\Model\ResourceModel\StringUtils;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Translation\Model\Inline\CacheManager;
+use Magento\Translation\Model\Inline\Parser;
+use Magento\Translation\Model\ResourceModel\StringUtils;
+use Magento\Translation\Model\ResourceModel\StringUtilsFactory;
 
 /**
  * Class ParserTest to test \Magento\Translation\Model\Inline\Parser
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php b/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
index 021709bdda1f6..d95448916d676 100644
--- a/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
@@ -8,11 +8,10 @@
 
 use Magento\Framework\App\State;
 use Magento\Framework\App\Utility\Files;
-use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\File\ReadInterface;
-use Magento\Translation\Model\Js\DataProvider;
-use Magento\Translation\Model\Js\Config;
 use Magento\Framework\Phrase\Renderer\Translate;
+use Magento\Translation\Model\Js\Config;
+use Magento\Translation\Model\Js\DataProvider;
 
 /**
  * Class DataProviderTest
@@ -76,8 +75,7 @@ protected function setUp()
                 'translate' => $this->translateMock,
                 'dirSearch' => $dirSearch,
                 'filesUtility' => $this->filesUtilityMock,
-                'componentRegistrar' =>
-                    $this->createMock(\Magento\Framework\Component\ComponentRegistrar::class)
+                'componentRegistrar' => $this->createMock(\Magento\Framework\Component\ComponentRegistrar::class)
             ]
         );
     }
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Js/PreProcessorTest.php b/app/code/Magento/Translation/Test/Unit/Model/Js/PreProcessorTest.php
index 713086f298806..71704b12958e8 100644
--- a/app/code/Magento/Translation/Test/Unit/Model/Js/PreProcessorTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Model/Js/PreProcessorTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Translation\Test\Unit\Model\Js;
 
-use Magento\Translation\Model\Js\PreProcessor;
-use Magento\Translation\Model\Js\Config;
 use Magento\Framework\App\AreaList;
 use Magento\Framework\TranslateInterface;
+use Magento\Translation\Model\Js\Config;
+use Magento\Translation\Model\Js\PreProcessor;
 
 class PreProcessorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Ui/Api/Data/BookmarkExtensionInterface.php b/app/code/Magento/Ui/Api/Data/BookmarkExtensionInterface.php
index 37f2f27f15d23..0fdca93bbafb1 100644
--- a/app/code/Magento/Ui/Api/Data/BookmarkExtensionInterface.php
+++ b/app/code/Magento/Ui/Api/Data/BookmarkExtensionInterface.php
@@ -13,5 +13,4 @@
  */
 interface BookmarkExtensionInterface extends \Magento\Framework\Api\ExtensionAttributesInterface
 {
-
 }
diff --git a/app/code/Magento/Ui/Component/AbstractComponent.php b/app/code/Magento/Ui/Component/AbstractComponent.php
index 772bdceeb4957..0c2c52d4caa68 100644
--- a/app/code/Magento/Ui/Component/AbstractComponent.php
+++ b/app/code/Magento/Ui/Component/AbstractComponent.php
@@ -5,14 +5,12 @@
  */
 namespace Magento\Ui\Component;
 
+use Magento\Framework\Data\ValueSourceInterface;
 use Magento\Framework\DataObject;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\DataSourceInterface;
 use Magento\Framework\View\Element\UiComponent\ObserverInterface;
-use Magento\Framework\Data\ValueSourceInterface;
+use Magento\Framework\View\Element\UiComponentInterface;
 
 /**
  * Abstract class AbstractComponent
diff --git a/app/code/Magento/Ui/Component/Container.php b/app/code/Magento/Ui/Component/Container.php
index d6f4b9a439b87..b73e574b8aa82 100644
--- a/app/code/Magento/Ui/Component/Container.php
+++ b/app/code/Magento/Ui/Component/Container.php
@@ -21,6 +21,6 @@ class Container extends AbstractComponent
     public function getComponentName()
     {
         $type = $this->getData('type');
-        return static::NAME . ($type ? ('.' . $type): '');
+        return static::NAME . ($type ? ('.' . $type) : '');
     }
 }
diff --git a/app/code/Magento/Ui/Component/Control/Action.php b/app/code/Magento/Ui/Component/Control/Action.php
index 3908f554fcc1a..9a6667225f4a7 100644
--- a/app/code/Magento/Ui/Component/Control/Action.php
+++ b/app/code/Magento/Ui/Component/Control/Action.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Ui\Component\Control;
 
-use Magento\Ui\Component\AbstractComponent;
 use Magento\Framework\View\Element\UiComponent\Control\ControlInterface;
+use Magento\Ui\Component\AbstractComponent;
 
 /**
  * Class Action
diff --git a/app/code/Magento/Ui/Component/Control/ActionPool.php b/app/code/Magento/Ui/Component/Control/ActionPool.php
index 052f99b60add0..2a043ab8a70e9 100644
--- a/app/code/Magento/Ui/Component/Control/ActionPool.php
+++ b/app/code/Magento/Ui/Component/Control/ActionPool.php
@@ -8,8 +8,8 @@
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\BlockInterface;
 use Magento\Framework\View\Element\UiComponent\Context;
-use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\View\Element\UiComponent\Control\ActionPoolInterface;
+use Magento\Framework\View\Element\UiComponentInterface;
 
 /**
  * Class ActionPool
diff --git a/app/code/Magento/Ui/Component/Control/Link.php b/app/code/Magento/Ui/Component/Control/Link.php
index 0301de1985635..d8d6f13ca1a38 100644
--- a/app/code/Magento/Ui/Component/Control/Link.php
+++ b/app/code/Magento/Ui/Component/Control/Link.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Ui\Component\Control;
 
-use Magento\Ui\Component\AbstractComponent;
 use Magento\Framework\View\Element\UiComponent\Control\ControlInterface;
+use Magento\Ui\Component\AbstractComponent;
 
 /**
  * Class Link
diff --git a/app/code/Magento/Ui/Component/DataSource.php b/app/code/Magento/Ui/Component/DataSource.php
index 04473aac45ead..7e1cf45bc37ec 100644
--- a/app/code/Magento/Ui/Component/DataSource.php
+++ b/app/code/Magento/Ui/Component/DataSource.php
@@ -6,8 +6,8 @@
 namespace Magento\Ui\Component;
 
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Framework\View\Element\UiComponent\DataSourceInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
+use Magento\Framework\View\Element\UiComponent\DataSourceInterface;
 
 /**
  * @api
diff --git a/app/code/Magento/Ui/Component/ExportButton.php b/app/code/Magento/Ui/Component/ExportButton.php
index 284362a119bad..1ab1009b3f4a2 100644
--- a/app/code/Magento/Ui/Component/ExportButton.php
+++ b/app/code/Magento/Ui/Component/ExportButton.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Ui\Component;
 
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
 /**
  * Class ExportButton
diff --git a/app/code/Magento/Ui/Component/Filters/FilterModifier.php b/app/code/Magento/Ui/Component/Filters/FilterModifier.php
index 2db85a4b0d69a..37d58d9d72999 100644
--- a/app/code/Magento/Ui/Component/Filters/FilterModifier.php
+++ b/app/code/Magento/Ui/Component/Filters/FilterModifier.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Ui\Component\Filters;
 
-use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
-use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
 
 /**
  * Apply modifiers to filter
diff --git a/app/code/Magento/Ui/Component/Filters/Type/AbstractFilter.php b/app/code/Magento/Ui/Component/Filters/Type/AbstractFilter.php
index f5d3af44f71f4..6a573d3d5977d 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/AbstractFilter.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/AbstractFilter.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Ui\Component\Filters\Type;
 
-use Magento\Ui\Component\AbstractComponent;
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\AbstractComponent;
 use Magento\Ui\Component\Filters\FilterModifier;
 
 /**
diff --git a/app/code/Magento/Ui/Component/Filters/Type/Select.php b/app/code/Magento/Ui/Component/Filters/Type/Select.php
index 06a821019b680..c6fe31898f8e2 100644
--- a/app/code/Magento/Ui/Component/Filters/Type/Select.php
+++ b/app/code/Magento/Ui/Component/Filters/Type/Select.php
@@ -6,10 +6,10 @@
 namespace Magento\Ui\Component\Filters\Type;
 
 use Magento\Framework\Data\OptionSourceInterface;
-use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Ui\Component\Form\Element\Select as ElementSelect;
+use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Filters\FilterModifier;
+use Magento\Ui\Component\Form\Element\Select as ElementSelect;
 
 /**
  * @api
diff --git a/app/code/Magento/Ui/Component/Form/Collection.php b/app/code/Magento/Ui/Component/Form/Collection.php
index b15cd1870639c..c32c28c95d020 100644
--- a/app/code/Magento/Ui/Component/Form/Collection.php
+++ b/app/code/Magento/Ui/Component/Form/Collection.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Ui\Component\Form;
 
-use Magento\Ui\Component\AbstractComponent;
 use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Ui\Component\AbstractComponent;
 
 /**
  * @api
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
index 470767af6d319..9df7d6bd04e1e 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentInterface;
 
 /**
  * Class Date
diff --git a/app/code/Magento/Ui/Component/Form/Element/Multiline.php b/app/code/Magento/Ui/Component/Form/Element/Multiline.php
index fc8e96638fc50..2e07f1b634f53 100644
--- a/app/code/Magento/Ui/Component/Form/Element/Multiline.php
+++ b/app/code/Magento/Ui/Component/Form/Element/Multiline.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Ui\Component\Form\Element;
 
-use Magento\Ui\Component\Form\Field;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\Form\Field;
 
 /**
  * @api
diff --git a/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php b/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php
index 627feceac79c4..1ddfdade1dd6f 100644
--- a/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php
+++ b/app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Ui\Component\Form\Element;
 
-use Magento\Framework\Data\Form\Element\Editor;
 use Magento\Framework\Data\Form;
+use Magento\Framework\Data\Form\Element\Editor;
 use Magento\Framework\Data\FormFactory;
-use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Component\Wysiwyg\ConfigInterface;
 
diff --git a/app/code/Magento/Ui/Component/Form/Field.php b/app/code/Magento/Ui/Component/Form/Field.php
index 48ca012f56953..45655984d1620 100644
--- a/app/code/Magento/Ui/Component/Form/Field.php
+++ b/app/code/Magento/Ui/Component/Form/Field.php
@@ -6,10 +6,10 @@
 namespace Magento\Ui\Component\Form;
 
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Ui\Component\AbstractComponent;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\AbstractComponent;
 
 /**
  * Class Field
diff --git a/app/code/Magento/Ui/Component/Form/Fieldset.php b/app/code/Magento/Ui/Component/Form/Fieldset.php
index 745068ca0fa8a..2535acdd43bce 100644
--- a/app/code/Magento/Ui/Component/Form/Fieldset.php
+++ b/app/code/Magento/Ui/Component/Form/Fieldset.php
@@ -5,11 +5,7 @@
  */
 namespace Magento\Ui\Component\Form;
 
-use Magento\Ui\Component\Container;
 use Magento\Ui\Component\AbstractComponent;
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
 /**
  * @api
diff --git a/app/code/Magento/Ui/Component/Form/Fieldset/Factory.php b/app/code/Magento/Ui/Component/Form/Fieldset/Factory.php
index fa1e1d5a9244c..bdc00762a465b 100644
--- a/app/code/Magento/Ui/Component/Form/Fieldset/Factory.php
+++ b/app/code/Magento/Ui/Component/Form/Fieldset/Factory.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Ui\Component\Form\Fieldset;
 
-use Magento\Ui\Component\Form\Fieldset;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Ui\Component\Form\Fieldset;
 
 /**
  * Class Factory
diff --git a/app/code/Magento/Ui/Component/Layout.php b/app/code/Magento/Ui/Component/Layout.php
index d75b0a3cca266..c0b0cd0da69d6 100644
--- a/app/code/Magento/Ui/Component/Layout.php
+++ b/app/code/Magento/Ui/Component/Layout.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Ui\Component;
 
-use Magento\Framework\View\Layout\Pool as LayoutPool;
-use Magento\Framework\View\Element\Template;
-use Magento\Framework\View\Element\UiComponent\LayoutInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponent\LayoutInterface;
+use Magento\Framework\View\Layout\Pool as LayoutPool;
 
 /**
  * Class Layout
diff --git a/app/code/Magento/Ui/Component/Listing.php b/app/code/Magento/Ui/Component/Listing.php
index 513186560ca09..5ab6b46a4ec39 100644
--- a/app/code/Magento/Ui/Component/Listing.php
+++ b/app/code/Magento/Ui/Component/Listing.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Ui\Component;
 
-use Magento\Ui\Component\Listing\Columns;
-
 /**
  * @api
  * @since 100.0.2
diff --git a/app/code/Magento/Ui/Component/Listing/Columns.php b/app/code/Magento/Ui/Component/Listing/Columns.php
index 0d1d813db5067..cc3c215febeca 100644
--- a/app/code/Magento/Ui/Component/Listing/Columns.php
+++ b/app/code/Magento/Ui/Component/Listing/Columns.php
@@ -6,9 +6,6 @@
 namespace Magento\Ui\Component\Listing;
 
 use Magento\Ui\Component\AbstractComponent;
-use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Framework\UrlInterface;
 
 /**
  * @api
diff --git a/app/code/Magento/Ui/Component/Listing/Columns/Column.php b/app/code/Magento/Ui/Component/Listing/Columns/Column.php
index e69658540c51f..3a5f956499818 100644
--- a/app/code/Magento/Ui/Component/Listing/Columns/Column.php
+++ b/app/code/Magento/Ui/Component/Listing/Columns/Column.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Ui\Component\Listing\Columns;
 
-use Magento\Ui\Component\AbstractComponent;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\AbstractComponent;
 
 /**
  * @api
diff --git a/app/code/Magento/Ui/Component/Listing/Columns/Date.php b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
index 75cb9dfbc52f7..6f6227c44684b 100644
--- a/app/code/Magento/Ui/Component/Listing/Columns/Date.php
+++ b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
@@ -6,9 +6,9 @@
 namespace Magento\Ui\Component\Listing\Columns;
 
 use Magento\Framework\Stdlib\BooleanUtils;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
  * @api
diff --git a/app/code/Magento/Ui/Component/MassAction/Columns/Column.php b/app/code/Magento/Ui/Component/MassAction/Columns/Column.php
index a0adc3e3b436e..70b54ca2527a6 100644
--- a/app/code/Magento/Ui/Component/MassAction/Columns/Column.php
+++ b/app/code/Magento/Ui/Component/MassAction/Columns/Column.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Ui\Component\MassAction\Columns;
 
-use Magento\Ui\Component\AbstractComponent;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Ui\Component\AbstractComponent;
 use Magento\Ui\Component\Listing\Columns\ColumnInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
 
 /**
  * Class Column
diff --git a/app/code/Magento/Ui/Component/MassAction/Filter.php b/app/code/Magento/Ui/Component/MassAction/Filter.php
index 6b089233c210a..e4f24f795a374 100644
--- a/app/code/Magento/Ui/Component/MassAction/Filter.php
+++ b/app/code/Magento/Ui/Component/MassAction/Filter.php
@@ -6,12 +6,12 @@
 namespace Magento\Ui\Component\MassAction;
 
 use Magento\Framework\Api\FilterBuilder;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\View\Element\UiComponentInterface;
 
 /**
  * @api
diff --git a/app/code/Magento/Ui/Component/Wrapper/Block.php b/app/code/Magento/Ui/Component/Wrapper/Block.php
index a4e5bbf213062..ee01e6101a5c2 100644
--- a/app/code/Magento/Ui/Component/Wrapper/Block.php
+++ b/app/code/Magento/Ui/Component/Wrapper/Block.php
@@ -6,9 +6,9 @@
 namespace Magento\Ui\Component\Wrapper;
 
 use Magento\Framework\View\Element\BlockInterface;
+use Magento\Framework\View\Element\UiComponent\BlockWrapperInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Component\AbstractComponent;
-use Magento\Framework\View\Element\UiComponent\BlockWrapperInterface;
 
 /**
  * @deprecated 100.2.0
diff --git a/app/code/Magento/Ui/Component/Wrapper/UiComponent.php b/app/code/Magento/Ui/Component/Wrapper/UiComponent.php
index e683aeb66c630..bd1526a24fc8b 100644
--- a/app/code/Magento/Ui/Component/Wrapper/UiComponent.php
+++ b/app/code/Magento/Ui/Component/Wrapper/UiComponent.php
@@ -6,9 +6,9 @@
 namespace Magento\Ui\Component\Wrapper;
 
 use Magento\Framework\View\Element\Template;
-use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ContainerInterface;
 use Magento\Framework\View\Element\Template\Context as TemplateContext;
+use Magento\Framework\View\Element\UiComponent\ContainerInterface;
+use Magento\Framework\View\Element\UiComponentInterface;
 
 /**
  * Class UiComponent
diff --git a/app/code/Magento/Ui/Config/Argument/Parser/Url.php b/app/code/Magento/Ui/Config/Argument/Parser/Url.php
index 605ee9ee0e082..09942da98ce70 100644
--- a/app/code/Magento/Ui/Config/Argument/Parser/Url.php
+++ b/app/code/Magento/Ui/Config/Argument/Parser/Url.php
@@ -6,8 +6,8 @@
 namespace Magento\Ui\Config\Argument\Parser;
 
 use Magento\Framework\Data\Argument\InterpreterInterface;
-use Magento\Framework\UrlInterface;
 use Magento\Framework\UrlFactory;
+use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Layout\Argument\Interpreter\NamedParams;
 
 /**
diff --git a/app/code/Magento/Ui/Config/Converter/Actions.php b/app/code/Magento/Ui/Config/Converter/Actions.php
index 3a2e4b9a2b5a7..64ed8f563aa26 100644
--- a/app/code/Magento/Ui/Config/Converter/Actions.php
+++ b/app/code/Magento/Ui/Config/Converter/Actions.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Ui\Config\Converter;
 
+use Magento\Framework\ObjectManager\Config\Reader\Dom;
 use Magento\Ui\Config\Converter;
 use Magento\Ui\Config\ConverterInterface;
-use Magento\Framework\ObjectManager\Config\Reader\Dom;
 use Magento\Ui\Config\ConverterUtils;
 
 /**
diff --git a/app/code/Magento/Ui/Config/Converter/Buttons.php b/app/code/Magento/Ui/Config/Converter/Buttons.php
index 3cba3c1350b6a..8f052c27552fa 100644
--- a/app/code/Magento/Ui/Config/Converter/Buttons.php
+++ b/app/code/Magento/Ui/Config/Converter/Buttons.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Ui\Config\Converter;
 
+use Magento\Framework\ObjectManager\Config\Reader\Dom;
 use Magento\Ui\Config\Converter;
 use Magento\Ui\Config\ConverterInterface;
-use Magento\Framework\ObjectManager\Config\Reader\Dom;
 use Magento\Ui\Config\ConverterUtils;
 
 /**
diff --git a/app/code/Magento/Ui/Config/Converter/Options.php b/app/code/Magento/Ui/Config/Converter/Options.php
index cf3ad4072fa88..2afdf1398118e 100644
--- a/app/code/Magento/Ui/Config/Converter/Options.php
+++ b/app/code/Magento/Ui/Config/Converter/Options.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Ui\Config\Converter;
 
+use Magento\Framework\ObjectManager\Config\Reader\Dom;
 use Magento\Ui\Config\Converter;
 use Magento\Ui\Config\ConverterInterface;
-use Magento\Framework\ObjectManager\Config\Reader\Dom;
 use Magento\Ui\Config\ConverterUtils;
 
 /**
diff --git a/app/code/Magento/Ui/Config/Converter/StorageConfig.php b/app/code/Magento/Ui/Config/Converter/StorageConfig.php
index 8d45897cb7b54..2c64dca2158d3 100644
--- a/app/code/Magento/Ui/Config/Converter/StorageConfig.php
+++ b/app/code/Magento/Ui/Config/Converter/StorageConfig.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Ui\Config\Converter;
 
+use Magento\Framework\ObjectManager\Config\Reader\Dom;
 use Magento\Ui\Config\Converter;
 use Magento\Ui\Config\ConverterInterface;
-use Magento\Framework\ObjectManager\Config\Reader\Dom;
 use Magento\Ui\Config\ConverterUtils;
 
 /**
diff --git a/app/code/Magento/Ui/Config/Converter/Url.php b/app/code/Magento/Ui/Config/Converter/Url.php
index 970feae531098..6aaf135818396 100644
--- a/app/code/Magento/Ui/Config/Converter/Url.php
+++ b/app/code/Magento/Ui/Config/Converter/Url.php
@@ -50,7 +50,7 @@ public function toArray(\DOMNode $node)
     {
         $result[Converter::NAME_ATTRIBUTE_KEY] = $this->converterUtils->getComponentName($node);
         if ($node->localName != 'param') {
-             $result[Dom::TYPE_ATTRIBUTE] = 'url';
+            $result[Dom::TYPE_ATTRIBUTE] = 'url';
         }
         if ($this->hasChildNodes($node)) {
             $result = array_merge($result, $this->processChildNodes($node));
diff --git a/app/code/Magento/Ui/Config/Data.php b/app/code/Magento/Ui/Config/Data.php
index 9c33eaf3fcf95..67e01a85b0c9f 100644
--- a/app/code/Magento/Ui/Config/Data.php
+++ b/app/code/Magento/Ui/Config/Data.php
@@ -6,9 +6,8 @@
 namespace Magento\Ui\Config;
 
 use Magento\Framework\Config\CacheInterface;
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Ui\Config\Converter;
 use Magento\Framework\Data\Argument\InterpreterInterface;
+use Magento\Framework\Serialize\SerializerInterface;
 
 /**
  * UI Component configuration data
diff --git a/app/code/Magento/Ui/Config/Reader/Definition/Data.php b/app/code/Magento/Ui/Config/Reader/Definition/Data.php
index 62bb07a6486f5..68f8922cf082d 100644
--- a/app/code/Magento/Ui/Config/Reader/Definition/Data.php
+++ b/app/code/Magento/Ui/Config/Reader/Definition/Data.php
@@ -6,9 +6,9 @@
 namespace Magento\Ui\Config\Reader\Definition;
 
 use Magento\Framework\Config\CacheInterface;
+use Magento\Framework\Data\Argument\InterpreterInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Ui\Config\Converter;
-use Magento\Framework\Data\Argument\InterpreterInterface;
 use Magento\Ui\Config\Reader\Definition;
 use Magento\Ui\Config\Reader\DefinitionFactory;
 
diff --git a/app/code/Magento/Ui/Config/Reader/Dom.php b/app/code/Magento/Ui/Config/Reader/Dom.php
index 9167382647d86..2dc0f26a949ce 100644
--- a/app/code/Magento/Ui/Config/Reader/Dom.php
+++ b/app/code/Magento/Ui/Config/Reader/Dom.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Ui\Config\Reader;
 
+use Magento\Framework\Config\Dom as ConfigDom;
 use Magento\Framework\Config\SchemaLocatorInterface;
 use Magento\Framework\Config\ValidationStateInterface;
 use Magento\Ui\Config\Converter;
-use Magento\Framework\Config\Dom as ConfigDom;
 
 /**
  * UI Component configuration file DOM object representation
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/AbstractAction.php b/app/code/Magento/Ui/Controller/Adminhtml/AbstractAction.php
index e7ca944908e07..ebad0c535057a 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/AbstractAction.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/AbstractAction.php
@@ -7,8 +7,8 @@
 
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
-use Magento\Ui\Controller\UiActionInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Controller\UiActionInterface;
 
 /**
  * Class Render
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php
index 13aed8fe300e5..d15d572fc2b0b 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToCsv.php
@@ -7,8 +7,8 @@
 
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
-use Magento\Ui\Model\Export\ConvertToCsv;
 use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Ui\Model\Export\ConvertToCsv;
 
 /**
  * Class Render
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php
index f00825a3e0bb9..dfe875c18c719 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Export/GridToXml.php
@@ -7,8 +7,8 @@
 
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
-use Magento\Ui\Model\Export\ConvertToXml;
 use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Ui\Model\Export\ConvertToXml;
 
 /**
  * Class Render
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
index 6eb503a64cc3d..d1f78ca9db775 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Ui\Controller\Adminhtml\Index;
 
-use Magento\Ui\Controller\Adminhtml\AbstractAction;
-use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Ui\Controller\Adminhtml\AbstractAction;
 use Psr\Log\LoggerInterface;
-use Magento\Framework\Escaper;
-use Magento\Framework\Controller\Result\JsonFactory;
 
 class Render extends AbstractAction
 {
diff --git a/app/code/Magento/Ui/Model/Bookmark.php b/app/code/Magento/Ui/Model/Bookmark.php
index 88da0e0b79c77..3ec108ba68f84 100644
--- a/app/code/Magento/Ui/Model/Bookmark.php
+++ b/app/code/Magento/Ui/Model/Bookmark.php
@@ -12,8 +12,8 @@
 use Magento\Framework\Model\Context;
 use Magento\Framework\Registry;
 use Magento\Ui\Api\Data\BookmarkInterface;
-use Magento\Ui\Model\ResourceModel\Bookmark\Collection;
 use Magento\Ui\Model\ResourceModel\Bookmark as ResourceBookmark;
+use Magento\Ui\Model\ResourceModel\Bookmark\Collection;
 
 /**
  * Domain class Bookmark
diff --git a/app/code/Magento/Ui/Model/Config.php b/app/code/Magento/Ui/Model/Config.php
index 0e8ff5a1928b0..19af892a98316 100644
--- a/app/code/Magento/Ui/Model/Config.php
+++ b/app/code/Magento/Ui/Model/Config.php
@@ -6,7 +6,6 @@
 namespace Magento\Ui\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\View\Element\Template;
 
 class Config
 {
diff --git a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
index 9eba829982533..2b8f3c683b6a3 100644
--- a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
+++ b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
@@ -60,7 +60,7 @@ public function getCsvFile()
         $component = $this->filter->getComponent();
 
         $name = md5(microtime());
-        $file = 'export/'. $component->getName() . $name . '.csv';
+        $file = 'export/' . $component->getName() . $name . '.csv';
 
         $this->filter->prepareComponent($component);
         $this->filter->applySelectionOnTargetProvider();
diff --git a/app/code/Magento/Ui/Model/Export/ConvertToXml.php b/app/code/Magento/Ui/Model/Export/ConvertToXml.php
index b707742063dbd..cbb4131f7a8fd 100644
--- a/app/code/Magento/Ui/Model/Export/ConvertToXml.php
+++ b/app/code/Magento/Ui/Model/Export/ConvertToXml.php
@@ -120,7 +120,7 @@ public function getXmlFile()
         $component = $this->filter->getComponent();
 
         $name = md5(microtime());
-        $file = 'export/'. $component->getName() . $name . '.xml';
+        $file = 'export/' . $component->getName() . $name . '.xml';
 
         $this->filter->prepareComponent($component);
         $this->filter->applySelectionOnTargetProvider();
diff --git a/app/code/Magento/Ui/Model/Export/MetadataProvider.php b/app/code/Magento/Ui/Model/Export/MetadataProvider.php
index 499cd06e505f6..0dd47fbdc5dee 100644
--- a/app/code/Magento/Ui/Model/Export/MetadataProvider.php
+++ b/app/code/Magento/Ui/Model/Export/MetadataProvider.php
@@ -6,13 +6,13 @@
 namespace Magento\Ui\Model\Export;
 
 use Magento\Framework\Api\Search\DocumentInterface;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Ui\Component\Filters;
 use Magento\Ui\Component\Filters\Type\Select;
 use Magento\Ui\Component\Listing\Columns;
 use Magento\Ui\Component\MassAction\Filter;
-use Magento\Framework\Locale\ResolverInterface;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Ui/Model/Manager.php b/app/code/Magento/Ui/Model/Manager.php
index 6dca4632fe7fc..fa0a7f460148e 100644
--- a/app/code/Magento/Ui/Model/Manager.php
+++ b/app/code/Magento/Ui/Model/Manager.php
@@ -6,9 +6,11 @@
 namespace Magento\Ui\Model;
 
 use ArrayObject;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Data\Argument\InterpreterInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Config\CacheInterface;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\View\Element\UiComponent\ArrayObjectFactory;
 use Magento\Framework\View\Element\UiComponent\Config\Converter;
 use Magento\Framework\View\Element\UiComponent\Config\DomMergerInterface;
@@ -17,8 +19,6 @@
 use Magento\Framework\View\Element\UiComponent\Config\Provider\Component\Definition as ComponentDefinition;
 use Magento\Framework\View\Element\UiComponent\Config\ReaderFactory;
 use Magento\Framework\View\Element\UiComponent\Config\UiReaderInterface;
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class Manager
diff --git a/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php b/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php
index 1b03b7c402680..83b2ac444d528 100644
--- a/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php
+++ b/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php
@@ -5,16 +5,15 @@
  */
 namespace Magento\Ui\Model\ResourceModel;
 
+use Magento\Framework\Api\Search\FilterGroup;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
-use Magento\Framework\Api\SortOrder;
-use Magento\Ui\Api\BookmarkRepositoryInterface;
-use Magento\Framework\Api\Search\FilterGroup;
-use Magento\Ui\Api\Data\BookmarkInterface;
-use Magento\Ui\Model\ResourceModel\Bookmark\Collection;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Ui\Api\BookmarkRepositoryInterface;
+use Magento\Ui\Api\Data\BookmarkInterface;
+use Magento\Ui\Model\ResourceModel\Bookmark\Collection;
 
 /**
  * Class BookmarkRepository
@@ -55,7 +54,6 @@ public function __construct(
         \Magento\Ui\Api\Data\BookmarkSearchResultsInterfaceFactory $searchResultsFactory,
         CollectionProcessorInterface $collectionProcessor = null
     ) {
-
         $this->bookmarkResourceModel = $bookmarkResourceModel;
         $this->bookmarkFactory = $bookmarkFactory;
         $this->searchResultsFactory = $searchResultsFactory;
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Content.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Content.php
index 6c83b04dbb19b..040058bfb88e6 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Content.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Content.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\DataObject;
 use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\TemplateEngine\Xhtml\CompilerInterface;
 use Magento\Framework\View\TemplateEngine\Xhtml\Compiler\Element\ElementInterface;
+use Magento\Framework\View\TemplateEngine\Xhtml\CompilerInterface;
 
 /**
  * Class Content
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Form.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Form.php
index d5387f15c7c0d..b749199e34f83 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Form.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Form.php
@@ -6,8 +6,8 @@
 namespace Magento\Ui\TemplateEngine\Xhtml\Compiler\Element;
 
 use Magento\Framework\DataObject;
-use Magento\Framework\View\TemplateEngine\Xhtml\CompilerInterface;
 use Magento\Framework\View\TemplateEngine\Xhtml\Compiler\Element\ElementInterface;
+use Magento\Framework\View\TemplateEngine\Xhtml\CompilerInterface;
 
 /**
  * Class Form
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
index bd1dde10f8eed..41db84dad0d97 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Result.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Ui\TemplateEngine\Xhtml;
 
-use Magento\Framework\View\Layout\Generator\Structure;
 use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\TemplateEngine\Xhtml\Template;
-use Magento\Framework\View\TemplateEngine\Xhtml\ResultInterface;
+use Magento\Framework\View\Layout\Generator\Structure;
 use Magento\Framework\View\TemplateEngine\Xhtml\CompilerInterface;
+use Magento\Framework\View\TemplateEngine\Xhtml\ResultInterface;
+use Magento\Framework\View\TemplateEngine\Xhtml\Template;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/app/code/Magento/Ui/Test/Unit/Component/AbstractComponentTest.php b/app/code/Magento/Ui/Test/Unit/Component/AbstractComponentTest.php
index d12b649cffdfc..121b1d5492738 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/AbstractComponentTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/AbstractComponentTest.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Ui\Test\Unit\Component;
 
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\ContentType\ContentTypeInterface;
-use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class AbstractComponentTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Control/ActionTest.php b/app/code/Magento/Ui/Test/Unit/Component/Control/ActionTest.php
index d86b3228cebc0..127923649c761 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Control/ActionTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Control/ActionTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Ui\Test\Unit\Component\Control;
 
-use Magento\Ui\Component\Control\Action;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Ui\Component\Control\Action;
 
 /**
  * Class ActionTest
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Control/ContainerTest.php b/app/code/Magento/Ui/Test/Unit/Component/Control/ContainerTest.php
index d40cb9f699ed9..314e63e6735e5 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Control/ContainerTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Control/ContainerTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Ui\Test\Unit\Component\Control;
 
-use \Magento\Ui\Component\Control\Container;
+use Magento\Ui\Component\Control\Container;
 
 class ContainerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Control/LinkTest.php b/app/code/Magento/Ui/Test/Unit/Component/Control/LinkTest.php
index 6c9a1a7cb19c2..8522ad2a40e51 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Control/LinkTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Control/LinkTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Ui\Test\Unit\Component\Control;
 
-use Magento\Ui\Component\Control\Link;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Ui\Component\Control\Link;
 
 /**
  * Class LinkTest
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php b/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php
index f91401e43ea80..2dbd9886cccbb 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Filters/FilterModifierTest.php
@@ -114,7 +114,7 @@ public function getApplyFilterModifierDataProvider()
         return [
             [
                 [
-                    'filter1' => ['condition_type' => 'eq', 'value' => '5',]
+                    'filter1' => ['condition_type' => 'eq', 'value' => '5']
                 ],
                 'filter1',
                 'eq',
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php
index 78456968cbef1..5c86596aac125 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Filters/Type/DateTest.php
@@ -7,11 +7,11 @@
 
 use Magento\Framework\Api\Filter;
 use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Filters\FilterModifier;
 use Magento\Ui\Component\Filters\Type\Date;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Component\Form\Element\DataType\Date as FormDate;
 
 /**
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/AbstractElementTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/AbstractElementTest.php
index 54bf0c9e8b37e..7c00dd4bca820 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/AbstractElementTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/AbstractElementTest.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Ui\Component\Form\Element\AbstractElement;
 use Magento\Framework\View\Element\UiComponent\Processor;
+use Magento\Ui\Component\Form\Element\AbstractElement;
 
 /**
  * Class AbstractElementTest
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
index d0e0542a19480..f504e1386dfde 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/WysiwygTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Ui\Test\Unit\Component\Form\Element;
 
-use Magento\Ui\Component\Form\Element\Wysiwyg;
-use Magento\Framework\Data\Form\Element\Editor;
 use Magento\Framework\Data\Form;
+use Magento\Framework\Data\Form\Element\Editor;
 use Magento\Framework\Data\FormFactory;
+use Magento\Ui\Component\Form\Element\Wysiwyg;
 use Magento\Ui\Component\Wysiwyg\ConfigInterface;
 
 /**
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Field/MultilineTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Field/MultilineTest.php
index bc9f485d90353..78ac89a0aa4c1 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Field/MultilineTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Field/MultilineTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Ui\Test\Unit\Component\Form\Field;
 
-use Magento\Ui\Component\Form\Field;
-use Magento\Ui\Component\Form\Element\Multiline;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\Form\Element\Multiline;
+use Magento\Ui\Component\Form\Field;
 
 /**
  * Class MultilineTest
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/FieldTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/FieldTest.php
index 02db643c321d8..d386d3184869e 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/FieldTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/FieldTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Ui\Test\Unit\Component\Form;
 
-use Magento\Ui\Component\Form\Field;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\Form\Field;
 
 /**
  * Class FieldTest
diff --git a/app/code/Magento/Ui/Test/Unit/Component/FormTest.php b/app/code/Magento/Ui/Test/Unit/Component/FormTest.php
index 6951583291df9..1d7abe177f3f3 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/FormTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/FormTest.php
@@ -9,7 +9,6 @@
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
-use Magento\Framework\View\Element\UiComponent\Processor;
 use Magento\Ui\Component\Form;
 
 class FormTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/ColumnTest.php b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/ColumnTest.php
index 05d92fb269584..f54b08109439a 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/ColumnTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/ColumnTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Ui\Test\Unit\Component\Listing\Columns;
 
-use Magento\Ui\Component\Listing\Columns\Column;
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
  * Class ColumnTest
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Listing/ColumnsTest.php b/app/code/Magento/Ui/Test/Unit/Component/Listing/ColumnsTest.php
index 85af3dd6694a0..e575492a27da9 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Listing/ColumnsTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Listing/ColumnsTest.php
@@ -5,11 +5,9 @@
  */
 namespace Magento\Ui\Test\Unit\Component\Listing;
 
-use Magento\Ui\Component\Listing\Columns;
-use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
+use Magento\Ui\Component\Listing\Columns;
 
 /**
  * Class ColumnsTest
diff --git a/app/code/Magento/Ui/Test/Unit/Component/ListingTest.php b/app/code/Magento/Ui/Test/Unit/Component/ListingTest.php
index a4af2a7f54a6c..27d4b30a4a11e 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/ListingTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/ListingTest.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Ui\Test\Unit\Component;
 
-use Magento\Ui\Component\Listing;
-use Magento\Ui\Component\Listing\Columns;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\Listing;
 
 /**
  * Class ListingTest
diff --git a/app/code/Magento/Ui/Test/Unit/Component/MassAction/Columns/ColumnTest.php b/app/code/Magento/Ui/Test/Unit/Component/MassAction/Columns/ColumnTest.php
index 62b4e84d62c6c..18c05a402d75d 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/MassAction/Columns/ColumnTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/MassAction/Columns/ColumnTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Ui\Test\Unit\Component\MassAction\Columns;
 
-use Magento\Ui\Component\MassAction\Columns\Column;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\MassAction\Columns\Column;
 
 /**
  * Class ColumnTest
diff --git a/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php b/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php
index 123b4cacf71a7..4a388e4bfb34b 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/MassActionTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Ui\Test\Unit\Component;
 
-use Magento\Ui\Component\MassAction;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\MassAction;
 
 /**
  * Class MassActionTest
diff --git a/app/code/Magento/Ui/Test/Unit/Component/PagingTest.php b/app/code/Magento/Ui/Test/Unit/Component/PagingTest.php
index 44dca689eef99..1530650e37f20 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/PagingTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/PagingTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Ui\Test\Unit\Component;
 
-use Magento\Ui\Component\Paging;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
+use Magento\Ui\Component\Paging;
 
 /**
  * Class PagingTest
diff --git a/app/code/Magento/Ui/Test/Unit/Config/Converter/DepsTest.php b/app/code/Magento/Ui/Test/Unit/Config/Converter/DepsTest.php
index aa1ebb0d12e1a..3edb730a3248a 100644
--- a/app/code/Magento/Ui/Test/Unit/Config/Converter/DepsTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Config/Converter/DepsTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Ui\Test\Unit\Config\Converter;
 
-use Magento\Framework\Data\Argument\Interpreter\Composite;
 use Magento\Ui\Config\Converter\Deps;
 use Magento\Ui\Config\ConverterUtils;
 
diff --git a/app/code/Magento/Ui/Test/Unit/Config/Converter/HtmlContentTest.php b/app/code/Magento/Ui/Test/Unit/Config/Converter/HtmlContentTest.php
index 045cd2c3b3b31..6844ac1820ba8 100644
--- a/app/code/Magento/Ui/Test/Unit/Config/Converter/HtmlContentTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Config/Converter/HtmlContentTest.php
@@ -31,7 +31,7 @@ public function testConvert()
                 '<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">' .
                         '<block class="Magento\Customer\Block\Adminhtml\Edit\Tab\View" name="customer_edit_tab_view" ' .
                                 'template="Magento_Customer::tab/view.phtml">' .
-                            '<block class="Magento\Customer\Block\Adminhtml\Edit\Tab\View\PersonalInfo" '.
+                            '<block class="Magento\Customer\Block\Adminhtml\Edit\Tab\View\PersonalInfo" ' .
                                     'name="personal_info" template="Magento_Customer::tab/view/personal_info.phtml"/>' .
                         '</block>' .
                 '</layout>';
diff --git a/app/code/Magento/Ui/Test/Unit/Config/Converter/ItemTest.php b/app/code/Magento/Ui/Test/Unit/Config/Converter/ItemTest.php
index e99440405c3e5..b783d577933c9 100644
--- a/app/code/Magento/Ui/Test/Unit/Config/Converter/ItemTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Config/Converter/ItemTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Ui\Test\Unit\Config\Converter;
 
-use Magento\Ui\Config\ConverterInterface;
 use Magento\Ui\Config\Converter\Item;
+use Magento\Ui\Config\ConverterInterface;
 use Magento\Ui\Config\ConverterUtils;
 
 class ItemTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
index 9e66d6a05f17b..1954a46203960 100644
--- a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Ui\Test\Unit\Controller\Adminhtml\Index;
 
-use Magento\Ui\Controller\Adminhtml\Index\Render;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Ui\Controller\Adminhtml\Index\Render;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Ui/Test/Unit/Model/Export/ConvertToXmlTest.php b/app/code/Magento/Ui/Test/Unit/Model/Export/ConvertToXmlTest.php
index fbd4464802bbd..f82f1e52a790f 100644
--- a/app/code/Magento/Ui/Test/Unit/Model/Export/ConvertToXmlTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Model/Export/ConvertToXmlTest.php
@@ -6,20 +6,20 @@
 namespace Magento\Ui\Test\Unit\Model\Export;
 
 use Magento\Framework\Api\Search\DocumentInterface;
+use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Convert\ExcelFactory;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface as DirectoryWriteInterface;
 use Magento\Framework\Filesystem\File\WriteInterface as FileWriteInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Ui\Model\Export\ConvertToXml;
 use Magento\Ui\Model\Export\MetadataProvider;
-use Magento\Ui\Model\Export\SearchResultIteratorFactory;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Ui\Model\Export\SearchResultIterator;
-use Magento\Framework\Api\Search\SearchResultInterface;
-use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
+use Magento\Ui\Model\Export\SearchResultIteratorFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php b/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php
index dd6fd58d355e6..ab1295f27c93d 100644
--- a/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php
@@ -6,12 +6,12 @@
 namespace Magento\Ui\Test\Unit\Model\Export;
 
 use Magento\Framework\Api\Search\DocumentInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Ui\Component\Listing\Columns;
 use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Ui\Model\Export\MetadataProvider;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class MetadataProviderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php b/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php
index 96468b63314b4..787f6afb16550 100644
--- a/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php
@@ -7,16 +7,16 @@
 namespace Magento\Ui\Test\Unit\Model;
 
 use Magento\Framework\Config\CacheInterface;
+use Magento\Framework\Data\Argument\InterpreterInterface;
 use Magento\Framework\View\Element\UiComponent\ArrayObjectFactory;
+use Magento\Framework\View\Element\UiComponent\Config\Converter;
 use Magento\Framework\View\Element\UiComponent\Config\DomMergerInterface;
 use Magento\Framework\View\Element\UiComponent\Config\FileCollector\AggregatedFileCollector;
 use Magento\Framework\View\Element\UiComponent\Config\FileCollector\AggregatedFileCollectorFactory;
+use Magento\Framework\View\Element\UiComponent\Config\ManagerInterface;
+use Magento\Framework\View\Element\UiComponent\Config\Provider\Component\Definition as ComponentDefinition;
 use Magento\Framework\View\Element\UiComponent\Config\UiReaderInterface;
 use Magento\Ui\Model\Manager;
-use Magento\Framework\View\Element\UiComponent\Config\Provider\Component\Definition as ComponentDefinition;
-use Magento\Framework\Data\Argument\InterpreterInterface;
-use Magento\Framework\View\Element\UiComponent\Config\ManagerInterface;
-use Magento\Framework\View\Element\UiComponent\Config\Converter;
 
 /**
  * Class ManagerTest
@@ -196,13 +196,13 @@ public function testPrepareGetData($componentName, $componentData, $isCached, $r
     public function getComponentData()
     {
         $cachedData = new \ArrayObject(
-            ['test_component1' =>
-                [
+            ['test_component1' => [
                     ManagerInterface::COMPONENT_ARGUMENTS_KEY => ['argument_name1' => ['value' => 'value1']],
                     ManagerInterface::CHILDREN_KEY => [
                         'custom' => [
-                            ManagerInterface::COMPONENT_ARGUMENTS_KEY =>
-                                ['custom_name1' => ['value' => 'custom_value1']],
+                            ManagerInterface::COMPONENT_ARGUMENTS_KEY => [
+                                'custom_name1' => ['value' => 'custom_value1']
+                            ],
                             ManagerInterface::CHILDREN_KEY => [],
                         ],
                     ],
@@ -221,8 +221,9 @@ public function getComponentData()
                         ManagerInterface::COMPONENT_ARGUMENTS_KEY => ['argument_name1' => ['argument' => 'value1']],
                         ManagerInterface::CHILDREN_KEY => [
                             'custom' => [
-                                ManagerInterface::COMPONENT_ARGUMENTS_KEY =>
-                                    ['custom_name1' => ['argument' => 'custom_value1']],
+                                ManagerInterface::COMPONENT_ARGUMENTS_KEY => [
+                                    'custom_name1' => ['argument' => 'custom_value1']
+                                ],
                                 ManagerInterface::CHILDREN_KEY => [],
                             ]
                         ]
@@ -232,13 +233,13 @@ public function getComponentData()
             [
                 'test_component2',
                 new \ArrayObject(
-                    ['test_component2' =>
-                        [
+                    ['test_component2' => [
                             ManagerInterface::COMPONENT_ARGUMENTS_KEY => ['argument_name2' => ['value' => 'value2']],
                             ManagerInterface::CHILDREN_KEY => [
                                 'test_component21' => [
-                                    ManagerInterface::COMPONENT_ARGUMENTS_KEY =>
-                                        ['argument_name21' => ['value' => 'value21']],
+                                    ManagerInterface::COMPONENT_ARGUMENTS_KEY => [
+                                        'argument_name21' => ['value' => 'value21']
+                                    ],
                                     ManagerInterface::CHILDREN_KEY => [],
                                 ],
                             ],
@@ -261,8 +262,9 @@ public function getComponentData()
                         ManagerInterface::COMPONENT_ATTRIBUTES_KEY => ['name' => 'attribute_name2'],
                         ManagerInterface::CHILDREN_KEY => [
                             'attribute_name21' => [
-                                ManagerInterface::COMPONENT_ARGUMENTS_KEY =>
-                                    ['argument_name21' => ['argument' => 'value21']],
+                                ManagerInterface::COMPONENT_ARGUMENTS_KEY => [
+                                    'argument_name21' => ['argument' => 'value21']
+                                ],
                                 ManagerInterface::COMPONENT_ATTRIBUTES_KEY => ['name' => 'attribute_name21'],
                                 ManagerInterface::CHILDREN_KEY => [],
                             ],
diff --git a/app/code/Magento/Ui/Test/Unit/Model/UiComponentGeneratorTest.php b/app/code/Magento/Ui/Test/Unit/Model/UiComponentGeneratorTest.php
index c22b753dac2ec..8a40677ece4c7 100644
--- a/app/code/Magento/Ui/Test/Unit/Model/UiComponentGeneratorTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Model/UiComponentGeneratorTest.php
@@ -6,7 +6,6 @@
 namespace Magento\Ui\Test\Unit\Model;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\View\Element\UiComponent\LayoutInterface;
 use Magento\Framework\View\Element\UiComponentInterface;
 
 class UiComponentGeneratorTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php b/app/code/Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php
index e51062e1cb36b..51ad4a2ef6883 100644
--- a/app/code/Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php
+++ b/app/code/Magento/Ui/Test/Unit/TemplateEngine/Xhtml/ResultTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Ui\Test\Unit\TemplateEngine\Xhtml;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\View\Layout\Generator\Structure;
 use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Framework\View\Layout\Generator\Structure;
 use Magento\Framework\View\TemplateEngine\Xhtml\CompilerInterface;
 use Magento\Framework\View\TemplateEngine\Xhtml\Template;
 use Magento\Ui\TemplateEngine\Xhtml\Result;
@@ -91,7 +91,7 @@ public function testAppendLayoutConfiguration()
             ->with('<script type="text/x-magento-init"><![CDATA[{"*": {"Magento_Ui/js/core/app": '
                 . '["text before <![CDATA[cdata text]]]]><![CDATA[>"]'
                 . '}}]]></script>');
-        
+
         $this->testModel->appendLayoutConfiguration();
     }
 }
diff --git a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
index 05a537b9a6559..8ad4a2ba3e8e0 100644
--- a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
+++ b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
@@ -13,14 +13,16 @@
 
     <div data-role="steps-wizard-controls" class="steps-wizard-navigation">
         <ul class="nav-bar">
-            <?php foreach ($block->getSteps() as $step) { ?>
+            <?php foreach ($block->getSteps() as $step) {
+    ?>
                 <li data-role="collapsible" data-bind="css: { 'active': selectedStep() == '<?= /* @escapeNotVerified */  $step->getComponentName() ?>'}">
                     <a href="#<?= /* @escapeNotVerified */  $step->getComponentName() ?>"
                        data-bind="click: showSpecificStep">
                         <?= /* @escapeNotVerified */  $step->getCaption() ?>
                     </a>
                 </li>
-            <?php } ?>
+            <?php
+} ?>
         </ul>
         <div class="nav-bar-outer-actions">
             <div class="action-wrap" data-role="closeBtn">
@@ -45,13 +47,15 @@
         </div>
     </div>
     <div data-role="steps-wizard-tab">
-        <?php foreach ($block->getSteps() as $step) { ?>
+        <?php foreach ($block->getSteps() as $step) {
+        ?>
             <div data-bind="visible: selectedStep() == $element.id, css: {'no-display':false}"
                  class="content no-display" id="<?= /* @escapeNotVerified */ $step->getComponentName() ?>"
                  data-role="content">
                 <?= /* @escapeNotVerified */  $step->getContent() ?>
             </div>
-        <?php } ?>
+        <?php
+    } ?>
     </div>
 </div>
 
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 095f4b9a5e0df..1973fdf86cc25 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -8,14 +8,14 @@
 
 namespace Magento\Ups\Model;
 
-use Magento\Quote\Model\Quote\Address\RateResult\Error;
+use Magento\Framework\Xml\Security;
 use Magento\Quote\Model\Quote\Address\RateRequest;
+use Magento\Quote\Model\Quote\Address\RateResult\Error;
 use Magento\Shipping\Model\Carrier\AbstractCarrierOnline;
 use Magento\Shipping\Model\Carrier\CarrierInterface;
 use Magento\Shipping\Model\Rate\Result;
 use Magento\Shipping\Model\Simplexml\Element;
 use Magento\Ups\Helper\Config;
-use Magento\Framework\Xml\Security;
 
 /**
  * UPS shipping implementation
diff --git a/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php
index 53a2dcfc60fcc..d23b43b4ae805 100644
--- a/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Ups\Test\Unit\Model;
 
+use Magento\Directory\Model\Country;
 use Magento\Quote\Model\Quote\Address\RateRequest;
 use Magento\Ups\Model\Carrier;
-use Magento\Directory\Model\Country;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/UrlRewrite/Block/Plugin/Store/Switcher/SetRedirectUrl.php b/app/code/Magento/UrlRewrite/Block/Plugin/Store/Switcher/SetRedirectUrl.php
index 55d23658e8e82..8cc0d1d3a93e3 100644
--- a/app/code/Magento/UrlRewrite/Block/Plugin/Store/Switcher/SetRedirectUrl.php
+++ b/app/code/Magento/UrlRewrite/Block/Plugin/Store/Switcher/SetRedirectUrl.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\UrlRewrite\Block\Plugin\Store\Switcher;
 
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Url\Helper\Data as UrlHelper;
 use Magento\Framework\UrlInterface;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\Framework\App\RequestInterface;
-use Magento\Framework\App\ActionInterface;
 
 class SetRedirectUrl
 {
diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/app/code/Magento/UrlRewrite/Controller/Router.php
index 863d998776ef1..f16fa6806f0f6 100644
--- a/app/code/Magento/UrlRewrite/Controller/Router.php
+++ b/app/code/Magento/UrlRewrite/Controller/Router.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\UrlRewrite\Controller;
 
+use Magento\Framework\App\Action\Redirect;
+use Magento\Framework\App\ActionInterface;
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\App\Response\Http as HttpResponse;
+use Magento\Framework\UrlInterface;
 use Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\Framework\UrlInterface;
-use Magento\Framework\App\Action\Redirect;
-use Magento\Framework\App\ActionInterface;
 
 /**
  * UrlRewrite Controller Router
@@ -93,8 +93,7 @@ public function match(\Magento\Framework\App\RequestInterface $request)
                     [
                         UrlRewrite::ENTITY_TYPE => $oldRewrite->getEntityType(),
                         UrlRewrite::ENTITY_ID => $oldRewrite->getEntityId(),
-                        UrlRewrite::STORE_ID =>
-                            $this->storeManager->getStore()->getId(),
+                        UrlRewrite::STORE_ID => $this->storeManager->getStore()->getId(),
                         UrlRewrite::REDIRECT_TYPE => 0,
                     ]
                 );
diff --git a/app/code/Magento/UrlRewrite/Model/Message/UrlRewriteExceptionMessageFactory.php b/app/code/Magento/UrlRewrite/Model/Message/UrlRewriteExceptionMessageFactory.php
index 514345aa3e9d9..b1502c3633942 100644
--- a/app/code/Magento/UrlRewrite/Model/Message/UrlRewriteExceptionMessageFactory.php
+++ b/app/code/Magento/UrlRewrite/Model/Message/UrlRewriteExceptionMessageFactory.php
@@ -6,11 +6,11 @@
 
 namespace Magento\UrlRewrite\Model\Message;
 
+use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\Message\ExceptionMessageFactoryInterface;
-use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
-use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Message\Factory;
-use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Message\MessageInterface;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 
 class UrlRewriteExceptionMessageFactory implements ExceptionMessageFactoryInterface
 {
diff --git a/app/code/Magento/UrlRewrite/Model/Storage/AbstractStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/AbstractStorage.php
index 3d9ed0dc57e9c..9dc3c40e76ad3 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/AbstractStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/AbstractStorage.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\UrlRewrite\Model\Storage;
 
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\UrlRewrite\Model\StorageInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
-use Magento\Framework\Api\DataObjectHelper;
 
 /**
  * Abstract db storage
diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
index 376b07a17fe6a..4c6251c48118c 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
@@ -9,9 +9,9 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite as UrlRewriteData;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory;
 use Psr\Log\LoggerInterface;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite as UrlRewriteData;
 
 class DbStorage extends AbstractStorage
 {
diff --git a/app/code/Magento/UrlRewrite/Setup/UpgradeData.php b/app/code/Magento/UrlRewrite/Setup/UpgradeData.php
index 7b9bc2020e60c..1f0f9328f2895 100644
--- a/app/code/Magento/UrlRewrite/Setup/UpgradeData.php
+++ b/app/code/Magento/UrlRewrite/Setup/UpgradeData.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\UrlRewrite\Setup;
 
-use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
index 3f5b5f34c462e..afb12afdc4629 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
@@ -8,9 +8,9 @@
 
 use Magento\Framework\App\Action\Redirect;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\Store;
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\Store\Model\Store;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Helper/UrlRewriteTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Helper/UrlRewriteTest.php
index e41a06cb0c9f0..a937632132257 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Helper/UrlRewriteTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Helper/UrlRewriteTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\UrlRewrite\Test\Unit\Helper;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-
 class UrlRewriteTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Model/Exception/UrlAlreadyExistsExceptionTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Model/Exception/UrlAlreadyExistsExceptionTest.php
index 669acc2a9a3b7..6ce27962d52b1 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Model/Exception/UrlAlreadyExistsExceptionTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Model/Exception/UrlAlreadyExistsExceptionTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\UrlRewrite\Test\Unit\Model\Exception;
 
-use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 use Magento\Framework\Phrase;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 
 /**
  * Class UrlAlreadyExistsExceptionTest
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Model/MergeDataProviderTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Model/MergeDataProviderTest.php
index 6dcf668fb9cca..85a75c75dbbbc 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Model/MergeDataProviderTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Model/MergeDataProviderTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\UrlRewrite\Test\Unit\Model;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\UrlRewrite\Model\MergeDataProvider;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class MergeDataProviderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Model/Message/UrlRewriteExceptionMessageFactoryTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Model/Message/UrlRewriteExceptionMessageFactoryTest.php
index f0dccb5dbc5d5..ac3bcf8beb368 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Model/Message/UrlRewriteExceptionMessageFactoryTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Model/Message/UrlRewriteExceptionMessageFactoryTest.php
@@ -6,8 +6,8 @@
 namespace Magento\UrlRewrite\Test\Unit\Model\Message;
 
 use Magento\Framework\Message\MessageInterface;
-use Magento\UrlRewrite\Model\Message\UrlRewriteExceptionMessageFactory;
 use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
+use Magento\UrlRewrite\Model\Message\UrlRewriteExceptionMessageFactory;
 
 class UrlRewriteExceptionMessageFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/User/Console/UnlockAdminAccountCommand.php b/app/code/Magento/User/Console/UnlockAdminAccountCommand.php
index a60cb37ddd7fe..2a4291bb0367b 100644
--- a/app/code/Magento/User/Console/UnlockAdminAccountCommand.php
+++ b/app/code/Magento/User/Console/UnlockAdminAccountCommand.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\User\Console;
 
+use Magento\User\Model\ResourceModel\User as AdminUser;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\User\Model\ResourceModel\User as AdminUser;
 
 /**
  * Command for unlocking an account.
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Delete.php b/app/code/Magento/User/Controller/Adminhtml/User/Delete.php
index e5fb1590a8cc1..4ca4a8cc25f8a 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Delete.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Delete.php
@@ -6,8 +6,8 @@
  */
 namespace Magento\User\Controller\Adminhtml\User;
 
-use Magento\User\Block\User\Edit\Tab\Main as UserEdit;
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\User\Block\User\Edit\Tab\Main as UserEdit;
 
 class Delete extends \Magento\User\Controller\Adminhtml\User
 {
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index 2a7d43008f2ad..a44f89a05a0f3 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -8,8 +8,8 @@
 use Magento\Backend\App\Area\FrontNameResolver;
 use Magento\Backend\Model\Auth\Credential\StorageInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Store\Model\Store;
 use Magento\User\Api\Data\UserInterface;
diff --git a/app/code/Magento/User/Observer/Backend/AuthObserver.php b/app/code/Magento/User/Observer/Backend/AuthObserver.php
index bc5d6af615f13..384f9a20876b8 100644
--- a/app/code/Magento/User/Observer/Backend/AuthObserver.php
+++ b/app/code/Magento/User/Observer/Backend/AuthObserver.php
@@ -10,12 +10,12 @@
 use Magento\Backend\Model\UrlInterface;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\User\Model\Backend\Config\ObserverConfig;
 use Magento\User\Model\ResourceModel\User as ResourceUser;
 use Magento\User\Model\User;
-use Magento\Framework\Event\ObserverInterface;
 use Magento\User\Model\UserFactory;
 
 /**
@@ -168,7 +168,7 @@ private function _updateLockingInformation($user)
 
         $newFirstFailureDate = false;
         $updateLockExpires = false;
-        $lockThreshInterval = new \DateInterval('PT' . $lockThreshold.'S');
+        $lockThreshInterval = new \DateInterval('PT' . $lockThreshold . 'S');
         // set first failure date when this is first failure or last first failure expired
         if (1 === $failuresNum || !$firstFailureDate || $now->diff($firstFailureDate) > $lockThreshInterval) {
             $newFirstFailureDate = $now;
diff --git a/app/code/Magento/User/Test/Unit/Block/Role/Tab/UsersTest.php b/app/code/Magento/User/Test/Unit/Block/Role/Tab/UsersTest.php
index 0863b52139c44..6307139ddb83a 100644
--- a/app/code/Magento/User/Test/Unit/Block/Role/Tab/UsersTest.php
+++ b/app/code/Magento/User/Test/Unit/Block/Role/Tab/UsersTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\User\Test\Unit\Block\Role\Tab;
 
-use Magento\User\Model\ResourceModel\User\CollectionFactory;
 use Magento\User\Model\ResourceModel\User\Collection;
+use Magento\User\Model\ResourceModel\User\CollectionFactory;
 
 class UsersTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/DeleteTest.php b/app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/DeleteTest.php
index 62e6dfcd61cc2..7872723b77c99 100644
--- a/app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/DeleteTest.php
+++ b/app/code/Magento/User/Test/Unit/Controller/Adminhtml/User/DeleteTest.php
@@ -7,7 +7,6 @@
 namespace Magento\User\Test\Unit\Controller\Adminhtml\User;
 
 use Magento\Backend\Model\Auth\Session;
-use Magento\Framework\Exception\AuthenticationException;
 
 /**
  * Test class for \Magento\User\Controller\Adminhtml\User\Delete testing
diff --git a/app/code/Magento/Vault/Block/Form.php b/app/code/Magento/Vault/Block/Form.php
index 48b2c8b1b038f..ea009dc872c4c 100644
--- a/app/code/Magento/Vault/Block/Form.php
+++ b/app/code/Magento/Vault/Block/Form.php
@@ -6,9 +6,8 @@
 namespace Magento\Vault\Block;
 
 use Magento\Framework\View\Element\Template\Context;
-use Magento\Payment\Model\Config;
-use Magento\Vault\Model\Ui\Adminhtml\TokensConfigProvider;
 use Magento\Payment\Model\CcConfigProvider;
+use Magento\Vault\Model\Ui\Adminhtml\TokensConfigProvider;
 
 /**
  * Class Form
diff --git a/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php b/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
index d568a91c0421b..8d55da75c603a 100644
--- a/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
+++ b/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
@@ -6,9 +6,9 @@
 namespace Magento\Vault\Model;
 
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Vault\Api\Data\PaymentTokenFactoryInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Api\Data\PaymentTokenInterfaceFactory;
-use Magento\Vault\Api\Data\PaymentTokenFactoryInterface;
 
 /**
  * Class AbstractPaymentTokenFactory
diff --git a/app/code/Magento/Vault/Model/PaymentToken.php b/app/code/Magento/Vault/Model/PaymentToken.php
index beee13cff4e01..e326554cb7e34 100644
--- a/app/code/Magento/Vault/Model/PaymentToken.php
+++ b/app/code/Magento/Vault/Model/PaymentToken.php
@@ -6,8 +6,6 @@
 namespace Magento\Vault\Model;
 
 use Magento\Framework\Model\AbstractModel;
-use Magento\Vault\Api\Data\PaymentTokenExtensionInterface;
-use Magento\Vault\Model\ResourceModel;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 
 /**
diff --git a/app/code/Magento/Vault/Model/ResourceModel/PaymentToken.php b/app/code/Magento/Vault/Model/ResourceModel/PaymentToken.php
index c144f6ba9ea51..1cf1fcc7745c2 100644
--- a/app/code/Magento/Vault/Model/ResourceModel/PaymentToken.php
+++ b/app/code/Magento/Vault/Model/ResourceModel/PaymentToken.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Vault\Model\ResourceModel;
 
-use Magento\Vault\Setup\InstallSchema;
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\AbstractDb;
+use Magento\Vault\Setup\InstallSchema;
 
 /**
  * Vault Payment Token Resource Model
diff --git a/app/code/Magento/Vault/Observer/PaymentTokenAssigner.php b/app/code/Magento/Vault/Observer/PaymentTokenAssigner.php
index 54debff11ed73..e3bc711bcb225 100644
--- a/app/code/Magento/Vault/Observer/PaymentTokenAssigner.php
+++ b/app/code/Magento/Vault/Observer/PaymentTokenAssigner.php
@@ -11,7 +11,6 @@
 use Magento\Quote\Model\Quote\Payment;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Api\PaymentTokenManagementInterface;
-use Magento\Vault\Model\Method\Vault;
 
 class PaymentTokenAssigner extends AbstractDataAssignObserver
 {
diff --git a/app/code/Magento/Vault/Plugin/PaymentVaultAttributesLoad.php b/app/code/Magento/Vault/Plugin/PaymentVaultAttributesLoad.php
index 6633673a7dbf0..cc188d5f52e73 100644
--- a/app/code/Magento/Vault/Plugin/PaymentVaultAttributesLoad.php
+++ b/app/code/Magento/Vault/Plugin/PaymentVaultAttributesLoad.php
@@ -7,11 +7,11 @@
 
 namespace Magento\Vault\Plugin;
 
+use Magento\Sales\Api\Data\OrderPaymentExtensionFactory;
 use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
-use Magento\Vault\Api\PaymentTokenManagementInterface;
-use Magento\Sales\Api\Data\OrderPaymentExtensionFactory;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Api\PaymentTokenManagementInterface;
 
 /**
  * Plugin for loading vault payment extension attribute to order/payment entity
diff --git a/app/code/Magento/Vault/Setup/InstallSchema.php b/app/code/Magento/Vault/Setup/InstallSchema.php
index dd65f7a8c9772..6f77bcccf4bff 100644
--- a/app/code/Magento/Vault/Setup/InstallSchema.php
+++ b/app/code/Magento/Vault/Setup/InstallSchema.php
@@ -6,9 +6,9 @@
 namespace Magento\Vault\Setup;
 
 use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
 
 /**
  * Class InstallSchema
diff --git a/app/code/Magento/Vault/Setup/UpgradeSchema.php b/app/code/Magento/Vault/Setup/UpgradeSchema.php
index 643bd1751f668..4b8d93bfe6f22 100644
--- a/app/code/Magento/Vault/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Vault/Setup/UpgradeSchema.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Vault\Setup;
 
+use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Magento\Framework\Setup\UpgradeSchemaInterface;
-use Magento\Framework\DB\Ddl\Table;
 
 /**
  * Upgrade the Vault module DB scheme
diff --git a/app/code/Magento/Vault/Test/Unit/Model/AccountPaymentTokenFactoryTest.php b/app/code/Magento/Vault/Test/Unit/Model/AccountPaymentTokenFactoryTest.php
index 1ff94288d6c76..ec79827704af1 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/AccountPaymentTokenFactoryTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/AccountPaymentTokenFactoryTest.php
@@ -8,9 +8,9 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
-use Magento\Vault\Model\PaymentTokenFactory;
 use Magento\Vault\Model\AccountPaymentTokenFactory;
 use Magento\Vault\Model\PaymentToken;
+use Magento\Vault\Model\PaymentTokenFactory;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/Vault/Test/Unit/Model/CreditCardTokenFactoryTest.php b/app/code/Magento/Vault/Test/Unit/Model/CreditCardTokenFactoryTest.php
index 0ad51f3dcc75d..8bffda18559d7 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/CreditCardTokenFactoryTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/CreditCardTokenFactoryTest.php
@@ -8,9 +8,9 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
-use Magento\Vault\Model\PaymentTokenFactory;
 use Magento\Vault\Model\CreditCardTokenFactory;
 use Magento\Vault\Model\PaymentToken;
+use Magento\Vault\Model\PaymentTokenFactory;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
diff --git a/app/code/Magento/Vault/Test/Unit/Model/PaymentMethodListTest.php b/app/code/Magento/Vault/Test/Unit/Model/PaymentMethodListTest.php
index 4db9f695dad5d..3c29d4ace237b 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/PaymentMethodListTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/PaymentMethodListTest.php
@@ -9,8 +9,8 @@
 use Magento\Payment\Api\PaymentMethodListInterface;
 use Magento\Payment\Model\Method\InstanceFactory;
 use Magento\Payment\Model\MethodInterface;
-use Magento\Vault\Model\VaultPaymentInterface;
 use Magento\Vault\Model\PaymentMethodList;
+use Magento\Vault\Model\VaultPaymentInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class PaymentMethodListTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Vault/Test/Unit/Model/Ui/Adminhtml/TokensConfigProviderTest.php b/app/code/Magento/Vault/Test/Unit/Model/Ui/Adminhtml/TokensConfigProviderTest.php
index e510e0928bd35..cf93e1f51b2fb 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/Ui/Adminhtml/TokensConfigProviderTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/Ui/Adminhtml/TokensConfigProviderTest.php
@@ -146,7 +146,7 @@ protected function setUp()
             ->getMockForAbstractClass();
 
         $this->vaultPayment = $this->getMockForAbstractClass(VaultPaymentInterface::class);
-        
+
         $this->objectManager = new ObjectManager($this);
 
         $this->initStoreMock();
@@ -197,7 +197,7 @@ public function testGetTokensComponentsRegisteredCustomer()
             ->method('getMethodInstance')
             ->with(self::VAULT_PAYMENT_CODE)
             ->willReturn($this->vaultPayment);
-        
+
         $this->vaultPayment->expects(static::once())
             ->method('isActive')
             ->with(self::STORE_ID)
diff --git a/app/code/Magento/Vault/Test/Unit/Model/Ui/TokensConfigProviderTest.php b/app/code/Magento/Vault/Test/Unit/Model/Ui/TokensConfigProviderTest.php
index 4251ff18e42aa..970558b1ef253 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/Ui/TokensConfigProviderTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/Ui/TokensConfigProviderTest.php
@@ -100,7 +100,7 @@ public function testGetConfig()
             ->method('getActiveList')
             ->with($storeId)
             ->willReturn([$this->vaultPayment]);
-        
+
         $this->vaultPayment->expects(static::once())
             ->method('getProviderCode')
             ->willReturn($vaultProviderCode);
@@ -108,7 +108,7 @@ public function testGetConfig()
         $this->customerTokenManagement->expects(static::once())
             ->method('getCustomerSessionTokens')
             ->willReturn([$token]);
-        
+
         $token->expects(static::once())
             ->method('getPaymentMethodCode')
             ->willReturn($vaultProviderCode);
diff --git a/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php b/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php
index efbe2e9745ef1..b21456346b269 100644
--- a/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Observer/AfterPaymentSaveObserverTest.php
@@ -10,7 +10,6 @@
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Math\Random;
 use Magento\Sales\Api\Data\OrderPaymentExtension;
-use Magento\Sales\Api\Data\OrderPaymentExtensionFactory;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Vault\Model\PaymentToken;
diff --git a/app/code/Magento/Vault/Test/Unit/Observer/PaymentTokenAssignerTest.php b/app/code/Magento/Vault/Test/Unit/Observer/PaymentTokenAssignerTest.php
index 1644d90e0731b..3a817dcc64dc0 100644
--- a/app/code/Magento/Vault/Test/Unit/Observer/PaymentTokenAssignerTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Observer/PaymentTokenAssignerTest.php
@@ -16,7 +16,6 @@
 use Magento\Quote\Model\Quote\Payment;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Api\PaymentTokenManagementInterface;
-use Magento\Vault\Model\Method\Vault;
 use Magento\Vault\Observer\PaymentTokenAssigner;
 
 /**
diff --git a/app/code/Magento/Vault/view/frontend/templates/token_list.phtml b/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
index 17d648ebaf25c..3438592edf359 100644
--- a/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
+++ b/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
@@ -18,7 +18,7 @@ $tokens = $block->getPaymentTokens();
             </tr>
             </thead>
             <tbody>
-            <?php foreach($tokens as $token): ?>
+            <?php foreach ($tokens as $token): ?>
                 <?= /* @noEscape */ $block->renderTokenHtml($token) ?>
             <?php endforeach; ?>
             </tbody>
diff --git a/app/code/Magento/Version/Controller/Index/Index.php b/app/code/Magento/Version/Controller/Index/Index.php
index 4314676c479f9..c66dead3a5597 100644
--- a/app/code/Magento/Version/Controller/Index/Index.php
+++ b/app/code/Magento/Version/Controller/Index/Index.php
@@ -9,7 +9,6 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\ProductMetadataInterface;
-use Magento\Framework\Exception\StateException;
 
 /**
  * Magento Version controller
@@ -41,7 +40,7 @@ public function execute()
     {
         $versionParts = explode('.', $this->productMetadata->getVersion());
         if (!isset($versionParts[0]) || !isset($versionParts[1])) {
-            return ; // Major and minor version are not set - return empty response
+            return; // Major and minor version are not set - return empty response
         }
         $majorMinorVersion = $versionParts[0] . '.' . $versionParts[1];
         $this->getResponse()->setBody(
diff --git a/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php b/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php
index 1d8ccc127cea9..3fd85b896f018 100644
--- a/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php
+++ b/app/code/Magento/Webapi/Controller/Rest/ParamsOverrider.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Webapi\Controller\Rest;
 
+use Magento\Framework\Api\SimpleDataObjectConverter;
+use Magento\Framework\Reflection\MethodsMap;
 use Magento\Framework\Webapi\Rest\Request\ParamOverriderInterface;
 use Magento\Webapi\Model\Config\Converter;
-use Magento\Framework\Reflection\MethodsMap;
-use Magento\Framework\Api\SimpleDataObjectConverter;
 
 /**
  * Override parameter values
diff --git a/app/code/Magento/Webapi/Controller/Rest/Router.php b/app/code/Magento/Webapi/Controller/Rest/Router.php
index e825403284adf..a693a38717eb1 100644
--- a/app/code/Magento/Webapi/Controller/Rest/Router.php
+++ b/app/code/Magento/Webapi/Controller/Rest/Router.php
@@ -7,7 +7,7 @@
  */
 namespace Magento\Webapi\Controller\Rest;
 
-use \Magento\Framework\Webapi\Rest\Request;
+use Magento\Framework\Webapi\Rest\Request;
 
 class Router
 {
diff --git a/app/code/Magento/Webapi/Controller/Rest/Router/Route.php b/app/code/Magento/Webapi/Controller/Rest/Router/Route.php
index 6e2fda94237d7..65127f835c9a3 100644
--- a/app/code/Magento/Webapi/Controller/Rest/Router/Route.php
+++ b/app/code/Magento/Webapi/Controller/Rest/Router/Route.php
@@ -111,7 +111,7 @@ public function match(Request $request)
         /** @var \Magento\Framework\Webapi\Rest\Request $request */
         $pathParts = $this->getPathParts($request->getPathInfo());
         $routeParts = $this->getRouteParts();
-        if (count($pathParts) <> count($routeParts)) {
+        if (count($pathParts) != count($routeParts)) {
             return false;
         }
 
diff --git a/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php b/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
index 081b4c829475a..2a020de696909 100644
--- a/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
+++ b/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
@@ -8,15 +8,15 @@
 use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\MetadataObjectInterface;
 use Magento\Framework\Api\SimpleDataObjectConverter;
-use Magento\Framework\Webapi\Authorization;
 use Magento\Framework\Exception\AuthorizationException;
 use Magento\Framework\Reflection\DataObjectProcessor;
-use Magento\Framework\Webapi\ServiceInputProcessor;
-use Magento\Framework\Webapi\Request as SoapRequest;
-use Magento\Framework\Webapi\Exception as WebapiException;
-use Magento\Webapi\Model\Soap\Config as SoapConfig;
 use Magento\Framework\Reflection\MethodsMap;
+use Magento\Framework\Webapi\Authorization;
+use Magento\Framework\Webapi\Exception as WebapiException;
+use Magento\Framework\Webapi\Request as SoapRequest;
+use Magento\Framework\Webapi\ServiceInputProcessor;
 use Magento\Webapi\Model\ServiceMetadata;
+use Magento\Webapi\Model\Soap\Config as SoapConfig;
 use Magento\Webapi\Model\UrlDecoder;
 
 /**
diff --git a/app/code/Magento/Webapi/Model/Authorization/OauthUserContext.php b/app/code/Magento/Webapi/Model/Authorization/OauthUserContext.php
index c97a0cb174f55..c0b3b29ccc49e 100644
--- a/app/code/Magento/Webapi/Model/Authorization/OauthUserContext.php
+++ b/app/code/Magento/Webapi/Model/Authorization/OauthUserContext.php
@@ -9,8 +9,8 @@
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\Oauth\Helper\Request as OauthRequestHelper;
 use Magento\Framework\Oauth\OauthInterface as OauthService;
-use Magento\Integration\Api\IntegrationServiceInterface;
 use Magento\Framework\Webapi\Request;
+use Magento\Integration\Api\IntegrationServiceInterface;
 
 /**
  * A user context determined by OAuth headers in a HTTP request.
diff --git a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
index 110191360acfd..c7f4c5c6f5e82 100644
--- a/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
+++ b/app/code/Magento/Webapi/Model/Authorization/TokenUserContext.php
@@ -8,13 +8,13 @@
 
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Integration\Model\Oauth\Token;
-use Magento\Integration\Model\Oauth\TokenFactory;
-use Magento\Integration\Api\IntegrationServiceInterface;
-use Magento\Framework\Webapi\Request;
-use Magento\Framework\Stdlib\DateTime\DateTime as Date;
 use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\DateTime as Date;
+use Magento\Framework\Webapi\Request;
+use Magento\Integration\Api\IntegrationServiceInterface;
 use Magento\Integration\Helper\Oauth\Data as OauthHelper;
+use Magento\Integration\Model\Oauth\Token;
+use Magento\Integration\Model\Oauth\TokenFactory;
 
 /**
  * A user context determined by tokens in a HTTP request Authorization header.
diff --git a/app/code/Magento/Webapi/Model/Config.php b/app/code/Magento/Webapi/Model/Config.php
index cf268828c8091..2e572c54675c4 100644
--- a/app/code/Magento/Webapi/Model/Config.php
+++ b/app/code/Magento/Webapi/Model/Config.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Webapi\Model;
 
-use Magento\Webapi\Model\Cache\Type\Webapi as WebapiCache;
-use Magento\Webapi\Model\Config\Reader;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Webapi\Model\Cache\Type\Webapi as WebapiCache;
+use Magento\Webapi\Model\Config\Reader;
 
 /**
  * This class gives access to consolidated web API configuration from <Module_Name>/etc/webapi.xml files.
diff --git a/app/code/Magento/Webapi/Model/Config/ClassReflector.php b/app/code/Magento/Webapi/Model/Config/ClassReflector.php
index 7ce94c9bc6eeb..6748319f9f482 100644
--- a/app/code/Magento/Webapi/Model/Config/ClassReflector.php
+++ b/app/code/Magento/Webapi/Model/Config/ClassReflector.php
@@ -129,8 +129,8 @@ protected function extractMethodDescription(\Zend\Code\Reflection\MethodReflecti
         $docBlock = $methodReflection->getDocBlock();
         if (!$docBlock) {
             throw new \LogicException(
-                'The docBlock of the method '.
-                $method->getDeclaringClass()->getName() . '::' .  $method->getName() . ' is empty.'
+                'The docBlock of the method ' .
+                $method->getDeclaringClass()->getName() . '::' . $method->getName() . ' is empty.'
             );
         }
         return $this->_typeProcessor->getDescription($docBlock);
diff --git a/app/code/Magento/Webapi/Model/Plugin/Manager.php b/app/code/Magento/Webapi/Model/Plugin/Manager.php
index c9dab914b3a90..c19cb061bae27 100644
--- a/app/code/Magento/Webapi/Model/Plugin/Manager.php
+++ b/app/code/Magento/Webapi/Model/Plugin/Manager.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Webapi\Model\Plugin;
 
-use Magento\Integration\Model\ConfigBasedIntegrationManager;
 use Magento\Integration\Api\AuthorizationServiceInterface as IntegrationAuthorizationInterface;
+use Magento\Integration\Model\ConfigBasedIntegrationManager;
 use Magento\Integration\Model\IntegrationConfig;
 
 /**
diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger.php b/app/code/Magento/Webapi/Model/Rest/Swagger.php
index 9363c992775ea..3458bfd6bbf5a 100644
--- a/app/code/Magento/Webapi/Model/Rest/Swagger.php
+++ b/app/code/Magento/Webapi/Model/Rest/Swagger.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Webapi\Model\Rest;
 
-use Magento\Webapi\Model\Config as ModelConfig;
-
 /**
  * Webapi Swagger Specification Model
  *
diff --git a/app/code/Magento/Webapi/Model/Soap/Server.php b/app/code/Magento/Webapi/Model/Soap/Server.php
index aa7a4041ae415..d0111e8d40eb9 100644
--- a/app/code/Magento/Webapi/Model/Soap/Server.php
+++ b/app/code/Magento/Webapi/Model/Soap/Server.php
@@ -139,7 +139,7 @@ private function getWsdlLocalUri()
             $this->_request->getHttpHost(),
             $this->generateUri()
         );
-        return 'data://text/plain;base64,'.base64_encode($wsdlBody);
+        return 'data://text/plain;base64,' . base64_encode($wsdlBody);
     }
 
     /**
diff --git a/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php b/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
index a71a2befd0675..05876f3a25185 100644
--- a/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
+++ b/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
@@ -6,13 +6,13 @@
  */
 namespace Magento\Webapi\Model\Soap\Wsdl;
 
+use Magento\Framework\Exception\AuthorizationException;
+use Magento\Framework\Webapi\Authorization;
 use Magento\Webapi\Model\AbstractSchemaGenerator;
+use Magento\Webapi\Model\ServiceMetadata;
 use Magento\Webapi\Model\Soap\Fault;
 use Magento\Webapi\Model\Soap\Wsdl;
 use Magento\Webapi\Model\Soap\WsdlFactory;
-use Magento\Framework\Webapi\Authorization;
-use Magento\Webapi\Model\ServiceMetadata;
-use Magento\Framework\Exception\AuthorizationException;
 
 /**
  * WSDL generator.
diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/Rest/ParamOverriderCustomerIdTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/Rest/ParamOverriderCustomerIdTest.php
index 929e5f248ec2d..b7b18e7cb7332 100644
--- a/app/code/Magento/Webapi/Test/Unit/Controller/Rest/ParamOverriderCustomerIdTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Controller/Rest/ParamOverriderCustomerIdTest.php
@@ -33,7 +33,7 @@ protected function setUp()
             ]
         );
     }
-    
+
     public function testGetOverriddenValueIsCustomer()
     {
         $retValue = 'retValue';
diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/Rest/ParamsOverriderTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/Rest/ParamsOverriderTest.php
index 7f98f21d1e2bb..59e07480709ae 100644
--- a/app/code/Magento/Webapi/Test/Unit/Controller/Rest/ParamsOverriderTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Controller/Rest/ParamsOverriderTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Webapi\Test\Unit\Controller\Rest;
 
-use \Magento\Authorization\Model\UserContextInterface;
+use Magento\Authorization\Model\UserContextInterface;
 
 /**
  * Test Magento\Webapi\Controller\Rest\ParamsOverrider
diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/Rest/Router/RouteTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/Rest/Router/RouteTest.php
index 042f60027ff1c..a2951be1b1b20 100644
--- a/app/code/Magento/Webapi/Test/Unit/Controller/Rest/Router/RouteTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Controller/Rest/Router/RouteTest.php
@@ -7,10 +7,10 @@
  */
 namespace Magento\Webapi\Test\Unit\Controller\Rest\Router;
 
-use \Magento\Webapi\Controller\Rest\Router\Route;
-
 use Magento\Framework\App\RequestInterface as Request;
+
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Webapi\Controller\Rest\Router\Route;
 
 class RouteTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php
index c747ada367aa2..b4bf3d20b3366 100644
--- a/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php
@@ -8,9 +8,6 @@
 
 namespace Magento\Webapi\Test\Unit\Controller;
 
-use Magento\Authorization\Model\UserContextInterface;
-use Magento\Framework\Exception\AuthorizationException;
-
 /**
  * Test Rest controller.
  *
diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/SoapTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/SoapTest.php
index 9b42d3c9c3e3a..6e613dadc316b 100644
--- a/app/code/Magento/Webapi/Test/Unit/Controller/SoapTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Controller/SoapTest.php
@@ -60,7 +60,7 @@ class SoapTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         parent::setUp();
-        
+
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->_soapServerMock = $this->getMockBuilder(\Magento\Webapi\Model\Soap\Server::class)
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php b/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php
index c7272e3e5a2b2..5c136f5faea1a 100644
--- a/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Model/Authorization/TokenUserContextTest.php
@@ -6,17 +6,17 @@
 
 namespace Magento\Webapi\Test\Unit\Model\Authorization;
 
-use Magento\Webapi\Model\Authorization\TokenUserContext;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Authorization\Model\UserContextInterface;
-use Magento\Integration\Model\Oauth\TokenFactory;
-use Magento\Integration\Model\Oauth\Token;
-use Magento\Integration\Api\IntegrationServiceInterface;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\DateTime as Date;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Webapi\Request;
+use Magento\Integration\Api\IntegrationServiceInterface;
 use Magento\Integration\Helper\Oauth\Data as OauthHelper;
-use Magento\Framework\Stdlib\DateTime\DateTime as Date;
-use Magento\Framework\Stdlib\DateTime;
 use Magento\Integration\Model\Integration;
+use Magento\Integration\Model\Oauth\Token;
+use Magento\Integration\Model\Oauth\TokenFactory;
+use Magento\Webapi\Model\Authorization\TokenUserContext;
 
 /**
  * Tests TokenUserContext
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Webapi/Test/Unit/Model/ConfigTest.php
index cedf236ad7ec3..2e41e1fd101c9 100644
--- a/app/code/Magento/Webapi/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Model/ConfigTest.php
@@ -6,9 +6,9 @@
 namespace Magento\Webapi\Test\Unit\Model;
 
 use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Webapi\Model\Cache\Type\Webapi;
 use Magento\Webapi\Model\Config;
 use Magento\Webapi\Model\Config\Reader;
-use Magento\Webapi\Model\Cache\Type\Webapi;
 
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/DataObjectProcessorTest.php b/app/code/Magento/Webapi/Test/Unit/Model/DataObjectProcessorTest.php
index 6f578ccb3b079..54f88715db181 100644
--- a/app/code/Magento/Webapi/Test/Unit/Model/DataObjectProcessorTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Model/DataObjectProcessorTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Webapi\Test\Unit\Model;
 
-use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Webapi\Model\Config as ModelConfig;
 
 class DataObjectProcessorTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/ServiceMetadataTest.php b/app/code/Magento/Webapi/Test/Unit/Model/ServiceMetadataTest.php
index a24878c408e13..d692dad427c84 100644
--- a/app/code/Magento/Webapi/Test/Unit/Model/ServiceMetadataTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Model/ServiceMetadataTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Webapi\Test\Unit\Model;
 
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Reflection\TypeProcessor;
 use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Webapi\Model\Config;
 use Magento\Webapi\Model\Cache\Type\Webapi;
+use Magento\Webapi\Model\Config;
 use Magento\Webapi\Model\Config\ClassReflector;
-use Magento\Framework\Reflection\TypeProcessor;
 use Magento\Webapi\Model\ServiceMetadata;
-use Magento\Customer\Api\CustomerRepositoryInterface;
 
 class ServiceMetadataTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/Soap/FaultTest.php b/app/code/Magento/Webapi/Test/Unit/Model/Soap/FaultTest.php
index 1ac7943fa6484..3297c64bf40a8 100644
--- a/app/code/Magento/Webapi/Test/Unit/Model/Soap/FaultTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Model/Soap/FaultTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Webapi\Test\Unit\Model\Soap;
 
-use \Magento\Webapi\Model\Soap\Fault;
+use Magento\Webapi\Model\Soap\Fault;
 
 /**
  * Test SOAP fault model.
diff --git a/app/code/Magento/Webapi/Test/Unit/Model/Soap/Wsdl/ComplexTypeStrategyTest.php b/app/code/Magento/Webapi/Test/Unit/Model/Soap/Wsdl/ComplexTypeStrategyTest.php
index 93d65d545408d..6f1824086a2d4 100644
--- a/app/code/Magento/Webapi/Test/Unit/Model/Soap/Wsdl/ComplexTypeStrategyTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Model/Soap/Wsdl/ComplexTypeStrategyTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Webapi\Test\Unit\Model\Soap\Wsdl;
 
-use \Magento\Webapi\Model\Soap\Wsdl\ComplexTypeStrategy;
+use Magento\Webapi\Model\Soap\Wsdl\ComplexTypeStrategy;
 
 use Zend\Soap\Wsdl;
 
diff --git a/app/code/Magento/Weee/Block/Adminhtml/Items/Price/Renderer.php b/app/code/Magento/Weee/Block/Adminhtml/Items/Price/Renderer.php
index 396f9e835382e..56d3c976ed735 100644
--- a/app/code/Magento/Weee/Block/Adminhtml/Items/Price/Renderer.php
+++ b/app/code/Magento/Weee/Block/Adminhtml/Items/Price/Renderer.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Weee\Block\Adminhtml\Items\Price;
 
+use Magento\Quote\Model\Quote\Item\AbstractItem as QuoteItem;
 use Magento\Sales\Model\Order\Creditmemo\Item as CreditmemoItem;
 use Magento\Sales\Model\Order\Invoice\Item as InvoiceItem;
 use Magento\Sales\Model\Order\Item;
-use Magento\Quote\Model\Quote\Item\AbstractItem as QuoteItem;
 use Magento\Weee\Block\Item\Price\Renderer as ItemPriceRenderer;
 
 /**
diff --git a/app/code/Magento/Weee/Block/Element/Weee/Tax.php b/app/code/Magento/Weee/Block/Element/Weee/Tax.php
index bf22a81c65147..06613b89a9b95 100644
--- a/app/code/Magento/Weee/Block/Element/Weee/Tax.php
+++ b/app/code/Magento/Weee/Block/Element/Weee/Tax.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Weee\Block\Element\Weee;
 
-use \Magento\Framework\Currency;
+use Magento\Framework\Currency;
 
 class Tax extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
diff --git a/app/code/Magento/Weee/Helper/Data.php b/app/code/Magento/Weee/Helper/Data.php
index c4d1871383320..d6ebb06867e57 100644
--- a/app/code/Magento/Weee/Helper/Data.php
+++ b/app/code/Magento/Weee/Helper/Data.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Weee\Helper;
 
-use Magento\Sales\Model\Order\Item as OrderItem;
 use Magento\Quote\Model\Quote\Item\AbstractItem as QuoteAbstractItem;
+use Magento\Sales\Model\Order\Item as OrderItem;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\Website;
 use Magento\Weee\Model\Tax as WeeeDisplayConfig;
diff --git a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
index dfa40a166ba99..c4c869646d198 100644
--- a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
+++ b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Weee\Model\Attribute\Backend\Weee;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
+use Magento\Framework\Exception\LocalizedException;
 
 class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
 {
diff --git a/app/code/Magento/Weee/Model/ResourceModel/Tax.php b/app/code/Magento/Weee/Model/ResourceModel/Tax.php
index b097e4a018f22..03b23a8e3b7fa 100644
--- a/app/code/Magento/Weee/Model/ResourceModel/Tax.php
+++ b/app/code/Magento/Weee/Model/ResourceModel/Tax.php
@@ -5,9 +5,6 @@
  */
 namespace Magento\Weee\Model\ResourceModel;
 
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\Condition\ConditionInterface;
-
 /**
  * Wee tax resource model
  *
@@ -106,7 +103,7 @@ public function fetchWeeeTaxCalculationsByEntity($countryId, $regionId, $website
             ['eavTable.attribute_code', 'eavTable.attribute_id', 'eavTable.frontend_label']
         )->joinLeft(
             ['eavLabel' => $this->getTable('eav_attribute_label')],
-            'eavLabel.attribute_id = eavTable.attribute_id and eavLabel.store_id = ' .((int) $storeId),
+            'eavLabel.attribute_id = eavTable.attribute_id and eavLabel.store_id = ' . ((int) $storeId),
             'eavLabel.value as label_value'
         )->joinInner(
             ['weeeTax' => $this->getTable('weee_tax')],
diff --git a/app/code/Magento/Weee/Model/Tax.php b/app/code/Magento/Weee/Model/Tax.php
index ae370b41ec192..4658366bc6e96 100644
--- a/app/code/Magento/Weee/Model/Tax.php
+++ b/app/code/Magento/Weee/Model/Tax.php
@@ -6,11 +6,10 @@
 namespace Magento\Weee\Model;
 
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Store\Model\Website;
-use Magento\Tax\Model\Calculation;
-use Magento\Customer\Api\AccountManagementInterface;
-use Magento\Catalog\Model\Product\Type;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php b/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
index afe5de41b2656..a5c5b712afe74 100644
--- a/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Creditmemo/Weee.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Weee\Model\Total\Creditmemo;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Sales\Model\Order\Creditmemo;
 use Magento\Weee\Helper\Data as WeeeHelper;
-use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\App\ObjectManager;
 
 class Weee extends \Magento\Sales\Model\Order\Creditmemo\Total\AbstractTotal
 {
diff --git a/app/code/Magento/Weee/Model/Total/Invoice/Weee.php b/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
index e9c18f1090998..9353fd27440ad 100644
--- a/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Invoice/Weee.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Weee\Model\Total\Invoice;
 
-use Magento\Weee\Helper\Data as WeeeHelper;
-use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Weee\Helper\Data as WeeeHelper;
 
 class Weee extends \Magento\Sales\Model\Order\Invoice\Total\AbstractTotal
 {
@@ -120,11 +120,11 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
             $applied = $this->_weeeData->getApplied($orderItem);
             foreach ($applied as $one) {
                 $title = (string)$one['title'];
-                $one['base_row_amount'] = $invoice->roundPrice($one['base_row_amount'] * $ratio, $title.'_base');
+                $one['base_row_amount'] = $invoice->roundPrice($one['base_row_amount'] * $ratio, $title . '_base');
                 $one['row_amount'] = $invoice->roundPrice($one['row_amount'] * $ratio, $title);
                 $one['base_row_amount_incl_tax'] = $invoice->roundPrice(
                     $one['base_row_amount_incl_tax'] * $ratio,
-                    $title.'_base'
+                    $title . '_base'
                 );
                 $one['row_amount_incl_tax'] = $invoice->roundPrice($one['row_amount_incl_tax'] * $ratio, $title);
 
diff --git a/app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php b/app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php
index c6825958d2178..23d658e399a6c 100644
--- a/app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php
+++ b/app/code/Magento/Weee/Model/Total/Quote/WeeeTax.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Weee\Model\Total\Quote;
 
-use Magento\Quote\Model\Quote\Address\Total\AbstractTotal;
-use Magento\Store\Model\Store;
 use Magento\Tax\Model\Sales\Total\Quote\CommonTaxCollector;
 
 class WeeeTax extends Weee
diff --git a/app/code/Magento/Weee/Observer/CustomerLoggedIn.php b/app/code/Magento/Weee/Observer/CustomerLoggedIn.php
index 8a498d628dabd..41ba027ee2274 100644
--- a/app/code/Magento/Weee/Observer/CustomerLoggedIn.php
+++ b/app/code/Magento/Weee/Observer/CustomerLoggedIn.php
@@ -12,7 +12,6 @@
 use Magento\PageCache\Model\Config;
 use Magento\Tax\Api\TaxAddressManagerInterface;
 use Magento\Weee\Helper\Data;
-use Magento\Tax\Helper\Data as TaxHelper;
 
 class CustomerLoggedIn implements ObserverInterface
 {
diff --git a/app/code/Magento/Weee/Pricing/Render/Adjustment.php b/app/code/Magento/Weee/Pricing/Render/Adjustment.php
index d6e0d15faae10..5ee76d23a5c89 100644
--- a/app/code/Magento/Weee/Pricing/Render/Adjustment.php
+++ b/app/code/Magento/Weee/Pricing/Render/Adjustment.php
@@ -176,7 +176,7 @@ public function renderWeeeTaxAttributeWithTax(\Magento\Framework\DataObject $att
     public function renderWeeeTaxAttributeWithoutTax(\Magento\Framework\DataObject $attribute)
     {
         $price = $attribute->getData('amount_excl_tax');
-        return ($price > 0) ? $this->convertAndFormatCurrency($price): $this->convertAndFormatCurrency(0);
+        return ($price > 0) ? $this->convertAndFormatCurrency($price) : $this->convertAndFormatCurrency(0);
     }
 
     /**
diff --git a/app/code/Magento/Weee/Pricing/TaxAdjustment.php b/app/code/Magento/Weee/Pricing/TaxAdjustment.php
index b913fdafcc00a..67b8d50dbe54d 100644
--- a/app/code/Magento/Weee/Pricing/TaxAdjustment.php
+++ b/app/code/Magento/Weee/Pricing/TaxAdjustment.php
@@ -8,10 +8,10 @@
 
 use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface;
 use Magento\Framework\Pricing\Adjustment\AdjustmentInterface;
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Weee\Helper\Data as WeeeHelper;
+use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Tax\Helper\Data as TaxHelper;
+use Magento\Weee\Helper\Data as WeeeHelper;
 
 /**
  * Weee tax pricing adjustment
diff --git a/app/code/Magento/Weee/Setup/Recurring.php b/app/code/Magento/Weee/Setup/Recurring.php
index 71047832a1fac..593cb3f546672 100644
--- a/app/code/Magento/Weee/Setup/Recurring.php
+++ b/app/code/Magento/Weee/Setup/Recurring.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Weee\Setup;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Setup\ExternalFKSetup;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Weee/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Weee/Test/Unit/Model/ConfigTest.php
index a5663ec35e59c..532cafa94e195 100644
--- a/app/code/Magento/Weee/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Model/ConfigTest.php
@@ -9,7 +9,7 @@
  */
 namespace Magento\Weee\Test\Unit\Model;
 
-use \Magento\Weee\Model\Config;
+use Magento\Weee\Model\Config;
 
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Weee/Test/Unit/Model/Total/Creditmemo/WeeeTest.php b/app/code/Magento/Weee/Test/Unit/Model/Total/Creditmemo/WeeeTest.php
index 409dd93cb2050..fb34fcbbf5d91 100644
--- a/app/code/Magento/Weee/Test/Unit/Model/Total/Creditmemo/WeeeTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Model/Total/Creditmemo/WeeeTest.php
@@ -132,7 +132,7 @@ function ($price, $type) use (&$roundingDelta) {
             $this->assertEquals(
                 $value,
                 $this->creditmemo->getData($key),
-                'Creditmemo data field '.$key.' is incorrect'
+                'Creditmemo data field ' . $key . ' is incorrect'
             );
         }
         //verify invoice item data
@@ -146,7 +146,7 @@ function ($price, $type) use (&$roundingDelta) {
                     $this->assertEquals(
                         $value,
                         $creditmemoItem->getData($key),
-                        'Creditmemo item field '.$key.' is incorrect'
+                        'Creditmemo item field ' . $key . ' is incorrect'
                     );
                 }
             }
diff --git a/app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php b/app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php
index 975580945bb3a..5d232730cc749 100644
--- a/app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Model/Total/Invoice/WeeeTest.php
@@ -136,7 +136,7 @@ function ($price, $type) use (&$roundingDelta) {
 
         //verify invoice data
         foreach ($expectedResults['invoice_data'] as $key => $value) {
-            $this->assertEquals($value, $this->invoice->getData($key), 'Invoice data field '.$key.' is incorrect');
+            $this->assertEquals($value, $this->invoice->getData($key), 'Invoice data field ' . $key . ' is incorrect');
         }
         //verify invoice item data
         foreach ($expectedResults['invoice_items'] as $itemKey => $itemData) {
@@ -149,7 +149,7 @@ function ($price, $type) use (&$roundingDelta) {
                     $this->assertEquals(
                         $value,
                         $invoiceItem->getData($key),
-                        'Invoice item field '.$key.' is incorrect'
+                        'Invoice item field ' . $key . ' is incorrect'
                     );
                 }
             }
diff --git a/app/code/Magento/Weee/Test/Unit/Model/Total/Quote/WeeeTaxTest.php b/app/code/Magento/Weee/Test/Unit/Model/Total/Quote/WeeeTaxTest.php
index 51cba29199abb..73ece86638b59 100644
--- a/app/code/Magento/Weee/Test/Unit/Model/Total/Quote/WeeeTaxTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Model/Total/Quote/WeeeTaxTest.php
@@ -134,15 +134,13 @@ protected function setupTotalMock($itemMock, $isWeeeTaxable, $itemWeeeTaxDetails
                     CTC::KEY_TAX_DETAILS_PRICE_EXCL_TAX => $itemData['weee_tax_applied_amount'],
                     CTC::KEY_TAX_DETAILS_BASE_PRICE_EXCL_TAX => $itemData['base_weee_tax_applied_amount'],
                     CTC::KEY_TAX_DETAILS_PRICE_INCL_TAX => $itemData['weee_tax_applied_amount_incl_tax'],
-                    CTC::KEY_TAX_DETAILS_BASE_PRICE_INCL_TAX =>
-                        $itemData['base_weee_tax_applied_amount_incl_tax'],
+                    CTC::KEY_TAX_DETAILS_BASE_PRICE_INCL_TAX => $itemData['base_weee_tax_applied_amount_incl_tax'],
                     CTC::KEY_TAX_DETAILS_ROW_TOTAL => $itemData['weee_tax_applied_row_amount'],
                     CTC::KEY_TAX_DETAILS_BASE_ROW_TOTAL => $itemData['base_weee_tax_applied_row_amnt'],
-                    CTC::KEY_TAX_DETAILS_ROW_TOTAL_INCL_TAX =>
-                        $itemData['weee_tax_applied_row_amount_incl_tax'],
+                    CTC::KEY_TAX_DETAILS_ROW_TOTAL_INCL_TAX => $itemData['weee_tax_applied_row_amount_incl_tax'],
                     CTC::KEY_TAX_DETAILS_BASE_ROW_TOTAL_INCL_TAX =>
                         $itemData['base_weee_tax_applied_row_amnt_incl_tax'],
-                    ];
+                ];
             }
             $extraDetails = [
                 'weee' => [
diff --git a/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php b/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
index 19f55550bac65..ddb7fa5b8b769 100644
--- a/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Observer/AfterAddressSaveTest.php
@@ -15,7 +15,7 @@ class AfterAddressSaveTest extends \PHPUnit\Framework\TestCase
      * @var ObjectManager
      */
     private $objectManager;
-    
+
     /**
      * @var \Magento\Framework\Event\Observer|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -39,7 +39,7 @@ class AfterAddressSaveTest extends \PHPUnit\Framework\TestCase
      * @var \Magento\Weee\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
      */
     private $weeeHelperMock;
-    
+
     /**
      * @var TaxAddressManagerInterface|MockObject
      */
@@ -126,7 +126,7 @@ public function testExecute(
         $this->addressManagerMock->expects($isNeedSetAddress ? $this->once() : $this->never())
             ->method('setDefaultAddressAfterSave')
             ->with($address);
-        
+
         $this->session->execute($this->observerMock);
     }
 
diff --git a/app/code/Magento/Weee/Test/Unit/Observer/UpdateProductOptionsObserverTest.php b/app/code/Magento/Weee/Test/Unit/Observer/UpdateProductOptionsObserverTest.php
index a3fa2ce474e0d..a30c6e5a56b9e 100644
--- a/app/code/Magento/Weee/Test/Unit/Observer/UpdateProductOptionsObserverTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Observer/UpdateProductOptionsObserverTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Weee\Test\Unit\Observer;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Weee\Model\Tax as WeeeDisplayConfig;
 use Magento\Tax\Model\Config as TaxConfig;
+use Magento\Weee\Model\Tax as WeeeDisplayConfig;
 
 class UpdateProductOptionsObserverTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Weee/Test/Unit/Pricing/AdjustmentTest.php b/app/code/Magento/Weee/Test/Unit/Pricing/AdjustmentTest.php
index e0eba358bc892..c08327feb126c 100644
--- a/app/code/Magento/Weee/Test/Unit/Pricing/AdjustmentTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Pricing/AdjustmentTest.php
@@ -8,10 +8,7 @@
 
 namespace Magento\Weee\Test\Unit\Pricing;
 
-use \Magento\Weee\Pricing\Adjustment;
-
-use Magento\Framework\Pricing\SaleableInterface;
-use Magento\Weee\Helper\Data as WeeeHelper;
+use Magento\Weee\Pricing\Adjustment;
 
 class AdjustmentTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Manager/WebsiteTest.php b/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Manager/WebsiteTest.php
index 6671402d49d47..e89a953d54868 100644
--- a/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Manager/WebsiteTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Form/Modifier/Manager/WebsiteTest.php
@@ -7,11 +7,11 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Locator\LocatorInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
+use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Weee\Ui\DataProvider\Product\Form\Modifier\Manager\Website;
-use Magento\Directory\Helper\Data as DirectoryHelper;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
 
 /**
  * Class WebsiteTest
diff --git a/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WeeeTest.php b/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WeeeTest.php
index 8bd2d24fe160f..87f66169e07ba 100644
--- a/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WeeeTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Form/Modifier/WeeeTest.php
@@ -5,13 +5,12 @@
  */
 namespace Magento\Weee\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
-use Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier\AbstractModifierTest;
-use Magento\Weee\Ui\DataProvider\Product\Form\Modifier\Weee;
-use Magento\Directory\Model\Config\Source\Country as SourceCountry;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
 use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory as EavAttributeFactory;
+use Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier\AbstractModifierTest;
+use Magento\Directory\Model\Config\Source\Country as SourceCountry;
 use Magento\Weee\Ui\DataProvider\Product\Form\Modifier\Manager\Website as WebsiteManager;
+use Magento\Weee\Ui\DataProvider\Product\Form\Modifier\Weee;
 
 /**
  * Class WeeeTest
diff --git a/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php b/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php
index 6be1713c99004..79c20028acf30 100644
--- a/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Weee\Test\Unit\Ui\DataProvider\Product\Listing\Collector;
 
+use Magento\Catalog\Api\Data\ProductRender\PriceInfoExtensionInterface;
 use Magento\Catalog\Api\Data\ProductRender\PriceInfoExtensionInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductRenderInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductRender\FormattedPriceInfoBuilder;
 use Magento\Framework\Pricing\Amount\AmountInterface;
-use Magento\Catalog\Api\Data\ProductRender\PriceInfoExtensionInterface;
-use Magento\Weee\Api\Data\ProductRender\WeeeAdjustmentAttributeInterfaceFactory;
 use Magento\Weee\Api\Data\ProductRender\WeeeAdjustmentAttributeInterface;
+use Magento\Weee\Api\Data\ProductRender\WeeeAdjustmentAttributeInterfaceFactory;
 use Magento\Weee\Ui\DataProvider\Product\Listing\Collector\Weee;
 
 /**
diff --git a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
index c05d48cab6a43..f918cb2274146 100644
--- a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
@@ -18,7 +18,7 @@ $taxDisplay = $block->getTaxDisplayConfig();
 $priceDisplay = $block->isPriceIncludesTax();
 ?>
 
-<?php if ($block->showInclDescr() || $block->showExclDescrIncl()): // incl. + weee ||  excl. + weee + final ?>
+<?php if ($block->showInclDescr() || $block->showExclDescrIncl()): // incl. + weee ||  excl. + weee + final?>
     <?php foreach ($block->getWeeeTaxAttributes() as $weeeTaxAttribute): ?>
         <?php if ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_INCLUDING_TAX): ?>
             <span class="weee"
@@ -43,7 +43,7 @@ $priceDisplay = $block->isPriceIncludesTax();
     <?php endforeach; ?>
 <?php endif; ?>
 
-<?php if ($block->showExclDescrIncl()): // excl. + weee + final ?>
+<?php if ($block->showExclDescrIncl()): // excl. + weee + final?>
     <span class="price-final price-final_price"
           data-price-type="weeePrice"
           data-price-amount="<?= /* @escapeNotVerified */ $block->getRawFinalAmount() ?>"
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
index 49345f29afd53..b0f77ccec6df9 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Main;
 
-use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Backend\Block\Template;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
-use Magento\Backend\Block\Template;
+use Magento\Framework\Serialize\Serializer\Json;
 
 /**
  * Widget Instance page groups (predefined layouts group) to display on
diff --git a/app/code/Magento/Widget/Helper/Conditions.php b/app/code/Magento/Widget/Helper/Conditions.php
index 33cc353358020..1686c93c59f91 100644
--- a/app/code/Magento/Widget/Helper/Conditions.php
+++ b/app/code/Magento/Widget/Helper/Conditions.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Widget\Helper;
 
-use Magento\Framework\Data\Wysiwyg\Normalizer;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Wysiwyg\Normalizer;
 use Magento\Framework\Serialize\Serializer\Json;
 
 /**
diff --git a/app/code/Magento/Widget/Model/Config/Converter.php b/app/code/Magento/Widget/Model/Config/Converter.php
index 40718a5a5db9c..fbfcadf9e77c5 100644
--- a/app/code/Magento/Widget/Model/Config/Converter.php
+++ b/app/code/Magento/Widget/Model/Config/Converter.php
@@ -240,7 +240,7 @@ protected function _convertDepends($source)
                 ];
 
                 continue;
-            } else if (!isset($depends[$dependencyName]['values'])) {
+            } elseif (!isset($depends[$dependencyName]['values'])) {
                 $depends[$dependencyName]['values'] = [$depends[$dependencyName]['value']];
                 unset($depends[$dependencyName]['value']);
             }
diff --git a/app/code/Magento/Widget/Model/Config/FileResolver.php b/app/code/Magento/Widget/Model/Config/FileResolver.php
index bdb2c4f801485..e9640330f71bf 100644
--- a/app/code/Magento/Widget/Model/Config/FileResolver.php
+++ b/app/code/Magento/Widget/Model/Config/FileResolver.php
@@ -7,8 +7,8 @@
  */
 namespace Magento\Widget\Model\Config;
 
-use Magento\Framework\Component\DirSearch;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\DirSearch;
 
 class FileResolver implements \Magento\Framework\Config\FileResolverInterface
 {
diff --git a/app/code/Magento/Widget/Model/Config/SchemaLocator.php b/app/code/Magento/Widget/Model/Config/SchemaLocator.php
index 58018bee8b315..54368a980ce6d 100644
--- a/app/code/Magento/Widget/Model/Config/SchemaLocator.php
+++ b/app/code/Magento/Widget/Model/Config/SchemaLocator.php
@@ -7,8 +7,6 @@
  */
 namespace Magento\Widget\Model\Config;
 
-use Magento\Framework\Module\Dir;
-
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
     /**
diff --git a/app/code/Magento/Widget/Model/Widget/Instance.php b/app/code/Magento/Widget/Model/Widget/Instance.php
index f21609cb1ef5c..f8a4ada59b9a5 100644
--- a/app/code/Magento/Widget/Model/Widget/Instance.php
+++ b/app/code/Magento/Widget/Model/Widget/Instance.php
@@ -38,7 +38,7 @@ class Instance extends \Magento\Framework\Model\AbstractModel
      * @deprecated see self::SINGLE_PRODUCT_LAYOUT_HANDLE
      */
     const SINGLE_PRODUCT_LAYOUT_HANLDE = self::SINGLE_PRODUCT_LAYOUT_HANDLE;
-    
+
     const SINGLE_PRODUCT_LAYOUT_HANDLE = 'catalog_product_view_id_{{ID}}';
 
     const PRODUCT_TYPE_LAYOUT_HANDLE = 'catalog_product_view_type_{{TYPE}}';
diff --git a/app/code/Magento/Widget/Setup/LayoutUpdateConverter.php b/app/code/Magento/Widget/Setup/LayoutUpdateConverter.php
index 54c364dcc49a4..83c7829d4f3f1 100644
--- a/app/code/Magento/Widget/Setup/LayoutUpdateConverter.php
+++ b/app/code/Magento/Widget/Setup/LayoutUpdateConverter.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Widget\Setup;
 
-use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\Serialize\Serializer\Serialize;
 use Magento\Framework\Data\Wysiwyg\Normalizer;
 use Magento\Framework\DB\DataConverter\DataConversionException;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Serialize\Serializer\Serialize;
 
 /**
  * Convert conditions_encoded part of layout update data from serialized to JSON format
diff --git a/app/code/Magento/Widget/Setup/UpgradeData.php b/app/code/Magento/Widget/Setup/UpgradeData.php
index de3928d1fb5b8..2bda373bcbd54 100644
--- a/app/code/Magento/Widget/Setup/UpgradeData.php
+++ b/app/code/Magento/Widget/Setup/UpgradeData.php
@@ -6,11 +6,11 @@
 namespace Magento\Widget\Setup;
 
 use Magento\Framework\DB\AggregatedFieldDataConverter;
+use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\DB\FieldToConvert;
-use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\Setup\UpgradeDataInterface;
 
 /**
  * Upgrade data for widget module.
diff --git a/app/code/Magento/Widget/Test/Unit/Controller/Adminhtml/Widget/LoadOptionsTest.php b/app/code/Magento/Widget/Test/Unit/Controller/Adminhtml/Widget/LoadOptionsTest.php
index e3be77193be01..f08350e56be3f 100644
--- a/app/code/Magento/Widget/Test/Unit/Controller/Adminhtml/Widget/LoadOptionsTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Controller/Adminhtml/Widget/LoadOptionsTest.php
@@ -5,15 +5,15 @@
  */
 namespace Magento\Widget\Test\Unit\Controller\Adminhtml\Widget;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Widget\Controller\Adminhtml\Widget\LoadOptions;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\ViewInterface;
-use Magento\Widget\Helper\Conditions as ConditionsHelper;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\App\RequestInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Widget\Controller\Adminhtml\Widget\LoadOptions;
+use Magento\Widget\Helper\Conditions as ConditionsHelper;
 
 /**
  * Test class for \Magento\Widget\Controller\Adminhtml\Widget\LoadOptions
diff --git a/app/code/Magento/Widget/Test/Unit/Helper/ConditionsTest.php b/app/code/Magento/Widget/Test/Unit/Helper/ConditionsTest.php
index f943a5688b56c..d7d91329c34c1 100644
--- a/app/code/Magento/Widget/Test/Unit/Helper/ConditionsTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Helper/ConditionsTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Widget\Test\Unit\Helper;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Data\Wysiwyg\Normalizer;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class ConditionsTest
diff --git a/app/code/Magento/Widget/Test/Unit/Model/Config/FileResolverTest.php b/app/code/Magento/Widget/Test/Unit/Model/Config/FileResolverTest.php
index 301869a50a713..acb53689c69a5 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/Config/FileResolverTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/Config/FileResolverTest.php
@@ -7,7 +7,7 @@
 namespace Magento\Widget\Test\Unit\Model\Config;
 
 use Magento\Framework\Component\ComponentRegistrar;
-use \Magento\Widget\Model\Config\FileResolver;
+use Magento\Widget\Model\Config\FileResolver;
 
 class FileResolverTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Widget/Instance/Options/ThemesTest.php b/app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Widget/Instance/Options/ThemesTest.php
index cc87b98b28ed5..ce37e9c2d9645 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Widget/Instance/Options/ThemesTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Widget/Instance/Options/ThemesTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Widget\Test\Unit\Model\ResourceModel\Widget\Instance\Options;
 
-use Magento\Widget\Model\ResourceModel\Widget\Instance\Options\Themes;
 use Magento\Theme\Model\ResourceModel\Theme\Collection as ThemeCollection;
 use Magento\Theme\Model\ResourceModel\Theme\CollectionFactory as ThemeCollectionFactory;
+use Magento\Widget\Model\ResourceModel\Widget\Instance\Options\Themes;
 
 /**
  * Test class for \Magento\Widget\Model\ResourceModel\Widget\Instance\Options\Themes
diff --git a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterEmulateTest.php b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterEmulateTest.php
index f49ee97818618..9846dd06d11d6 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterEmulateTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterEmulateTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Widget\Test\Unit\Model\Template;
 
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class FilterEmulateTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php b/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php
index de47e5ca703aa..eb3c05024b6bc 100644
--- a/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php
+++ b/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Wishlist\Block\Adminhtml;
 
-use Magento\Framework\Registry;
 use Magento\Backend\Block\Template\Context;
-use Magento\Ui\Component\Layout\Tabs\TabWrapper;
-use Magento\Ui\Component\Layout\Tabs\TabInterface;
 use Magento\Customer\Controller\RegistryConstants;
+use Magento\Framework\Registry;
+use Magento\Ui\Component\Layout\Tabs\TabInterface;
+use Magento\Ui\Component\Layout\Tabs\TabWrapper;
 
 /**
  * Class WishlistTab
diff --git a/app/code/Magento/Wishlist/Controller/AbstractIndex.php b/app/code/Magento/Wishlist/Controller/AbstractIndex.php
index 4242240277b5a..30828b09da1ab 100644
--- a/app/code/Magento/Wishlist/Controller/AbstractIndex.php
+++ b/app/code/Magento/Wishlist/Controller/AbstractIndex.php
@@ -6,7 +6,6 @@
 namespace Magento\Wishlist\Controller;
 
 use Magento\Framework\App\Action;
-use Magento\Wishlist\Controller\IndexInterface;
 
 /**
  * Class AbstractIndex
diff --git a/app/code/Magento/Wishlist/Controller/Index/Add.php b/app/code/Magento/Wishlist/Controller/Index/Add.php
index 1aa96dd6f75fd..0c1b62e0598d7 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Add.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Add.php
@@ -7,10 +7,10 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\App\Action;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Data\Form\FormKey\Validator;
-use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NotFoundException;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Wishlist/Controller/Index/Allcart.php b/app/code/Magento/Wishlist/Controller/Index/Allcart.php
index 8463a00c866c5..d595508d96911 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Allcart.php
@@ -5,12 +5,11 @@
  */
 namespace Magento\Wishlist\Controller\Index;
 
-use Magento\Framework\Data\Form\FormKey\Validator;
-use Magento\Framework\App\Action;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
 use Magento\Wishlist\Model\ItemCarrier;
-use Magento\Framework\Controller\ResultFactory;
 
 class Allcart extends \Magento\Wishlist\Controller\AbstractIndex
 {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Cart.php b/app/code/Magento/Wishlist/Controller/Index/Cart.php
index 0e826d83a52f6..edad170617ee5 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Cart.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Wishlist\Controller\Index;
 
-use Magento\Framework\App\Action;
 use Magento\Catalog\Model\Product\Exception as ProductException;
+use Magento\Framework\App\Action;
 use Magento\Framework\Controller\ResultFactory;
 
 /**
@@ -211,7 +211,7 @@ public function execute()
             $resultJson->setData(['backUrl' => $redirectUrl]);
             return $resultJson;
         }
-        
+
         $resultRedirect->setUrl($redirectUrl);
         return $resultRedirect;
     }
diff --git a/app/code/Magento/Wishlist/Controller/Index/Configure.php b/app/code/Magento/Wishlist/Controller/Index/Configure.php
index 7e6f4d3ed7939..7915b1fc10748 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Configure.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Configure.php
@@ -6,8 +6,8 @@
 namespace Magento\Wishlist\Controller\Index;
 
 use Magento\Framework\App\Action;
-use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NotFoundException;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
index 994da75073e96..81e3caed8b108 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
@@ -7,13 +7,12 @@
 
 use Magento\Checkout\Helper\Cart as CartHelper;
 use Magento\Checkout\Model\Cart as CheckoutCart;
-use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Escaper;
-use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
 use Magento\Wishlist\Helper\Data as WishlistHelper;
 
diff --git a/app/code/Magento/Wishlist/Controller/Index/Index.php b/app/code/Magento/Wishlist/Controller/Index/Index.php
index 16b31960d44a5..94351a70eb519 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Index.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Index.php
@@ -6,8 +6,8 @@
 namespace Magento\Wishlist\Controller\Index;
 
 use Magento\Framework\App\Action;
-use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NotFoundException;
 
 class Index extends \Magento\Wishlist\Controller\AbstractIndex
 {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Plugin.php b/app/code/Magento/Wishlist/Controller/Index/Plugin.php
index a27379486c2b3..d7a00aaeac554 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Plugin.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Plugin.php
@@ -7,10 +7,10 @@
 namespace Magento\Wishlist\Controller\Index;
 
 use Magento\Customer\Model\Session as CustomerSession;
-use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\Exception\NotFoundException;
 
 class Plugin
 {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Remove.php b/app/code/Magento/Wishlist/Controller/Index/Remove.php
index ec45201e390f1..4d05072ff7242 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Remove.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Remove.php
@@ -6,9 +6,9 @@
 namespace Magento\Wishlist\Controller\Index;
 
 use Magento\Framework\App\Action;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Exception\NotFoundException;
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
 
 /**
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index c2389af6a2282..6b542f48fcfea 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -8,11 +8,11 @@
 
 use Magento\Framework\App\Action;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Session\Generic as WishlistSession;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\View\Result\Layout as ResultLayout;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Wishlist/Controller/Index/Share.php b/app/code/Magento/Wishlist/Controller/Index/Share.php
index c79f997936887..a8520042301b4 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Share.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Share.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Wishlist\Controller\Index;
 
-use Magento\Framework\App\Action;
 use Magento\Framework\Controller\ResultFactory;
 
 class Share extends \Magento\Wishlist\Controller\AbstractIndex
diff --git a/app/code/Magento/Wishlist/Controller/Index/Update.php b/app/code/Magento/Wishlist/Controller/Index/Update.php
index cc3f222c83065..f5399d66da3f0 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Update.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Update.php
@@ -6,8 +6,8 @@
 namespace Magento\Wishlist\Controller\Index;
 
 use Magento\Framework\App\Action;
-use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NotFoundException;
 
 class Update extends \Magento\Wishlist\Controller\AbstractIndex
 {
diff --git a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
index 2a98fa1b7fcd5..2a666b327110d 100644
--- a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
+++ b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
@@ -8,9 +8,9 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
 
 /**
diff --git a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
index 6300b14dcf515..e2da4ad4ea645 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
@@ -6,8 +6,8 @@
 namespace Magento\Wishlist\Controller\Shared;
 
 use Magento\Framework\App\Action\Context;
-use Magento\Wishlist\Model\ItemCarrier;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Wishlist\Model\ItemCarrier;
 
 class Allcart extends \Magento\Framework\App\Action\Action
 {
diff --git a/app/code/Magento/Wishlist/Model/Item.php b/app/code/Magento/Wishlist/Model/Item.php
index b0e7c78cae5f4..294b23de97d9e 100644
--- a/app/code/Magento/Wishlist/Model/Item.php
+++ b/app/code/Magento/Wishlist/Model/Item.php
@@ -8,12 +8,12 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
+use Magento\Catalog\Model\Product\Exception as ProductException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Wishlist\Model\Item\Option;
 use Magento\Wishlist\Model\Item\OptionFactory;
 use Magento\Wishlist\Model\ResourceModel\Item\Option\CollectionFactory;
-use Magento\Catalog\Model\Product\Exception as ProductException;
 
 /**
  * Wishlist item model
diff --git a/app/code/Magento/Wishlist/Model/Item/Option.php b/app/code/Magento/Wishlist/Model/Item/Option.php
index 61acfcb666531..b507836363254 100644
--- a/app/code/Magento/Wishlist/Model/Item/Option.php
+++ b/app/code/Magento/Wishlist/Model/Item/Option.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Wishlist\Model\Item;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Wishlist\Model\Item;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 
 /**
  * Item option model
diff --git a/app/code/Magento/Wishlist/Model/ItemCarrier.php b/app/code/Magento/Wishlist/Model/ItemCarrier.php
index 6cf295084eca8..60a8c84a47144 100644
--- a/app/code/Magento/Wishlist/Model/ItemCarrier.php
+++ b/app/code/Magento/Wishlist/Model/ItemCarrier.php
@@ -12,10 +12,10 @@
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Psr\Log\LoggerInterface as Logger;
 use Magento\Framework\Message\ManagerInterface as MessageManager;
 use Magento\Framework\UrlInterface;
 use Magento\Wishlist\Helper\Data as WishlistHelper;
+use Psr\Log\LoggerInterface as Logger;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Wishlist/Observer/CustomerLogout.php b/app/code/Magento/Wishlist/Observer/CustomerLogout.php
index 3f89aa5dad7a5..640db010a28d4 100644
--- a/app/code/Magento/Wishlist/Observer/CustomerLogout.php
+++ b/app/code/Magento/Wishlist/Observer/CustomerLogout.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Wishlist\Observer;
 
+use Magento\Customer\Model\Session;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
-use Magento\Customer\Model\Session;
 
 /**
  * Class CustomerLogout
@@ -34,6 +34,7 @@ public function __construct(Session $customerSession)
      *
      * @param Observer $observer
      * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(Observer $observer)
     {
diff --git a/app/code/Magento/Wishlist/Setup/Recurring.php b/app/code/Magento/Wishlist/Setup/Recurring.php
index 5ddb69a5a3b29..98344c3a6e837 100644
--- a/app/code/Magento/Wishlist/Setup/Recurring.php
+++ b/app/code/Magento/Wishlist/Setup/Recurring.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Wishlist\Setup;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Setup\ExternalFKSetup;
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * @codeCoverageIgnore
diff --git a/app/code/Magento/Wishlist/Setup/UpgradeData.php b/app/code/Magento/Wishlist/Setup/UpgradeData.php
index 10ce3469afe4f..3ffa5f4ad9c66 100644
--- a/app/code/Magento/Wishlist/Setup/UpgradeData.php
+++ b/app/code/Magento/Wishlist/Setup/UpgradeData.php
@@ -5,14 +5,13 @@
  */
 namespace Magento\Wishlist\Setup;
 
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\DB\Select\QueryModifierFactory;
-use Magento\Framework\DB\Select\InQueryModifier;
+use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\Query\Generator;
+use Magento\Framework\DB\Select\QueryModifierFactory;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\UpgradeDataInterface;
 
 class UpgradeData implements UpgradeDataInterface
 {
diff --git a/app/code/Magento/Wishlist/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php b/app/code/Magento/Wishlist/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php
index 69283cd701119..0a683cb0b190f 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Filter/TextTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Wishlist\Test\Unit\Block\Adminhtml\Widget\Grid\Column\Filter;
 
-use \Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter\Text;
+use Magento\Wishlist\Block\Adminhtml\Widget\Grid\Column\Filter\Text;
 
 class TextTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Wishlist/Test/Unit/Block/Cart/Item/Renderer/Actions/MoveToWishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/Block/Cart/Item/Renderer/Actions/MoveToWishlistTest.php
index cd4fe2d04cbbe..13b8b08da4893 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Block/Cart/Item/Renderer/Actions/MoveToWishlistTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Block/Cart/Item/Renderer/Actions/MoveToWishlistTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Wishlist\Test\Unit\Block\Cart\Item\Renderer\Actions;
 
-use Magento\Wishlist\Block\Cart\Item\Renderer\Actions\MoveToWishlist;
 use Magento\Quote\Model\Quote\Item;
+use Magento\Wishlist\Block\Cart\Item\Renderer\Actions\MoveToWishlist;
 use Magento\Wishlist\Helper\Data;
 
 class MoveToWishlistTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php
index d7195086850e4..c6133719ee04d 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/AllcartTest.php
@@ -186,7 +186,7 @@ public function testExecutePassed()
     {
         $url = 'http://redirect-url.com';
         $wishlist = $this->createMock(\Magento\Wishlist\Model\Wishlist::class);
-        
+
         $this->formKeyValidator->expects($this->once())
             ->method('validate')
             ->with($this->request)
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
index d89f6e43e07be..c12b8b5b6049d 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Wishlist\Test\Unit\Controller\Index;
 
-use Magento\Wishlist\Controller\Index\Cart;
 use Magento\Catalog\Model\Product\Exception as ProductException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Wishlist\Controller\Index\Cart;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -567,7 +567,7 @@ protected function prepareExecuteWithQuantityArray($isAjax = false)
 
         $this->messageManagerMock->expects($this->once())
             ->method('addSuccess')
-            ->with('You added '  . $productName . ' to your shopping cart.', null)
+            ->with('You added ' . $productName . ' to your shopping cart.', null)
             ->willReturnSelf();
 
         $this->cartHelperMock->expects($this->once())
@@ -581,7 +581,7 @@ protected function prepareExecuteWithQuantityArray($isAjax = false)
         $this->helperMock->expects($this->once())
             ->method('calculate')
             ->willReturnSelf();
-        
+
         return $refererUrl;
     }
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
index 2a36d3beb8558..31b4be2891b96 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/RemoveTest.php
@@ -241,7 +241,7 @@ public function testExecuteWithoutWishlist()
             ->method('create')
             ->with(\Magento\Wishlist\Model\Item::class)
             ->willReturn($item);
-        
+
         $this->wishlistProvider
             ->expects($this->once())
             ->method('getWishlist')
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
index 24438dbc71d99..787124ddf40ae 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Wishlist\Test\Unit\Controller\Shared;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class AllcartTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
index 9ecd58b44f0e5..a36b58ccde414 100644
--- a/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
@@ -8,7 +8,6 @@
 use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Type\AbstractType;
-use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
 use Magento\Framework\App\ViewInterface;
 use Magento\Framework\Pricing\Render;
 use Magento\Wishlist\Block\Customer\Sidebar;
diff --git a/app/code/Magento/Wishlist/Test/Unit/DataProvider/Product/Collector/ButtonTest.php b/app/code/Magento/Wishlist/Test/Unit/DataProvider/Product/Collector/ButtonTest.php
index cc456197a7a14..4a48e0104ac4e 100644
--- a/app/code/Magento/Wishlist/Test/Unit/DataProvider/Product/Collector/ButtonTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/DataProvider/Product/Collector/ButtonTest.php
@@ -6,13 +6,13 @@
 
 namespace Magento\Wishlist\Test\Unit\DataProvider\Product\Collector;
 
-use Magento\Catalog\Api\Data\ProductRenderExtensionFactory;
-use Magento\Catalog\Api\Data\ProductRender\ButtonInterfaceFactory;
-use Magento\Wishlist\Helper\Data;
-use Magento\Catalog\Api\Data\ProductRenderInterface;
-use Magento\Catalog\Api\Data\ProductRenderExtensionInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\ProductRender\ButtonInterface;
+use Magento\Catalog\Api\Data\ProductRender\ButtonInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductRenderExtensionFactory;
+use Magento\Catalog\Api\Data\ProductRenderExtensionInterface;
+use Magento\Catalog\Api\Data\ProductRenderInterface;
+use Magento\Wishlist\Helper\Data;
 use Magento\Wishlist\Ui\DataProvider\Product\Collector\Button;
 
 /**
@@ -66,7 +66,7 @@ public function testCollect()
         $buttonInterfaceMock = $this->getMockBuilder(ButtonInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        
+
         $productRendererMock->expects($this->once())
             ->method('getExtensionAttributes')
             ->willReturn($productRendererExtensionMock);
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/AuthenticationStateTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/AuthenticationStateTest.php
index df81814c8e305..143b475723659 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/AuthenticationStateTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/AuthenticationStateTest.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Wishlist\Test\Unit\Model;
 
-use \Magento\Wishlist\Model\AuthenticationState;
+use Magento\Wishlist\Model\AuthenticationState;
 
 class AuthenticationStateTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/ConfigTest.php
index 914d9aca65602..67dbfc6849f6a 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/ConfigTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Wishlist\Test\Unit\Model;
 
-use \Magento\Wishlist\Model\Config;
+use Magento\Wishlist\Model\Config;
 
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php
index 0b1057683de86..81aca0734f91b 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php
@@ -6,8 +6,7 @@
 
 namespace Magento\Wishlist\Test\Unit\Model;
 
-use Magento\Framework\Exception\LocalizedException;
-use \Magento\Wishlist\Model\Item;
+use Magento\Wishlist\Model\Item;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/LocaleQuantityProcessorTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/LocaleQuantityProcessorTest.php
index 145d282554634..ad43af63b4adf 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/LocaleQuantityProcessorTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/LocaleQuantityProcessorTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Wishlist\Test\Unit\Model;
 
-use \Magento\Wishlist\Model\LocaleQuantityProcessor;
+use Magento\Wishlist\Model\LocaleQuantityProcessor;
 
 class LocaleQuantityProcessorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Wishlist/Test/Unit/Observer/AddToCartTest.php b/app/code/Magento/Wishlist/Test/Unit/Observer/AddToCartTest.php
index e6e14a452a96d..68cf0dcde02ec 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Observer/AddToCartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Observer/AddToCartTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Wishlist\Test\Unit\Observer;
 
-use \Magento\Wishlist\Observer\AddToCart as Observer;
+use Magento\Wishlist\Observer\AddToCart as Observer;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Wishlist/Test/Unit/Observer/CartUpdateBeforeTest.php b/app/code/Magento/Wishlist/Test/Unit/Observer/CartUpdateBeforeTest.php
index 3ca87234b60f9..4e6827a7c32cd 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Observer/CartUpdateBeforeTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Observer/CartUpdateBeforeTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Wishlist\Test\Unit\Observer;
 
-use \Magento\Wishlist\Observer\CartUpdateBefore as Observer;
+use Magento\Wishlist\Observer\CartUpdateBefore as Observer;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Wishlist/Test/Unit/Observer/CustomerLoginTest.php b/app/code/Magento/Wishlist/Test/Unit/Observer/CustomerLoginTest.php
index e94f0a8793d57..f0566d32f9cce 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Observer/CustomerLoginTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Observer/CustomerLoginTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Wishlist\Test\Unit\Observer;
 
-use \Magento\Wishlist\Observer\CustomerLogin as Observer;
+use Magento\Wishlist\Observer\CustomerLogin as Observer;
 
 class CustomerLoginTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Wishlist/Test/Unit/Observer/CustomerLogoutTest.php b/app/code/Magento/Wishlist/Test/Unit/Observer/CustomerLogoutTest.php
index 0933ff2772214..1020e4c08ef28 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Observer/CustomerLogoutTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Observer/CustomerLogoutTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Wishlist\Test\Unit\Observer;
 
-use \Magento\Wishlist\Observer\CustomerLogout as Observer;
+use Magento\Wishlist\Observer\CustomerLogout as Observer;
 
 class CustomerLogoutTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Wishlist/Test/Unit/Pricing/ConfiguredPrice/ConfigurableProductTest.php b/app/code/Magento/Wishlist/Test/Unit/Pricing/ConfiguredPrice/ConfigurableProductTest.php
index 23a93bc350203..07c236dd6bed6 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Pricing/ConfiguredPrice/ConfigurableProductTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Pricing/ConfiguredPrice/ConfigurableProductTest.php
@@ -36,7 +36,7 @@ protected function setUp()
     {
         $this->priceInfoMock = $this->getMockBuilder(\Magento\Framework\Pricing\PriceInfoInterface::class)
             ->getMockForAbstractClass();
-        
+
         $this->saleableItem = $this->getMockBuilder(\Magento\Framework\Pricing\SaleableInterface::class)
             ->setMethods([
                 'getPriceInfo',
diff --git a/app/code/Magento/Wishlist/Ui/DataProvider/Product/Collector/Button.php b/app/code/Magento/Wishlist/Ui/DataProvider/Product/Collector/Button.php
index 2404c6ecc5b1e..3389e93d6fd68 100644
--- a/app/code/Magento/Wishlist/Ui/DataProvider/Product/Collector/Button.php
+++ b/app/code/Magento/Wishlist/Ui/DataProvider/Product/Collector/Button.php
@@ -8,11 +8,8 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\ProductRender\ButtonInterfaceFactory;
-use Magento\Catalog\Api\Data\ProductRenderInfoDtoInterface;
 use Magento\Catalog\Api\Data\ProductRenderInterface;
-use Magento\Catalog\Model\ProductRenderInfoDto;
 use Magento\Catalog\Ui\DataProvider\Product\ProductRenderCollectorInterface;
-use Magento\Catalog\Ui\DataProvider\Product\ProductRenderInfoProviderInterface;
 use Magento\Wishlist\Helper\Data;
 
 /**
diff --git a/lib/internal/Magento/Framework/Acl/Test/Unit/Role/RegistryTest.php b/lib/internal/Magento/Framework/Acl/Test/Unit/Role/RegistryTest.php
index 9f7269455555c..551bf09c63cc5 100644
--- a/lib/internal/Magento/Framework/Acl/Test/Unit/Role/RegistryTest.php
+++ b/lib/internal/Magento/Framework/Acl/Test/Unit/Role/RegistryTest.php
@@ -6,7 +6,7 @@
  */
 namespace Magento\Framework\Acl\Test\Unit\Role;
 
-use \Magento\Framework\Acl\Role\Registry;
+use Magento\Framework\Acl\Role\Registry;
 
 class RegistryTest extends \PHPUnit\Framework\TestCase
 {
@@ -78,7 +78,7 @@ public function testAddParentWrongParentId()
     {
         $roleId = 1;
         $parentRoleId = 2;
-        list($role,) = $this->initRoles($roleId, $parentRoleId);
+        list($role, ) = $this->initRoles($roleId, $parentRoleId);
 
         $this->model->addParent($role, 26);
     }
diff --git a/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php b/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
index 3ea43cbccd24f..aa6807f1f9551 100644
--- a/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
+++ b/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Api;
 
-use \Magento\Framework\Api\AttributeValueFactory;
-
 /**
  * Base Class for extensible data Objects
  * @SuppressWarnings(PHPMD.NumberOfChildren)
diff --git a/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesGenerator.php b/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesGenerator.php
index a14001bf05b35..b13f33b54fcaf 100644
--- a/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesGenerator.php
+++ b/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesGenerator.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\Api\Code\Generator;
 
+use Magento\Framework\Api\ExtensionAttribute\Config\Converter;
+use Magento\Framework\Api\SimpleDataObjectConverter;
 use Magento\Framework\Code\Generator\DefinedClasses;
 use Magento\Framework\Code\Generator\Io;
-use Magento\Framework\Api\SimpleDataObjectConverter;
-use Magento\Framework\Api\ExtensionAttribute\Config\Converter;
 
 /**
  * Code generator for data object extensions.
diff --git a/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceFactoryGenerator.php b/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceFactoryGenerator.php
index 12af882a46760..147cc7a3d3d36 100644
--- a/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceFactoryGenerator.php
+++ b/lib/internal/Magento/Framework/Api/Code/Generator/ExtensionAttributesInterfaceFactoryGenerator.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Framework\Api\Code\Generator;
 
-use Magento\Framework\ObjectManager\Code\Generator\Factory;
+use Magento\Framework\Code\Generator\CodeGeneratorInterface;
 use Magento\Framework\Code\Generator\DefinedClasses;
 use Magento\Framework\Code\Generator\Io;
-use Magento\Framework\Code\Generator\CodeGeneratorInterface;
+use Magento\Framework\ObjectManager\Code\Generator\Factory;
 
 class ExtensionAttributesInterfaceFactoryGenerator extends Factory
 {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config.php
index d928c77cc2e20..223429af5f681 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/Config.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Api\ExtensionAttribute;
 
-use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Api\ExtensionAttribute\Config\Reader;
+use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessor.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessor.php
index 28f053e1afa84..a33befa3d2822 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessor.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessor.php
@@ -6,12 +6,11 @@
 
 namespace Magento\Framework\Api\ExtensionAttribute;
 
-use Magento\Framework\Api\ExtensionAttribute\Config;
+use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\ExtensionAttribute\Config\Converter as Converter;
+use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Framework\Data\Collection\AbstractDb as DbCollection;
 use Magento\Framework\Reflection\TypeProcessor;
-use Magento\Framework\Api\ExtensibleDataInterface;
-use Magento\Framework\Api\ExtensionAttributesFactory;
 
 /**
  * Join processor allows to join extension attributes during collections loading.
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorHelper.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorHelper.php
index f49c1fd0b5154..79fc328c98d90 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorHelper.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorHelper.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\Api\ExtensionAttribute;
 
-use Magento\Framework\Api\ExtensionAttribute\Config;
 use Magento\Framework\Api\ExtensionAttribute\Config\Converter as Converter;
 use Magento\Framework\Api\SimpleDataObjectConverter;
 
diff --git a/lib/internal/Magento/Framework/Api/Filter.php b/lib/internal/Magento/Framework/Api/Filter.php
index 03af29a00ad67..e575bdfe87dae 100644
--- a/lib/internal/Magento/Framework/Api/Filter.php
+++ b/lib/internal/Magento/Framework/Api/Filter.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Framework\Api;
 
-use Magento\Framework\Api\AbstractSimpleObject;
-
 /**
  * Filter which can be used by any methods from service layer.
  *
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchCriteria.php b/lib/internal/Magento/Framework/Api/Search/SearchCriteria.php
index 964e506120167..258e88e83857f 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchCriteria.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchCriteria.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\Api\Search;
 
 use Magento\Framework\Api\SearchCriteria as BaseSearchCriteria;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
 
 /**
  * @api
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchResult.php b/lib/internal/Magento/Framework/Api/Search/SearchResult.php
index 321edc8b5a05d..32a8e209ba102 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchResult.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchResult.php
@@ -7,8 +7,6 @@
 
 use Magento\Framework\Api\AbstractSimpleObject;
 use Magento\Framework\Api\SearchCriteriaInterface as BaseSearchCriteriaInterface;
-use Magento\Framework\Api\Search\SearchCriteriaInterface;
-use Magento\Framework\Api\Search\SearchResultInterface;
 
 class SearchResult extends AbstractSimpleObject implements SearchResultInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php
index 4946f083004ba..e44ccb0d22b41 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/DataObjectHelperTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\Api\Test\Unit;
 
-use Magento\Framework\Api\CustomAttributesDataInterface;
 use Magento\Framework\Api\AttributeInterface;
+use Magento\Framework\Api\CustomAttributesDataInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/ExtensibleDataObjectConverterTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/ExtensibleDataObjectConverterTest.php
index f0e333aa5e1d5..eacfc1ab1f73a 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/ExtensibleDataObjectConverterTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/ExtensibleDataObjectConverterTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Framework\Api\Test\Unit;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Api\AbstractExtensibleObject;
 use Magento\Framework\Api\AttributeValue;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class ExtensibleDataObjectConverterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Search/SearchResultTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/Search/SearchResultTest.php
index 21178c0bce0f8..b17e1f43f7b84 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/Search/SearchResultTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/Search/SearchResultTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\Api\Test\Unit\Search;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\Api\Search\SearchResult;
 use Magento\Framework\Api\Search\DocumentInterface;
+use Magento\Framework\Api\Search\SearchResult;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class SearchResultTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/PaginationProcessorTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/PaginationProcessorTest.php
index 47878ddcec8a5..6f21c098068c2 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/PaginationProcessorTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/SearchCriteria/CollectionProcessor/PaginationProcessorTest.php
@@ -13,7 +13,7 @@ class PaginationProcessorTest extends \PHPUnit\Framework\TestCase
 {
     public function testProcess()
     {
-        $model = new PaginationProcessor;
+        $model = new PaginationProcessor();
 
         /** @var SearchCriteriaInterface|\PHPUnit_Framework_MockObject_MockObject $searchCriteriaMock */
         $searchCriteriaMock = $this->getMockBuilder(SearchCriteriaInterface::class)
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/SortOrderTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/SortOrderTest.php
index 05ecc0bdbcc61..cc2c7bffc36ea 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/SortOrderTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/SortOrderTest.php
@@ -22,7 +22,7 @@ protected function setUp()
     {
         $this->sortOrder = new SortOrder();
     }
-    
+
     public function testItReturnsNullIfNoOrderIsSet()
     {
         $this->assertNull($this->sortOrder->getDirection());
@@ -41,7 +41,7 @@ public function sortOrderDirectionProvider()
     {
         return [[SortOrder::SORT_ASC], [SortOrder::SORT_DESC]];
     }
-    
+
     /**
      * @param mixed $invalidDirection
      * @dataProvider invalidSortDirectionProvider
@@ -70,7 +70,7 @@ public function testTheSortDirectionCanBeSpecifiedCaseInsensitive()
         $this->assertSame(SortOrder::SORT_ASC, $this->sortOrder->getDirection());
         $this->sortOrder->setDirection(strtoupper(SortOrder::SORT_ASC));
         $this->assertSame(SortOrder::SORT_ASC, $this->sortOrder->getDirection());
-        
+
         $this->sortOrder->setDirection(strtolower(SortOrder::SORT_DESC));
         $this->assertSame(SortOrder::SORT_DESC, $this->sortOrder->getDirection());
         $this->sortOrder->setDirection(strtoupper(SortOrder::SORT_DESC));
diff --git a/lib/internal/Magento/Framework/App/Action/Action.php b/lib/internal/Magento/Framework/App/Action/Action.php
index b68e7e873be6a..3c792bc9079b8 100644
--- a/lib/internal/Magento/Framework/App/Action/Action.php
+++ b/lib/internal/Magento/Framework/App/Action/Action.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Exception\NotFoundException;
 
 /**
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
index 4468954d189da..644829bc6bc0e 100644
--- a/lib/internal/Magento/Framework/App/Bootstrap.php
+++ b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -374,7 +374,7 @@ private function initErrorHandler()
         $handler = new ErrorHandler();
         set_error_handler([$handler, 'handler']);
     }
-    
+
     /**
      * Getter for error code
      *
diff --git a/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php b/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
index 4c539da0960ea..cb66b465eedb6 100644
--- a/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
+++ b/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
@@ -10,9 +10,7 @@
 namespace Magento\Framework\App\Cache\Frontend;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/App/Cache/Manager.php b/lib/internal/Magento/Framework/App/Cache/Manager.php
index 7ac53d5d6e070..64d7ab1e13c42 100644
--- a/lib/internal/Magento/Framework/App/Cache/Manager.php
+++ b/lib/internal/Magento/Framework/App/Cache/Manager.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Framework\App\Cache;
 
-use Magento\Framework\App;
-
 /**
  * Cache status manager
  *
diff --git a/lib/internal/Magento/Framework/App/Cache/Proxy.php b/lib/internal/Magento/Framework/App/Cache/Proxy.php
index 50c14e24203b0..3f65951d67afd 100644
--- a/lib/internal/Magento/Framework/App/Cache/Proxy.php
+++ b/lib/internal/Magento/Framework/App/Cache/Proxy.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\App\Cache;
 
-use \Magento\Framework\App\CacheInterface;
-use \Magento\Framework\ObjectManager\NoninterceptableInterface;
+use Magento\Framework\App\CacheInterface;
+use Magento\Framework\ObjectManager\NoninterceptableInterface;
 
 /**
  * System cache proxy model
diff --git a/lib/internal/Magento/Framework/App/Cache/Type/FrontendPool.php b/lib/internal/Magento/Framework/App/Cache/Type/FrontendPool.php
index 596fd833ab1ed..1d34fd1bb997e 100644
--- a/lib/internal/Magento/Framework/App/Cache/Type/FrontendPool.php
+++ b/lib/internal/Magento/Framework/App/Cache/Type/FrontendPool.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\App\Cache\Type;
 
 use Magento\Framework\App\Cache\Frontend\Pool;
-use Magento\Framework\App\DeploymentConfig;
 
 /**
  * In-memory readonly pool of cache front-ends with enforced access control, specific to cache types
diff --git a/lib/internal/Magento/Framework/App/Config/Initial.php b/lib/internal/Magento/Framework/App/Config/Initial.php
index 1933682346ad3..ae98b7da62fa6 100644
--- a/lib/internal/Magento/Framework/App/Config/Initial.php
+++ b/lib/internal/Magento/Framework/App/Config/Initial.php
@@ -7,7 +7,6 @@
  */
 namespace Magento\Framework\App\Config;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 
 class Initial
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/CommentParser.php b/lib/internal/Magento/Framework/App/DeploymentConfig/CommentParser.php
index 4e9bea50ebbc8..5b2bcbe8671a6 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/CommentParser.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/CommentParser.php
@@ -6,9 +6,9 @@
 namespace Magento\Framework\App\DeploymentConfig;
 
 use Magento\Framework\App\Config\CommentParserInterface;
-use Magento\Framework\Filesystem;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Filesystem;
 
 /**
  * Parses and retrieves comments from configuration files.
diff --git a/lib/internal/Magento/Framework/App/EnvironmentFactory.php b/lib/internal/Magento/Framework/App/EnvironmentFactory.php
index cc17a3cf57a33..fa0647c6f1f25 100644
--- a/lib/internal/Magento/Framework/App/EnvironmentFactory.php
+++ b/lib/internal/Magento/Framework/App/EnvironmentFactory.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Framework\App;
 
+use Magento\Framework\App\ObjectManager\ConfigLoader;
 use Magento\Framework\App\ObjectManager\Environment\Compiled;
 use Magento\Framework\App\ObjectManager\Environment\Developer;
-use Magento\Framework\App\ObjectManager\ConfigLoader;
-use Magento\Framework\ObjectManager\RelationsInterface;
 use Magento\Framework\ObjectManager\DefinitionInterface;
+use Magento\Framework\ObjectManager\RelationsInterface;
 
 class EnvironmentFactory
 {
diff --git a/lib/internal/Magento/Framework/App/EnvironmentInterface.php b/lib/internal/Magento/Framework/App/EnvironmentInterface.php
index ef0394c49aed4..26c666c7c7f07 100644
--- a/lib/internal/Magento/Framework/App/EnvironmentInterface.php
+++ b/lib/internal/Magento/Framework/App/EnvironmentInterface.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Framework\App;
 
-use Magento\Framework\ObjectManager\FactoryInterface;
 use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManager\ConfigLoaderInterface;
+use Magento\Framework\ObjectManager\FactoryInterface;
 
 /**
  * Interface for ObjectManager Environment
diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php
index 3c6dee49f97b4..fd21457baa656 100644
--- a/lib/internal/Magento/Framework/App/Http.php
+++ b/lib/internal/Magento/Framework/App/Http.php
@@ -6,13 +6,13 @@
 namespace Magento\Framework\App;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\ObjectManager\ConfigLoaderInterface;
 use Magento\Framework\App\Request\Http as RequestHttp;
 use Magento\Framework\App\Response\Http as ResponseHttp;
 use Magento\Framework\App\Response\HttpInterface;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Event;
 use Magento\Framework\Filesystem;
+use Magento\Framework\ObjectManager\ConfigLoaderInterface;
 
 /**
  * HTTP web application. Called from webroot index.php to serve web requests.
diff --git a/lib/internal/Magento/Framework/App/Interception/Cache/CompiledConfig.php b/lib/internal/Magento/Framework/App/Interception/Cache/CompiledConfig.php
index d638181492d1e..f228eea1f8ba8 100644
--- a/lib/internal/Magento/Framework/App/Interception/Cache/CompiledConfig.php
+++ b/lib/internal/Magento/Framework/App/Interception/Cache/CompiledConfig.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\App\Interception\Cache;
 
+use Magento\Framework\App\Cache\Type\FrontendPool;
 use Magento\Framework\Cache\Frontend\Decorator\TagScope;
 use Magento\Framework\Config\CacheInterface;
-use Magento\Framework\App\Cache\Type\FrontendPool;
 
 class CompiledConfig extends TagScope implements CacheInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigCache.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigCache.php
index 0df11cb3cb6e1..41bf17c327c17 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/ConfigCache.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/ConfigCache.php
@@ -7,8 +7,8 @@
  */
 namespace Magento\Framework\App\ObjectManager;
 
-use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Serialize\Serializer\Serialize;
+use Magento\Framework\Serialize\SerializerInterface;
 
 class ConfigCache implements \Magento\Framework\ObjectManager\ConfigCacheInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php
index 01e5031461f85..77a8cb59b21a4 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php
@@ -8,8 +8,6 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\ObjectManager\ConfigLoaderInterface;
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\Serialize\Serializer\Serialize;
 
 class Compiled implements ConfigLoaderInterface
 {
@@ -28,7 +26,7 @@ public function load($area)
         if (isset($this->configCache[$area])) {
             return $this->configCache[$area];
         }
-        $diConfiguration = include(self::getFilePath($area));
+        $diConfiguration = include self::getFilePath($area);
         $this->configCache[$area] = $diConfiguration;
         return $this->configCache[$area];
     }
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/Environment/AbstractEnvironment.php b/lib/internal/Magento/Framework/App/ObjectManager/Environment/AbstractEnvironment.php
index 40dc8d442d010..10931890bcf1e 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/Environment/AbstractEnvironment.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/Environment/AbstractEnvironment.php
@@ -7,10 +7,10 @@
 namespace Magento\Framework\App\ObjectManager\Environment;
 
 use Magento\Framework\App\EnvironmentFactory;
-use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 use Magento\Framework\App\EnvironmentInterface;
-use Magento\Framework\ObjectManager\Profiler\FactoryDecorator;
+use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManager\FactoryInterface;
+use Magento\Framework\ObjectManager\Profiler\FactoryDecorator;
 use Magento\Framework\ObjectManager\Profiler\Log;
 
 abstract class AbstractEnvironment implements EnvironmentInterface
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/Environment/Compiled.php b/lib/internal/Magento/Framework/App/ObjectManager/Environment/Compiled.php
index 189773d7d6c59..a3dc41573cf72 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/Environment/Compiled.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/Environment/Compiled.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Framework\App\ObjectManager\Environment;
 
+use Magento\Framework\App\Area;
 use Magento\Framework\App\EnvironmentInterface;
 use Magento\Framework\App\Interception\Cache\CompiledConfig;
-use Magento\Framework\ObjectManager\FactoryInterface;
-use Magento\Framework\App\Area;
-use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Interception\ObjectManager\ConfigInterface;
+use Magento\Framework\ObjectManager\FactoryInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/Environment/Developer.php b/lib/internal/Magento/Framework/App/ObjectManager/Environment/Developer.php
index 7f62e3f8e0f79..655e96a6f5efe 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/Environment/Developer.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/Environment/Developer.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Framework\App\ObjectManager\Environment;
 
+use Magento\Framework\App\Area;
 use Magento\Framework\App\EnvironmentInterface;
-use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\Area;
+use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 
 class Developer extends AbstractEnvironment implements EnvironmentInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
index 3f852d07462c3..025bf50c575c3 100644
--- a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
+++ b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
@@ -6,11 +6,11 @@
 namespace Magento\Framework\App;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\DriverPool;
-use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 use Magento\Framework\App\ObjectManager\Environment;
-use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Code\GeneratedFiles;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Filesystem\DriverPool;
+use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 
 /**
  * Initialization of object manager is a complex operation.
diff --git a/lib/internal/Magento/Framework/App/ProductMetadata.php b/lib/internal/Magento/Framework/App/ProductMetadata.php
index c9fde94352a71..23ab7ee2a3ef5 100644
--- a/lib/internal/Magento/Framework/App/ProductMetadata.php
+++ b/lib/internal/Magento/Framework/App/ProductMetadata.php
@@ -7,10 +7,10 @@
  */
 namespace Magento\Framework\App;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Composer\ComposerFactory;
-use \Magento\Framework\Composer\ComposerJsonFinder;
-use \Magento\Framework\App\Filesystem\DirectoryList;
-use \Magento\Framework\Composer\ComposerInformation;
+use Magento\Framework\Composer\ComposerInformation;
+use Magento\Framework\Composer\ComposerJsonFinder;
 
 /**
  * Class ProductMetadata
diff --git a/lib/internal/Magento/Framework/App/RequestContentInterface.php b/lib/internal/Magento/Framework/App/RequestContentInterface.php
index 90848f34ccd66..35fa20b414208 100644
--- a/lib/internal/Magento/Framework/App/RequestContentInterface.php
+++ b/lib/internal/Magento/Framework/App/RequestContentInterface.php
@@ -15,5 +15,4 @@
  */
 interface RequestContentInterface extends RequestInterface, PlainTextRequestInterface
 {
-
 }
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection.php b/lib/internal/Magento/Framework/App/ResourceConnection.php
index 4a093dada3559..3df4c46e7a4d4 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection.php
@@ -5,10 +5,9 @@
  */
 namespace Magento\Framework\App;
 
-use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ResourceConnection\ConfigInterface as ResourceConfigInterface;
-use Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactoryInterface;
 use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactoryInterface;
 
 /**
  * Application provides ability to configure multiple connections to persistent storage.
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/Config.php b/lib/internal/Magento/Framework/App/ResourceConnection/Config.php
index 9077ff649d364..e72a51ba7cf73 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection/Config.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection/Config.php
@@ -63,7 +63,7 @@ public function getConnectionName($resourceName)
     {
         $this->initConnections();
         $connectionName = \Magento\Framework\App\ResourceConnection::DEFAULT_CONNECTION;
- 
+
         if (!isset($this->_connectionNames[$resourceName])) {
             $resourcesConfig = $this->get();
             $pointerResourceName = $resourceName;
diff --git a/lib/internal/Magento/Framework/App/Response/HeaderProvider/XContentTypeOptions.php b/lib/internal/Magento/Framework/App/Response/HeaderProvider/XContentTypeOptions.php
index e48f803a2ddc2..fc5c1ee6bd68c 100644
--- a/lib/internal/Magento/Framework/App/Response/HeaderProvider/XContentTypeOptions.php
+++ b/lib/internal/Magento/Framework/App/Response/HeaderProvider/XContentTypeOptions.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\App\Response\HeaderProvider;
 
-use Magento\Framework\App\Response\HeaderProvider\AbstractHeaderProvider;
-
 class XContentTypeOptions extends AbstractHeaderProvider
 {
     /**
diff --git a/lib/internal/Magento/Framework/App/Response/HeaderProvider/XFrameOptions.php b/lib/internal/Magento/Framework/App/Response/HeaderProvider/XFrameOptions.php
index d7fb622596687..8170c9fffb877 100644
--- a/lib/internal/Magento/Framework/App/Response/HeaderProvider/XFrameOptions.php
+++ b/lib/internal/Magento/Framework/App/Response/HeaderProvider/XFrameOptions.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\App\Response\HeaderProvider;
 
-use \Magento\Framework\App\Response\Http;
+use Magento\Framework\App\Response\Http;
 
 /**
  * Adds an X-FRAME-OPTIONS header to HTTP responses to safeguard against click-jacking.
diff --git a/lib/internal/Magento/Framework/App/Response/HeaderProvider/XssProtection.php b/lib/internal/Magento/Framework/App/Response/HeaderProvider/XssProtection.php
index dce7d4af0c38f..67db09349223e 100644
--- a/lib/internal/Magento/Framework/App/Response/HeaderProvider/XssProtection.php
+++ b/lib/internal/Magento/Framework/App/Response/HeaderProvider/XssProtection.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\App\Response\HeaderProvider;
 
-use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface;
 use Magento\Framework\HTTP\Header;
 
 class XssProtection extends AbstractHeaderProvider
diff --git a/lib/internal/Magento/Framework/App/Response/Http.php b/lib/internal/Magento/Framework/App/Response/Http.php
index 099b1500cb14b..d6e50aada7ef7 100644
--- a/lib/internal/Magento/Framework/App/Response/Http.php
+++ b/lib/internal/Magento/Framework/App/Response/Http.php
@@ -9,10 +9,10 @@
 
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\CookieManagerInterface;
 use Magento\Framework\Stdlib\DateTime;
-use Magento\Framework\App\Request\Http as HttpRequest;
 
 class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
 {
diff --git a/lib/internal/Magento/Framework/App/Router/ActionList.php b/lib/internal/Magento/Framework/App/Router/ActionList.php
index 9944e617b1ce6..95e40abfe3dfb 100644
--- a/lib/internal/Magento/Framework/App/Router/ActionList.php
+++ b/lib/internal/Magento/Framework/App/Router/ActionList.php
@@ -6,9 +6,9 @@
  */
 namespace Magento\Framework\App\Router;
 
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\Serialize\Serializer\Serialize;
 use Magento\Framework\Module\Dir\Reader as ModuleReader;
+use Magento\Framework\Serialize\Serializer\Serialize;
+use Magento\Framework\Serialize\SerializerInterface;
 
 class ActionList
 {
diff --git a/lib/internal/Magento/Framework/App/Router/DefaultRouter.php b/lib/internal/Magento/Framework/App/Router/DefaultRouter.php
index 7b878dd3f1f13..4822cb6271939 100644
--- a/lib/internal/Magento/Framework/App/Router/DefaultRouter.php
+++ b/lib/internal/Magento/Framework/App/Router/DefaultRouter.php
@@ -8,9 +8,9 @@
 namespace Magento\Framework\App\Router;
 
 use Magento\Framework\App\ActionFactory;
+use Magento\Framework\App\ActionInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\RouterInterface;
-use Magento\Framework\App\ActionInterface;
 
 class DefaultRouter implements RouterInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Scope/Validator.php b/lib/internal/Magento/Framework/App/Scope/Validator.php
index 242277ed98e8f..9b821b568053e 100644
--- a/lib/internal/Magento/Framework/App/Scope/Validator.php
+++ b/lib/internal/Magento/Framework/App/Scope/Validator.php
@@ -8,8 +8,8 @@
 use InvalidArgumentException;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ScopeResolverPool;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/lib/internal/Magento/Framework/App/State/CleanupFiles.php b/lib/internal/Magento/Framework/App/State/CleanupFiles.php
index c95caf8310b77..4c0d265838888 100644
--- a/lib/internal/Magento/Framework/App/State/CleanupFiles.php
+++ b/lib/internal/Magento/Framework/App/State/CleanupFiles.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Framework\App\State;
 
-use Magento\Framework\Filesystem;
-use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Filesystem;
 
 /**
  * A service for cleaning up application state
diff --git a/lib/internal/Magento/Framework/App/StaticResource.php b/lib/internal/Magento/Framework/App/StaticResource.php
index b4618bdec5035..158573015b2e6 100644
--- a/lib/internal/Magento/Framework/App/StaticResource.php
+++ b/lib/internal/Magento/Framework/App/StaticResource.php
@@ -6,8 +6,8 @@
 namespace Magento\Framework\App;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\ObjectManager\ConfigLoaderInterface;
 use Magento\Framework\Filesystem;
+use Magento\Framework\ObjectManager\ConfigLoaderInterface;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionFake.php b/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionFake.php
index d5235879fae48..9eadfeb4338f6 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionFake.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionFake.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\Action;
 
-use \Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Action;
 
 class ActionFake extends Action
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionTest.php
index ebd72f5badccf..9ff2b65f631ea 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Action/ActionTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\Action;
 
-use \Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Action;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/AreaListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/AreaListTest.php
index 8688cc3fcb2e9..ce33bc851498e 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/AreaListTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/AreaListTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit;
 
-use \Magento\Framework\App\AreaList;
+use Magento\Framework\App\AreaList;
 
 class AreaListTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/AreaTest.php b/lib/internal/Magento/Framework/App/Test/Unit/AreaTest.php
index 678bb7a85272f..9013b63947036 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/AreaTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/AreaTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit;
 
-use \Magento\Framework\App\Area;
+use Magento\Framework\App\Area;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Arguments/ArgumentInterpreterTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Arguments/ArgumentInterpreterTest.php
index 7e23efdd60758..6744c95c12b2f 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Arguments/ArgumentInterpreterTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Arguments/ArgumentInterpreterTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\App\Test\Unit\Arguments;
 
-use \Magento\Framework\App\Arguments\ArgumentInterpreter;
+use Magento\Framework\App\Arguments\ArgumentInterpreter;
 
 class ArgumentInterpreterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/ManagerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/ManagerTest.php
index b8d600c4f69bd..1e1f572b201a6 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/ManagerTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/ManagerTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\Cache;
 
-use \Magento\Framework\App\Cache\Manager;
+use Magento\Framework\App\Cache\Manager;
 
 class ManagerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/StateTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/StateTest.php
index c90b61baf6103..a30bc1e8c63af 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/StateTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/StateTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\App\Test\Unit\Cache;
 
-use \Magento\Framework\App\Cache\State;
+use Magento\Framework\App\Cache\State;
 use Magento\Framework\Config\File\ConfigFilePool;
 
 class StateTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php
index 33b6ab7e99aed..f1e8de54bbfd6 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\Cache\Tag;
 
-use \Magento\Framework\App\Cache\Tag\Resolver;
+use Magento\Framework\App\Cache\Tag\Resolver;
 
 class ResolverTest extends \PHPUnit\Framework\TestCase
 {
@@ -48,7 +48,7 @@ public function testGetTagsForNotObject()
     public function testGetTagsForObject()
     {
         $strategyReturnValue = ['test tag'];
-        $object = new \stdClass;
+        $object = new \stdClass();
         $this->strategy->expects($this->once())
             ->method('getTags')
             ->with($object)
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php
index 4f072e037f74e..8f6f52ac6721b 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/DummyTest.php
@@ -6,11 +6,10 @@
 
 namespace Magento\Framework\App\Test\Unit\Cache\Tag\Strategy;
 
-use \Magento\Framework\App\Cache\Tag\Strategy\Dummy;
+use Magento\Framework\App\Cache\Tag\Strategy\Dummy;
 
 class DummyTest extends \PHPUnit\Framework\TestCase
 {
-
     private $model;
 
     protected function setUp()
@@ -29,7 +28,7 @@ public function testGetTagsWithObject()
     {
         $emptyArray = [];
 
-        $this->assertEquals($emptyArray, $this->model->getTags(new \stdClass));
+        $this->assertEquals($emptyArray, $this->model->getTags(new \stdClass()));
 
         $identityInterface = $this->getMockForAbstractClass(\Magento\Framework\DataObject\IdentityInterface::class);
         $this->assertEquals($emptyArray, $this->model->getTags($identityInterface));
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php
index 3e96c7ab9ca6c..fe93f23ff9ad1 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\Cache\Tag\Strategy;
 
-use \Magento\Framework\App\Cache\Tag\Strategy\Factory;
+use Magento\Framework\App\Cache\Tag\Strategy\Factory;
 
 class FactoryTest extends \PHPUnit\Framework\TestCase
 {
@@ -56,7 +56,7 @@ public function testGetStrategyWithScalar()
 
     public function testGetStrategyWithObject()
     {
-        $this->assertEquals($this->dummyStrategy, $this->model->getStrategy(new \stdClass));
+        $this->assertEquals($this->dummyStrategy, $this->model->getStrategy(new \stdClass()));
     }
 
     public function testGetStrategyWithIdentityInterface()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php
index 4dc46d46e675e..d0fc962348b09 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/IdentifierTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\Cache\Tag\Strategy;
 
-use \Magento\Framework\App\Cache\Tag\Strategy\Identifier;
+use Magento\Framework\App\Cache\Tag\Strategy\Identifier;
 
 class IdentifierTest extends \PHPUnit\Framework\TestCase
 {
@@ -17,7 +17,7 @@ class IdentifierTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->model = new Identifier;
+        $this->model = new Identifier();
     }
 
     public function testGetWithScalar()
@@ -29,7 +29,7 @@ public function testGetWithScalar()
 
     public function testGetTagsWithObject()
     {
-        $this->assertEquals([], $this->model->getTags(new \stdClass));
+        $this->assertEquals([], $this->model->getTags(new \stdClass()));
     }
 
     public function testGetTagsWithIdentityInterface()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/ConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/ConfigTest.php
index 74a92d54f1934..e0decd18caeb5 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/ConfigTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/ConfigTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\App\Test\Unit\Cache\Type;
 
-use Magento\Framework\App\Cache\Type\FrontendPool;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class ConfigTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/FrontendPoolTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/FrontendPoolTest.php
index e8c0217b40b2c..473f460c1707f 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/FrontendPoolTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Type/FrontendPoolTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\App\Test\Unit\Cache\Type;
 
-use \Magento\Framework\App\Cache\Type\FrontendPool;
+use Magento\Framework\App\Cache\Type\FrontendPool;
 
 class FrontendPoolTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/TypeListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/TypeListTest.php
index 8d9b297d7dded..1a95bf7ff1f34 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/TypeListTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/TypeListTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\Cache;
 
-use \Magento\Framework\App\Cache\TypeList;
+use Magento\Framework\App\Cache\TypeList;
 use Magento\Framework\Serialize\SerializerInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/ConfigPathResolverTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/ConfigPathResolverTest.php
index 3cf552ae115a5..13f218a9c4a74 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/ConfigPathResolverTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/ConfigPathResolverTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\App\Test\Unit\Config;
 
-use Magento\Framework\App\Config\ScopeCodeResolver;
 use Magento\Framework\App\Config\ConfigPathResolver;
-use \PHPUnit_Framework_MockObject_MockObject as Mock;
+use Magento\Framework\App\Config\ScopeCodeResolver;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
 
 /**
  * {@inheritdoc}
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php
index 56589b20dcd0c..4454c2485452e 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/Initial/ReaderTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\App\Test\Unit\Config\Initial;
 
-use Magento\Framework\Filesystem;
-
 class ReaderTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/MetadataConfigTypeProcessorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/MetadataConfigTypeProcessorTest.php
index efca2624a4aba..cb21d95405d7c 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/MetadataConfigTypeProcessorTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/MetadataConfigTypeProcessorTest.php
@@ -11,7 +11,7 @@
 use Magento\Framework\App\Config\Data\ProcessorInterface;
 use Magento\Framework\App\Config\Initial;
 use Magento\Framework\App\Config\MetadataConfigTypeProcessor;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class MetadataConfigTypeProcessorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/MetadataProcessorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/MetadataProcessorTest.php
index 3e5f58d496ebe..be58fd5e9c1ed 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/MetadataProcessorTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/MetadataProcessorTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Framework\App\Test\Unit\Config;
 
-use Magento\Framework\App\Config\MetadataProcessor;
-use Magento\Framework\App\Config\Initial;
 use Magento\Framework\App\Config\Data\ProcessorFactory;
 use Magento\Framework\App\Config\Data\ProcessorInterface;
-use \PHPUnit_Framework_MockObject_MockObject as Mock;
+use Magento\Framework\App\Config\Initial;
+use Magento\Framework\App\Config\MetadataProcessor;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
 
 /**
  * {@inheritdoc}
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/Scope/ValidatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/Scope/ValidatorTest.php
index f0863a81b7999..4c4bca9a66663 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/Scope/ValidatorTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/Scope/ValidatorTest.php
@@ -6,12 +6,12 @@
 namespace Magento\Framework\App\Test\Unit\Config\Scope;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Scope\Validator;
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\App\ScopeResolverPool;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\App\Scope\Validator;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * @deprecated As tested model class was moved to another directory,
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/Storage/WriterTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/Storage/WriterTest.php
index a4839d9cafa81..8f7ffa608c81a 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/Storage/WriterTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/Storage/WriterTest.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\App\Test\Unit\Config\Storage;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ScopeInterface;
 
 class WriterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Console/MaintenanceModeEnablerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Console/MaintenanceModeEnablerTest.php
index ebd47c0dc8936..942a6ed3ec6fc 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Console/MaintenanceModeEnablerTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Console/MaintenanceModeEnablerTest.php
@@ -103,7 +103,7 @@ private function createMaintenanceMode(bool $isOn): MaintenanceMode
             ->getMock();
 
         $maintenanceMode->method('isOn')->willReturnCallback(function () use (&$isOn) {
-                return $isOn;
+            return $isOn;
         });
         $maintenanceMode->method('set')->willReturnCallback(function ($newValue) use (&$isOn) {
             $isOn = (bool)$newValue;
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/CronTest.php b/lib/internal/Magento/Framework/App/Test/Unit/CronTest.php
index e2c77864d8e82..13f2ef552227f 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/CronTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/CronTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Framework\App\Test\Unit;
 
 use Magento\Framework\App\Area;
-use \Magento\Framework\App\Cron;
+use Magento\Framework\App\Cron;
 
 class CronTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/CommentParserTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/CommentParserTest.php
index b3fa8820d8a5a..baea16e906d39 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/CommentParserTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/CommentParserTest.php
@@ -6,9 +6,9 @@
 namespace Magento\Framework\App\Test\Unit\DeploymentConfig;
 
 use Magento\Framework\App\DeploymentConfig\CommentParser;
-use Magento\Framework\Filesystem;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 
 class CommentParserTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/FileReaderTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/FileReaderTest.php
index 59bf4128ad858..4583848539c55 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/FileReaderTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/FileReaderTest.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\Filesystem\DriverPool;
-use \PHPUnit_Framework_MockObject_MockObject as Mock;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
 
 /**
  * @inheritdoc
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php
index d4783cd36a051..f051e8bd4ad69 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php
@@ -6,9 +6,9 @@
 namespace Magento\Framework\App\Test\Unit\DeploymentConfig;
 
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\DeploymentConfig\CommentParser;
 use Magento\Framework\App\DeploymentConfig\Reader;
 use Magento\Framework\App\DeploymentConfig\Writer;
-use Magento\Framework\App\DeploymentConfig\CommentParser;
 use Magento\Framework\App\DeploymentConfig\Writer\FormatterInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Config\File\ConfigFilePool;
@@ -17,7 +17,7 @@
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\Phrase;
-use \PHPUnit_Framework_MockObject_MockObject as Mock;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
index fa41d717cc521..98233224618d6 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfigTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\App\Test\Unit;
 
-use \Magento\Framework\App\DeploymentConfig;
-use \Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 
 class DeploymentConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php
index daf3a4bdfab0c..8d8287b7a8c94 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ErrorHandlerTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit;
 
-use \Magento\Framework\App\ErrorHandler;
+use Magento\Framework\App\ErrorHandler;
 
 class ErrorHandlerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php
index 183f9f2ac567c..1117627647934 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Filesystem/DirectoryListTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\Filesystem;
 
-use \Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Filesystem\DirectoryList;
 
 class DirectoryListTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Http/ContextTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Http/ContextTest.php
index aeb60724ec675..2dbe353945397 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Http/ContextTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Http/ContextTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\Http;
 
-use \Magento\Framework\App\Http\Context;
+use Magento\Framework\App\Http\Context;
 use Magento\Framework\Serialize\Serializer\Json;
 
 class ContextTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/HttpTest.php
index a299e04e152cc..b759ce56628df 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/HttpTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/HttpTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Framework\App\Test\Unit;
 
+use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\SetupInfo;
-use Magento\Framework\App\Bootstrap;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Language/ConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Language/ConfigTest.php
index 9d2c5c2425069..633317202633d 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Language/ConfigTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Language/ConfigTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\Language;
 
-use \Magento\Framework\App\Language\Config;
+use Magento\Framework\App\Language\Config;
 
 /**
  * Test for configuration of language
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php
index 472fff4f4f287..2a128d7781a77 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Language/DictionaryTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\App\Test\Unit\Language;
 
 use Magento\Framework\App\Language\Dictionary;
-use Magento\Framework\Filesystem\DriverPool;
 
 class DictionaryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/MaintenanceModeTest.php b/lib/internal/Magento/Framework/App/Test/Unit/MaintenanceModeTest.php
index 5d1c22a38af4d..b8671b11da7b4 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/MaintenanceModeTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/MaintenanceModeTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit;
 
-use \Magento\Framework\App\MaintenanceMode;
+use Magento\Framework\App\MaintenanceMode;
 
 class MaintenanceModeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/FormKeyTest.php b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/FormKeyTest.php
index 3292fa61906eb..f27274b332780 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/FormKeyTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/FormKeyTest.php
@@ -7,10 +7,10 @@
 namespace Magento\Framework\App\Test\Unit\PageCache;
 
 use Magento\Framework\App\PageCache\FormKey;
-use Magento\Framework\Stdlib\CookieManagerInterface;
 use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\Cookie\PublicCookieMetadata;
+use Magento\Framework\Stdlib\CookieManagerInterface;
 
 /**
  * Class FormKeyTest
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php
index 15f6bed1ac0d3..419badba0a3f5 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\PageCache\Identifier;
-use Magento\Framework\App\Response\Http;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\Response\Http;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/KernelTest.php b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/KernelTest.php
index 20ea5d1a3e86f..aebdc5bd2efa4 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/KernelTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/KernelTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\App\Test\Unit\PageCache;
 
-use \Magento\Framework\App\PageCache\Kernel;
-use \Magento\Framework\App\Http\ContextFactory;
-use \Magento\Framework\App\Response\HttpFactory;
+use Magento\Framework\App\Http\ContextFactory;
+use Magento\Framework\App\PageCache\Kernel;
+use Magento\Framework\App\Response\HttpFactory;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/VersionTest.php b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/VersionTest.php
index 82f990e218921..71778cc47f5e7 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/PageCache/VersionTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/PageCache/VersionTest.php
@@ -5,9 +5,7 @@
  */
 namespace Magento\Framework\App\Test\Unit\PageCache;
 
-use \Magento\Framework\App\PageCache\Version;
-
-use Magento\TestFramework\ObjectManager;
+use Magento\Framework\App\PageCache\Version;
 
 class VersionTest extends \PHPUnit\Framework\TestCase
 {
@@ -92,7 +90,7 @@ public function testProcess($isPost)
                 ->method('setSecure')
                 ->with(false)
                 ->will($this->returnSelf());
-                
+
             $publicCookieMetadataMock->expects($this->once())
                 ->method('setHttpOnly')
                 ->with(false)
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
index 66eee671e17d3..e4e5713f0a87e 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
@@ -427,7 +427,7 @@ public function isSecureDataProvider()
             'HTTPS off with HTTP_ prefixed proxy set to https' => [true, 'off', 'HTTP_HEADER_FROM_PROXY', 'https', 1],
         ];
     }
-    
+
     /**
      * @dataProvider setPathInfoDataProvider
      * @param string $requestUri
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/RequestFactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/RequestFactoryTest.php
index 8c9f86bb61b9c..792220f46baf5 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/RequestFactoryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/RequestFactoryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\App\Test\Unit;
 
-use \Magento\Framework\App\RequestFactory;
+use Magento\Framework\App\RequestFactory;
 
 class RequestFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/HeaderProvider/XFrameOptionsTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/HeaderProvider/XFrameOptionsTest.php
index 5dfe09e67b0a0..b054e86da01a0 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Response/HeaderProvider/XFrameOptionsTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Response/HeaderProvider/XFrameOptionsTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\App\Test\Unit\Response\HeaderProvider;
 
-use \Magento\Framework\App\Response\HeaderProvider\XFrameOptions;
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\App\Response\HeaderProvider\XFrameOptions;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class XFrameOptionsTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
index 3215a82ffad5f..d83e0e2deb2bc 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Response/HttpTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\Response;
 
-use \Magento\Framework\App\Response\Http;
+use Magento\Framework\App\Response\Http;
 use Magento\Framework\ObjectManagerInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php
index 0bdbcccc40b35..6bdb698135dba 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Router/ActionListTest.php
@@ -65,8 +65,7 @@ public function testConstructActionsNoCached()
             ->method('save');
         $this->readerMock->expects($this->once())
             ->method('getActionFiles')
-            ->willReturn('data')
-        ;
+            ->willReturn('data');
         $this->createActionListInstance();
     }
 
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Scope/ValidatorTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Scope/ValidatorTest.php
index b9df13c67a863..a7747c95d7b41 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Scope/ValidatorTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Scope/ValidatorTest.php
@@ -6,12 +6,12 @@
 namespace Magento\Framework\App\Test\Unit\Scope;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Scope\Validator;
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\App\ScopeResolverPool;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\App\Scope\Validator;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class ValidatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php b/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php
index 3db75f7ec7fb2..7a0acdc5d3b87 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/SetupInfoTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit;
 
-use \Magento\Framework\App\SetupInfo;
+use Magento\Framework\App\SetupInfo;
 
 class SetupInfoTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/State/CleanupFilesTest.php b/lib/internal/Magento/Framework/App/Test/Unit/State/CleanupFilesTest.php
index 912b3d43103de..cabec5aa871b6 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/State/CleanupFilesTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/State/CleanupFilesTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Framework\App\Test\Unit\State;
 
-use \Magento\Framework\App\State\CleanupFiles;
-
 use Magento\Framework\App\Filesystem\DirectoryList;
+
+use Magento\Framework\App\State\CleanupFiles;
 use Magento\Framework\Filesystem\DriverPool;
 
 class CleanupFilesTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php b/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php
index 46eec1e692424..1e770cda60b2e 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/StateTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Framework\App\Test\Unit;
 
-use \Magento\Framework\App\Area;
-use \Magento\Framework\App\AreaList;
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\AreaList;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class StateTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php b/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php
index 80b5e79582ee8..d127607480838 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\App\Test\Unit;
 
 use Magento\Framework\App\Bootstrap;
-use Magento\Framework\Filesystem;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Utility/AggregateInvokerTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Utility/AggregateInvokerTest.php
index 56eb0c7799da4..ed5d5f9e50c65 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Utility/AggregateInvokerTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Utility/AggregateInvokerTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\App\Test\Unit\Utility;
 
-use \Magento\Framework\App\Utility\AggregateInvoker;
+use Magento\Framework\App\Utility\AggregateInvoker;
 
 class AggregateInvokerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/CopyTest.php b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/CopyTest.php
index 7758c067c0aae..7fef842762d99 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/CopyTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/CopyTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\View\Asset\MaterializationStrategy;
 
-use \Magento\Framework\App\View\Asset\MaterializationStrategy\Copy;
+use Magento\Framework\App\View\Asset\MaterializationStrategy\Copy;
 
 class CopyTest extends \PHPUnit\Framework\TestCase
 {
@@ -17,7 +17,7 @@ class CopyTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->copyPublisher = new Copy;
+        $this->copyPublisher = new Copy();
     }
 
     public function testPublishFile()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php
index 1873cc593a655..061ebe76a364c 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/FactoryTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\View\Asset\MaterializationStrategy;
 
-use \Magento\Framework\App\View\Asset\MaterializationStrategy\Factory;
+use Magento\Framework\App\View\Asset\MaterializationStrategy\Factory;
 
 use Magento\Framework\ObjectManagerInterface;
 
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/SymlinkTest.php b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/SymlinkTest.php
index a1b4f8c294e91..5ce1f5a4f9783 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/SymlinkTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/MaterializationStrategy/SymlinkTest.php
@@ -6,10 +6,9 @@
 
 namespace Magento\Framework\App\Test\Unit\View\Asset\MaterializationStrategy;
 
-use \Magento\Framework\App\View\Asset\MaterializationStrategy\Symlink;
-
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\View\Asset;
+
+use Magento\Framework\App\View\Asset\MaterializationStrategy\Symlink;
 
 class SymlinkTest extends \PHPUnit\Framework\TestCase
 {
@@ -20,7 +19,7 @@ class SymlinkTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->symlinkPublisher = new Symlink;
+        $this->symlinkPublisher = new Symlink();
     }
 
     public function testPublishFile()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/PublisherTest.php b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/PublisherTest.php
index 3f1b851129f08..bd40136b7712c 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/PublisherTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/View/Asset/PublisherTest.php
@@ -6,11 +6,10 @@
 
 namespace Magento\Framework\App\Test\Unit\View\Asset;
 
-use \Magento\Framework\App\View\Asset\Publisher;
-use \Magento\Framework\App\View\Asset\MaterializationStrategy;
-
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\DriverPool;
+use Magento\Framework\App\View\Asset\MaterializationStrategy;
+
+use Magento\Framework\App\View\Asset\Publisher;
 
 class PublisherTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/Version/Storage/FileTest.php b/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/Version/Storage/FileTest.php
index f26b44ff99fff..701a250889a2d 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/Version/Storage/FileTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/Version/Storage/FileTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\App\Test\Unit\View\Deployment\Version\Storage;
 
-use \Magento\Framework\App\View\Deployment\Version\Storage\File;
+use Magento\Framework\App\View\Deployment\Version\Storage\File;
 
 class FileTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
index ee5281a8e4600..9fb481ece3458 100644
--- a/lib/internal/Magento/Framework/App/Utility/Files.php
+++ b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -8,9 +8,9 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Component\DirSearch;
+use Magento\Framework\Filesystem\Glob;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\View\Design\Theme\ThemePackageList;
-use Magento\Framework\Filesystem\Glob;
 
 /**
  * A helper to gather specific kind of files in Magento application
diff --git a/lib/internal/Magento/Framework/Archive/Tar.php b/lib/internal/Magento/Framework/Archive/Tar.php
index ccf9838d6649f..c07b297d7cab0 100644
--- a/lib/internal/Magento/Framework/Archive/Tar.php
+++ b/lib/internal/Magento/Framework/Archive/Tar.php
@@ -12,7 +12,6 @@
 namespace Magento\Framework\Archive;
 
 use Magento\Framework\Archive\Helper\File;
-use Magento\Framework\Filesystem\DriverInterface;
 
 class Tar extends \Magento\Framework\Archive\AbstractArchive implements \Magento\Framework\Archive\ArchiveInterface
 {
diff --git a/lib/internal/Magento/Framework/Archive/Test/Unit/ZipTest.php b/lib/internal/Magento/Framework/Archive/Test/Unit/ZipTest.php
index 39efe939c2bbb..0c5553cfbbfcd 100644
--- a/lib/internal/Magento/Framework/Archive/Test/Unit/ZipTest.php
+++ b/lib/internal/Magento/Framework/Archive/Test/Unit/ZipTest.php
@@ -7,8 +7,6 @@
 
 namespace Magento\Framework\Archive\Test\Unit;
 
-use Composer\Composer;
-
 class ZipTest extends \PHPUnit\Framework\TestCase
 {
 
diff --git a/lib/internal/Magento/Framework/Archive/Zip.php b/lib/internal/Magento/Framework/Archive/Zip.php
index f33ad8700f056..b17409950422b 100644
--- a/lib/internal/Magento/Framework/Archive/Zip.php
+++ b/lib/internal/Magento/Framework/Archive/Zip.php
@@ -57,7 +57,7 @@ public function unpack($source, $destination)
         $zip->open($source);
         $filename = $zip->getNameIndex(0);
         $zip->extractTo(dirname($destination), $filename);
-        rename(dirname($destination).'/'.$filename, $destination);
+        rename(dirname($destination) . '/' . $filename, $destination);
         $zip->close();
         return $destination;
     }
diff --git a/lib/internal/Magento/Framework/Autoload/AutoloaderRegistry.php b/lib/internal/Magento/Framework/Autoload/AutoloaderRegistry.php
index f051d215808a3..7fecb35bc18e0 100644
--- a/lib/internal/Magento/Framework/Autoload/AutoloaderRegistry.php
+++ b/lib/internal/Magento/Framework/Autoload/AutoloaderRegistry.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Autoload;
 
-use Magento\Framework\Autoload\AutoloaderInterface;
-
 /**
  * Registry to store a static member autoloader
  */
diff --git a/lib/internal/Magento/Framework/Autoload/Test/Unit/PopulatorTest.php b/lib/internal/Magento/Framework/Autoload/Test/Unit/PopulatorTest.php
index ebb6ce5596c46..973355c452a64 100644
--- a/lib/internal/Magento/Framework/Autoload/Test/Unit/PopulatorTest.php
+++ b/lib/internal/Magento/Framework/Autoload/Test/Unit/PopulatorTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\Autoload\Test\Unit;
 
-use \Magento\Framework\Autoload\Populator;
-
 use Magento\Framework\App\Filesystem\DirectoryList;
 
+use Magento\Framework\Autoload\Populator;
+
 class PopulatorTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Framework\App\Filesystem\DirectoryList | \PHPUnit_Framework_MockObject_MockObject */
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Ftp.php b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Ftp.php
index 10322bb5ab23c..3e1fe8a14ea7b 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Ftp.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Ftp.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Backup\Filesystem\Rollback;
 
-use Magento\Framework\Filesystem\DriverInterface;
-
 /**
  * Rollback worker for rolling back via ftp
  *
diff --git a/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php b/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
index 45dfc8b721dec..7f88c5e67aa53 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
@@ -122,7 +122,7 @@ public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, $tags = [])
                 break;
             case \Zend_Cache::CLEANING_MODE_OLD:
                 $this->_log(
-                    "Magento\Framework\Cache\Backend\Eaccelerator::clean() : ".
+                    "Magento\Framework\Cache\Backend\Eaccelerator::clean() : " .
                     "CLEANING_MODE_OLD is unsupported by the Eaccelerator backend"
                 );
                 break;
diff --git a/lib/internal/Magento/Framework/Code/Minifier/Adapter/Css/CSSmin.php b/lib/internal/Magento/Framework/Code/Minifier/Adapter/Css/CSSmin.php
index dc4f554ba2949..f6fe01955ac1c 100644
--- a/lib/internal/Magento/Framework/Code/Minifier/Adapter/Css/CSSmin.php
+++ b/lib/internal/Magento/Framework/Code/Minifier/Adapter/Css/CSSmin.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Code\Minifier\Adapter\Css;
 
-use tubalmartin\CssMin\Minifier as CssMinLibrary;
 use Magento\Framework\Code\Minifier\AdapterInterface;
+use tubalmartin\CssMin\Minifier as CssMinLibrary;
 
 /**
  * Adapter for CSSmin library
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratedFilesTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratedFilesTest.php
index 31462fad14579..80fe421d9ff93 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/GeneratedFilesTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/GeneratedFilesTest.php
@@ -46,7 +46,6 @@ protected function setUp()
      */
     public function testCleanGeneratedFiles($getPathMap, $isDirectoryMap, $deleteMap)
     {
-
         $this->writeInterface
             ->expects($this->any())
             ->method('isExist')
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php
index 0f3daa46e1ec3..631cb57acbe8f 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/InterfaceGeneratorTest.php
@@ -120,24 +120,25 @@ public function generateDataProvider()
             'Valid data' => [
                 'additionalMethodsData' => [],
                 'expectedException' => '',
-                'expectedExceptionMessage' => ''
+                'expectedExceptionMessage' => '',
             ],
             '"final" usage exception' => [
                 'additionalMethodsData' => ['testMethod1' => ['final' => true]],
                 'expectedException' => '\LogicException',
-                'expectedExceptionMessage' => "Interface method cannot be marked as 'final'. Method name: 'testMethod1'"
+                'expectedExceptionMessage' =>
+                    "Interface method cannot be marked as 'final'. Method name: 'testMethod1'",
             ],
             'Non public interface method  exception' => [
                 'additionalMethodsData' => ['testMethod2' => ['visibility' => 'protected']],
-                'expectedException' => '\LogicException',
+                'expectedException' => \LogicException::class,
                 'expectedExceptionMessage' =>
-                    "Interface method visibility can only be 'public'. Method name: 'testMethod2'"
+                    "Interface method visibility can only be 'public'. Method name: 'testMethod2'",
             ],
             '"abstract" usage exception' => [
                 'additionalMethodsData' => ['testMethod1' => ['abstract' => true]],
                 'expectedException' => '\LogicException',
                 'expectedExceptionMessage' =>
-                    "'abstract' modifier cannot be used for interface method. Method name: 'testMethod1'"
+                    "'abstract' modifier cannot be used for interface method. Method name: 'testMethod1'",
             ],
         ];
     }
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/ValidatorTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/ValidatorTest.php
index ae369ec8db965..fe79758c18c69 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/ValidatorTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/ValidatorTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Code\Test\Unit;
 
-use \Magento\Framework\Code\Validator;
+use Magento\Framework\Code\Validator;
 
 class ValidatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Communication/Config.php b/lib/internal/Magento/Framework/Communication/Config.php
index 3dc8e21acd59e..8a814eb0ff894 100644
--- a/lib/internal/Magento/Framework/Communication/Config.php
+++ b/lib/internal/Magento/Framework/Communication/Config.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Communication;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Communication\Config\Data as ConfigData;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/lib/internal/Magento/Framework/Communication/Config/Reader/EnvReader.php b/lib/internal/Magento/Framework/Communication/Config/Reader/EnvReader.php
index 360bcca2f55cf..808681006ede9 100644
--- a/lib/internal/Magento/Framework/Communication/Config/Reader/EnvReader.php
+++ b/lib/internal/Magento/Framework/Communication/Config/Reader/EnvReader.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Communication\Config\Reader;
 
-use Magento\Framework\Communication\Config\Reader\EnvReader\Validator;
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Communication\Config\Reader\EnvReader\Validator;
 
 /**
  * Communication configuration reader. Reads data from env.php.
diff --git a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Validator.php b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Validator.php
index ce94aaff91ba6..b2e98ebd3fdf7 100644
--- a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Validator.php
+++ b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Validator.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\Communication\Config\Reader\XmlReader;
 
-use Magento\Framework\Stdlib\BooleanUtils;
 use Magento\Framework\Communication\Config\Validator as ConfigValidator;
-use Magento\Framework\Reflection\TypeProcessor;
 use Magento\Framework\Reflection\MethodsMap;
+use Magento\Framework\Reflection\TypeProcessor;
+use Magento\Framework\Stdlib\BooleanUtils;
 
 /**
  * Communication configuration validator.
diff --git a/lib/internal/Magento/Framework/Communication/Config/Validator.php b/lib/internal/Magento/Framework/Communication/Config/Validator.php
index 5e2687c3b08c1..4dc7ef79135b5 100644
--- a/lib/internal/Magento/Framework/Communication/Config/Validator.php
+++ b/lib/internal/Magento/Framework/Communication/Config/Validator.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Communication\Config;
 
-use Magento\Framework\Reflection\TypeProcessor;
 use Magento\Framework\Reflection\MethodsMap;
+use Magento\Framework\Reflection\TypeProcessor;
 
 /**
  * Communication configuration validator.
diff --git a/lib/internal/Magento/Framework/Composer/ComposerInformation.php b/lib/internal/Magento/Framework/Composer/ComposerInformation.php
index 93fb9070cddf3..df975667968f5 100755
--- a/lib/internal/Magento/Framework/Composer/ComposerInformation.php
+++ b/lib/internal/Magento/Framework/Composer/ComposerInformation.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Composer;
 
-use Composer\Package\Link;
 use Composer\Package\CompletePackageInterface;
+use Composer\Package\Link;
 use Magento\Framework\App\ObjectManager;
 
 /**
diff --git a/lib/internal/Magento/Framework/Composer/Remove.php b/lib/internal/Magento/Framework/Composer/Remove.php
index b7a9a20333d86..45e73cdbe595f 100644
--- a/lib/internal/Magento/Framework/Composer/Remove.php
+++ b/lib/internal/Magento/Framework/Composer/Remove.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Composer;
 
-use Magento\Composer\MagentoComposerApplication;
-
 /**
  * Class to run composer remove command
  */
diff --git a/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php b/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
index 4ca43591c96ff..54a2102eec5e7 100644
--- a/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
+++ b/lib/internal/Magento/Framework/Composer/Test/Unit/ComposerInformationTest.php
@@ -7,7 +7,6 @@
 
 use Composer\Composer;
 use Composer\Package\Locker;
-use Magento\Framework\Composer\ComposerInformation;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class ComposerInformationTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/Config/Data.php b/lib/internal/Magento/Framework/Config/Data.php
index 2ae8eb378064a..0f254773067aa 100644
--- a/lib/internal/Magento/Framework/Config/Data.php
+++ b/lib/internal/Magento/Framework/Config/Data.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Config;
 
-use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\SerializerInterface;
 
 /**
  * Represents loaded and cached configuration data, should be used to gain access to different types
diff --git a/lib/internal/Magento/Framework/Config/Data/Scoped.php b/lib/internal/Magento/Framework/Config/Data/Scoped.php
index 9806d89fd5737..5138579d7e7db 100644
--- a/lib/internal/Magento/Framework/Config/Data/Scoped.php
+++ b/lib/internal/Magento/Framework/Config/Data/Scoped.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Config\Data;
 
-use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\SerializerInterface;
 
 /**
  * Provides scoped configuration
diff --git a/lib/internal/Magento/Framework/Config/FileResolver.php b/lib/internal/Magento/Framework/Config/FileResolver.php
index 25171d9cb0b9f..a99ae96040cb5 100644
--- a/lib/internal/Magento/Framework/Config/FileResolver.php
+++ b/lib/internal/Magento/Framework/Config/FileResolver.php
@@ -7,13 +7,13 @@
  */
 namespace Magento\Framework\Config;
 
-use Magento\Framework\Module\Dir\Reader as DirReader;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Module\Dir\Reader as DirReader;
+use Magento\Framework\View\Design\Fallback\RulePool;
+use Magento\Framework\View\Design\FileResolution\Fallback\ResolverInterface;
 use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\DesignInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\View\Design\FileResolution\Fallback\ResolverInterface;
-use Magento\Framework\View\Design\Fallback\RulePool;
 
 /**
  * Class FileResolver
@@ -105,7 +105,7 @@ public function get($filename, $scope)
                     );
                     if (file_exists($designPath)) {
                         try {
-                            $designDom = new \DOMDocument;
+                            $designDom = new \DOMDocument();
                             $designDom->load($designPath);
                             $iterator[$designPath] = $designDom->saveXML();
                         } catch (\Exception $e) {
@@ -174,7 +174,7 @@ private function getParentConfigs(ThemeInterface $theme, array $iterator, $index
                 $theme->getParentTheme()
             );
 
-            $parentDom = new \DOMDocument;
+            $parentDom = new \DOMDocument();
             $parentDom->load($parentDesignPath);
 
             $iterator[$index] = $parentDom->saveXML();
diff --git a/lib/internal/Magento/Framework/Config/GenericSchemaLocator.php b/lib/internal/Magento/Framework/Config/GenericSchemaLocator.php
index df0a55bf20b57..e4740eac3b5d9 100644
--- a/lib/internal/Magento/Framework/Config/GenericSchemaLocator.php
+++ b/lib/internal/Magento/Framework/Config/GenericSchemaLocator.php
@@ -18,17 +18,17 @@ class GenericSchemaLocator implements SchemaLocatorInterface
      * @var ModuleDirReader
      */
     private $moduleDirReader;
-    
+
     /**
      * @var string
      */
     private $moduleName;
-    
+
     /**
      * @var string
      */
     private $perFileSchema;
-    
+
     /**
      * @var string|null
      */
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Composer/PackageTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Composer/PackageTest.php
index 1142aa1fa95aa..59b0cf82892d2 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Composer/PackageTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Composer/PackageTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Config\Test\Unit\Composer;
 
-use \Magento\Framework\Config\Composer\Package;
+use Magento\Framework\Config\Composer\Package;
 
 class PackageTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Converter/DomTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Converter/DomTest.php
index 09366c91a73a3..c53fe08b99a19 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Converter/DomTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Converter/DomTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Config\Test\Unit\Converter;
 
-use \Magento\Framework\Config\Converter\Dom;
+use Magento\Framework\Config\Converter\Dom;
 
 class DomTest extends \PHPUnit\Framework\TestCase
 {
@@ -28,7 +28,7 @@ public function convertDataProvider()
     {
         return [
             ['cdata.xml', 'cdata.php'],
-            ['attributes.xml', 'attributes.php',],
+            ['attributes.xml', 'attributes.php'],
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php
index 619135f9c7038..7f39405cb278d 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Data/ConfigDataTest.php
@@ -39,7 +39,6 @@ public function testSet()
      */
     public function testSetWrongKey($key, $expectedException)
     {
-
         $configData = new ConfigData('testKey');
 
         $this->expectException('InvalidArgumentException');
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/ArrayNodeConfigTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/ArrayNodeConfigTest.php
index fc161b5b55b5a..e93e11610cca3 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/ArrayNodeConfigTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/ArrayNodeConfigTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Config\Test\Unit\Dom;
 
-use \Magento\Framework\Config\Dom\ArrayNodeConfig;
+use Magento\Framework\Config\Dom\ArrayNodeConfig;
 
 class ArrayNodeConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodeMergingConfigTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodeMergingConfigTest.php
index a782e23da838a..75c6a82e8ee95 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodeMergingConfigTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodeMergingConfigTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Config\Test\Unit\Dom;
 
-use \Magento\Framework\Config\Dom\NodeMergingConfig;
+use Magento\Framework\Config\Dom\NodeMergingConfig;
 
 class NodeMergingConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodePathMatcherTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodePathMatcherTest.php
index 94197fe737918..96b8c90885956 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodePathMatcherTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/NodePathMatcherTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Config\Test\Unit\Dom;
 
-use \Magento\Framework\Config\Dom\NodePathMatcher;
+use Magento\Framework\Config\Dom\NodePathMatcher;
 
 class NodePathMatcherTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/UrnResolverTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/UrnResolverTest.php
index 6c8741245a87e..9fe48cb562e51 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Dom/UrnResolverTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Dom/UrnResolverTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Config\Test\Unit\Dom;
 
-use Magento\Framework\Config\Dom\UrnResolver;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Config\Dom\UrnResolver;
 
 class UrnResolverTest extends \PHPUnit\Framework\TestCase
 {
@@ -45,7 +45,7 @@ public function testGetRealPathWithModuleUrn()
     {
         $xsdUrn = 'urn:magento:module:Magento_Customer:etc/address_formats.xsd';
         $componentRegistrar = new ComponentRegistrar();
-                $xsdPath = $componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_Customer')
+        $xsdPath = $componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_Customer')
                     . '/etc/address_formats.xsd';
 
         $result = $this->urnResolver->getRealPath($xsdUrn);
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/FileIteratorTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/FileIteratorTest.php
index 043f2328a7e7e..7a805eac57b8f 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/FileIteratorTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/FileIteratorTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Config\Test\Unit;
 
-use \Magento\Framework\Config\FileIterator;
+use Magento\Framework\Config\FileIterator;
 
 /**
  * Class FileIteratorTest
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php
index bd1aaa7ca791f..b6d1650c7f934 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/Reader/FilesystemTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Config\Test\Unit\Reader;
 
-use \Magento\Framework\Config\Reader\Filesystem;
+use Magento\Framework\Config\Reader\Filesystem;
 
 class FilesystemTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/ReaderTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/ReaderTest.php
index 0e4a43fb3ffee..3ed0d09237a05 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/ReaderTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/ReaderTest.php
@@ -6,9 +6,7 @@
 namespace Magento\Framework\Config\Test\Unit;
 
 use Magento\Framework\App\Config\Reader\Source\SourceInterface;
-use Magento\Framework\App\Config\Scope\Converter;
 use Magento\Framework\Config\Reader;
-use Magento\Framework\Stdlib\ArrayUtils;
 
 class ReaderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/ScopeTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/ScopeTest.php
index 0ed59e73a25a2..372433174ce29 100644
--- a/lib/internal/Magento/Framework/Config/Test/Unit/ScopeTest.php
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/ScopeTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Config\Test\Unit;
 
-use \Magento\Framework\Config\Scope;
+use Magento\Framework\Config\Scope;
 
 class ScopeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Console/GenerationDirectoryAccess.php b/lib/internal/Magento/Framework/Console/GenerationDirectoryAccess.php
index b8978c9ef7181..359cc44e80625 100644
--- a/lib/internal/Magento/Framework/Console/GenerationDirectoryAccess.php
+++ b/lib/internal/Magento/Framework/Console/GenerationDirectoryAccess.php
@@ -9,8 +9,8 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem\Directory\WriteFactory;
 use Magento\Framework\Filesystem\DriverPool;
-use Zend\ServiceManager\ServiceManager;
 use Magento\Setup\Mvc\Bootstrap\InitParamListener;
+use Zend\ServiceManager\ServiceManager;
 
 /**
  * Check generated/code read and write access
diff --git a/lib/internal/Magento/Framework/Console/Test/Unit/QuestionPerformer/YesNoTest.php b/lib/internal/Magento/Framework/Console/Test/Unit/QuestionPerformer/YesNoTest.php
index d8552f2ba5f31..4e1140b1b4d41 100644
--- a/lib/internal/Magento/Framework/Console/Test/Unit/QuestionPerformer/YesNoTest.php
+++ b/lib/internal/Magento/Framework/Console/Test/Unit/QuestionPerformer/YesNoTest.php
@@ -9,10 +9,8 @@
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\QuestionFactory;
 use Symfony\Component\Console\Question\Question;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Phrase;
+use Symfony\Component\Console\Question\QuestionFactory;
 
 class YesNoTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Controller/AbstractResult.php b/lib/internal/Magento/Framework/Controller/AbstractResult.php
index 50ed034b0a488..7bda2df3cb015 100644
--- a/lib/internal/Magento/Framework/Controller/AbstractResult.php
+++ b/lib/internal/Magento/Framework/Controller/AbstractResult.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\Controller;
 
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
+use Magento\Framework\App\ResponseInterface;
 
 abstract class AbstractResult implements ResultInterface
 {
diff --git a/lib/internal/Magento/Framework/Controller/Result/Redirect.php b/lib/internal/Magento/Framework/Controller/Result/Redirect.php
index 120b18d873cff..e5c9bc2f54a19 100644
--- a/lib/internal/Magento/Framework/Controller/Result/Redirect.php
+++ b/lib/internal/Magento/Framework/Controller/Result/Redirect.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\App;
 use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
-use Magento\Framework\Controller\AbstractResult;
 use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\Controller\AbstractResult;
 use Magento\Framework\UrlInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php b/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php
index 65e7ee489e84c..cb6817b97e4ce 100644
--- a/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php
+++ b/lib/internal/Magento/Framework/Controller/Test/Unit/Result/RedirectTest.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Framework\Controller\Test\Unit\Result;
 
-use \PHPUnit\Framework\TestCase;
-use \Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
-use \Magento\Framework\App\Response\RedirectInterface;
-use \Magento\Framework\Controller\Result\Redirect;
-use \Magento\Framework\UrlInterface;
+use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\UrlInterface;
+use PHPUnit\Framework\TestCase;
 
 class RedirectTest extends TestCase
 {
diff --git a/lib/internal/Magento/Framework/Controller/Test/Unit/Router/Route/FactoryTest.php b/lib/internal/Magento/Framework/Controller/Test/Unit/Router/Route/FactoryTest.php
index 87adadbd34e3b..f16603e9a6d5a 100644
--- a/lib/internal/Magento/Framework/Controller/Test/Unit/Router/Route/FactoryTest.php
+++ b/lib/internal/Magento/Framework/Controller/Test/Unit/Router/Route/FactoryTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Controller\Test\Unit\Router\Route;
 
-use \Magento\Framework\Controller\Router\Route\Factory;
+use Magento\Framework\Controller\Router\Route\Factory;
 
 use Magento\Framework\Controller\Router\Route\Factory as RouteFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManager;
diff --git a/lib/internal/Magento/Framework/Convert/Test/Unit/ConvertArrayTest.php b/lib/internal/Magento/Framework/Convert/Test/Unit/ConvertArrayTest.php
index 70414b2802c8a..bec8ca8448336 100644
--- a/lib/internal/Magento/Framework/Convert/Test/Unit/ConvertArrayTest.php
+++ b/lib/internal/Magento/Framework/Convert/Test/Unit/ConvertArrayTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Convert\Test\Unit;
 
-use \Magento\Framework\Convert\ConvertArray;
+use Magento\Framework\Convert\ConvertArray;
 
 class ConvertArrayTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Convert/Test/Unit/ObjectTest.php b/lib/internal/Magento/Framework/Convert/Test/Unit/ObjectTest.php
index 40805152e3c03..35e760b9f856d 100644
--- a/lib/internal/Magento/Framework/Convert/Test/Unit/ObjectTest.php
+++ b/lib/internal/Magento/Framework/Convert/Test/Unit/ObjectTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Convert\Test\Unit;
 
-use \Magento\Framework\Convert\DataObject;
+use Magento\Framework\Convert\DataObject;
 
 class ObjectTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/File/Temporary.php b/lib/internal/Magento/Framework/Css/PreProcessor/File/Temporary.php
index aebff27086b9e..6333b0d5614c9 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/File/Temporary.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/File/Temporary.php
@@ -6,8 +6,8 @@
 namespace Magento\Framework\Css\PreProcessor\File;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem;
 use Magento\Framework\Css\PreProcessor\Config;
+use Magento\Framework\Filesystem;
 
 class Temporary
 {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/FileGenerator/RelatedGenerator.php b/lib/internal/Magento/Framework/Css/PreProcessor/FileGenerator/RelatedGenerator.php
index ed1f16c2e427b..31e2e0ebf2161 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/FileGenerator/RelatedGenerator.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/FileGenerator/RelatedGenerator.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\Css\PreProcessor\FileGenerator;
 
-use Magento\Framework\View\Asset\Repository;
 use Magento\Framework\Css\PreProcessor\File\Temporary;
 use Magento\Framework\Css\PreProcessor\Instruction\Import;
 use Magento\Framework\View\Asset\LocalInterface;
+use Magento\Framework\View\Asset\Repository;
 
 /**
  * Class RelatedGenerator
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php b/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php
index 788cbee21b318..a0f90c102eb4e 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/Import.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Framework\Css\PreProcessor\Instruction;
 
+use Magento\Framework\Css\PreProcessor\FileGenerator\RelatedGenerator;
 use Magento\Framework\View\Asset\LocalInterface;
 use Magento\Framework\View\Asset\NotationResolver;
-use Magento\Framework\View\Asset\PreProcessorInterface;
-use Magento\Framework\Css\PreProcessor\FileGenerator\RelatedGenerator;
 use Magento\Framework\View\Asset\PreProcessor\Chain;
+use Magento\Framework\View\Asset\PreProcessorInterface;
 
 /**
  * 'import' instruction preprocessor
@@ -22,9 +22,9 @@ class Import implements PreProcessorInterface
      */
     const REPLACE_PATTERN =
         '#@import[\s]*'
-        .'(?P<start>[\(\),\w\s]*?[\'\"][\s]*)'
-        .'(?P<path>[^\)\'\"]*?)'
-        .'(?P<end>[\s]*[\'\"][\s\w]*[\)]?)[\s]*;#';
+        . '(?P<start>[\(\),\w\s]*?[\'\"][\s]*)'
+        . '(?P<path>[^\)\'\"]*?)'
+        . '(?P<end>[\s]*[\'\"][\s\w]*[\)]?)[\s]*;#';
 
     /**
      * @var \Magento\Framework\View\Asset\NotationResolver\Module
diff --git a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/Adapter/Less/ProcessorTest.php b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/Adapter/Less/ProcessorTest.php
index e1588db4ba97c..65e684475a02c 100644
--- a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/Adapter/Less/ProcessorTest.php
+++ b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/Adapter/Less/ProcessorTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Framework\Css\Test\Unit\PreProcessor\Adapter\Less;
 
-use Psr\Log\LoggerInterface;
 use Magento\Framework\App\State;
+use Magento\Framework\Css\PreProcessor\Adapter\Less\Processor;
+use Magento\Framework\Css\PreProcessor\File\Temporary;
 use Magento\Framework\View\Asset\File;
 use Magento\Framework\View\Asset\Source;
-use Magento\Framework\Css\PreProcessor\File\Temporary;
-use Magento\Framework\Css\PreProcessor\Adapter\Less\Processor;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class ProcessorTest
diff --git a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/AggregatedTest.php b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/AggregatedTest.php
index c1c2a4f4a1d18..7336633fd437b 100644
--- a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/AggregatedTest.php
+++ b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/AggregatedTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Css\Test\Unit\PreProcessor\File\Collector;
 
-use \Magento\Framework\Css\PreProcessor\File\Collector\Aggregated;
+use Magento\Framework\Css\PreProcessor\File\Collector\Aggregated;
 
 /**
  * Tests Aggregate
diff --git a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/LibraryTest.php b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/LibraryTest.php
index 962734feea18a..9abe53f082e6b 100644
--- a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/LibraryTest.php
+++ b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/Collector/LibraryTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\Css\Test\Unit\PreProcessor\File\Collector;
 
-use Magento\Framework\Component\ComponentRegistrar;
-use \Magento\Framework\Css\PreProcessor\File\Collector\Library;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Css\PreProcessor\File\Collector\Library;
 use Magento\Framework\Filesystem;
 
 /**
diff --git a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/FileList/CollatorTest.php b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/FileList/CollatorTest.php
index 630876e8ff675..dad377b0e9016 100644
--- a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/FileList/CollatorTest.php
+++ b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/File/FileList/CollatorTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Css\Test\Unit\PreProcessor\File\FileList;
 
-use \Magento\Framework\Css\PreProcessor\File\FileList\Collator;
+use Magento\Framework\Css\PreProcessor\File\FileList\Collator;
 
 class CollatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/Instruction/ImportTest.php b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/Instruction/ImportTest.php
index 22df07f4c95cf..1f473e9001083 100644
--- a/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/Instruction/ImportTest.php
+++ b/lib/internal/Magento/Framework/Css/Test/Unit/PreProcessor/Instruction/ImportTest.php
@@ -36,7 +36,6 @@ class ImportTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-
         $this->notationResolver = $this->createMock(\Magento\Framework\View\Asset\NotationResolver\Module::class);
         $contextMock = $this->getMockForAbstractClass(
             \Magento\Framework\View\Asset\ContextInterface::class,
diff --git a/lib/internal/Magento/Framework/DB/AbstractMapper.php b/lib/internal/Magento/Framework/DB/AbstractMapper.php
index b9c44bbaed6f8..464391d97a677 100644
--- a/lib/internal/Magento/Framework/DB/AbstractMapper.php
+++ b/lib/internal/Magento/Framework/DB/AbstractMapper.php
@@ -10,7 +10,6 @@
 use Magento\Framework\Data\ObjectFactory;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Psr\Log\LoggerInterface as Logger;
-use Magento\Framework\DataObject;
 
 /**
  * Class AbstractMapper
diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index 89e50c2e7b6d7..63aa4114639ab 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -35,7 +35,7 @@ interface AdapterInterface
     const INSERT_ON_DUPLICATE = 1;
 
     const INSERT_IGNORE = 2;
-    
+
     /** Strategy for updating data in table. See https://dev.mysql.com/doc/refman/5.7/en/replace.html */
     const REPLACE = 4;
 
diff --git a/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php b/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php
index 0a51354f77462..7691271ad612f 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/DdlCache.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\DB\Adapter;
 
-use Magento\Framework\Cache\Frontend\Decorator\TagScope;
 use Magento\Framework\App\Cache\Type\FrontendPool;
+use Magento\Framework\Cache\Frontend\Decorator\TagScope;
 
 /**
  * Cache segment for DDL operations in database adapter
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/MysqlFactory.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/MysqlFactory.php
index 06a7373cb35c2..57396fdf669ff 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/MysqlFactory.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/MysqlFactory.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\DB\Adapter\Pdo;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\LoggerInterface;
 use Magento\Framework\DB\SelectFactory;
 use Magento\Framework\ObjectManagerInterface;
diff --git a/lib/internal/Magento/Framework/DB/Select/ColumnsRenderer.php b/lib/internal/Magento/Framework/DB/Select/ColumnsRenderer.php
index 15cdb84ecb5b3..bcb7761014dc6 100644
--- a/lib/internal/Magento/Framework/DB/Select/ColumnsRenderer.php
+++ b/lib/internal/Magento/Framework/DB/Select/ColumnsRenderer.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\DB\Select;
 
-use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Platform\Quote;
+use Magento\Framework\DB\Select;
 
 /**
  * Class ColumnsRenderer
diff --git a/lib/internal/Magento/Framework/DB/Select/DistinctRenderer.php b/lib/internal/Magento/Framework/DB/Select/DistinctRenderer.php
index ae395eb823277..131e97ea5b84f 100644
--- a/lib/internal/Magento/Framework/DB/Select/DistinctRenderer.php
+++ b/lib/internal/Magento/Framework/DB/Select/DistinctRenderer.php
@@ -22,7 +22,7 @@ class DistinctRenderer implements RendererInterface
     public function render(Select $select, $sql = '')
     {
         if ($select->getPart(Select::DISTINCT)) {
-            $sql .= ' ' . Select::SQL_DISTINCT  . ' ';
+            $sql .= ' ' . Select::SQL_DISTINCT . ' ';
         }
         return $sql;
     }
diff --git a/lib/internal/Magento/Framework/DB/Select/FromRenderer.php b/lib/internal/Magento/Framework/DB/Select/FromRenderer.php
index 8755cb891076e..ad6ed3a051fc0 100644
--- a/lib/internal/Magento/Framework/DB/Select/FromRenderer.php
+++ b/lib/internal/Magento/Framework/DB/Select/FromRenderer.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\DB\Select;
 
-use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Platform\Quote;
+use Magento\Framework\DB\Select;
 
 class FromRenderer implements RendererInterface
 {
diff --git a/lib/internal/Magento/Framework/DB/Select/GroupRenderer.php b/lib/internal/Magento/Framework/DB/Select/GroupRenderer.php
index df046c92203c2..d468d55a36a6f 100644
--- a/lib/internal/Magento/Framework/DB/Select/GroupRenderer.php
+++ b/lib/internal/Magento/Framework/DB/Select/GroupRenderer.php
@@ -5,9 +5,8 @@
  */
 namespace Magento\Framework\DB\Select;
 
-use Magento\Framework\DB\Select;
-use Magento\Framework\DB\Platform;
 use Magento\Framework\DB\Platform\Quote;
+use Magento\Framework\DB\Select;
 
 /**
  * Class GroupRenderer
diff --git a/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php b/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php
index 36a075b9af8c9..cd6927cfd15d0 100644
--- a/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php
+++ b/lib/internal/Magento/Framework/DB/Select/OrderRenderer.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\DB\Select;
 
-use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Platform\Quote;
+use Magento\Framework\DB\Select;
 
 /**
  * Class OrderRenderer
diff --git a/lib/internal/Magento/Framework/DB/Select/WhereRenderer.php b/lib/internal/Magento/Framework/DB/Select/WhereRenderer.php
index b33abd59b278e..7c796e825b126 100644
--- a/lib/internal/Magento/Framework/DB/Select/WhereRenderer.php
+++ b/lib/internal/Magento/Framework/DB/Select/WhereRenderer.php
@@ -22,7 +22,7 @@ class WhereRenderer implements RendererInterface
     public function render(Select $select, $sql = '')
     {
         if ($select->getPart(Select::FROM) && $select->getPart(Select::WHERE)) {
-            $sql .= ' ' . Select::SQL_WHERE . ' ' .  implode(' ', $select->getPart(Select::WHERE));
+            $sql .= ' ' . Select::SQL_WHERE . ' ' . implode(' ', $select->getPart(Select::WHERE));
         }
         return $sql;
     }
diff --git a/lib/internal/Magento/Framework/DB/SelectFactory.php b/lib/internal/Magento/Framework/DB/SelectFactory.php
index bdbc35b395af7..10b931d89f5c4 100644
--- a/lib/internal/Magento/Framework/DB/SelectFactory.php
+++ b/lib/internal/Magento/Framework/DB/SelectFactory.php
@@ -6,9 +6,8 @@
 
 namespace Magento\Framework\DB;
 
-use Magento\Framework\DB\Select;
-use Magento\Framework\DB\Select\SelectRenderer;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select\SelectRenderer;
 
 /**
  * Class SelectFactory
diff --git a/lib/internal/Magento/Framework/DB/TemporaryTableService.php b/lib/internal/Magento/Framework/DB/TemporaryTableService.php
index 479cd0c6fddb9..d21b8decb5645 100644
--- a/lib/internal/Magento/Framework/DB/TemporaryTableService.php
+++ b/lib/internal/Magento/Framework/DB/TemporaryTableService.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\DB;
 
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\DB\Select;
 
 /**
  * Class TemporaryTableService creates a temporary table in mysql from a Magento\Framework\DB\Select.
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/DB/Logger/LoggerProxyTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/DB/Logger/LoggerProxyTest.php
index 8ca17078e79ab..e1deacc099507 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/DB/Logger/LoggerProxyTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/DB/Logger/LoggerProxyTest.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Framework\DB\Test\Unit\DB\Logger;
 
+use Magento\Framework\DB\Logger\File;
 use Magento\Framework\DB\Logger\FileFactory;
-use Magento\Framework\DB\Logger\QuietFactory;
 use Magento\Framework\DB\Logger\LoggerProxy;
-use Magento\Framework\DB\Logger\File;
 use Magento\Framework\DB\Logger\Quiet;
+use Magento\Framework\DB\Logger\QuietFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class LoggerProxyTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/DataConverter/SerializedToJsonTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/DataConverter/SerializedToJsonTest.php
index 23143e635fb24..a960011e06743 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/DataConverter/SerializedToJsonTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/DataConverter/SerializedToJsonTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\DB\Test\Unit\DataConverter;
 
-use Magento\Framework\Serialize\Serializer\Serialize;
-use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Serialize\Serializer\Serialize;
 
 class SerializedToJsonTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/FieldDataConverterFactoryTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/FieldDataConverterFactoryTest.php
index 687831c1b34ee..e6c18a5a0b9bc 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/FieldDataConverterFactoryTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/FieldDataConverterFactoryTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Framework\DB\Test\Unit;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\DB\DataConverter\DataConverterInterface;
+use Magento\Framework\DB\FieldDataConverter;
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\DB\FieldDataConverter;
-use Magento\Framework\DB\DataConverter\DataConverterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class FieldDataConverterFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/FieldDataConverterTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/FieldDataConverterTest.php
index 3648946b44e01..df87269304972 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/FieldDataConverterTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/FieldDataConverterTest.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Framework\DB\Test\Unit;
 
-use Magento\Framework\DB\SelectFactory;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\DB\Query\Generator;
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\DB\FieldDataConverter;
 use Magento\Framework\DB\DataConverter\DataConverterInterface;
+use Magento\Framework\DB\FieldDataConverter;
+use Magento\Framework\DB\Query\Generator;
 use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Select\QueryModifierInterface;
+use Magento\Framework\DB\SelectFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class FieldDataConverterTest extends \PHPUnit\Framework\TestCase
 {
@@ -143,7 +143,7 @@ public function testConvert($useQueryModifier, $numQueryModifierCalls)
     public function convertDataProvider()
     {
         return [
-            [false, 0, ],
+            [false, 0],
             [true, 1]
         ];
     }
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Helper/Mysql/FulltextTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Helper/Mysql/FulltextTest.php
index 713f6471ded3c..ab645e90587cd 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Helper/Mysql/FulltextTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Helper/Mysql/FulltextTest.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\DB\Test\Unit\Helper\Mysql;
 
 use Magento\Framework\DB\Helper\Mysql\Fulltext;
-use Magento\Framework\DB\Select;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class FulltextTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Logger/FileTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Logger/FileTest.php
index 04f223a26fd14..ce0968710e13a 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Logger/FileTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Logger/FileTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\DB\Test\Unit\Logger;
 
-use \Magento\Framework\DB\Logger\File;
+use Magento\Framework\DB\Logger\File;
 
 class FileTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Select/CompositeQueryModifierTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Select/CompositeQueryModifierTest.php
index a0ecce8e707c4..028d20013e7bc 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Select/CompositeQueryModifierTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Select/CompositeQueryModifierTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\DB\Test\Unit\Select;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\DB\Select;
-use Magento\Framework\DB\Select\QueryModifierInterface;
 use Magento\Framework\DB\Select\CompositeQueryModifier;
+use Magento\Framework\DB\Select\QueryModifierInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class CompositeQueryModifierTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Select/DistinctRendererTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Select/DistinctRendererTest.php
index fbd970fda6b4a..67759fe854e7c 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Select/DistinctRendererTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Select/DistinctRendererTest.php
@@ -48,7 +48,7 @@ public function testRenderNoPart()
     public function testRender()
     {
         $sql = 'SELECT';
-        $expectedResult = $sql . ' ' . Select::SQL_DISTINCT  . ' ';
+        $expectedResult = $sql . ' ' . Select::SQL_DISTINCT . ' ';
         $this->selectMock->expects($this->once())
             ->method('getPart')
             ->with(Select::DISTINCT)
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Select/FromRendererTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Select/FromRendererTest.php
index 9a7cf83ffeed2..6aaac81ca6115 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Select/FromRendererTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Select/FromRendererTest.php
@@ -70,7 +70,7 @@ public function testRender($from, $sql, $expectedResult)
             ->method('quoteTableAs')
             ->willReturnCallback(
                 function ($tableName, $correlationName) {
-                    return $tableName.' AS '.$correlationName;
+                    return $tableName . ' AS ' . $correlationName;
                 }
             );
         $this->selectMock->expects($this->once())
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Select/QueryModifierFactoryTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Select/QueryModifierFactoryTest.php
index 3728d2a9018e6..7cd8debda050c 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Select/QueryModifierFactoryTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Select/QueryModifierFactoryTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\DB\Test\Unit\Select;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\DB\Select\QueryModifierFactory;
 use Magento\Framework\DB\Select\InQueryModifier;
+use Magento\Framework\DB\Select\QueryModifierFactory;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class QueryModifierFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php
index 7ce0ba4e4eb45..6e220fb86e2ca 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php
@@ -5,9 +5,7 @@
  */
 namespace Magento\Framework\DB\Test\Unit;
 
-use \Magento\Framework\DB\Select;
-
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\DB\Select;
 
 /**
  * Class SelectTest
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/TemporaryTableServiceTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/TemporaryTableServiceTest.php
index 19cd1604522e7..f10f60b729aa3 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/TemporaryTableServiceTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/TemporaryTableServiceTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Framework\DB\Test\Unit;
 
-use Magento\Framework\DB\TemporaryTableService;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\DB\TemporaryTableService;
 use Magento\Framework\Math\Random;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class TemporaryTableServiceTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Data/AbstractSearchResult.php b/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
index f9272683005ce..f52f0247fb7ab 100644
--- a/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
+++ b/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
@@ -61,7 +61,7 @@ abstract class AbstractSearchResult extends AbstractDataObject implements Search
      * @var \Magento\Framework\DB\QueryInterface
      */
     protected $query;
-    
+
     /**
      * @var \Magento\Framework\DB\Select
      * @deprecated 100.2.0
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index b0b31fa3751a8..64717668a7db6 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -536,7 +536,7 @@ public function each($objMethod, $args = [])
             }
         }
     }
-    
+
     /**
      * Setting data for all collection items
      *
diff --git a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
index a36a97d0be7f1..ad561b6a94e0a 100644
--- a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Framework\Data\Collection;
 
+use Magento\Framework\Api\ExtensionAttribute\JoinDataInterface;
+use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
-use Magento\Framework\Api\ExtensionAttribute\JoinDataInterface;
-use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Psr\Log\LoggerInterface as Logger;
 
 /**
@@ -244,7 +244,7 @@ public function getSelectCountSql()
 
         $countSelect->reset(\Magento\Framework\DB\Select::GROUP);
         $group = $this->getSelect()->getPart(\Magento\Framework\DB\Select::GROUP);
-        $countSelect->columns(new \Zend_Db_Expr(("COUNT(DISTINCT ".implode(", ", $group).")")));
+        $countSelect->columns(new \Zend_Db_Expr(("COUNT(DISTINCT " . implode(", ", $group) . ")")));
         return $countSelect;
     }
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
index ef85876521d23..6ae1d4caf7897 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Date.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
@@ -12,7 +12,6 @@
 namespace Magento\Framework\Data\Form\Element;
 
 use Magento\Framework\Escaper;
-use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 class Date extends AbstractElement
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index 6ed2d8293e61d..282b2ae074687 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -415,7 +415,7 @@ protected function _getButtonHtml($data)
     protected function _wrapIntoContainer($html)
     {
         if (!$this->getConfig('use_container')) {
-            return '<div class="admin__control-wysiwig">' .$html . '</div>';
+            return '<div class="admin__control-wysiwig">' . $html . '</div>';
         }
 
         $html = '<div id="editor' . $this->getHtmlId() . '"'
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
index 9f9a3306ae65a..235ee3f7a0495 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
@@ -48,7 +48,7 @@ public function getElementHtml()
             '<td class="gallery" valign="middle" align="center">Small Thumb</td>' .
             '<td class="gallery" valign="middle" align="center">Sort Order</td>' .
             '<td class="gallery" valign="middle" align="center">Delete</td>' .
-            '</tr>'.
+            '</tr>' .
             '</thead>';
         $widgetButton = $this->getForm()->getParent()->getLayout();
         $buttonHtml = $widgetButton->createBlock(
diff --git a/lib/internal/Magento/Framework/Data/Form/FilterFactory.php b/lib/internal/Magento/Framework/Data/Form/FilterFactory.php
index 2763e8bd17cce..22dfabb8fb565 100644
--- a/lib/internal/Magento/Framework/Data/Form/FilterFactory.php
+++ b/lib/internal/Magento/Framework/Data/Form/FilterFactory.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\Data\Form\Filter\FilterInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Phrase;
 
 class FilterFactory
 {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/AbstractSearchResultTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/AbstractSearchResultTest.php
index c6084ae5d88fb..c0010bad10bd1 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/AbstractSearchResultTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/AbstractSearchResultTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit;
 
-use \Magento\Framework\Data\AbstractSearchResult;
+use Magento\Framework\Data\AbstractSearchResult;
 
 /**
  * Class AbstractSearchResultTest
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php
index 20a0b384bad7e..a446b15bf8a0c 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ArrayTypeTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Argument\Interpreter;
 
-use \Magento\Framework\Data\Argument\Interpreter\ArrayType;
+use Magento\Framework\Data\Argument\Interpreter\ArrayType;
 
 class ArrayTypeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/BooleanTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/BooleanTest.php
index a5746e7c38888..20d2095033d30 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/BooleanTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/BooleanTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Argument\Interpreter;
 
-use \Magento\Framework\Data\Argument\Interpreter\Boolean;
+use Magento\Framework\Data\Argument\Interpreter\Boolean;
 
 class BooleanTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php
index bca8bb0d9347f..ae540033712b7 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/CompositeTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Argument\Interpreter;
 
-use \Magento\Framework\Data\Argument\Interpreter\Composite;
+use Magento\Framework\Data\Argument\Interpreter\Composite;
 
 class CompositeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ConstantTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ConstantTest.php
index 8fd76d56e0e88..373e563155cea 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ConstantTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/ConstantTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Argument\Interpreter;
 
-use \Magento\Framework\Data\Argument\Interpreter\Constant;
+use Magento\Framework\Data\Argument\Interpreter\Constant;
 
 class ConstantTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NullTypeTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NullTypeTest.php
index d6f46b7981cf3..2712c873b57f0 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NullTypeTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NullTypeTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Argument\Interpreter;
 
-use \Magento\Framework\Data\Argument\Interpreter\NullType;
+use Magento\Framework\Data\Argument\Interpreter\NullType;
 
 class NullTypeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NumberTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NumberTest.php
index bec2a37545e65..a20da6755f407 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NumberTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Argument/Interpreter/NumberTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Argument\Interpreter;
 
-use \Magento\Framework\Data\Argument\Interpreter\Number;
+use Magento\Framework\Data\Argument\Interpreter\Number;
 
 class NumberTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Collection/FilesystemTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Collection/FilesystemTest.php
index 720285c0f4526..61a6d6699dd09 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Collection/FilesystemTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Collection/FilesystemTest.php
@@ -40,44 +40,44 @@ public function testFilterCallbackLikeDataProvider()
         $field     = 'field';
         $testValue = '\'\'\'test\'\'\'Filter\'\'\'Value\'\'\'';
         return [
-            [$field, '\'%test%\'', [$field => $testValue,], true],
-            [$field, '%\'test%', [$field => $testValue,], true],
-            [$field, '%\'test\'%', [$field => $testValue,], true],
-            [$field, '%\'\'test%', [$field => $testValue,], true],
-            [$field, '%\'\'test\'\'%', [$field => $testValue,], true],
-            [$field, '%\'\'\'test%', [$field => $testValue,], true],
-            [$field, '%\'\'\'test\'\'\'%', [$field => $testValue,], true],
-            [$field, '%\'\'\'\'test%', [$field => $testValue,], false],
+            [$field, '\'%test%\'', [$field => $testValue], true],
+            [$field, '%\'test%', [$field => $testValue], true],
+            [$field, '%\'test\'%', [$field => $testValue], true],
+            [$field, '%\'\'test%', [$field => $testValue], true],
+            [$field, '%\'\'test\'\'%', [$field => $testValue], true],
+            [$field, '%\'\'\'test%', [$field => $testValue], true],
+            [$field, '%\'\'\'test\'\'\'%', [$field => $testValue], true],
+            [$field, '%\'\'\'\'test%', [$field => $testValue], false],
 
-            [$field, '\'%Value%\'', [$field => $testValue,], true],
-            [$field, '%Value\'%', [$field => $testValue,], true],
-            [$field, '%\'Value\'%', [$field => $testValue,], true],
-            [$field, '%Value\'\'%', [$field => $testValue,], true],
-            [$field, '%\'\'Value\'\'%', [$field => $testValue,], true],
-            [$field, '%Value\'\'\'%', [$field => $testValue,], true],
-            [$field, '%\'\'\'Value\'\'\'%', [$field => $testValue,], true],
-            [$field, '%Value%\'\'\'\'%', [$field => $testValue,], false],
+            [$field, '\'%Value%\'', [$field => $testValue], true],
+            [$field, '%Value\'%', [$field => $testValue], true],
+            [$field, '%\'Value\'%', [$field => $testValue], true],
+            [$field, '%Value\'\'%', [$field => $testValue], true],
+            [$field, '%\'\'Value\'\'%', [$field => $testValue], true],
+            [$field, '%Value\'\'\'%', [$field => $testValue], true],
+            [$field, '%\'\'\'Value\'\'\'%', [$field => $testValue], true],
+            [$field, '%Value%\'\'\'\'%', [$field => $testValue], false],
 
-            [$field, '\'%\'\'\'test\'\'\'Filter\'\'\'Value\'\'\'%\'', [$field => $testValue,], true],
-            [$field, '\'\'\'%\'\'\'test\'\'\'Filter\'\'\'Value\'\'\'%\'\'\'', [$field => $testValue,], true],
-            [$field, '%test\'\'\'Filter\'\'\'Value%', [$field => $testValue,], true],
-            [$field, '%test\'\'\'Filter\'\'\'Value\'\'\'%', [$field => $testValue,], true],
-            [$field, '%\'\'\'test\'\'\'Filter\'\'\'Value%', [$field => $testValue,], true],
-            [$field, '%\'\'\'Filter\'\'\'Value\'\'\'%', [$field => $testValue,], true],
-            [$field, '%Filter\'\'\'Value\'\'\'%', [$field => $testValue,], true],
-            [$field, '%\'\'\'Filter\'\'\'Value%', [$field => $testValue,], true],
-            [$field, '%Filter\'\'\'Value%', [$field => $testValue,], true],
-            [$field, '%Filter\'\'\'\'Value%', [$field => $testValue,], false],
+            [$field, '\'%\'\'\'test\'\'\'Filter\'\'\'Value\'\'\'%\'', [$field => $testValue], true],
+            [$field, '\'\'\'%\'\'\'test\'\'\'Filter\'\'\'Value\'\'\'%\'\'\'', [$field => $testValue], true],
+            [$field, '%test\'\'\'Filter\'\'\'Value%', [$field => $testValue], true],
+            [$field, '%test\'\'\'Filter\'\'\'Value\'\'\'%', [$field => $testValue], true],
+            [$field, '%\'\'\'test\'\'\'Filter\'\'\'Value%', [$field => $testValue], true],
+            [$field, '%\'\'\'Filter\'\'\'Value\'\'\'%', [$field => $testValue], true],
+            [$field, '%Filter\'\'\'Value\'\'\'%', [$field => $testValue], true],
+            [$field, '%\'\'\'Filter\'\'\'Value%', [$field => $testValue], true],
+            [$field, '%Filter\'\'\'Value%', [$field => $testValue], true],
+            [$field, '%Filter\'\'\'\'Value%', [$field => $testValue], false],
 
-            [$field, '\'%\'\'\'Filter\'\'\'%\'', [$field => $testValue,], true],
-            [$field, '%Filter\'\'\'%', [$field => $testValue,], true],
-            [$field, '%\'\'\'Filter%', [$field => $testValue,], true],
-            [$field, '%\'Filter%', [$field => $testValue,], true],
-            [$field, '%Filter\'%', [$field => $testValue,], true],
-            [$field, '%Filter%', [$field => $testValue,], true],
-            [$field, '%Filter\'\'\'\'%', [$field => $testValue,], false],
+            [$field, '\'%\'\'\'Filter\'\'\'%\'', [$field => $testValue], true],
+            [$field, '%Filter\'\'\'%', [$field => $testValue], true],
+            [$field, '%\'\'\'Filter%', [$field => $testValue], true],
+            [$field, '%\'Filter%', [$field => $testValue], true],
+            [$field, '%Filter\'%', [$field => $testValue], true],
+            [$field, '%Filter%', [$field => $testValue], true],
+            [$field, '%Filter\'\'\'\'%', [$field => $testValue], false],
 
-            [$field, '\'%no_match_value%\'', [$field => $testValue,], false],
+            [$field, '\'%no_match_value%\'', [$field => $testValue], false],
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
index 2ecc67e1eb70e..1103c9ec8ed11 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/CollectionTest.php
@@ -173,7 +173,7 @@ public function testEachCallsMethodOnEachItemWithNoArgs()
         }
         $this->_model->each('testCallback');
     }
-    
+
     public function testEachCallsMethodOnEachItemWithArgs()
     {
         for ($i = 0; $i < 3; $i++) {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/AbstractFormTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/AbstractFormTest.php
index 0537a25aa966d..d55045048ac7d 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/AbstractFormTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/AbstractFormTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Data\Test\Unit\Form;
 
-use \Magento\Framework\Data\Form\AbstractForm;
+use Magento\Framework\Data\Form\AbstractForm;
 
 class AbstractFormTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php
index a34fdf21f7ab4..bc0078b3b0390 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php
@@ -9,7 +9,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
-use \Magento\Framework\Data\Form\Element\Date;
+use Magento\Framework\Data\Form\Element\Date;
 
 class DateTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/FormFactoryTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/FormFactoryTest.php
index 2a36c25e81401..137ad123e097c 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/FormFactoryTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/FormFactoryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit;
 
-use \Magento\Framework\Data\FormFactory;
+use Magento\Framework\Data\FormFactory;
 
 /**
  * Tests for \Magento\Framework\Data\FormFactory
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/FormTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/FormTest.php
index 89aff747238a1..c0fb2b03ca5e3 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/FormTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/FormTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit;
 
-use \Magento\Framework\Data\Form;
+use Magento\Framework\Data\Form;
 
 /**
  * Tests for \Magento\Framework\Data\FormFactory
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/SearchResultProcessorTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/SearchResultProcessorTest.php
index 93cbcf130aff8..e3b20de6071d2 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/SearchResultProcessorTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/SearchResultProcessorTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit;
 
-use \Magento\Framework\Data\SearchResultProcessor;
+use Magento\Framework\Data\SearchResultProcessor;
 
 /**
  * Class SearchResultProcessorTest
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php
index e91ec72dae112..1c339d37e0359 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Tree/Node/CollectionTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Data\Test\Unit\Tree\Node;
 
-use \Magento\Framework\Data\Tree\Node\Collection;
+use Magento\Framework\Data\Tree\Node\Collection;
 
 class CollectionTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/TreeTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/TreeTest.php
index a2ec1901219a6..a45f8f94b2ba7 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/TreeTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/TreeTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Data\Test\Unit;
 
-use \Magento\Framework\Data\Tree\Node;
-use \Magento\Framework\Data\Tree;
+use Magento\Framework\Data\Tree;
+use Magento\Framework\Data\Tree\Node;
 
 /**
  * Tests for \Magento\Framework\Data\FormFactory
diff --git a/lib/internal/Magento/Framework/Data/Wysiwyg/Normalizer.php b/lib/internal/Magento/Framework/Data/Wysiwyg/Normalizer.php
index 62e7500a302a6..32ccbca035d3b 100644
--- a/lib/internal/Magento/Framework/Data/Wysiwyg/Normalizer.php
+++ b/lib/internal/Magento/Framework/Data/Wysiwyg/Normalizer.php
@@ -10,7 +10,6 @@
  */
 class Normalizer
 {
-
     const WYSIWYG_RESERVED_CHARACTERS_REPLACEMENT_MAP = [
         '{' => '^[',
         '}' => '^]',
diff --git a/lib/internal/Magento/Framework/DataObject/IdentityGeneratorInterface.php b/lib/internal/Magento/Framework/DataObject/IdentityGeneratorInterface.php
index 6cfab9b8d4683..0704c6ec74002 100644
--- a/lib/internal/Magento/Framework/DataObject/IdentityGeneratorInterface.php
+++ b/lib/internal/Magento/Framework/DataObject/IdentityGeneratorInterface.php
@@ -16,7 +16,7 @@ interface IdentityGeneratorInterface
      * @return string
      **/
     public function generateId();
-    
+
     /**
      * Generate id for data
      *
diff --git a/lib/internal/Magento/Framework/DataObject/Test/Unit/Copy/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/DataObject/Test/Unit/Copy/Config/SchemaLocatorTest.php
index c7417439bac1f..0d35b3a4264e0 100644
--- a/lib/internal/Magento/Framework/DataObject/Test/Unit/Copy/Config/SchemaLocatorTest.php
+++ b/lib/internal/Magento/Framework/DataObject/Test/Unit/Copy/Config/SchemaLocatorTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Framework\DataObject\Test\Unit\Copy\Config;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-
 class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php b/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
index 685c22f24c303..e3625480b9587 100644
--- a/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
+++ b/lib/internal/Magento/Framework/Encryption/Test/Unit/EncryptorTest.php
@@ -5,9 +5,8 @@
  */
 namespace Magento\Framework\Encryption\Test\Unit;
 
-use Magento\Framework\Encryption\Encryptor;
 use Magento\Framework\Encryption\Crypt;
-use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Encryption\Encryptor;
 
 class EncryptorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/AbstractModelHydrator.php b/lib/internal/Magento/Framework/EntityManager/AbstractModelHydrator.php
index ce35e72baea1f..9b31fcce10b9d 100644
--- a/lib/internal/Magento/Framework/EntityManager/AbstractModelHydrator.php
+++ b/lib/internal/Magento/Framework/EntityManager/AbstractModelHydrator.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\EntityManager;
 
-use Magento\Framework\Model\AbstractModel;
-
 /**
  * Class AbstractModelHydrator
  */
diff --git a/lib/internal/Magento/Framework/EntityManager/Db/CreateRow.php b/lib/internal/Magento/Framework/EntityManager/Db/CreateRow.php
index d5a58abb3fd7d..0b17ebbefa580 100644
--- a/lib/internal/Magento/Framework/EntityManager/Db/CreateRow.php
+++ b/lib/internal/Magento/Framework/EntityManager/Db/CreateRow.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Framework\EntityManager\Db;
 
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\EntityManager\EntityMetadataInterface;
-use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * Class CreateRow
diff --git a/lib/internal/Magento/Framework/EntityManager/Db/DeleteRow.php b/lib/internal/Magento/Framework/EntityManager/Db/DeleteRow.php
index 43582e94f7294..5f2fee57b2cc7 100644
--- a/lib/internal/Magento/Framework/EntityManager/Db/DeleteRow.php
+++ b/lib/internal/Magento/Framework/EntityManager/Db/DeleteRow.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\EntityManager\Db;
 
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * Class DeleteRow
diff --git a/lib/internal/Magento/Framework/EntityManager/Db/UpdateRow.php b/lib/internal/Magento/Framework/EntityManager/Db/UpdateRow.php
index 9232f43f0d28c..d625cc167d71c 100644
--- a/lib/internal/Magento/Framework/EntityManager/Db/UpdateRow.php
+++ b/lib/internal/Magento/Framework/EntityManager/Db/UpdateRow.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Framework\EntityManager\Db;
 
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\EntityManager\EntityMetadataInterface;
-use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * Class UpdateRow
diff --git a/lib/internal/Magento/Framework/EntityManager/Hydrator.php b/lib/internal/Magento/Framework/EntityManager/Hydrator.php
index ccf5b0c8557ab..b07826eaa0d42 100644
--- a/lib/internal/Magento/Framework/EntityManager/Hydrator.php
+++ b/lib/internal/Magento/Framework/EntityManager/Hydrator.php
@@ -5,10 +5,8 @@
  */
 namespace Magento\Framework\EntityManager;
 
-use Magento\Framework\EntityManager\MapperPool;
-use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Api\DataObjectHelper;
-use Magento\Framework\EntityManager\TypeResolver;
+use Magento\Framework\Reflection\DataObjectProcessor;
 
 /**
  * Class Hydrator
diff --git a/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntityDelete.php b/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntityDelete.php
index a5f8ad070c7de..f451f46f8ee72 100644
--- a/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntityDelete.php
+++ b/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntityDelete.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\EntityManager\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Model\AbstractModel;
 
 /**
diff --git a/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntityLoad.php b/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntityLoad.php
index c8e04ed49788b..ec596ec6fc3f9 100644
--- a/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntityLoad.php
+++ b/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntityLoad.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\EntityManager\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
diff --git a/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntitySave.php b/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntitySave.php
index b855929afbe8c..dd2d7233c4f24 100644
--- a/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntitySave.php
+++ b/lib/internal/Magento/Framework/EntityManager/Observer/AfterEntitySave.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\EntityManager\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
diff --git a/lib/internal/Magento/Framework/EntityManager/Observer/BeforeEntityDelete.php b/lib/internal/Magento/Framework/EntityManager/Observer/BeforeEntityDelete.php
index 5480b1c4feba9..638a72937141b 100644
--- a/lib/internal/Magento/Framework/EntityManager/Observer/BeforeEntityDelete.php
+++ b/lib/internal/Magento/Framework/EntityManager/Observer/BeforeEntityDelete.php
@@ -6,10 +6,9 @@
 
 namespace Magento\Framework\EntityManager\Observer;
 
-use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Model\AbstractModel;
-use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
 /**
  * Class BeforeEntityDelete
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/CheckIfExists.php b/lib/internal/Magento/Framework/EntityManager/Operation/CheckIfExists.php
index 2eb3ffaec895f..c83c2ebb9d843 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/CheckIfExists.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/CheckIfExists.php
@@ -5,11 +5,10 @@
  */
 namespace Magento\Framework\EntityManager\Operation;
 
-use Magento\Framework\EntityManager\Operation\CheckIfExistsInterface;
-use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\HydratorPool;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\TypeResolver;
-use Magento\Framework\App\ResourceConnection;
 
 /**
  * Class CheckIfExists
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Create.php b/lib/internal/Magento/Framework/EntityManager/Operation/Create.php
index ae9001be9e34f..e08fb2adfc66b 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Create.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Create.php
@@ -6,15 +6,15 @@
 namespace Magento\Framework\EntityManager\Operation;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\DuplicateException;
-use Magento\Framework\EntityManager\Sequence\SequenceApplier;
-use Magento\Framework\EntityManager\Operation\Create\CreateMain;
+use Magento\Framework\EntityManager\EventManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\Create\CreateAttributes;
 use Magento\Framework\EntityManager\Operation\Create\CreateExtensions;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\EntityManager\EventManager;
+use Magento\Framework\EntityManager\Operation\Create\CreateMain;
+use Magento\Framework\EntityManager\Sequence\SequenceApplier;
 use Magento\Framework\EntityManager\TypeResolver;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Phrase;
 
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateAttributes.php b/lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateAttributes.php
index 3ae6416b928f4..a9622e696e0a8 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateAttributes.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateAttributes.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\EntityManager\Operation\Create;
 
-use Magento\Framework\EntityManager\TypeResolver;
 use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Framework\EntityManager\Operation\AttributePool;
+use Magento\Framework\EntityManager\TypeResolver;
 
 /**
  * Class CreateAttributes
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateExtensions.php b/lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateExtensions.php
index eb9bd9c93d7ba..19775cc87ba93 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateExtensions.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateExtensions.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\EntityManager\Operation\Create;
 
-use Magento\Framework\EntityManager\TypeResolver;
 use Magento\Framework\EntityManager\Operation\ExtensionPool;
+use Magento\Framework\EntityManager\TypeResolver;
 
 /**
  * Class CreateExtensions
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateMain.php b/lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateMain.php
index 33d36b8eb2bce..61446d4caf434 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateMain.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Create/CreateMain.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\EntityManager\Operation\Create;
 
-use Magento\Framework\EntityManager\TypeResolver;
-use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Framework\EntityManager\Db\CreateRow;
+use Magento\Framework\EntityManager\HydratorPool;
+use Magento\Framework\EntityManager\TypeResolver;
 
 /**
  * Class CreateMain
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Delete.php b/lib/internal/Magento/Framework/EntityManager/Operation/Delete.php
index aadc968370bfd..a7772a64a0fb9 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Delete.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Delete.php
@@ -5,15 +5,14 @@
  */
 namespace Magento\Framework\EntityManager\Operation;
 
-use Magento\Framework\EntityManager\Operation\DeleteInterface;
-use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
-use Magento\Framework\EntityManager\Operation\Delete\DeleteMain;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\EventManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\Delete\DeleteAttributes;
 use Magento\Framework\EntityManager\Operation\Delete\DeleteExtensions;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\EntityManager\EventManager;
+use Magento\Framework\EntityManager\Operation\Delete\DeleteMain;
 use Magento\Framework\EntityManager\TypeResolver;
-use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
 
 /**
  * Class Delete
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Delete/DeleteAttributes.php b/lib/internal/Magento/Framework/EntityManager/Operation/Delete/DeleteAttributes.php
index 7de4c8e83f3c8..f9890b54946a7 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Delete/DeleteAttributes.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Delete/DeleteAttributes.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\EntityManager\Operation\Delete;
 
-use Magento\Framework\EntityManager\TypeResolver;
 use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Framework\EntityManager\Operation\AttributePool;
+use Magento\Framework\EntityManager\TypeResolver;
 
 /**
  * Class DeleteAttributes
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Delete/DeleteExtensions.php b/lib/internal/Magento/Framework/EntityManager/Operation/Delete/DeleteExtensions.php
index 68ce0372db59f..c90fcde7b921c 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Delete/DeleteExtensions.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Delete/DeleteExtensions.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\EntityManager\Operation\Delete;
 
-use Magento\Framework\EntityManager\TypeResolver;
 use Magento\Framework\EntityManager\Operation\ExtensionPool;
+use Magento\Framework\EntityManager\TypeResolver;
 
 /**
  * Class DeleteExtensions
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Delete/DeleteMain.php b/lib/internal/Magento/Framework/EntityManager/Operation/Delete/DeleteMain.php
index b226bbe3c7134..d6406f00affd2 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Delete/DeleteMain.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Delete/DeleteMain.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\EntityManager\Operation\Delete;
 
-use Magento\Framework\EntityManager\TypeResolver;
-use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Framework\EntityManager\Db\DeleteRow;
+use Magento\Framework\EntityManager\HydratorPool;
+use Magento\Framework\EntityManager\TypeResolver;
 
 /**
  * Class DeleteMain
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionPool.php b/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionPool.php
index 703ed96ece4b9..5d3d37bb830d5 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionPool.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/ExtensionPool.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\EntityManager\Operation;
 
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
 /**
  * Class ExtensionPool
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Read.php b/lib/internal/Magento/Framework/EntityManager/Operation/Read.php
index 41084d6538d93..e076fb264cfc5 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Read.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Read.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Framework\EntityManager\Operation;
 
-use Magento\Framework\EntityManager\Operation\Read\ReadMain;
-use Magento\Framework\EntityManager\Operation\Read\ReadAttributes;
-use Magento\Framework\EntityManager\Operation\Read\ReadExtensions;
+use Magento\Framework\EntityManager\EventManager;
 use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\EntityManager\EventManager;
+use Magento\Framework\EntityManager\Operation\Read\ReadAttributes;
+use Magento\Framework\EntityManager\Operation\Read\ReadExtensions;
+use Magento\Framework\EntityManager\Operation\Read\ReadMain;
 use Magento\Framework\EntityManager\TypeResolver;
 
 /**
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Read/ReadAttributes.php b/lib/internal/Magento/Framework/EntityManager/Operation/Read/ReadAttributes.php
index 5c98461dbd69b..87e2dcf43c7fc 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Read/ReadAttributes.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Read/ReadAttributes.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\EntityManager\Operation\Read;
 
-use Magento\Framework\EntityManager\TypeResolver;
 use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Framework\EntityManager\Operation\AttributePool;
+use Magento\Framework\EntityManager\TypeResolver;
 
 /**
  * Class ReadAttributes
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Read/ReadExtensions.php b/lib/internal/Magento/Framework/EntityManager/Operation/Read/ReadExtensions.php
index 22a16fbf4c6a7..482727187c344 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Read/ReadExtensions.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Read/ReadExtensions.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\EntityManager\Operation\Read;
 
-use Magento\Framework\EntityManager\TypeResolver;
 use Magento\Framework\EntityManager\Operation\ExtensionPool;
+use Magento\Framework\EntityManager\TypeResolver;
 
 /**
  * Class ReadExtensions
@@ -45,7 +45,7 @@ public function execute($entity, $arguments = [])
         $entityType = $this->typeResolver->resolve($entity);
         $actions = $this->extensionPool->getActions($entityType, 'read');
         foreach ($actions as $action) {
-                $entity = $action->execute($entity, $arguments);
+            $entity = $action->execute($entity, $arguments);
         }
         return $entity;
     }
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Read/ReadMain.php b/lib/internal/Magento/Framework/EntityManager/Operation/Read/ReadMain.php
index 546602af41dd6..ec9c289afbd77 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Read/ReadMain.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Read/ReadMain.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Framework\EntityManager\Operation\Read;
 
-use Magento\Framework\EntityManager\TypeResolver;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Framework\EntityManager\Db\ReadRow;
+use Magento\Framework\EntityManager\HydratorPool;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\EntityManager\TypeResolver;
 
 class ReadMain
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Update.php b/lib/internal/Magento/Framework/EntityManager/Operation/Update.php
index c11b7b7aa6eeb..5307d41a1bced 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Update.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Update.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Framework\EntityManager\Operation;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\DuplicateException;
-use Magento\Framework\EntityManager\Operation\Update\UpdateMain;
+use Magento\Framework\EntityManager\EventManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\Update\UpdateAttributes;
 use Magento\Framework\EntityManager\Operation\Update\UpdateExtensions;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\EntityManager\EventManager;
+use Magento\Framework\EntityManager\Operation\Update\UpdateMain;
 use Magento\Framework\EntityManager\TypeResolver;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Phrase;
 
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Update/UpdateAttributes.php b/lib/internal/Magento/Framework/EntityManager/Operation/Update/UpdateAttributes.php
index fe34866c6218c..125e838e85da4 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Update/UpdateAttributes.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Update/UpdateAttributes.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\EntityManager\Operation\Update;
 
-use Magento\Framework\EntityManager\TypeResolver;
 use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Framework\EntityManager\Operation\AttributePool;
+use Magento\Framework\EntityManager\TypeResolver;
 
 /**
  * Class UpdateAttributes
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Update/UpdateExtensions.php b/lib/internal/Magento/Framework/EntityManager/Operation/Update/UpdateExtensions.php
index efbcf7dc9f22d..b33e5c5afa4bc 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Update/UpdateExtensions.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Update/UpdateExtensions.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\EntityManager\Operation\Update;
 
-use Magento\Framework\EntityManager\TypeResolver;
 use Magento\Framework\EntityManager\Operation\ExtensionPool;
+use Magento\Framework\EntityManager\TypeResolver;
 
 /**
  * Class UpdateExtensions
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Update/UpdateMain.php b/lib/internal/Magento/Framework/EntityManager/Operation/Update/UpdateMain.php
index 1bb31e5e02c6a..063d67b8a074d 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Update/UpdateMain.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Update/UpdateMain.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\EntityManager\Operation\Update;
 
-use Magento\Framework\EntityManager\TypeResolver;
-use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Framework\EntityManager\Db\UpdateRow;
+use Magento\Framework\EntityManager\HydratorPool;
+use Magento\Framework\EntityManager\TypeResolver;
 
 /**
  * Class UpdateMain
diff --git a/lib/internal/Magento/Framework/EntityManager/OperationPool.php b/lib/internal/Magento/Framework/EntityManager/OperationPool.php
index 97d580e328b1b..9f010ffe825fa 100644
--- a/lib/internal/Magento/Framework/EntityManager/OperationPool.php
+++ b/lib/internal/Magento/Framework/EntityManager/OperationPool.php
@@ -6,13 +6,12 @@
 
 namespace Magento\Framework\EntityManager;
 
-use Magento\Framework\ObjectManagerInterface as ObjectManager;
-use Magento\Framework\EntityManager\OperationInterface;
 use Magento\Framework\EntityManager\Operation\CheckIfExists;
-use Magento\Framework\EntityManager\Operation\Read;
 use Magento\Framework\EntityManager\Operation\Create;
-use Magento\Framework\EntityManager\Operation\Update;
 use Magento\Framework\EntityManager\Operation\Delete;
+use Magento\Framework\EntityManager\Operation\Read;
+use Magento\Framework\EntityManager\Operation\Update;
+use Magento\Framework\ObjectManagerInterface as ObjectManager;
 
 /**
  * Class OperationPool
diff --git a/lib/internal/Magento/Framework/EntityManager/Sequence/SequenceManager.php b/lib/internal/Magento/Framework/EntityManager/Sequence/SequenceManager.php
index 25af4743ac9b8..e646aea24fe26 100644
--- a/lib/internal/Magento/Framework/EntityManager/Sequence/SequenceManager.php
+++ b/lib/internal/Magento/Framework/EntityManager/Sequence/SequenceManager.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\EntityManager\Sequence;
 
-use Psr\Log\LoggerInterface;
 use Magento\Framework\EntityManager\MetadataPool;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class SequenceManager
@@ -68,7 +68,7 @@ public function force($entityType, $identifier)
 
         if (!isset($sequenceInfo['sequenceTable'])) {
             throw new \Exception(
-                'TODO: use correct Exception class' . PHP_EOL  . ' Sequence table doesnt exists'
+                'TODO: use correct Exception class' . PHP_EOL . ' Sequence table doesnt exists'
             );
         }
 
@@ -101,7 +101,7 @@ public function delete($entityType, $identifier)
         $metadata = $this->metadataPool->getMetadata($entityType);
         $sequenceInfo = $this->sequenceRegistry->retrieve($entityType);
         if (!isset($sequenceInfo['sequenceTable'])) {
-            throw new \Exception('TODO: use correct Exception class' . PHP_EOL  . ' Sequence table doesnt exists');
+            throw new \Exception('TODO: use correct Exception class' . PHP_EOL . ' Sequence table doesnt exists');
         }
         try {
             $connection = $this->appResource->getConnectionByName($metadata->getEntityConnectionName());
diff --git a/lib/internal/Magento/Framework/EntityManager/Test/Unit/Db/UpdateRowTest.php b/lib/internal/Magento/Framework/EntityManager/Test/Unit/Db/UpdateRowTest.php
index fb24aace9046f..993d73ef06984 100644
--- a/lib/internal/Magento/Framework/EntityManager/Test/Unit/Db/UpdateRowTest.php
+++ b/lib/internal/Magento/Framework/EntityManager/Test/Unit/Db/UpdateRowTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Framework\EntityManager\Test\Unit\Db;
 
-use Magento\Framework\EntityManager\Db\UpdateRow;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\EntityManager\Db\UpdateRow;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class UpdateRowTest
diff --git a/lib/internal/Magento/Framework/EntityManager/Test/Unit/OperationPoolTest.php b/lib/internal/Magento/Framework/EntityManager/Test/Unit/OperationPoolTest.php
index cd44a3088122f..3bf8b9fc41cba 100644
--- a/lib/internal/Magento/Framework/EntityManager/Test/Unit/OperationPoolTest.php
+++ b/lib/internal/Magento/Framework/EntityManager/Test/Unit/OperationPoolTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\EntityManager\Test\Unit;
 
-use PHPUnit\Framework\TestCase;
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\EntityManager\OperationPool;
+use Magento\Framework\ObjectManagerInterface;
+use PHPUnit\Framework\TestCase;
 
 class OperationPoolTest extends TestCase
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/Test/Unit/Sequence/SequenceApplierTest.php b/lib/internal/Magento/Framework/EntityManager/Test/Unit/Sequence/SequenceApplierTest.php
index 244b7d4cf3731..fbaf6516141f6 100644
--- a/lib/internal/Magento/Framework/EntityManager/Test/Unit/Sequence/SequenceApplierTest.php
+++ b/lib/internal/Magento/Framework/EntityManager/Test/Unit/Sequence/SequenceApplierTest.php
@@ -5,16 +5,16 @@
  */
 namespace Magento\Framework\EntityManager\Test\Unit\Sequence;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\DB\Sequence\SequenceInterface;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\EntityManager\HydratorInterface;
 use Magento\Framework\EntityManager\HydratorPool;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Sequence\SequenceApplier;
 use Magento\Framework\EntityManager\Sequence\SequenceManager;
 use Magento\Framework\EntityManager\Sequence\SequenceRegistry;
 use Magento\Framework\EntityManager\TypeResolver;
-use Magento\Framework\DataObject;
-use Magento\Framework\EntityManager\HydratorInterface;
-use Magento\Framework\EntityManager\EntityMetadataInterface;
-use Magento\Framework\DB\Sequence\SequenceInterface;
 
 class SequenceApplierTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/CollectionTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/CollectionTest.php
index 9fce0f09162ec..90656eb797fa5 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/CollectionTest.php
@@ -8,9 +8,7 @@
 
 namespace Magento\Framework\Event\Test\Unit;
 
-use \Magento\Framework\Event\Collection;
-
-use Magento\Framework\Event;
+use Magento\Framework\Event\Collection;
 
 /**
  * Class CollectionTest
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Config/ConverterTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Config/ConverterTest.php
index 11d58655ed697..4594b3bb1285d 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Config/ConverterTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Config/ConverterTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Event\Test\Unit\Config;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\Event\Config\Converter;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class ConverterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/ConfigTest.php
index 095527380fe44..192bae6b57af3 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/ConfigTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Event\Test\Unit;
 
-use \Magento\Framework\Event\Config;
+use Magento\Framework\Event\Config;
 
 use Magento\Framework\Event\Config\Data;
 
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/ManagerTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/ManagerTest.php
index 4b3127374d944..4eed3258ef548 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/ManagerTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/ManagerTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\Event\Test\Unit;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\Event\InvokerInterface;
 use Magento\Framework\Event\ConfigInterface;
+use Magento\Framework\Event\InvokerInterface;
 use Magento\Framework\Event\Manager as EventManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * Class ManagerTest
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CollectionTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CollectionTest.php
index 91c8afaef5d07..db51563ca29eb 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CollectionTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Event\Test\Unit\Observer;
 
-use \Magento\Framework\Event\Observer\Collection;
+use Magento\Framework\Event\Observer\Collection;
 
 /**
  * Class CollectionTest
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CronTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CronTest.php
index 511d547ebed44..f959170d53a78 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CronTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/CronTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Event\Test\Unit\Observer;
 
-use \Magento\Framework\Event\Observer\Cron;
+use Magento\Framework\Event\Observer\Cron;
 
 /**
  * Class CronTest
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/RegexTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/RegexTest.php
index cfd3602fb030d..49f3aa457e31c 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/Observer/RegexTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/Observer/RegexTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Event\Test\Unit\Observer;
 
-use \Magento\Framework\Event\Observer\Regex;
+use Magento\Framework\Event\Observer\Regex;
 
 /**
  * Class RegexTest
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/ObserverFactoryTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/ObserverFactoryTest.php
index 3350afb57a4d4..16a853cbbba48 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/ObserverFactoryTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/ObserverFactoryTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Event\Test\Unit;
 
-use \Magento\Framework\Event\ObserverFactory;
+use Magento\Framework\Event\ObserverFactory;
 
 /**
  * Class ConfigTest
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/ObserverTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/ObserverTest.php
index 5e5c60e149837..4c938a92704ea 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/ObserverTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/ObserverTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Framework\Event\Test\Unit;
 
-use \Magento\Framework\Event\Observer;
-
 use Magento\Framework\Event;
 
+use Magento\Framework\Event\Observer;
+
 /**
  * Class ConfigTest
  *
diff --git a/lib/internal/Magento/Framework/Event/Test/Unit/WrapperFactoryTest.php b/lib/internal/Magento/Framework/Event/Test/Unit/WrapperFactoryTest.php
index 6e370628242f2..409340c371cbe 100644
--- a/lib/internal/Magento/Framework/Event/Test/Unit/WrapperFactoryTest.php
+++ b/lib/internal/Magento/Framework/Event/Test/Unit/WrapperFactoryTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Framework\Event\Test\Unit;
 
-use \Magento\Framework\Event\WrapperFactory;
+use Magento\Framework\Event\WrapperFactory;
 
 /**
  * Class WrapperFactoryTest
diff --git a/lib/internal/Magento/Framework/Exception/InputException.php b/lib/internal/Magento/Framework/Exception/InputException.php
index b332c88d42f71..128bc8d982a39 100644
--- a/lib/internal/Magento/Framework/Exception/InputException.php
+++ b/lib/internal/Magento/Framework/Exception/InputException.php
@@ -38,7 +38,7 @@ class InputException extends AbstractAggregateException
      * @deprecated
      */
     const INVALID_FIELD_VALUE = 'Invalid value of "%value" provided for the %fieldName field.';
-    
+
     /**
      * @deprecated
      */
diff --git a/lib/internal/Magento/Framework/Exception/TemporaryState/CouldNotSaveException.php b/lib/internal/Magento/Framework/Exception/TemporaryState/CouldNotSaveException.php
index 894b5be3f0bd1..1e765e12268ec 100644
--- a/lib/internal/Magento/Framework/Exception/TemporaryState/CouldNotSaveException.php
+++ b/lib/internal/Magento/Framework/Exception/TemporaryState/CouldNotSaveException.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Exception\TemporaryState;
 
-use Magento\Framework\Exception\TemporaryStateExceptionInterface;
 use Magento\Framework\Exception\CouldNotSaveException as LocalizedCouldNotSaveException;
+use Magento\Framework\Exception\TemporaryStateExceptionInterface;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/lib/internal/Magento/Framework/Exception/Test/Unit/AuthenticationExceptionTest.php b/lib/internal/Magento/Framework/Exception/Test/Unit/AuthenticationExceptionTest.php
index f728a0deacc7e..26452a22f363d 100644
--- a/lib/internal/Magento/Framework/Exception/Test/Unit/AuthenticationExceptionTest.php
+++ b/lib/internal/Magento/Framework/Exception/Test/Unit/AuthenticationExceptionTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Exception\Test\Unit;
 
-use \Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/lib/internal/Magento/Framework/Exception/Test/Unit/AuthorizationExceptionTest.php b/lib/internal/Magento/Framework/Exception/Test/Unit/AuthorizationExceptionTest.php
index 9b96587c8d195..453b4dc92a2c5 100644
--- a/lib/internal/Magento/Framework/Exception/Test/Unit/AuthorizationExceptionTest.php
+++ b/lib/internal/Magento/Framework/Exception/Test/Unit/AuthorizationExceptionTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Exception\Test\Unit;
 
-use \Magento\Framework\Exception\AuthorizationException;
+use Magento\Framework\Exception\AuthorizationException;
 use Magento\Framework\Phrase;
 
 class AuthorizationExceptionTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/Exception/Test/Unit/EmailNotConfirmedExceptionTest.php b/lib/internal/Magento/Framework/Exception/Test/Unit/EmailNotConfirmedExceptionTest.php
index 14ba3520da2b4..4823e3fe96c9e 100644
--- a/lib/internal/Magento/Framework/Exception/Test/Unit/EmailNotConfirmedExceptionTest.php
+++ b/lib/internal/Magento/Framework/Exception/Test/Unit/EmailNotConfirmedExceptionTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Exception\Test\Unit;
 
-use \Magento\Framework\Exception\EmailNotConfirmedException;
+use Magento\Framework\Exception\EmailNotConfirmedException;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/lib/internal/Magento/Framework/Exception/Test/Unit/InputExceptionTest.php b/lib/internal/Magento/Framework/Exception/Test/Unit/InputExceptionTest.php
index edc66f2231025..33959bea81ac4 100644
--- a/lib/internal/Magento/Framework/Exception/Test/Unit/InputExceptionTest.php
+++ b/lib/internal/Magento/Framework/Exception/Test/Unit/InputExceptionTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Exception\Test\Unit;
 
-use \Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\InputException;
 use Magento\Framework\Phrase;
 
 class InputExceptionTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/Exception/Test/Unit/LocalizedExceptionTest.php b/lib/internal/Magento/Framework/Exception/Test/Unit/LocalizedExceptionTest.php
index ce189704f1d73..fb3e42ceba6fe 100644
--- a/lib/internal/Magento/Framework/Exception/Test/Unit/LocalizedExceptionTest.php
+++ b/lib/internal/Magento/Framework/Exception/Test/Unit/LocalizedExceptionTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Exception\Test\Unit;
 
-use \Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/lib/internal/Magento/Framework/Exception/Test/Unit/NoSuchEntityExceptionTest.php b/lib/internal/Magento/Framework/Exception/Test/Unit/NoSuchEntityExceptionTest.php
index cbdfe7d34711f..d2798c28438b9 100644
--- a/lib/internal/Magento/Framework/Exception/Test/Unit/NoSuchEntityExceptionTest.php
+++ b/lib/internal/Magento/Framework/Exception/Test/Unit/NoSuchEntityExceptionTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Exception\Test\Unit;
 
-use \Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/lib/internal/Magento/Framework/Exception/Test/Unit/State/ExpiredExceptionTest.php b/lib/internal/Magento/Framework/Exception/Test/Unit/State/ExpiredExceptionTest.php
index 51cd506d2ce4c..7989836e6b135 100644
--- a/lib/internal/Magento/Framework/Exception/Test/Unit/State/ExpiredExceptionTest.php
+++ b/lib/internal/Magento/Framework/Exception/Test/Unit/State/ExpiredExceptionTest.php
@@ -7,7 +7,7 @@
  */
 namespace Magento\Framework\Exception\Test\Unit\State;
 
-use \Magento\Framework\Exception\State\ExpiredException;
+use Magento\Framework\Exception\State\ExpiredException;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/lib/internal/Magento/Framework/Exception/Test/Unit/State/InputMismatchExceptionTest.php b/lib/internal/Magento/Framework/Exception/Test/Unit/State/InputMismatchExceptionTest.php
index 7caadccdbf0e1..9e50ddf73e77d 100644
--- a/lib/internal/Magento/Framework/Exception/Test/Unit/State/InputMismatchExceptionTest.php
+++ b/lib/internal/Magento/Framework/Exception/Test/Unit/State/InputMismatchExceptionTest.php
@@ -7,7 +7,7 @@
  */
 namespace Magento\Framework\Exception\Test\Unit\State;
 
-use \Magento\Framework\Exception\State\InputMismatchException;
+use Magento\Framework\Exception\State\InputMismatchException;
 use Magento\Framework\Phrase;
 
 class InputMismatchExceptionTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/Exception/Test/Unit/State/InvalidTransitionExceptionTest.php b/lib/internal/Magento/Framework/Exception/Test/Unit/State/InvalidTransitionExceptionTest.php
index a1628f678e349..18d6c78516020 100644
--- a/lib/internal/Magento/Framework/Exception/Test/Unit/State/InvalidTransitionExceptionTest.php
+++ b/lib/internal/Magento/Framework/Exception/Test/Unit/State/InvalidTransitionExceptionTest.php
@@ -7,7 +7,7 @@
  */
 namespace Magento\Framework\Exception\Test\Unit\State;
 
-use \Magento\Framework\Exception\State\InvalidTransitionException;
+use Magento\Framework\Exception\State\InvalidTransitionException;
 use Magento\Framework\Phrase;
 
 class InvalidTransitionExceptionTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/Exception/Test/Unit/StateExceptionTest.php b/lib/internal/Magento/Framework/Exception/Test/Unit/StateExceptionTest.php
index dc8806cdf77c6..b37d7afc3eeb7 100644
--- a/lib/internal/Magento/Framework/Exception/Test/Unit/StateExceptionTest.php
+++ b/lib/internal/Magento/Framework/Exception/Test/Unit/StateExceptionTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Exception\Test\Unit;
 
-use \Magento\Framework\Exception\StateException;
+use Magento\Framework\Exception\StateException;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php b/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php
index 5429c9e862188..1826574b034c9 100644
--- a/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php
+++ b/lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\File\Test\Unit\Transfer\Adapter;
 
-use \Magento\Framework\File\Transfer\Adapter\Http;
+use Magento\Framework\File\Transfer\Adapter\Http;
 
 class HttpTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index 07de9941271c3..7d9a8da1b6041 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\File;
 
-use Magento\Framework\Filesystem\DriverInterface;
-
 /**
  * File upload class
  *
diff --git a/lib/internal/Magento/Framework/Filesystem/File/Read.php b/lib/internal/Magento/Framework/Filesystem/File/Read.php
index e475bea31c380..8e03a0c09ef92 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/Read.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/Read.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Filesystem\File;
 
-use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Filesystem\DriverInterface;
 
 class Read implements ReadInterface
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/File/Write.php b/lib/internal/Magento/Framework/Filesystem/File/Write.php
index 03f8b38a6e930..ba98a9dddbf22 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/Write.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/Write.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Filesystem\File;
 
-use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Filesystem\DriverInterface;
 
 class Write extends Read implements WriteInterface
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/Glob.php b/lib/internal/Magento/Framework/Filesystem/Glob.php
index 415bb5494c2e8..eb2d92e43d954 100644
--- a/lib/internal/Magento/Framework/Filesystem/Glob.php
+++ b/lib/internal/Magento/Framework/Filesystem/Glob.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Filesystem;
 
-use Zend\Stdlib\Glob as ZendGlob;
 use Zend\Stdlib\Exception\RuntimeException as ZendRuntimeException;
+use Zend\Stdlib\Glob as ZendGlob;
 
 /**
  * Wrapper for Zend\Stdlib\Glob
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/File.php b/lib/internal/Magento/Framework/Filesystem/Io/File.php
index 565aaf8664328..72e201ce92d2c 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/File.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/File.php
@@ -5,9 +5,6 @@
  */
 namespace Magento\Framework\Filesystem\Io;
 
-use Magento\Framework\Filesystem\DriverInterface;
-use Symfony\Component\Finder\Tests\Iterator\DateRangeFilterIteratorTest;
-
 /**
  * Filesystem client
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php b/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php
index 2a1938df4d687..d8f0479a0ce34 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/Ftp.php
@@ -5,9 +5,8 @@
  */
 namespace Magento\Framework\Filesystem\Io;
 
-use Magento\Framework\Filesystem\DriverInterface;
-use Magento\Framework\Phrase;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
 
 /**
  * FTP client
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php b/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php
index c31d3ff9e52ba..e71fe88fd5544 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Filesystem\Io;
 
-use Magento\Framework\Filesystem\DriverInterface;
-
 /**
  * Input/output client interface
  */
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php
index 96b56de8451c2..ebe27006959b3 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/DirectoryListTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Filesystem\Test\Unit;
 
-use \Magento\Framework\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DirectoryList;
 
 class DirectoryListTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpTest.php
index 51a994dc73ff5..148b1489e23a4 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Filesystem\Test\Unit\Driver;
 
-use \Magento\Framework\Filesystem\Driver\Http;
+use Magento\Framework\Filesystem\Driver\Http;
 
 class HttpTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpsTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpsTest.php
index bcbc312e24830..89add450c245e 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpsTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/HttpsTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Filesystem\Test\Unit\Driver;
 
-use \Magento\Framework\Filesystem\Driver\Https;
+use Magento\Framework\Filesystem\Driver\Https;
 
 class HttpsTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/DriverPoolTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/DriverPoolTest.php
index 8e550ff0597d7..572e87f2e55c8 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/DriverPoolTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/DriverPoolTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Filesystem\Test\Unit;
 
-use \Magento\Framework\Filesystem\DriverPool;
+use Magento\Framework\Filesystem\DriverPool;
 
 class DriverPoolTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ReadFactoryTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ReadFactoryTest.php
index c2115205e6bd2..5486358a93830 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ReadFactoryTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ReadFactoryTest.php
@@ -5,9 +5,7 @@
  */
 namespace Magento\Framework\Filesystem\Test\Unit\File;
 
-use \Magento\Framework\Filesystem\File\ReadFactory;
-
-use Magento\Framework\Filesystem\DriverPool;
+use Magento\Framework\Filesystem\File\ReadFactory;
 
 /**
  * Class ReadFactoryTest
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ReadTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ReadTest.php
index 733b5cc61f499..76fc436a40bb8 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ReadTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ReadTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Filesystem\Test\Unit\File;
 
-use \Magento\Framework\Filesystem\File\Read;
+use Magento\Framework\Filesystem\File\Read;
 
 /**
  * Class ReadTest
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/WriteFactoryTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/WriteFactoryTest.php
index f24988832fef8..977ddcf282052 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/WriteFactoryTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/WriteFactoryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Filesystem\Test\Unit\File;
 
-use \Magento\Framework\Filesystem\File\WriteFactory;
+use Magento\Framework\Filesystem\File\WriteFactory;
 
 /**
  * Class WriteFactoryTest
diff --git a/lib/internal/Magento/Framework/Filter/DataObject/Grid.php b/lib/internal/Magento/Framework/Filter/DataObject/Grid.php
index 7676558a927b0..1ec94061f75f2 100644
--- a/lib/internal/Magento/Framework/Filter/DataObject/Grid.php
+++ b/lib/internal/Magento/Framework/Filter/DataObject/Grid.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Filter\DataObject;
 
-use Magento\Framework\DataObject;
+use Magento\Framework\DataObject as Object;
 
 class Grid extends \Magento\Framework\Filter\DataObject
 {
diff --git a/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php b/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php
index 55a8a5a3742f9..fa6e6471c6230 100644
--- a/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php
+++ b/lib/internal/Magento/Framework/Filter/Input/MaliciousCode.php
@@ -27,7 +27,7 @@ class MaliciousCode implements \Zend_Filter_Interface
         //js in the style attribute
         '/style=[^<]*((expression\s*?\([^<]*?\))|(behavior\s*:))[^<]*(?=\/*\>)/Uis',
         //js attributes
-        '/(ondblclick|onclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|'.
+        '/(ondblclick|onclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|' .
         'onload|onunload|onerror)=[^<]*(?=\/*\>)/Uis',
         //tags
         '/<\/?(script|meta|link|frame|iframe|object).*>/Uis',
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/ArrayFilterTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/ArrayFilterTest.php
index b42e2bdf3a668..4af022bd67f94 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/ArrayFilterTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/ArrayFilterTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Filter\Test\Unit;
 
-use \Magento\Framework\Filter\ArrayFilter;
+use Magento\Framework\Filter\ArrayFilter;
 
 class ArrayFilterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/DataObject/GridTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/DataObject/GridTest.php
index ab8f33dddd0df..4e9e388224f23 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/DataObject/GridTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/DataObject/GridTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Framework\Filter\Test\Unit\DataObject;
 
-use \Magento\Framework\Filter\DataObject\Grid;
-
 use Magento\Framework\DataObject;
 
+use Magento\Framework\Filter\DataObject\Grid;
+
 class GridTest extends \PHPUnit\Framework\TestCase
 {
     public function testFilter()
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php
index a8cf48eef433f..430bbe52800b5 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/Input/MaliciousCodeTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Filter\Test\Unit\Input;
 
-use \Magento\Framework\Filter\Input\MaliciousCode;
+use Magento\Framework\Filter\Input\MaliciousCode;
 
 class MaliciousCodeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/InputTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/InputTest.php
index 0c1d954c22875..81d284eec2492 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/InputTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/InputTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Filter\Test\Unit;
 
-use \Magento\Framework\Filter\Input;
+use Magento\Framework\Filter\Input;
 
 class InputTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/ParameterTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/ParameterTest.php
index 126d3f9f2f691..27d3da21351a7 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/ParameterTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/ParameterTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Filter\Test\Unit\Template\Tokenizer;
 
-use \Magento\Framework\Filter\Template\Tokenizer\Parameter;
+use Magento\Framework\Filter\Template\Tokenizer\Parameter;
 
 class ParameterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/VariableTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/VariableTest.php
index 793637203bb0d..cff65dd581d70 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/VariableTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/Template/Tokenizer/VariableTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Filter\Test\Unit\Template\Tokenizer;
 
-use \Magento\Framework\Filter\Template\Tokenizer\Variable;
+use Magento\Framework\Filter\Template\Tokenizer\Variable;
 
 class VariableTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php b/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php
index 8fd28e8513d0b..32214d67eafd8 100644
--- a/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php
+++ b/lib/internal/Magento/Framework/HTTP/Test/Unit/Adapter/CurlTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\HTTP\Test\Unit\Adapter;
 
-use \Magento\Framework\HTTP\Adapter\Curl;
+use Magento\Framework\HTTP\Adapter\Curl;
 
 class CurlTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RequestTest.php b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RequestTest.php
index a746b61ad0038..21d603804a433 100644
--- a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RequestTest.php
+++ b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RequestTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\HTTP\Test\Unit\PhpEnvironment;
 
-use \Magento\Framework\HTTP\PhpEnvironment\Request;
+use Magento\Framework\HTTP\PhpEnvironment\Request;
 
 use Zend\Stdlib\Parameters;
 
diff --git a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/ResponseTest.php b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/ResponseTest.php
index ba6746e75ce34..b309421f6f204 100644
--- a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/ResponseTest.php
+++ b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/ResponseTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\HTTP\Test\Unit\PhpEnvironment;
 
-use \Magento\Framework\HTTP\PhpEnvironment\Response;
+use Magento\Framework\HTTP\PhpEnvironment\Response;
 
 class ResponseTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/AdapterFactoryTest.php b/lib/internal/Magento/Framework/Image/Test/Unit/AdapterFactoryTest.php
index 96ec83952939c..de2041652473c 100644
--- a/lib/internal/Magento/Framework/Image/Test/Unit/AdapterFactoryTest.php
+++ b/lib/internal/Magento/Framework/Image/Test/Unit/AdapterFactoryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Image\Test\Unit;
 
-use \Magento\Framework\Image\AdapterFactory;
+use Magento\Framework\Image\AdapterFactory;
 
 class AdapterFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Indexer/Action/Base.php b/lib/internal/Magento/Framework/Indexer/Action/Base.php
index 11cf1cec62636..afccf5928a002 100644
--- a/lib/internal/Magento/Framework/Indexer/Action/Base.php
+++ b/lib/internal/Magento/Framework/Indexer/Action/Base.php
@@ -6,18 +6,18 @@
 namespace Magento\Framework\Indexer\Action;
 
 use Magento\Framework\App\ResourceConnection as AppResource;
+use Magento\Framework\App\ResourceConnection\SourceFactory;
 use Magento\Framework\App\ResourceConnection\SourceProviderInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
-use Magento\Framework\Stdlib\StringUtils as StdString;
 use Magento\Framework\Indexer\ActionInterface;
 use Magento\Framework\Indexer\FieldsetPool;
+use Magento\Framework\Indexer\HandlerInterface;
 use Magento\Framework\Indexer\HandlerPool;
 use Magento\Framework\Indexer\IndexStructureInterface;
+use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Framework\Indexer\SaveHandlerFactory;
-use Magento\Framework\App\ResourceConnection\SourceFactory;
-use Magento\Framework\Indexer\HandlerInterface;
+use Magento\Framework\Stdlib\StringUtils as StdString;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -208,7 +208,7 @@ public function executeList(array $ids)
      */
     public function executeRow($id)
     {
-         $this->execute([$id]);
+        $this->execute([$id]);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Indexer/BatchProvider.php b/lib/internal/Magento/Framework/Indexer/BatchProvider.php
index 9f8a1b1ace401..0b36e54cb74e2 100644
--- a/lib/internal/Magento/Framework/Indexer/BatchProvider.php
+++ b/lib/internal/Magento/Framework/Indexer/BatchProvider.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Indexer;
 
-use \Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 
 /**
  * Generator of consecutive entity ID ranges that must be handled as a batch.
diff --git a/lib/internal/Magento/Framework/Indexer/BatchSizeManagement.php b/lib/internal/Magento/Framework/Indexer/BatchSizeManagement.php
index 2733aae4bd545..1bf405a930f8d 100644
--- a/lib/internal/Magento/Framework/Indexer/BatchSizeManagement.php
+++ b/lib/internal/Magento/Framework/Indexer/BatchSizeManagement.php
@@ -51,7 +51,7 @@ public function ensureBatchSize(\Magento\Framework\DB\Adapter\AdapterInterface $
         // Log warning if allocated memory for temp table greater than 20% of innodb_buffer_pool_size
         if ($size > $bufferPoolSize * .2) {
             $message = 'Memory size allocated for the temporary table is more than 20% of innodb_buffer_pool_size. ' .
-                'Please update innodb_buffer_pool_size or decrease batch size value '.
+                'Please update innodb_buffer_pool_size or decrease batch size value ' .
                 '(which decreases memory usages for the temporary table). ' .
                 'Current batch size: %1; Allocated memory size: %2 bytes; InnoDB buffer pool size: %3 bytes.';
             $this->logger->warning(new \Magento\Framework\Phrase($message, [$batchSize, $size, $bufferPoolSize]));
diff --git a/lib/internal/Magento/Framework/Indexer/BatchSizeManagementInterface.php b/lib/internal/Magento/Framework/Indexer/BatchSizeManagementInterface.php
index b953afcd9e7e8..eaab970d71a6b 100644
--- a/lib/internal/Magento/Framework/Indexer/BatchSizeManagementInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/BatchSizeManagementInterface.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Indexer;
 
-use \Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 
 /**
  * Batch size manager can be used to ensure that MEMORY table has enough memory for data in batch.
diff --git a/lib/internal/Magento/Framework/Indexer/Config/DependencyInfoProvider.php b/lib/internal/Magento/Framework/Indexer/Config/DependencyInfoProvider.php
index c9d7c8a35b243..661f9f9c0ff80 100644
--- a/lib/internal/Magento/Framework/Indexer/Config/DependencyInfoProvider.php
+++ b/lib/internal/Magento/Framework/Indexer/Config/DependencyInfoProvider.php
@@ -49,7 +49,7 @@ public function getIndexerIdsToRunAfter(string $indexerId): array
             if (array_search($indexerId, $indexerData['dependencies']) !== false) {
                 $result[] = $id;
             }
-        };
+        }
 
         return $result;
     }
diff --git a/lib/internal/Magento/Framework/Indexer/Handler/ConcatHandler.php b/lib/internal/Magento/Framework/Indexer/Handler/ConcatHandler.php
index cc6a0ac43afa2..b583ffbfa50b4 100644
--- a/lib/internal/Magento/Framework/Indexer/Handler/ConcatHandler.php
+++ b/lib/internal/Magento/Framework/Indexer/Handler/ConcatHandler.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Indexer\Handler;
 
-use Magento\Framework\Indexer\HandlerInterface;
 use Magento\Framework\App\ResourceConnection\SourceProviderInterface;
+use Magento\Framework\Indexer\HandlerInterface;
 
 class ConcatHandler implements HandlerInterface
 {
@@ -31,6 +31,7 @@ public function __construct(
      * @param string $alias
      * @param array $fieldInfo
      * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function prepareSql(SourceProviderInterface $source, $alias, $fieldInfo)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php
index 3908cf1e98762..c906fe503ba69 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php
@@ -7,12 +7,11 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\Search\Request\Dimension;
-use Magento\Framework\Search\Request\IndexScopeResolverInterface;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
-use Magento\Framework\Indexer\SaveHandler\Batch;
+use Magento\Framework\Search\Request\Dimension;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
 
 class IndexerHandler implements IndexerInterface
 {
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php b/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php
index 82e8a26553b89..3a6a152edb8e9 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php
@@ -5,9 +5,8 @@
  */
 namespace Magento\Framework\Indexer;
 
-use Magento\Framework\Indexer\IndexerInterface;
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Indexer\SaveHandler\IndexerInterface as SaveHandlerInterface;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
  * @api Instantiate save handler when implementing custom Indexer\Action
diff --git a/lib/internal/Magento/Framework/Indexer/StructureFactory.php b/lib/internal/Magento/Framework/Indexer/StructureFactory.php
index f9b7eafdfc436..1b6729e4603ec 100644
--- a/lib/internal/Magento/Framework/Indexer/StructureFactory.php
+++ b/lib/internal/Magento/Framework/Indexer/StructureFactory.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Indexer;
 
-use Magento\Framework\Indexer\IndexStructureInterface;
-
 class StructureFactory
 {
     /**
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/BatchProviderTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/BatchProviderTest.php
index 06d9f58c2f2ec..2969a514c7fa0 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/BatchProviderTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/BatchProviderTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\Indexer\Test\Unit;
 
-use \Magento\Framework\DB\Adapter\AdapterInterface;
-use \Magento\Framework\DB\Select;
-use \Magento\Framework\Indexer\BatchProvider;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Indexer\BatchProvider;
 
 class BatchProviderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/BatchSizeManagementTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/BatchSizeManagementTest.php
index c641aedb449f7..4b7f321f1f36b 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/BatchSizeManagementTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/BatchSizeManagementTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Indexer\Test\Unit;
 
-use \Magento\Framework\DB\Adapter\AdapterInterface;
-use \Magento\Framework\Indexer\BatchSizeManagement;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Indexer\BatchSizeManagement;
 
 class BatchSizeManagementTest extends \PHPUnit\Framework\TestCase
 {
@@ -61,8 +61,8 @@ public function testEnsureBatchSize()
             ->method('warning')
             ->with(__(
                 "Memory size allocated for the temporary table is more than 20% of innodb_buffer_pool_size. " .
-                "Please update innodb_buffer_pool_size or decrease batch size value ".
-                "(which decreases memory usages for the temporary table). ".
+                "Please update innodb_buffer_pool_size or decrease batch size value " .
+                "(which decreases memory usages for the temporary table). " .
                 "Current batch size: %1; Allocated memory size: %2 bytes; InnoDB buffer pool size: %3 bytes.",
                 [$batchSize, $size, $innodbPollSize]
             ));
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/Config/ConverterTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/Config/ConverterTest.php
index 989742148e73d..d9647d6c9b04a 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/Config/ConverterTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/Config/ConverterTest.php
@@ -48,8 +48,7 @@ public function convertWithDependenciesDataProvider()
     {
         return [
             [
-                'xml' =>
-                    <<<XML
+                'xml' => <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
 <config>
     <indexer id="indexer_1" view_id="view_one" class="Index\Class\Name\One">
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/GridStructureTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/GridStructureTest.php
index fe15f56dfa6e3..292d4fb778c28 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/GridStructureTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/GridStructureTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\Indexer\Test\Unit;
 
-use Magento\Framework\Indexer\GridStructure;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Ddl\Table;
+use Magento\Framework\Indexer\GridStructure;
 
 class GridStructureTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php
index c68af718473a4..7e6adf48839a2 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php
@@ -6,10 +6,9 @@
 
 namespace Magento\Framework\Indexer\Test\Unit;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Ddl\Table;
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Test for \Magento\Framework\Indexer\IndexStructure
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/ScopeResolver/IndexScopeResolverTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/ScopeResolver/IndexScopeResolverTest.php
index ae898657ccecf..e26da1659d932 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/ScopeResolver/IndexScopeResolverTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/ScopeResolver/IndexScopeResolverTest.php
@@ -7,7 +7,7 @@
 namespace Magento\Framework\Indexer\Test\Unit\ScopeResolver;
 
 use Magento\Framework\Search\Request\Dimension;
-use \Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Test for \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver
diff --git a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
index 608907abcc0e1..2abee50e62219 100644
--- a/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
+++ b/lib/internal/Magento/Framework/Interception/Code/Generator/Interceptor.php
@@ -153,8 +153,8 @@ protected function _generateCode()
         } else {
             $this->_classGenerator->setExtendedClass($typeName);
         }
-        $this->_classGenerator->addTrait('\\'. \Magento\Framework\Interception\Interceptor::class);
-        $interfaces[] =  '\\'. \Magento\Framework\Interception\InterceptorInterface::class;
+        $this->_classGenerator->addTrait('\\' . \Magento\Framework\Interception\Interceptor::class);
+        $interfaces[] =  '\\' . \Magento\Framework\Interception\InterceptorInterface::class;
         $this->_classGenerator->setImplementedInterfaces($interfaces);
         return parent::_generateCode();
     }
diff --git a/lib/internal/Magento/Framework/Interception/Config/Config.php b/lib/internal/Magento/Framework/Interception/Config/Config.php
index 7c80051537baa..9d74a50d49f2a 100644
--- a/lib/internal/Magento/Framework/Interception/Config/Config.php
+++ b/lib/internal/Magento/Framework/Interception/Config/Config.php
@@ -7,8 +7,8 @@
  */
 namespace Magento\Framework\Interception\Config;
 
-use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Serialize\Serializer\Serialize;
+use Magento\Framework\Serialize\SerializerInterface;
 
 class Config implements \Magento\Framework\Interception\ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
index fac02b5d2614b..002ab2185b15d 100644
--- a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
@@ -9,8 +9,8 @@
 
 use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManager\DefinitionInterface;
-use Magento\Framework\ObjectManager\RelationsInterface;
 use Magento\Framework\ObjectManager\InterceptableValidator;
+use Magento\Framework\ObjectManager\RelationsInterface;
 
 class Developer extends \Magento\Framework\ObjectManager\Config\Config implements ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index 489755a2846fc..b1fdc35aed0d6 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -10,13 +10,13 @@
 use Magento\Framework\Config\ReaderInterface;
 use Magento\Framework\Config\ScopeInterface;
 use Magento\Framework\Interception\DefinitionInterface;
-use Magento\Framework\Interception\PluginListInterface as InterceptionPluginList;
 use Magento\Framework\Interception\ObjectManager\ConfigInterface;
-use Magento\Framework\ObjectManager\RelationsInterface;
+use Magento\Framework\Interception\PluginListInterface as InterceptionPluginList;
 use Magento\Framework\ObjectManager\DefinitionInterface as ClassDefinitions;
+use Magento\Framework\ObjectManager\RelationsInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Serialize\Serializer\Serialize;
+use Magento\Framework\Serialize\SerializerInterface;
 
 /**
  * Plugin config, provides list of plugins for a type
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/InterceptorTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/InterceptorTest.php
index 125c01a2c6369..0a4b12d9b3ff6 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/InterceptorTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/InterceptorTest.php
@@ -9,7 +9,7 @@
 use Composer\Autoload\ClassLoader;
 use Magento\Framework\Code\Generator\Io;
 use Magento\Framework\Interception\Code\Generator\Interceptor;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class InterceptorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/InterfaceValidatorTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/InterfaceValidatorTest.php
index ee62175e76259..65043d815c64a 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/InterfaceValidatorTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/InterfaceValidatorTest.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Framework\Interception\Test\Unit\Code;
 
-use \Magento\Framework\Interception\Code\InterfaceValidator;
-use \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemPlugin\ValidPlugin;
-use \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemPlugin\IncompatibleInterface;
-use \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemPlugin\IncorrectSubject;
-use \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemPlugin\ExtraParameters;
-use \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemPlugin\InvalidProceed;
+use Magento\Framework\Interception\Code\InterfaceValidator;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemPlugin\ExtraParameters;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemPlugin\IncompatibleInterface;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemPlugin\IncorrectSubject;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemPlugin\InvalidProceed;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemPlugin\ValidPlugin;
 
 class InterfaceValidatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Custom/Module/Model/InterfaceValidator/ItemPlugin/IncompatibleArgumentsType.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Custom/Module/Model/InterfaceValidator/ItemPlugin/IncompatibleArgumentsType.php
index e2e85113f4d76..8ed3dd5b008bd 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Custom/Module/Model/InterfaceValidator/ItemPlugin/IncompatibleArgumentsType.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Custom/Module/Model/InterfaceValidator/ItemPlugin/IncompatibleArgumentsType.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemPlugin;
 
-use \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemWithArguments;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemWithArguments;
 
 class IncompatibleArgumentsType
 {
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Custom/Module/Model/InterfaceValidator/ItemPlugin/ValidPlugin.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Custom/Module/Model/InterfaceValidator/ItemPlugin/ValidPlugin.php
index 5c49a3c3c9131..8e862f0e8bea6 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Custom/Module/Model/InterfaceValidator/ItemPlugin/ValidPlugin.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Custom/Module/Model/InterfaceValidator/ItemPlugin/ValidPlugin.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemPlugin;
 
-use \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemWithArguments;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\InterfaceValidator\ItemWithArguments;
 
 class ValidPlugin
 {
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/ObjectManager/Config/DeveloperTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/ObjectManager/Config/DeveloperTest.php
index 584cdd06b36ab..290caafbfc82b 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/ObjectManager/Config/DeveloperTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/ObjectManager/Config/DeveloperTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Interception\Test\Unit\ObjectManager\Config;
 
-use \Magento\Framework\Interception\ObjectManager\Config\Developer;
+use Magento\Framework\Interception\ObjectManager\Config\Developer;
 
 class DeveloperTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
index 843324f3dddea..4eb008a0d747b 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Interception\Test\Unit\PluginList;
 
-use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Serialize\SerializerInterface;
 
 require_once __DIR__ . '/../Custom/Module/Model/Item.php';
 require_once __DIR__ . '/../Custom/Module/Model/Item/Enhanced.php';
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/_files/reader_mock_map.php b/lib/internal/Magento/Framework/Interception/Test/Unit/_files/reader_mock_map.php
index 7698210126af7..ad958024807c0 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/_files/reader_mock_map.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/_files/reader_mock_map.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainerPlugin\Simple;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemPlugin\Advanced;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemPlugin\Simple as ImportPluginSimple;
 use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\StartingBackslash\Plugin;
 
 return [
@@ -14,8 +16,7 @@
                 'plugins' => [
                     'simple_plugin' => [
                         'sortOrder' => 10,
-                        'instance' =>
-                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemPlugin\Simple::class,
+                        'instance' => ImportPluginSimple::class,
                     ],
                 ],
             ]
@@ -28,8 +29,7 @@
                 'plugins' => [
                     'advanced_plugin' => [
                         'sortOrder' => 5,
-                        'instance' =>
-                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemPlugin\Advanced::class,
+                        'instance' => Advanced::class,
                     ],
                 ],
             ],
@@ -59,8 +59,7 @@
                 'plugins' => [
                     'advanced_plugin' => [
                         'sortOrder' => 5,
-                        'instance' =>
-                            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemPlugin\Advanced::class,
+                        'instance' => Advanced::class,
                     ],
                 ],
             ],
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php
index 5ef1a3097402b..3e917425c31e0 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\Locale\Test\Unit;
 
 use Magento\Framework\Locale\Currency;
-use Magento\Framework\Locale\CurrencyInterface;
 
 class CurrencyTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/Deployed/CodesTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/Deployed/CodesTest.php
index 634e12cd8a526..75e09f5e61045 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/Deployed/CodesTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/Deployed/CodesTest.php
@@ -11,7 +11,7 @@
 use Magento\Framework\Locale\Deployed\Codes;
 use Magento\Framework\View\Design\Theme\FlyweightFactory;
 use Magento\Framework\View\Design\ThemeInterface;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Test for Codes class.
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/Deployed/OptionsTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/Deployed/OptionsTest.php
index 417bbfd402549..6bca90222fb95 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/Deployed/OptionsTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/Deployed/OptionsTest.php
@@ -11,7 +11,7 @@
 use Magento\Framework\Locale\ListsInterface;
 use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\DesignInterface;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Test for Options class.
diff --git a/lib/internal/Magento/Framework/Message/Manager.php b/lib/internal/Magento/Framework/Message/Manager.php
index f31892a938fb1..acfde5bfc5771 100644
--- a/lib/internal/Magento/Framework/Message/Manager.php
+++ b/lib/internal/Magento/Framework/Message/Manager.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\Message;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Event;
 use Psr\Log\LoggerInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Message manager model
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php
index 550f135ddc545..f4b73bdd2f293 100644
--- a/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php
+++ b/lib/internal/Magento/Framework/Message/Test/Unit/AbstractMessageTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Message\Test\Unit;
 
-use Magento\Framework\Message\MessageInterface;
-
 /**
  * \Magento\Framework\Message\AbstractMessage test case
  */
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageFactoryPoolTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageFactoryPoolTest.php
index bbb025d8a0814..312d53af20adc 100644
--- a/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageFactoryPoolTest.php
+++ b/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageFactoryPoolTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\Message\Test\Unit;
 
-use Magento\Framework\Message\ExceptionMessageFactoryInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\ExceptionMessageFactoryInterface;
 
 class ExceptionMessageFactoryPoolTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/ManagerTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/ManagerTest.php
index f2b496b157c54..06d1d7a165f87 100644
--- a/lib/internal/Magento/Framework/Message/Test/Unit/ManagerTest.php
+++ b/lib/internal/Magento/Framework/Message/Test/Unit/ManagerTest.php
@@ -7,12 +7,12 @@
 
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Message\CollectionFactory;
+use Magento\Framework\Message\ExceptionMessageLookupFactory;
 use Magento\Framework\Message\Factory;
 use Magento\Framework\Message\Manager;
 use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Message\Session;
 use Psr\Log\LoggerInterface;
-use Magento\Framework\Message\ExceptionMessageLookupFactory;
 
 /**
  * \Magento\Framework\Message\Manager test case
diff --git a/lib/internal/Magento/Framework/Model/Entity/RepositoryFactory.php b/lib/internal/Magento/Framework/Model/Entity/RepositoryFactory.php
index 341ff9226555f..821d96254c6be 100644
--- a/lib/internal/Magento/Framework/Model/Entity/RepositoryFactory.php
+++ b/lib/internal/Magento/Framework/Model/Entity/RepositoryFactory.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\Model\Entity;
 
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
  * Class RepositoryFactory
diff --git a/lib/internal/Magento/Framework/Model/Entity/ScopeResolver.php b/lib/internal/Magento/Framework/Model/Entity/ScopeResolver.php
index ff7e359447cd8..445c3e720a0f5 100644
--- a/lib/internal/Magento/Framework/Model/Entity/ScopeResolver.php
+++ b/lib/internal/Magento/Framework/Model/Entity/ScopeResolver.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Framework\Model\Entity;
 
-use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Exception\ConfigurationMismatchException;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
index 1eaed75bcbfdd..a5a0d176dee4b 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
@@ -6,10 +6,10 @@
 namespace Magento\Framework\Model\ResourceModel\Db;
 
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\DuplicateException;
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
-use Magento\Framework\DB\Adapter\DuplicateException;
 use Magento\Framework\Phrase;
 
 /**
@@ -357,7 +357,7 @@ public function load(\Magento\Framework\Model\AbstractModel $object, $value, $fi
         $object->afterLoad();
         $object->setOrigData();
         $object->setHasDataChanges(false);
-        
+
         return $this;
     }
 
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
index b57755ed7eafa..9dca1f16406c4 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\Model\ResourceModel\Db\Collection;
 
-use \Magento\Framework\App\ResourceConnection\SourceProviderInterface;
-use \Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\App\ResourceConnection\SourceProviderInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
 
 /**
  * Abstract Resource Collection
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/DeleteEntityRow.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/DeleteEntityRow.php
index 7ec43220dc85c..d7d63232c1191 100755
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/DeleteEntityRow.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/DeleteEntityRow.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\Model\ResourceModel\Db;
 
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\EntityManager\EntityMetadata;
 
 class DeleteEntityRow
 {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Relation/ActionPool.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Relation/ActionPool.php
index 433762556693d..9382071efaba2 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Relation/ActionPool.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Relation/ActionPool.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\Model\ResourceModel\Db\Relation;
 
-use Magento\Framework\ObjectManagerInterface as ObjectManager;
 use Magento\Framework\Model\ResourceModel\Db\ProcessEntityRelationInterface;
+use Magento\Framework\ObjectManagerInterface as ObjectManager;
 
 /**
  * Class ActionPool
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/ValidateDataIntegrity.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/ValidateDataIntegrity.php
index 66d7185f8730a..973a63eecb77a 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/ValidateDataIntegrity.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/ValidateDataIntegrity.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\Model\ResourceModel\Db;
 
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\HydratorPool;
+use Magento\Framework\EntityManager\MetadataPool;
 
 /**
  * Class ValidateDataIntegrity
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/RelationComposite.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/RelationComposite.php
index af6c6a6575c70..31d23915951a8 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/RelationComposite.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/RelationComposite.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Model\ResourceModel\Db\VersionControl;
 
-use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Event\ManagerInterface as EventManager;
+use Magento\Framework\Model\AbstractModel;
 
 /**
  * Class RelationComposite
@@ -48,7 +48,7 @@ public function processRelations(AbstractModel $object)
             $processor->processRelation($object);
         }
         $this->eventManager->dispatch(
-            $object->getEventPrefix(). '_process_relation',
+            $object->getEventPrefix() . '_process_relation',
             [
                 'object' => $object
             ]
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/AbstractExtensibleModelTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/AbstractExtensibleModelTest.php
index 1b16427040709..7e68b8daf2aef 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/AbstractExtensibleModelTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/AbstractExtensibleModelTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\Model\Test\Unit;
 
 use Magento\Framework\Api\AttributeValue;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/EntitySnapshot/AttributeProviderTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/EntitySnapshot/AttributeProviderTest.php
index ae2c06f3260e2..644ca6cc1466c 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/EntitySnapshot/AttributeProviderTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/EntitySnapshot/AttributeProviderTest.php
@@ -8,9 +8,9 @@
 
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\EntityManager\EntityMetadata;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Model\EntitySnapshot\AttributeProvider;
 use Magento\Framework\Model\EntitySnapshot\AttributeProviderInterface;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\ObjectManagerInterface as ObjectManager;
 
 /**
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php
index 40243978fe753..59b1401be365e 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/AbstractResourceTest.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\DataObject;
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class AbstractResourceTest extends \PHPUnit\Framework\TestCase
 {
@@ -160,7 +160,7 @@ public function unserializeFieldsDataProvider()
             ]
         ];
     }
-    
+
     public function testCommitZeroLevel()
     {
         /** @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject $connection */
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php
index bfd9b5a63d21b..98276bae6dd21 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/Collection/AbstractCollectionTest.php
@@ -7,9 +7,8 @@
 namespace Magento\Framework\Model\Test\Unit\ResourceModel\Db\Collection;
 
 use Magento\Framework\DB\Select;
-use Magento\Framework\DataObject as MagentoObject;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/Module/ConflictChecker.php b/lib/internal/Magento/Framework/Module/ConflictChecker.php
index 64b1c7e5cfce3..39f5445f17a34 100644
--- a/lib/internal/Magento/Framework/Module/ConflictChecker.php
+++ b/lib/internal/Magento/Framework/Module/ConflictChecker.php
@@ -48,7 +48,7 @@ public function __construct(ModuleList $list, PackageInfoFactory $packageInfoFac
      */
     public function checkConflictsWhenEnableModules($moduleNames, $currentlyEnabledModules = null)
     {
-        $masterList = isset($currentlyEnabledModules) ? $currentlyEnabledModules: $this->list->getNames();
+        $masterList = isset($currentlyEnabledModules) ? $currentlyEnabledModules : $this->list->getNames();
         // union of currently enabled modules and to-be-enabled modules
         $enabledModules = array_unique(array_merge($masterList, $moduleNames));
         $conflictsAll = [];
diff --git a/lib/internal/Magento/Framework/Module/Dir.php b/lib/internal/Magento/Framework/Module/Dir.php
index 936fce3a046b7..2daedae3b9bf7 100644
--- a/lib/internal/Magento/Framework/Module/Dir.php
+++ b/lib/internal/Magento/Framework/Module/Dir.php
@@ -9,7 +9,6 @@
 
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Component\ComponentRegistrarInterface;
-use Magento\Framework\Filesystem;
 
 class Dir
 {
diff --git a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
index bdfb77762b41c..6d26c538f1e04 100644
--- a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
+++ b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Framework\Module\ModuleList;
 
-use Magento\Framework\Module\Declaration\Converter\Dom;
-use Magento\Framework\Xml\Parser;
-use Magento\Framework\Component\ComponentRegistrarInterface;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrarInterface;
 use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Module\Declaration\Converter\Dom;
+use Magento\Framework\Xml\Parser;
 
 /**
  * Loader of module list information from the filesystem
diff --git a/lib/internal/Magento/Framework/Module/ModuleResource.php b/lib/internal/Magento/Framework/Module/ModuleResource.php
index ed740d459060e..5ba9d0d6c97e8 100644
--- a/lib/internal/Magento/Framework/Module/ModuleResource.php
+++ b/lib/internal/Magento/Framework/Module/ModuleResource.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Module;
 
-use \Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
 /**
  * Resource Model
diff --git a/lib/internal/Magento/Framework/Module/PackageInfo.php b/lib/internal/Magento/Framework/Module/PackageInfo.php
index 7edb0c04ebf98..f7decc0ddddd7 100644
--- a/lib/internal/Magento/Framework/Module/PackageInfo.php
+++ b/lib/internal/Magento/Framework/Module/PackageInfo.php
@@ -76,7 +76,7 @@ public function __construct(
     ) {
         $this->reader = $reader;
         $this->componentRegistrar = $componentRegistrar;
-        $this->serializer = $serializer?: \Magento\Framework\App\ObjectManager::getInstance()
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
diff --git a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
index 171f6f74515fd..6fbb341dbf015 100644
--- a/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
+++ b/lib/internal/Magento/Framework/Module/Plugin/DbStatusValidator.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Framework\Module\Plugin;
 
-use Magento\Framework\Cache\FrontendInterface as FrontendCacheInterface;
-use Magento\Framework\Module\DbVersionInfo;
 use Magento\Framework\App\FrontController;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Cache\FrontendInterface as FrontendCacheInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Module\DbVersionInfo;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/lib/internal/Magento/Framework/Module/Setup.php b/lib/internal/Magento/Framework/Module/Setup.php
index 50e881c4ae534..7db2a41495e8f 100644
--- a/lib/internal/Magento/Framework/Module/Setup.php
+++ b/lib/internal/Magento/Framework/Module/Setup.php
@@ -7,9 +7,9 @@
  */
 namespace Magento\Framework\Module;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\SetupInterface;
-use Magento\Framework\App\ResourceConnection;
 
 class Setup implements SetupInterface
 {
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/ConflictCheckerTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/ConflictCheckerTest.php
index 445944a738ff3..b113c76fa2cee 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/ConflictCheckerTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/ConflictCheckerTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Module\Test\Unit;
 
-use \Magento\Framework\Module\ConflictChecker;
+use Magento\Framework\Module\ConflictChecker;
 
 class ConflictCheckerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php
index f8fa1c0b93506..b735ba739f826 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Module\Test\Unit;
 
-use \Magento\Framework\Module\DbVersionInfo;
+use Magento\Framework\Module\DbVersionInfo;
 
 class DbVersionInfoTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php
index ced028c0ef47b..5b44a6f8dd9e6 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Module\Test\Unit;
 
-use \Magento\Framework\Module\DependencyChecker;
+use Magento\Framework\Module\DependencyChecker;
 
 class DependencyCheckerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReaderTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReaderTest.php
index f41f9bbd0d239..59249e3b92ae9 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReaderTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Dir/ReaderTest.php
@@ -11,7 +11,6 @@
 namespace Magento\Framework\Module\Test\Unit\Dir;
 
 use Magento\Framework\Config\FileIteratorFactory;
-use Magento\Framework\Filesystem;
 use Magento\Framework\Module\Dir;
 
 class ReaderTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/FullModuleListTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/FullModuleListTest.php
index ba0aa52d0f438..3d1acb4ee62c9 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/FullModuleListTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/FullModuleListTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Module\Test\Unit;
 
-use \Magento\Framework\Module\FullModuleList;
+use Magento\Framework\Module\FullModuleList;
 
 class FullModuleListTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
index 44185b52b19a4..e38d174cd586f 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/ManagerTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Module\Test\Unit;
 
-use Magento\Framework\Module\Plugin\DbStatusValidator;
-
 class ManagerTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php
index fe613450fd485..4c8a6226d4edd 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Module\Test\Unit\ModuleList;
 
-use \Magento\Framework\Module\ModuleList\Loader;
+use Magento\Framework\Module\ModuleList\Loader;
 
 class LoaderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/ModuleListTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/ModuleListTest.php
index 9b4f238725138..3aceb51eaa778 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/ModuleListTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/ModuleListTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Module\Test\Unit;
 
-use \Magento\Framework\Module\ModuleList;
+use Magento\Framework\Module\ModuleList;
 
 class ModuleListTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoFactoryTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoFactoryTest.php
index 6c005b5b74bd9..763cabe8ff302 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoFactoryTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoFactoryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Module\Test\Unit;
 
-use \Magento\Framework\Module\PackageInfoFactory;
+use Magento\Framework\Module\PackageInfoFactory;
 
 class PackageInfoFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoTest.php
index a631d2a784de5..60535ffa85688 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoTest.php
@@ -5,8 +5,7 @@
  */
 namespace Magento\Framework\Module\Test\Unit;
 
-use Magento\Framework\Module\ModuleList;
-use \Magento\Framework\Module\PackageInfo;
+use Magento\Framework\Module\PackageInfo;
 
 class PackageInfoTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php
index 72a9ba7df0e77..6ae7220829cbf 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/Plugin/DbStatusValidatorTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\Module\Test\Unit\Plugin;
 
-use \Magento\Framework\Module\Plugin\DbStatusValidator;
-
 use Magento\Framework\Module\DbVersionInfo;
 
+use Magento\Framework\Module\Plugin\DbStatusValidator;
+
 class DbStatusValidatorTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/SetupTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/SetupTest.php
index 89c996b7d7c4e..2aa5e83697954 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/SetupTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/SetupTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Module\Test\Unit;
 
-use \Magento\Framework\Module\Setup;
+use Magento\Framework\Module\Setup;
 
 class SetupTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/StatusTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/StatusTest.php
index ea294ee9fde74..e51826b22ffea 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/StatusTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/StatusTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\Module\Test\Unit;
 
-use \Magento\Framework\Module\Status;
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Module\Status;
 
 class StatusTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Mview/Config/Converter.php b/lib/internal/Magento/Framework/Mview/Config/Converter.php
index 55b2f1da21cb9..5c33ac150d00a 100644
--- a/lib/internal/Magento/Framework/Mview/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Mview/Config/Converter.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Mview\Config;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Mview\View\SubscriptionInterface;
 
 class Converter implements \Magento\Framework\Config\ConverterInterface
diff --git a/lib/internal/Magento/Framework/Mview/Config/SchemaLocator.php b/lib/internal/Magento/Framework/Mview/Config/SchemaLocator.php
index 7cafc35ba1451..7eeea70ffe337 100644
--- a/lib/internal/Magento/Framework/Mview/Config/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/Mview/Config/SchemaLocator.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Mview\Config;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
     /**
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/Config/Data/ProxyTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/Config/Data/ProxyTest.php
index 69165f8f53882..8e4a23fa75cf1 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/Config/Data/ProxyTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/Config/Data/ProxyTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Framework\Mview\Test\Unit\Config\Data;
 
-use \Magento\Framework\Mview\Config\Data\Proxy;
+use Magento\Framework\Mview\Config\Data\Proxy;
 
 class ProxyTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/Config/ReaderTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/Config/ReaderTest.php
index ea8b7cfc068ac..4830c5e140917 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/Config/ReaderTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/Config/ReaderTest.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Mview\Test\Unit\Config;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-
 class ReaderTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/ConfigTest.php
index c414d4ed1f832..0a56b6ed90af4 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/ConfigTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Framework\Mview\Test\Unit;
 
-use \Magento\Framework\Mview\Config;
+use Magento\Framework\Mview\Config;
 
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/View/SubscriptionFactoryTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/View/SubscriptionFactoryTest.php
index ff0ff0909e750..1026a687bb9a9 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/View/SubscriptionFactoryTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/View/SubscriptionFactoryTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Framework\Mview\Test\Unit\View;
 
-use \Magento\Framework\Mview\View\SubscriptionFactory;
+use Magento\Framework\Mview\View\SubscriptionFactory;
 
 class SubscriptionFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/View/SubscriptionTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/View/SubscriptionTest.php
index 250e59603de0f..f312c98e7369d 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/View/SubscriptionTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/View/SubscriptionTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Framework\Mview\Test\Unit\View;
 
-use \Magento\Framework\Mview\View\Subscription;
+use Magento\Framework\Mview\View\Subscription;
 
 class SubscriptionTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php
index 3fd8ea93c9bbe..138c0088bf576 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Mview\Test\Unit;
 
-use \Magento\Framework\Mview\View;
+use Magento\Framework\Mview\View;
 
 class ViewTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Mview/View/Changelog.php b/lib/internal/Magento/Framework/Mview/View/Changelog.php
index 91caf66228360..1d64815ef39b9 100644
--- a/lib/internal/Magento/Framework/Mview/View/Changelog.php
+++ b/lib/internal/Magento/Framework/Mview/View/Changelog.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Mview\View;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Phrase;
 
 class Changelog implements ChangelogInterface
diff --git a/lib/internal/Magento/Framework/Mview/View/ChangelogTableNotExistsException.php b/lib/internal/Magento/Framework/Mview/View/ChangelogTableNotExistsException.php
index 0bc4d2eb01912..f33bbf0171d3d 100644
--- a/lib/internal/Magento/Framework/Mview/View/ChangelogTableNotExistsException.php
+++ b/lib/internal/Magento/Framework/Mview/View/ChangelogTableNotExistsException.php
@@ -14,5 +14,4 @@
  */
 class ChangelogTableNotExistsException extends LocalizedException
 {
-
 }
diff --git a/lib/internal/Magento/Framework/Oauth/Test/Unit/OauthInputExceptionTest.php b/lib/internal/Magento/Framework/Oauth/Test/Unit/OauthInputExceptionTest.php
index 72bf2fe7a6129..9a5838d05a709 100644
--- a/lib/internal/Magento/Framework/Oauth/Test/Unit/OauthInputExceptionTest.php
+++ b/lib/internal/Magento/Framework/Oauth/Test/Unit/OauthInputExceptionTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Oauth\Test\Unit;
 
-use \Magento\Framework\Oauth\OauthInputException;
+use Magento\Framework\Oauth\OauthInputException;
 use Magento\Framework\Phrase;
 
 class OauthInputExceptionTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
index b1cdb53288216..ed11743b8694e 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
@@ -9,8 +9,8 @@
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Zend\Code\Reflection\MethodReflection;
 use Zend\Code\Reflection\ParameterReflection;
 
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
index 7bf974a6e09e0..7c12739452aea 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\ObjectManager\Config;
 
-use Magento\Framework\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManager\ConfigCacheInterface;
+use Magento\Framework\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManager\RelationsInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Config.php b/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
index b45a2f8bcf0ba..19f0ec172a751 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\ObjectManager\Config;
 
-use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\ObjectManager\ConfigCacheInterface;
 use Magento\Framework\ObjectManager\DefinitionInterface;
 use Magento\Framework\ObjectManager\RelationsInterface;
+use Magento\Framework\Serialize\SerializerInterface;
 
 class Config implements \Magento\Framework\ObjectManager\ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php b/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php
index e4e82fc1ac7b3..80e859aae7ac8 100644
--- a/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/DefinitionFactory.php
@@ -5,12 +5,9 @@
  */
 namespace Magento\Framework\ObjectManager;
 
+use Magento\Framework\Code\Generator\Autoloader;
 use Magento\Framework\Filesystem\DriverInterface;
-use Magento\Framework\Interception\Code\Generator as InterceptionGenerator;
 use Magento\Framework\ObjectManager\Definition\Runtime;
-use Magento\Framework\ObjectManager\Profiler\Code\Generator as ProfilerGenerator;
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\Code\Generator\Autoloader;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/FactoryTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/FactoryTest.php
index 7f26d4210c2ff..217b4e08d1e3d 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/FactoryTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/FactoryTest.php
@@ -9,7 +9,7 @@
 use Magento\Framework\Code\Generator\Io;
 use Magento\Framework\ObjectManager\Code\Generator\Factory;
 use Magento\Framework\ObjectManager\Code\Generator\Sample;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class FactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/GenerateRepositoryTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/GenerateRepositoryTest.php
index b970cc67ea5c0..80b914cb1a99d 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/GenerateRepositoryTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/GenerateRepositoryTest.php
@@ -8,7 +8,7 @@
 use Composer\Autoload\ClassLoader;
 use Magento\Framework\Code\Generator\Io;
 use Magento\Framework\ObjectManager\Code\Generator\Repository;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class RepositoryTest
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/RepositoryTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/RepositoryTest.php
index 1bba19cb16a5a..3694c385e0528 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/RepositoryTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/RepositoryTest.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\ObjectManager\Test\Unit\Code\Generator;
 
 use Magento\Framework\Api\Test\Unit\Code\Generator\EntityChildTestAbstract;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class RepositoryTest
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleInterface.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleInterface.php
index 846cea22dfe01..d4ef3c4ecbcc1 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/TSampleInterface.php
@@ -7,5 +7,4 @@
 
 interface TSampleInterface
 {
-
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/ConfigTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/ConfigTest.php
index 83be92bf8b451..f0001d442aa53 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/ConfigTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/ConfigTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\ObjectManager\Test\Unit\Config;
 
+use Magento\Framework\ObjectManager\Config\Config;
 use Magento\Framework\Serialize\SerializerInterface;
-use \Magento\Framework\ObjectManager\Config\Config;
 
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Mapper/ArgumentParserTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Mapper/ArgumentParserTest.php
index 1bc07654e30f4..276d5023fea18 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Mapper/ArgumentParserTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Mapper/ArgumentParserTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\ObjectManager\Test\Unit\Config\Mapper;
 
-use \Magento\Framework\ObjectManager\Config\Mapper\ArgumentParser;
+use Magento\Framework\ObjectManager\Config\Mapper\ArgumentParser;
 
 class ArgumentParserTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Mapper/DomTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Mapper/DomTest.php
index 3f7afd8e5c135..62158696f175b 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Mapper/DomTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Mapper/DomTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\ObjectManager\Test\Unit\Config\Mapper;
 
-use \Magento\Framework\ObjectManager\Config\Mapper\Dom;
+use Magento\Framework\ObjectManager\Config\Mapper\Dom;
 
 class DomTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/DomFactoryTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/DomFactoryTest.php
index 6d06aa8c14517..bbd01fce0d666 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/DomFactoryTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/Reader/DomFactoryTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\ObjectManager\Test\Unit\Config\Reader;
 
-use \Magento\Framework\ObjectManager\Config\Reader\DomFactory;
+use Magento\Framework\ObjectManager\Config\Reader\DomFactory;
 
 class DomFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/DefinitionFactoryTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/DefinitionFactoryTest.php
index 6c35d97239c85..a139d60b1e423 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/DefinitionFactoryTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/DefinitionFactoryTest.php
@@ -6,9 +6,9 @@
 namespace Magento\Framework\ObjectManager\Test\Unit;
 
 use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Interception\DefinitionInterface as InterceptionDefinitionInterface;
 use Magento\Framework\ObjectManager\DefinitionFactory;
 use Magento\Framework\ObjectManager\DefinitionInterface;
-use Magento\Framework\Interception\DefinitionInterface as InterceptionDefinitionInterface;
 use Magento\Framework\ObjectManager\RelationsInterface;
 
 class DefinitionFactoryTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php
index 8deb2750653e7..dc3443936bea4 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/FactoryTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\ObjectManager\Test\Unit\Factory;
 
-use Magento\Framework\ObjectManager\FactoryInterface;
 use Magento\Framework\ObjectManager\Config\Config;
 use Magento\Framework\ObjectManager\Factory\Dynamic\Developer;
+use Magento\Framework\ObjectManager\FactoryInterface;
 use Magento\Framework\ObjectManager\ObjectManager;
 
 class FactoryTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Compiled/SimpleClassTesting.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Compiled/SimpleClassTesting.php
index 8fc5799fd983e..631dfa96b580c 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Compiled/SimpleClassTesting.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/Fixture/Compiled/SimpleClassTesting.php
@@ -56,7 +56,6 @@ public function __construct(
         $globalValue = '',
         $nullValue = null
     ) {
-
         $this->nonSharedDependency = $nonSharedDependency;
         $this->sharedDependency = $sharedDependency;
         $this->value = $value;
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Helper/CompositeTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Helper/CompositeTest.php
index 14a40c76bc470..7aaf122b9fdf2 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Helper/CompositeTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Helper/CompositeTest.php
@@ -6,10 +6,7 @@
 
 namespace Magento\Framework\ObjectManager\Test\Unit\Helper;
 
-use \Magento\Framework\ObjectManager\Helper\Composite;
-
 use Magento\Framework\ObjectManager\Helper\Composite as CompositeHelper;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class CompositeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/TMap/TClass.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/TMap/TClass.php
index 13b897dbf1545..46ffabef49f70 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/TMap/TClass.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/TMap/TClass.php
@@ -9,6 +9,5 @@
 
     class TClass implements TInterface
     {
-
     }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/TMap/TInterface.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/TMap/TInterface.php
index de5334b3a27a9..b4085603b6c90 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/TMap/TInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/TMap/TInterface.php
@@ -8,6 +8,5 @@
 
     interface TInterface
     {
-
     }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/logger_classes.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/logger_classes.php
index 04c5b2cbab054..0566e9e253068 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/logger_classes.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/logger_classes.php
@@ -12,7 +12,6 @@
      */
     class WrappedClass
     {
-
     }
 }
 
@@ -20,7 +19,6 @@ class WrappedClass
 
     class Logger
     {
-
     }
 }
 //@codingStandardsIgnoreEnd
diff --git a/lib/internal/Magento/Framework/Phrase/Renderer/Inline.php b/lib/internal/Magento/Framework/Phrase/Renderer/Inline.php
index 77e6d8f8c2e26..c53d221524ebc 100644
--- a/lib/internal/Magento/Framework/Phrase/Renderer/Inline.php
+++ b/lib/internal/Magento/Framework/Phrase/Renderer/Inline.php
@@ -8,8 +8,8 @@
 namespace Magento\Framework\Phrase\Renderer;
 
 use Magento\Framework\Phrase\RendererInterface;
-use Magento\Framework\TranslateInterface;
 use Magento\Framework\Translate\Inline\ProviderInterface;
+use Magento\Framework\TranslateInterface;
 use Psr\Log\LoggerInterface;
 
 class Inline implements RendererInterface
diff --git a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php
index e302dc8f5ad5e..1913731e3dd74 100644
--- a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php
+++ b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/CompositeTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Phrase\Test\Unit\Renderer;
 
-use \Magento\Framework\Phrase\Renderer\Composite;
+use Magento\Framework\Phrase\Renderer\Composite;
 
 class CompositeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/PlaceholderTest.php b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/PlaceholderTest.php
index 6a1349b6c9e54..856977b508501 100644
--- a/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/PlaceholderTest.php
+++ b/lib/internal/Magento/Framework/Phrase/Test/Unit/Renderer/PlaceholderTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Phrase\Test\Unit\Renderer;
 
-use \Magento\Framework\Phrase\Renderer\Placeholder;
+use Magento\Framework\Phrase\Renderer\Placeholder;
 
 class PlaceholderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php b/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
index fe8fcbb6f430f..1b10e0207905b 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\PriceInfoInterface;
+use Magento\Framework\Pricing\SaleableInterface;
 
 /**
  * Class AbstractPrice
diff --git a/lib/internal/Magento/Framework/Pricing/Render/AbstractAdjustment.php b/lib/internal/Magento/Framework/Pricing/Render/AbstractAdjustment.php
index d6c969b06d661..fb821b6acf3cc 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/AbstractAdjustment.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/AbstractAdjustment.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Framework\Pricing\Render;
 
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Price\PriceInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\View\Element\Template;
 
 /**
diff --git a/lib/internal/Magento/Framework/Pricing/Render/AdjustmentRenderInterface.php b/lib/internal/Magento/Framework/Pricing/Render/AdjustmentRenderInterface.php
index 3be51eb83b911..a554a55330801 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/AdjustmentRenderInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/AdjustmentRenderInterface.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\Pricing\Render;
 
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Framework\Pricing\SaleableInterface;
 
 /**
  * Adjustment render interface
diff --git a/lib/internal/Magento/Framework/Pricing/Render/Amount.php b/lib/internal/Magento/Framework/Pricing/Render/Amount.php
index f78107c184266..76ba11eaa444b 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/Amount.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/Amount.php
@@ -7,9 +7,9 @@
 namespace Magento\Framework\Pricing\Render;
 
 use Magento\Framework\Pricing\Amount\AmountInterface;
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Price\PriceInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\View\Element\Template;
 
 /**
diff --git a/lib/internal/Magento/Framework/Pricing/Render/AmountRenderInterface.php b/lib/internal/Magento/Framework/Pricing/Render/AmountRenderInterface.php
index 724593e269944..c4531e88e30af 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/AmountRenderInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/AmountRenderInterface.php
@@ -7,8 +7,8 @@
 namespace Magento\Framework\Pricing\Render;
 
 use Magento\Framework\Pricing\Amount\AmountInterface;
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Framework\Pricing\SaleableInterface;
 
 /**
  * Price amount renderer interface
diff --git a/lib/internal/Magento/Framework/Pricing/Render/PriceBox.php b/lib/internal/Magento/Framework/Pricing/Render/PriceBox.php
index ae572d8fe5f80..db22b9748907c 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/PriceBox.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/PriceBox.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Pricing\Amount\AmountInterface;
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\View\Element\Template;
 
 /**
@@ -88,7 +88,7 @@ protected function getCacheLifetime()
     {
         return parent::hasCacheLifetime() ? parent::getCacheLifetime() : null;
     }
-    
+
     /**
      * @return SaleableInterface
      */
diff --git a/lib/internal/Magento/Framework/Pricing/Render/PriceBoxRenderInterface.php b/lib/internal/Magento/Framework/Pricing/Render/PriceBoxRenderInterface.php
index 9c23c594a89fb..085083ef494d0 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/PriceBoxRenderInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/PriceBoxRenderInterface.php
@@ -7,8 +7,8 @@
 namespace Magento\Framework\Pricing\Render;
 
 use Magento\Framework\Pricing\Amount\AmountInterface;
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Framework\Pricing\SaleableInterface;
 
 /**
  * Price box render interface
diff --git a/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php b/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php
index 73efef2e477be..73dc887996461 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php
@@ -7,8 +7,8 @@
 namespace Magento\Framework\Pricing\Render;
 
 use Magento\Framework\Pricing\Amount\AmountInterface;
-use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Framework\Pricing\SaleableInterface;
 use Magento\Framework\View\Element\AbstractBlock;
 
 /**
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
index 9c23b38182f91..20386332e0ce3 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Pricing\Test\Unit\Adjustment;
 
-use \Magento\Framework\Pricing\Adjustment\Collection;
+use Magento\Framework\Pricing\Adjustment\Collection;
 
 class CollectionTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/PoolTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/PoolTest.php
index 6fca39b2082fb..89858f001a576 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/PoolTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/PoolTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Pricing\Test\Unit\Adjustment;
 
-use \Magento\Framework\Pricing\Adjustment\Pool;
+use Magento\Framework\Pricing\Adjustment\Pool;
 
 class PoolTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/AbstractPriceTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/AbstractPriceTest.php
index d7347089ca287..7d6e05126c892 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/AbstractPriceTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/AbstractPriceTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Pricing\Test\Unit\Price;
 
-use \Magento\Framework\Pricing\Price\AbstractPrice;
+use Magento\Framework\Pricing\Price\AbstractPrice;
 
 /**
  * Class RegularPriceTest
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/CollectionTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/CollectionTest.php
index 46cbe9f737dec..4cf77c6d61d75 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/CollectionTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\Pricing\Test\Unit\Price;
 
-use \Magento\Framework\Pricing\Price\Collection;
-use \Magento\Framework\Pricing\Price\Pool;
+use Magento\Framework\Pricing\Price\Collection;
+use Magento\Framework\Pricing\Price\Pool;
 
 /**
  * Test for class Collection
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/FactoryTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/FactoryTest.php
index 70e93bc196549..20d0bcc95115f 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/FactoryTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/FactoryTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Pricing\Test\Unit\Price;
 
-use \Magento\Framework\Pricing\Price\Factory;
+use Magento\Framework\Pricing\Price\Factory;
 
 /**
  * Test class for \Magento\Framework\Pricing\Factory
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/PoolTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/PoolTest.php
index c091aaa33bd33..dc8a33359ef6e 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/PoolTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/PoolTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Pricing\Test\Unit\Price;
 
-use \Magento\Framework\Pricing\Price\Pool;
+use Magento\Framework\Pricing\Price\Pool;
 
 /**
  * Test for Pool
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/BaseTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/BaseTest.php
index 2cf82d9d7c494..e9ce649f2e83a 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/BaseTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/PriceInfo/BaseTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Pricing\Test\Unit\PriceInfo;
 
-use \Magento\Framework\Pricing\PriceInfo\Base;
+use Magento\Framework\Pricing\PriceInfo\Base;
 
 /**
  * Test class for \Magento\Framework\Pricing\PriceInfo\Base
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AbstractAdjustmentTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AbstractAdjustmentTest.php
index 8aaded446cd83..38214234557ce 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AbstractAdjustmentTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AbstractAdjustmentTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Pricing\Test\Unit\Render;
 
-use \Magento\Framework\Pricing\Render\AbstractAdjustment;
+use Magento\Framework\Pricing\Render\AbstractAdjustment;
 
 /**
  * Test class for \Magento\Framework\Pricing\Render\AbstractAdjustment
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AmountTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AmountTest.php
index 009fb8236c4dc..17f82d7e7f99c 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AmountTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/AmountTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\Pricing\Test\Unit\Render;
 
-use Magento\Framework\Pricing\Render\RendererPool;
+use Magento\Framework\Pricing\Price\PriceInterface;
 use Magento\Framework\Pricing\Render\Amount;
+use Magento\Framework\Pricing\Render\RendererPool;
 use Magento\Framework\Pricing\SaleableInterface;
-use Magento\Framework\Pricing\Price\PriceInterface;
 
 /**
  * Test class for \Magento\Framework\Pricing\Render\Amount
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/LayoutTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/LayoutTest.php
index d61f8b1c2c8a1..1107818a7f41d 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/LayoutTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/LayoutTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Pricing\Test\Unit\Render;
 
-use \Magento\Framework\Pricing\Render\Layout;
+use Magento\Framework\Pricing\Render\Layout;
 
 /**
  * Test class for \Magento\Framework\Pricing\Render\Layout
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/RenderTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/RenderTest.php
index e764dbc2e0438..bdf1d8821f2ba 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/RenderTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/RenderTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Pricing\Test\Unit;
 
-use \Magento\Framework\Pricing\Render;
+use Magento\Framework\Pricing\Render;
 
 /**
  * Test class for \Magento\Framework\Pricing\Render
diff --git a/lib/internal/Magento/Framework/Reflection/CustomAttributesProcessor.php b/lib/internal/Magento/Framework/Reflection/CustomAttributesProcessor.php
index 4fd3a17fb6c6a..960249f1f8e87 100644
--- a/lib/internal/Magento/Framework/Reflection/CustomAttributesProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/CustomAttributesProcessor.php
@@ -6,13 +6,10 @@
 
 namespace Magento\Framework\Reflection;
 
-use Magento\Framework\Phrase;
 use Magento\Framework\Api\AttributeInterface;
+use Magento\Framework\Api\AttributeTypeResolverInterface;
 use Magento\Framework\Api\AttributeValue;
-use Magento\Framework\Api\SimpleDataObjectConverter;
-use Zend\Code\Reflection\MethodReflection;
 use Magento\Framework\Api\CustomAttributesDataInterface;
-use Magento\Framework\Api\AttributeTypeResolverInterface;
 
 /**
  * Processes custom attributes and produces an array for the data.
diff --git a/lib/internal/Magento/Framework/Reflection/ExtensionAttributesProcessor.php b/lib/internal/Magento/Framework/Reflection/ExtensionAttributesProcessor.php
index 3e9eef4fd7b15..a9b2faf41f24a 100644
--- a/lib/internal/Magento/Framework/Reflection/ExtensionAttributesProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/ExtensionAttributesProcessor.php
@@ -8,10 +8,9 @@
 
 use Magento\Framework\Api\ExtensionAttribute\Config;
 use Magento\Framework\Api\ExtensionAttribute\Config\Converter;
+use Magento\Framework\Api\ExtensionAttributesInterface;
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\Phrase;
-use Magento\Framework\Api\ExtensionAttributesInterface;
-use Magento\Framework\Reflection\MethodsMap;
 use Zend\Code\Reflection\MethodReflection;
 
 /**
diff --git a/lib/internal/Magento/Framework/Reflection/FieldNamer.php b/lib/internal/Magento/Framework/Reflection/FieldNamer.php
index 8e4d077c52e08..80462170bef66 100644
--- a/lib/internal/Magento/Framework/Reflection/FieldNamer.php
+++ b/lib/internal/Magento/Framework/Reflection/FieldNamer.php
@@ -6,12 +6,7 @@
 
 namespace Magento\Framework\Reflection;
 
-use Magento\Framework\Phrase;
-use Magento\Framework\Api\AttributeValue;
-use Magento\Framework\Api\CustomAttributesDataInterface;
 use Magento\Framework\Api\SimpleDataObjectConverter;
-use Zend\Code\Reflection\ClassReflection;
-use Zend\Code\Reflection\MethodReflection;
 
 /**
  * Determines the name to use for fields in a data output array given method metadata.
@@ -21,7 +16,7 @@ class FieldNamer
     const IS_METHOD_PREFIX = 'is';
     const HAS_METHOD_PREFIX = 'has';
     const GETTER_PREFIX = 'get';
-    
+
     /**
      * Converts a method's name into a data field name.
      *
diff --git a/lib/internal/Magento/Framework/Reflection/MethodsMap.php b/lib/internal/Magento/Framework/Reflection/MethodsMap.php
index 944cd8771ee33..4d0ca8a45ecb2 100644
--- a/lib/internal/Magento/Framework/Reflection/MethodsMap.php
+++ b/lib/internal/Magento/Framework/Reflection/MethodsMap.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Framework\Reflection;
 
+use Magento\Framework\App\Cache\Type\Reflection as ReflectionCache;
 use Magento\Framework\Serialize\SerializerInterface;
 use Zend\Code\Reflection\ClassReflection;
 use Zend\Code\Reflection\MethodReflection;
 use Zend\Code\Reflection\ParameterReflection;
-use Magento\Framework\App\Cache\Type\Reflection as ReflectionCache;
 
 /**
  * Gathers method metadata information.
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/AttributeTypeResolverTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/AttributeTypeResolverTest.php
index f1e1368cafd0b..3adfa035bc0e7 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/AttributeTypeResolverTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/AttributeTypeResolverTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Reflection\Test\Unit;
 
-use \Magento\Framework\Reflection\AttributeTypeResolver;
+use Magento\Framework\Reflection\AttributeTypeResolver;
 
 class AttributeTypeResolverTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php
index ed26efb5bff64..fbbdceddc4871 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/DataObjectProcessorTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\Reflection\Test\Unit;
 
-use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Reflection\ExtensionAttributesProcessor;
+use Magento\Framework\Serialize\SerializerInterface;
 
 class DataObjectProcessorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/MethodsMapTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/MethodsMapTest.php
index 75061c5e04904..21b97a93d1a6d 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/MethodsMapTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/MethodsMapTest.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Framework\Reflection\Test\Unit;
 
-use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Reflection\MethodsMap;
 use Magento\Framework\Reflection\TypeProcessor;
+use Magento\Framework\Serialize\SerializerInterface;
 
 /**
  * MethodsMap test
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/NameFinderTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/NameFinderTest.php
index a467c4b7b5aad..e4c0294c0cfb5 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/NameFinderTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/NameFinderTest.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\Reflection\Test\Unit;
 
 use Zend\Code\Reflection\ClassReflection;
-use Magento\Framework\Exception\SerializationException;
 
 /**
  * NameFinder Unit Test
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeCasterTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeCasterTest.php
index cf2d24cc69440..c635a120eb3c7 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeCasterTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeCasterTest.php
@@ -6,9 +6,9 @@
 namespace Magento\Framework\Reflection\Test\Unit;
 
 use Magento\Framework\Reflection\TypeCaster;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Type caster Test
diff --git a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
index 369449d1f046a..4920d1818604f 100644
--- a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\RequireJs\Test\Unit;
 
-use \Magento\Framework\RequireJs\Config;
+use Magento\Framework\RequireJs\Config;
 use Magento\Framework\View\Asset\RepositoryMap;
 
 class ConfigTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
index 098782b4e814e..d64f15058393d 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Adapter.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder as AggregationBuilder;
 use Magento\Framework\Search\AdapterInterface;
 use Magento\Framework\Search\RequestInterface;
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php
index ed3018756cdd6..78ff7b04fd39c 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Builder/Term.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder;
 
 use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface;
 use Magento\Framework\Search\Request\BucketInterface as RequestBucketInterface;
 
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
index 8e3758817adf0..312376c66dbfb 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
@@ -10,9 +10,9 @@
 use Magento\Framework\Search\Adapter\Mysql\Field\FieldInterface;
 use Magento\Framework\Search\Adapter\Mysql\Field\ResolverInterface;
 use Magento\Framework\Search\Adapter\Mysql\ScoreBuilder;
+use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
 use Magento\Framework\Search\Request\Query\BoolExpression;
 use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface;
-use Magento\Framework\Search\Adapter\Preprocessor\PreprocessorInterface;
 
 /**
  * @api
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/AlgorithmInterface.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/AlgorithmInterface.php
index 574c4a65b939d..e80173bd3b534 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/AlgorithmInterface.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/AlgorithmInterface.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Search\Dynamic\Algorithm;
 
-use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\Search\Dynamic\EntityStorage;
 use Magento\Framework\Search\Request\BucketInterface;
 
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Auto.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Auto.php
index e727495760d06..609571073e1f8 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Auto.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Auto.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Search\Dynamic\Algorithm;
 
-use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\Search\Adapter\OptionsInterface;
 use Magento\Framework\Search\Dynamic\DataProviderInterface;
 use Magento\Framework\Search\Dynamic\EntityStorage;
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php
index a3e9ed61824ed..a1228ff44889b 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Search\Dynamic\Algorithm;
 
-use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\Search\Adapter\OptionsInterface;
 use Magento\Framework\Search\Dynamic\Algorithm;
 use Magento\Framework\Search\Dynamic\DataProviderInterface;
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php
index 0c4ed8c9a084f..b889835a0fb3f 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\Search\Dynamic;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\ObjectManagerInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderInterface.php b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderInterface.php
index fa360134663d6..c0cd7b8a682da 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderInterface.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderInterface.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Search\Dynamic;
 
-use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Search\Dynamic\EntityStorage;
 use Magento\Framework\Search\Request\BucketInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php b/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php
index 94e38eb152c66..6dae0cecde290 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\Search\Dynamic;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\ObjectManagerInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/Search/Request/Cleaner.php b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
index 984065d1e2a2c..01f713b2d0567 100644
--- a/lib/internal/Magento/Framework/Search/Request/Cleaner.php
+++ b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
@@ -6,8 +6,8 @@
 namespace Magento\Framework\Search\Request;
 
 use Magento\Framework\Exception\StateException;
-use Magento\Framework\Search\Request\Aggregation\StatusInterface as AggregationStatus;
 use Magento\Framework\Phrase;
+use Magento\Framework\Search\Request\Aggregation\StatusInterface as AggregationStatus;
 
 /**
  * @api
diff --git a/lib/internal/Magento/Framework/Search/Request/Mapper.php b/lib/internal/Magento/Framework/Search/Request/Mapper.php
index 797d38ac7d39b..2a30e47b826aa 100644
--- a/lib/internal/Magento/Framework/Search/Request/Mapper.php
+++ b/lib/internal/Magento/Framework/Search/Request/Mapper.php
@@ -6,8 +6,8 @@
 namespace Magento\Framework\Search\Request;
 
 use Magento\Framework\Exception\StateException;
-use Magento\Framework\Search\Request\Query\Filter;
 use Magento\Framework\Phrase;
+use Magento\Framework\Search\Request\Query\Filter;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/Search/Response/Bucket.php b/lib/internal/Magento/Framework/Search/Response/Bucket.php
index 236498ad95d68..584d79fe0d334 100644
--- a/lib/internal/Magento/Framework/Search/Response/Bucket.php
+++ b/lib/internal/Magento/Framework/Search/Response/Bucket.php
@@ -5,9 +5,7 @@
  */
 namespace Magento\Framework\Search\Response;
 
-use Magento\Framework\Api\Search\AggregationValueInterface;
 use Magento\Framework\Api\Search\BucketInterface;
-use Magento\Framework\Search\Response\Aggregation\Value;
 
 /**
  * Facet Bucket
diff --git a/lib/internal/Magento/Framework/Search/Search.php b/lib/internal/Magento/Framework/Search/Search.php
index 16dfc6fdd1ddb..add09646904c6 100644
--- a/lib/internal/Magento/Framework/Search/Search.php
+++ b/lib/internal/Magento/Framework/Search/Search.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Search;
 
-use Magento\Framework\Api\Search\SearchInterface;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
+use Magento\Framework\Api\Search\SearchInterface;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\Search\Request\Builder;
 
diff --git a/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php b/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php
index 40fcd493861d7..ec2f314d55682 100644
--- a/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php
+++ b/lib/internal/Magento/Framework/Search/SearchResponseBuilder.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\Search;
 
-use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\Search\DocumentFactory;
 use Magento\Framework\Api\Search\SearchResultFactory;
+use Magento\Framework\Api\Search\SearchResultInterface;
 
 class SearchResponseBuilder
 {
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
index ef4a4d62322ed..55d26493ca379 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/AdapterTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\Search\Test\Unit\Adapter\Mysql;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Search\Request\BucketInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Aggregation/BuilderTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Aggregation/BuilderTest.php
index ede23c645546c..c0e1525baa095 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Aggregation/BuilderTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Aggregation/BuilderTest.php
@@ -8,9 +8,9 @@
 use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Aggregation\AggregationResolverInterface;
+use Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderContainer;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface;
-use Magento\Framework\Search\Adapter\Mysql\Aggregation\Builder;
 use Magento\Framework\Search\Adapter\Mysql\TemporaryStorage;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Filter/BuilderTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Filter/BuilderTest.php
index 2a7aa8561b27d..2e26a6a2d1c88 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Filter/BuilderTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Filter/BuilderTest.php
@@ -7,8 +7,8 @@
 namespace Magento\Framework\Search\Test\Unit\Adapter\Mysql\Filter;
 
 use Magento\Framework\DB\Select;
-use Magento\Framework\Search\Adapter\Mysql\Filter\PreprocessorInterface;
 use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
+use Magento\Framework\Search\Adapter\Mysql\Filter\PreprocessorInterface;
 use Magento\Framework\Search\Request\FilterInterface;
 use Magento\Framework\Search\Request\Query\BoolExpression as RequestBoolQuery;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/MapperTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/MapperTest.php
index 11fe3b85dfe1b..b0dfdc55e4ffe 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/MapperTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/MapperTest.php
@@ -9,11 +9,11 @@
 use Magento\Framework\Search\Adapter\Mysql\Mapper;
 use Magento\Framework\Search\Adapter\Mysql\Query\Builder\Match;
 use Magento\Framework\Search\Adapter\Mysql\TemporaryStorage;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Magento\Framework\Search\Request\Query\BoolExpression;
 use Magento\Framework\Search\Request\Query\Filter;
 use Magento\Framework\Search\Request\QueryInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Query/Builder/MatchTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Query/Builder/MatchTest.php
index e5097a322a953..95f78f999e7b2 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Query/Builder/MatchTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Query/Builder/MatchTest.php
@@ -8,7 +8,7 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Request\Query\BoolExpression;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 class MatchTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Query/QueryContainerTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Query/QueryContainerTest.php
index 627016fab2515..26320ba9fea96 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Query/QueryContainerTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Adapter/Mysql/Query/QueryContainerTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Framework\Search\Test\Unit\Adapter\Mysql\Query;
 
 use Magento\Framework\Search\Adapter\Mysql\Query\MatchContainerFactory;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Search\Request\Query\BoolExpression;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class QueryContainerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Dynamic/IntervalFactoryTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Dynamic/IntervalFactoryTest.php
index f24245fcf2f83..41702af91ce43 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Dynamic/IntervalFactoryTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Dynamic/IntervalFactoryTest.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Search\Dynamic\IntervalInterface;
-use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class IntervalFactoryTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Request/Aggregation/StatusTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Request/Aggregation/StatusTest.php
index 727e0764a571c..8c7c41444d32f 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Request/Aggregation/StatusTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Request/Aggregation/StatusTest.php
@@ -18,7 +18,6 @@ class StatusTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->status = $this->objectManagerHelper->getObject(
             \Magento\Framework\Search\Request\Aggregation\Status::class
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/Request/MapperTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/Request/MapperTest.php
index c5e18423eab07..5b444f581876d 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/Request/MapperTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/Request/MapperTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Framework\Search\Test\Unit\Request;
 
 use Magento\Framework\Search\Request\FilterInterface;
-use Magento\Framework\Search\Request\QueryInterface;
 use Magento\Framework\Search\Request\Query\Filter;
+use Magento\Framework\Search\Request\QueryInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
diff --git a/lib/internal/Magento/Framework/Search/Test/Unit/SearchTest.php b/lib/internal/Magento/Framework/Search/Test/Unit/SearchTest.php
index 91e047b6bf729..812e48642ae96 100644
--- a/lib/internal/Magento/Framework/Search/Test/Unit/SearchTest.php
+++ b/lib/internal/Magento/Framework/Search/Test/Unit/SearchTest.php
@@ -83,7 +83,7 @@ public function testSearch()
         $scope = $this->getMockBuilder(\Magento\Framework\App\ScopeInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        
+
         $filterGroup = $this->getMockBuilder(\Magento\Framework\Api\Search\FilterGroup::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php
index e74de735c1c1e..eb5c338650ed0 100644
--- a/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php
+++ b/lib/internal/Magento/Framework/Serialize/Test/Unit/Serializer/SerializeTest.php
@@ -6,9 +6,6 @@
 namespace Magento\Framework\Serialize\Test\Unit\Serializer;
 
 use Magento\Framework\Serialize\Serializer\Serialize;
-use Magento\Framework\Serialize\Signer;
-use Psr\Log\LoggerInterface;
-use Magento\Framework\Serialize\InvalidSignatureException;
 
 class SerializeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Session/Config.php b/lib/internal/Magento/Framework/Session/Config.php
index 053bd3e7fd6b9..296b7944ea4f6 100644
--- a/lib/internal/Magento/Framework/Session/Config.php
+++ b/lib/internal/Magento/Framework/Session/Config.php
@@ -11,7 +11,6 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Session\Config\ConfigInterface;
-use Magento\Framework\Session\SaveHandlerInterface;
 
 /**
  * Magento session configuration
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php b/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php
index 67ae707860640..7217303af8fff 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/DbTable.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Session\SaveHandler;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\SessionException;
 use Magento\Framework\Phrase;
 
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/Redis.php b/lib/internal/Magento/Framework/Session/SaveHandler/Redis.php
index 53af1847d1012..60d07e1ae1772 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/Redis.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/Redis.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\Framework\Session\SaveHandler;
 
+use Cm\RedisSession\ConcurrentConnectionsExceededException;
+use Cm\RedisSession\ConnectionFailedException;
 use Cm\RedisSession\Handler\ConfigInterface;
 use Cm\RedisSession\Handler\LoggerInterface;
-use Cm\RedisSession\ConnectionFailedException;
-use Cm\RedisSession\ConcurrentConnectionsExceededException;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\SessionException;
-use Magento\Framework\Phrase;
 use Magento\Framework\Filesystem;
-use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Phrase;
 
 class Redis extends \Cm\RedisSession\Handler
 {
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
index e21a92bbbdc24..6d5462dcbfc28 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Config.php
@@ -6,9 +6,9 @@
 namespace Magento\Framework\Session\SaveHandler\Redis;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\State;
+use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
 
 /**
  * Redis session save handler
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Logger.php b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Logger.php
index 3d8384d61d8d9..765fd423f5025 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Logger.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler/Redis/Logger.php
@@ -6,8 +6,8 @@
 namespace Magento\Framework\Session\SaveHandler\Redis;
 
 use Cm\RedisSession\Handler\ConfigInterface;
-use Psr\Log\LoggerInterface;
 use Magento\Framework\App\Request\Http as Request;
+use Psr\Log\LoggerInterface;
 
 class Logger implements \Cm\RedisSession\Handler\LoggerInterface
 {
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
index 12e28cdb3970d..9064296cb4f82 100644
--- a/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php
@@ -9,7 +9,7 @@
  */
 namespace Magento\Framework\Session\Test\Unit;
 
-use \Magento\Framework\Session\Config;
+use Magento\Framework\Session\Config;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php
index 26f3d4c4c4e89..bac6f4697bd07 100644
--- a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandler/Redis/ConfigTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Session\Test\Unit\SaveHandler\Redis;
 
-use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\Session\SaveHandler\Redis\Config;
+use Magento\Store\Model\ScopeInterface;
 
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandlerFactoryTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandlerFactoryTest.php
index ca49f73de031f..58720fc02c0a0 100644
--- a/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandlerFactoryTest.php
+++ b/lib/internal/Magento/Framework/Session/Test/Unit/SaveHandlerFactoryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Session\Test\Unit;
 
-use \Magento\Framework\Session\SaveHandlerFactory;
+use Magento\Framework\Session\SaveHandlerFactory;
 
 class SaveHandlerFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/_files/mock_ini_set.php b/lib/internal/Magento/Framework/Session/Test/Unit/_files/mock_ini_set.php
index 7d3a72248265b..9629f1356ac31 100644
--- a/lib/internal/Magento/Framework/Session/Test/Unit/_files/mock_ini_set.php
+++ b/lib/internal/Magento/Framework/Session/Test/Unit/_files/mock_ini_set.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Session;
 
-use \Magento\Framework\Session\Test\Unit\SessionManagerTest;
+use Magento\Framework\Session\Test\Unit\SessionManagerTest;
 
 /**
  * Mock ini_set global function
diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/_files/mock_session_regenerate_id.php b/lib/internal/Magento/Framework/Session/Test/Unit/_files/mock_session_regenerate_id.php
index 0b2640a27e70c..12869f927dc1a 100644
--- a/lib/internal/Magento/Framework/Session/Test/Unit/_files/mock_session_regenerate_id.php
+++ b/lib/internal/Magento/Framework/Session/Test/Unit/_files/mock_session_regenerate_id.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Session;
 
-use \Magento\Framework\Session\Test\Unit\SessionManagerTest;
+use Magento\Framework\Session\Test\Unit\SessionManagerTest;
 
 /**
  * Mock session_regenerate_id to fail if false is passed
diff --git a/lib/internal/Magento/Framework/Setup/BackupRollback.php b/lib/internal/Magento/Framework/Setup/BackupRollback.php
index a374611271039..aec585c9b03b8 100644
--- a/lib/internal/Magento/Framework/Setup/BackupRollback.php
+++ b/lib/internal/Magento/Framework/Setup/BackupRollback.php
@@ -7,13 +7,12 @@
 namespace Magento\Framework\Setup;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Backup\Factory;
 use Magento\Framework\Backup\Exception\NotEnoughPermissions;
+use Magento\Framework\Backup\Factory;
 use Magento\Framework\Backup\Filesystem;
 use Magento\Framework\Backup\Filesystem\Helper;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem\Driver\File;
-use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Phrase;
 
@@ -129,7 +128,7 @@ public function codeBackup($time, $type = Factory::TYPE_FILESYSTEM)
         $this->log->log($granularType . ' backup is starting...');
         $fsBackup->create();
         $this->log->log(
-            $granularType. ' backup filename: ' . $fsBackup->getBackupFilename()
+            $granularType . ' backup filename: ' . $fsBackup->getBackupFilename()
             . ' (The archive can be uncompressed with 7-Zip on Windows systems)'
         );
         $this->log->log($granularType . ' backup path: ' . $fsBackup->getBackupPath());
diff --git a/lib/internal/Magento/Framework/Setup/ConsoleLogger.php b/lib/internal/Magento/Framework/Setup/ConsoleLogger.php
index 01342ebb59b3a..627527d63bd73 100644
--- a/lib/internal/Magento/Framework/Setup/ConsoleLogger.php
+++ b/lib/internal/Magento/Framework/Setup/ConsoleLogger.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\Setup;
 
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Console Logger
diff --git a/lib/internal/Magento/Framework/Setup/SampleData/Context.php b/lib/internal/Magento/Framework/Setup/SampleData/Context.php
index 18d2a01bf599b..5d7c39e71c53e 100644
--- a/lib/internal/Magento/Framework/Setup/SampleData/Context.php
+++ b/lib/internal/Magento/Framework/Setup/SampleData/Context.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Setup\SampleData;
 
-use \Magento\Framework\File\Csv;
+use Magento\Framework\File\Csv;
 
 /**
  * Constructor modification point for Magento\Framework\Setup\SampleData.
diff --git a/lib/internal/Magento/Framework/Setup/SampleData/FixtureManager.php b/lib/internal/Magento/Framework/Setup/SampleData/FixtureManager.php
index 4b11118e79060..9ce5e969aeefe 100644
--- a/lib/internal/Magento/Framework/Setup/SampleData/FixtureManager.php
+++ b/lib/internal/Magento/Framework/Setup/SampleData/FixtureManager.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\Setup\SampleData;
 
 use Magento\Framework\Component\ComponentRegistrar;
-use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 
 class FixtureManager
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/BackendFrontnameGeneratorTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/BackendFrontnameGeneratorTest.php
index 8d90d80d21ae2..4f618c8dfec6f 100644
--- a/lib/internal/Magento/Framework/Setup/Test/Unit/BackendFrontnameGeneratorTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/BackendFrontnameGeneratorTest.php
@@ -12,7 +12,7 @@ class BackendFrontnameGeneratorTest extends \PHPUnit\Framework\TestCase
     public function testGenerate()
     {
         $regexp = '/' . BackendFrontnameGenerator::ADMIN_AREA_PATH_PREFIX
-            . '[a-z0-9]{1,' . BackendFrontnameGenerator::ADMIN_AREA_PATH_RANDOM_PART_LENGTH .'}/';
+            . '[a-z0-9]{1,' . BackendFrontnameGenerator::ADMIN_AREA_PATH_RANDOM_PART_LENGTH . '}/';
 
         $this->assertRegExp($regexp, BackendFrontnameGenerator::generate(), 'Unexpected Backend Frontname pattern.');
     }
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php
index fce077f7f8925..0696400fe5da9 100644
--- a/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php
+++ b/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Setup\Test\Unit;
 
-use \Magento\Framework\Setup\FilePermissions;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Setup\FilePermissions;
 
 class FilePermissionsTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Shell/Test/Unit/CommandRendererBackgroundTest.php b/lib/internal/Magento/Framework/Shell/Test/Unit/CommandRendererBackgroundTest.php
index 0a85032946b8f..149ed3d80b80e 100644
--- a/lib/internal/Magento/Framework/Shell/Test/Unit/CommandRendererBackgroundTest.php
+++ b/lib/internal/Magento/Framework/Shell/Test/Unit/CommandRendererBackgroundTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Shell\Test\Unit;
 
-use \Magento\Framework\Shell\CommandRendererBackground;
+use Magento\Framework\Shell\CommandRendererBackground;
 
 class CommandRendererBackgroundTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Shell/Test/Unit/ComplexParameterTest.php b/lib/internal/Magento/Framework/Shell/Test/Unit/ComplexParameterTest.php
index 906f07423c2fd..89a7fae7cdf6a 100644
--- a/lib/internal/Magento/Framework/Shell/Test/Unit/ComplexParameterTest.php
+++ b/lib/internal/Magento/Framework/Shell/Test/Unit/ComplexParameterTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Shell\Test\Unit;
 
-use \Magento\Framework\Shell\ComplexParameter;
+use Magento\Framework\Shell\ComplexParameter;
 
 class ComplexParameterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
index 91465280d1e80..67150c907a392 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
@@ -8,9 +8,9 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\Stdlib\CookieManagerInterface;
-use Magento\Framework\Phrase;
 use Magento\Framework\HTTP\Header as HttpHeader;
+use Magento\Framework\Phrase;
+use Magento\Framework\Stdlib\CookieManagerInterface;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/Stdlib/CookieManagerInterface.php b/lib/internal/Magento/Framework/Stdlib/CookieManagerInterface.php
index d4d37d656ebcf..fee3fa32e1d0d 100644
--- a/lib/internal/Magento/Framework/Stdlib/CookieManagerInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/CookieManagerInterface.php
@@ -6,13 +6,13 @@
 
 namespace Magento\Framework\Stdlib;
 
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Stdlib\Cookie\CookieMetadata;
 use Magento\Framework\Stdlib\Cookie\CookieReaderInterface;
+use Magento\Framework\Stdlib\Cookie\CookieSizeLimitReachedException;
+use Magento\Framework\Stdlib\Cookie\FailureToSendException;
 use Magento\Framework\Stdlib\Cookie\PublicCookieMetadata;
 use Magento\Framework\Stdlib\Cookie\SensitiveCookieMetadata;
-use Magento\Framework\Stdlib\Cookie\FailureToSendException;
-use Magento\Framework\Stdlib\Cookie\CookieSizeLimitReachedException;
-use Magento\Framework\Stdlib\Cookie\CookieMetadata;
-use Magento\Framework\Exception\InputException;
 
 /**
  * CookieManager helps manage the setting, retrieving and deleting of cookies.
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
index 90aec6024fe12..d475824075a2e 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Stdlib\DateTime;
 
-use \Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
 
 /**
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php
index 19ae3e80ed2af..ffccf9b2e2b1b 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Stdlib\Test\Unit;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class ArrayManagerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/BooleanUtilsTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/BooleanUtilsTest.php
index 26dcbc81262a2..38bd0ae1459f0 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/BooleanUtilsTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/BooleanUtilsTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Stdlib\Test\Unit;
 
-use \Magento\Framework\Stdlib\BooleanUtils;
+use Magento\Framework\Stdlib\BooleanUtils;
 
 class BooleanUtilsTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
index eb1ccd76acef9..e400167c7692c 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Framework\Stdlib\Test\Unit\Cookie;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\Stdlib\Cookie\SensitiveCookieMetadata;
-use Magento\Framework\Stdlib\Cookie\PublicCookieMetadata;
-use Magento\Framework\Stdlib\Cookie\CookieScope;
 use Magento\Framework\Stdlib\Cookie\CookieMetadata;
+use Magento\Framework\Stdlib\Cookie\CookieScope;
+use Magento\Framework\Stdlib\Cookie\PublicCookieMetadata;
+use Magento\Framework\Stdlib\Cookie\SensitiveCookieMetadata;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Test CookieScope
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
index 43a7a7cee16df..f353189a2f625 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
@@ -11,13 +11,14 @@
 
 namespace Magento\Framework\Stdlib\Test\Unit\Cookie
 {
-    use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
     use Magento\Framework\Exception\InputException;
-    use Magento\Framework\Stdlib\Cookie\FailureToSendException;
-    use Magento\Framework\Stdlib\Cookie\CookieSizeLimitReachedException;
-    use Magento\Framework\Phrase;
     use Magento\Framework\HTTP\Header as HttpHeader;
+    use Magento\Framework\Phrase;
+    use Magento\Framework\Stdlib\Cookie\CookieSizeLimitReachedException;
+    use Magento\Framework\Stdlib\Cookie\FailureToSendException;
+    use Magento\Framework\Stdlib\Cookie\PhpCookieManager;
     use Psr\Log\LoggerInterface;
+
     // @codingStandardsIgnoreEnd
 
     /**
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php
index e97dfab795c59..c35a9b3307b66 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php
@@ -6,8 +6,7 @@
 
 namespace Magento\Framework\Stdlib\Cookie;
 
-use \Magento\Framework\Stdlib\Cookie\PhpCookieManager;
-use \Magento\Framework\Stdlib\Test\Unit\Cookie\PhpCookieManagerTest;
+use Magento\Framework\Stdlib\Test\Unit\Cookie\PhpCookieManagerTest;
 
 /**
  * Mock global setcookie function
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/Filter/DateTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/Filter/DateTest.php
index d9b3a87641f08..31e20976b59e1 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/Filter/DateTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/Filter/DateTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Stdlib\Test\Unit\DateTime\Filter;
 
-use \Magento\Framework\Stdlib\DateTime\Filter\Date;
+use Magento\Framework\Stdlib\DateTime\Filter\Date;
 
 class DateTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/Filter/DateTimeTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/Filter/DateTimeTest.php
index 5f01f03f9008c..ee46012e9f471 100755
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/Filter/DateTimeTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/Filter/DateTimeTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Stdlib\Test\Unit\DateTime\Filter;
 
-use \Magento\Framework\Stdlib\DateTime\Filter\DateTime;
+use Magento\Framework\Stdlib\DateTime\Filter\DateTime;
 
 class DateTimeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/StringUtilsTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/StringUtilsTest.php
index 8b7bb051838b9..123ec2db2bd5c 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/StringUtilsTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/StringUtilsTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Stdlib\Test\Unit;
 
-use \Magento\Framework\Stdlib\StringUtils;
+use Magento\Framework\Stdlib\StringUtils;
 
 /**
  * Magento\Framework\Stdlib\StringUtilsTest test case
diff --git a/lib/internal/Magento/Framework/System/Dirs.php b/lib/internal/Magento/Framework/System/Dirs.php
index 1bab4c90b3bec..6328921d40bb0 100644
--- a/lib/internal/Magento/Framework/System/Dirs.php
+++ b/lib/internal/Magento/Framework/System/Dirs.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\System;
 
-use Magento\Framework\Filesystem\DriverInterface;
-
 class Dirs
 {
     /**
diff --git a/lib/internal/Magento/Framework/System/Ftp.php b/lib/internal/Magento/Framework/System/Ftp.php
index 216026be8d72e..4b6432a863ebe 100644
--- a/lib/internal/Magento/Framework/System/Ftp.php
+++ b/lib/internal/Magento/Framework/System/Ftp.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Framework\System;
 
-use Magento\Framework\Filesystem\DriverInterface;
-
 /**
  * Class to work with remote FTP server
  */
diff --git a/lib/internal/Magento/Framework/Test/Unit/ArchiveTest.php b/lib/internal/Magento/Framework/Test/Unit/ArchiveTest.php
index 68be50810d44f..12d392197d040 100644
--- a/lib/internal/Magento/Framework/Test/Unit/ArchiveTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/ArchiveTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Test\Unit;
 
-use \Magento\Framework\Archive;
+use Magento\Framework\Archive;
 
 class ArchiveTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchIteratorTest.php b/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchIteratorTest.php
index f55edc38470b9..45a641ca2f149 100644
--- a/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchIteratorTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/DB/Query/BatchIteratorTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\Test\Unit\DB\Query;
 
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Query\BatchIterator;
 use Magento\Framework\DB\Select;
-use Magento\Framework\DB\Adapter\AdapterInterface;
 
 class BatchIteratorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php b/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php
index d937dc10e4d4c..f623aa2acceef 100644
--- a/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/DataObjectTest.php
@@ -110,7 +110,7 @@ public function testGetData()
             'key1' => 'value1',
             'key2' => [
                 'subkey2.1' => 'value2.1',
-                'subkey2.2' => 'multiline'. PHP_EOL .'string',
+                'subkey2.2' => 'multiline' . PHP_EOL . 'string',
                 'subkey2.3' => new \Magento\Framework\DataObject(['test_key' => 'test_value']),
             ],
             'key3' => 5,
diff --git a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
index c728fdecfeaab..9e8c614ce97dd 100644
--- a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Test\Unit;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Escaper;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * \Magento\Framework\Escaper test case
diff --git a/lib/internal/Magento/Framework/Test/Unit/EventTest.php b/lib/internal/Magento/Framework/Test/Unit/EventTest.php
index 90f40e0807eb2..41ae94a1dc539 100644
--- a/lib/internal/Magento/Framework/Test/Unit/EventTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/EventTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Test\Unit;
 
-use \Magento\Framework\Event;
+use Magento\Framework\Event;
 
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\Observer\Collection;
diff --git a/lib/internal/Magento/Framework/Test/Unit/FilesystemTest.php b/lib/internal/Magento/Framework/Test/Unit/FilesystemTest.php
index 63b9a9d85a34b..474c1fa0bb2e3 100644
--- a/lib/internal/Magento/Framework/Test/Unit/FilesystemTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/FilesystemTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\Test\Unit;
 
-use \Magento\Framework\Filesystem;
-
 use Magento\Framework\App\Filesystem\DirectoryList;
 
+use Magento\Framework\Filesystem;
+
 class FilesystemTest extends \PHPUnit\Framework\TestCase
 {
     /** @var Filesystem */
diff --git a/lib/internal/Magento/Framework/Test/Unit/FlagManagerTest.php b/lib/internal/Magento/Framework/Test/Unit/FlagManagerTest.php
index 955f16d4241c2..a47fe020fbf9b 100644
--- a/lib/internal/Magento/Framework/Test/Unit/FlagManagerTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/FlagManagerTest.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Framework\Test\Unit;
 
-use Magento\Framework\FlagFactory;
-use Magento\Framework\Flag\FlagResource;
 use Magento\Framework\Flag;
+use Magento\Framework\Flag\FlagResource;
+use Magento\Framework\FlagFactory;
 use Magento\Framework\FlagManager;
-use \PHPUnit_Framework_MockObject_MockObject as Mock;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
 
 /**
  * Class FlagManagerTest
diff --git a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
index 1516f65479771..3333fe315c63b 100644
--- a/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/Module/Plugin/DbStatusValidatorTest.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Framework\Test\Unit\Module\Plugin;
 
-use Magento\Framework\Module\Plugin\DbStatusValidator as DbStatusValidatorPlugin;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\Cache\FrontendInterface as FrontendCacheInterface;
-use Magento\Framework\Module\DbVersionInfo;
 use Magento\Framework\App\FrontController;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Cache\FrontendInterface as FrontendCacheInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Module\DbVersionInfo;
+use Magento\Framework\Module\Plugin\DbStatusValidator as DbStatusValidatorPlugin;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class DbStatusValidatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Test/Unit/RegistryTest.php b/lib/internal/Magento/Framework/Test/Unit/RegistryTest.php
index 0263b86d598c3..07beb3caee59a 100644
--- a/lib/internal/Magento/Framework/Test/Unit/RegistryTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/RegistryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Test\Unit;
 
-use \Magento\Framework\Registry;
+use Magento\Framework\Registry;
 
 /**
  * Registry model test. Test cases for managing values in registry
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php
index 03c7d85251ac4..2d8348f64a5af 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php
@@ -65,7 +65,7 @@ public function load($className)
                     include $classSourceFile;
                     return true;
                 }
-            };
+            }
         }
 
         return false;
diff --git a/lib/internal/Magento/Framework/Translate/Test/Unit/Inline/ProxyTest.php b/lib/internal/Magento/Framework/Translate/Test/Unit/Inline/ProxyTest.php
index 68638e74edff7..dcc6f36e5c7a3 100644
--- a/lib/internal/Magento/Framework/Translate/Test/Unit/Inline/ProxyTest.php
+++ b/lib/internal/Magento/Framework/Translate/Test/Unit/Inline/ProxyTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Translate\Test\Unit\Inline;
 
-use \Magento\Framework\Translate\Inline\Proxy;
+use Magento\Framework\Translate\Inline\Proxy;
 
 class ProxyTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Translate/Test/Unit/Inline/StateTest.php b/lib/internal/Magento/Framework/Translate/Test/Unit/Inline/StateTest.php
index fe8d6bf0ef4cf..b28ef846810db 100644
--- a/lib/internal/Magento/Framework/Translate/Test/Unit/Inline/StateTest.php
+++ b/lib/internal/Magento/Framework/Translate/Test/Unit/Inline/StateTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Translate\Test\Unit\Inline;
 
-use \Magento\Framework\Translate\Inline\State;
+use Magento\Framework\Translate\Inline\State;
 
 class StateTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php b/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
index 6e222ba90da8e..019d5004fe6fc 100644
--- a/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
+++ b/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Translate\Test\Unit;
 
-use \Magento\Framework\Translate\Inline;
+use Magento\Framework\Translate\Inline;
 
 class InlineTest extends \PHPUnit\Framework\TestCase
 {
@@ -131,10 +131,10 @@ public function processResponseBodyStripInlineDataProvider()
         return [
             ['test', 'test'],
             ['{{{aaaaaa}}{{bbbbb}}{{eeeee}}{{cccccc}}}', 'aaaaaa'],
-            [['test1', 'test2'], ['test1', 'test2'],],
-            [['{{{aaaaaa}}', 'test3'], ['{{{aaaaaa}}', 'test3'],],
-            [['{{{aaaaaa}}{{bbbbb}}', 'test4'], ['{{{aaaaaa}}{{bbbbb}}', 'test4'],],
-            [['{{{aaaaaa}}{{bbbbb}}{{eeeee}}{{cccccc}}}', 'test5'], ['aaaaaa', 'test5'],],
+            [['test1', 'test2'], ['test1', 'test2']],
+            [['{{{aaaaaa}}', 'test3'], ['{{{aaaaaa}}', 'test3']],
+            [['{{{aaaaaa}}{{bbbbb}}', 'test4'], ['{{{aaaaaa}}{{bbbbb}}', 'test4']],
+            [['{{{aaaaaa}}{{bbbbb}}{{eeeee}}{{cccccc}}}', 'test5'], ['aaaaaa', 'test5']],
         ];
     }
 
@@ -150,7 +150,7 @@ public function testProcessResponseBody($scope, $body, $expected)
         $isJson = true;
         $this->prepareIsAllowed(true, true, true, $scope);
 
-        $jsonCall = is_array($body) ? 2 * (count($body) + 1)  : 2;
+        $jsonCall = is_array($body) ? 2 * (count($body) + 1) : 2;
         $this->parserMock->expects(
             $this->exactly($jsonCall)
         )->method(
@@ -212,7 +212,7 @@ public function testProcessResponseBodyGetInlineScript($scope, $body, $expected)
         $isJson = true;
         $this->prepareIsAllowed(true, true, true, $scope);
 
-        $jsonCall = is_array($body) ? 2 * (count($body) + 1)  : 2;
+        $jsonCall = is_array($body) ? 2 * (count($body) + 1) : 2;
         $this->parserMock->expects(
             $this->exactly($jsonCall)
         )->method(
diff --git a/lib/internal/Magento/Framework/Url/RouteParamsResolver.php b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
index b46ba00d48023..f553bf1e6a22d 100644
--- a/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
+++ b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\Url;
 
-use Magento\Framework\Url\RouteParamsResolverInterface;
-
 /**
  * Route params resolver.
  *
diff --git a/lib/internal/Magento/Framework/Url/Test/Unit/DecoderTest.php b/lib/internal/Magento/Framework/Url/Test/Unit/DecoderTest.php
index 6a891d23564ed..d4bbb30e15a4d 100644
--- a/lib/internal/Magento/Framework/Url/Test/Unit/DecoderTest.php
+++ b/lib/internal/Magento/Framework/Url/Test/Unit/DecoderTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\Url\Test\Unit;
 
-use \Magento\Framework\Url\Decoder;
-use \Magento\Framework\Url\Encoder;
+use Magento\Framework\Url\Decoder;
+use Magento\Framework\Url\Encoder;
 
 class DecoderTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Validator/AllowedProtocols.php b/lib/internal/Magento/Framework/Validator/AllowedProtocols.php
index a25346d673408..1eda4051519e0 100644
--- a/lib/internal/Magento/Framework/Validator/AllowedProtocols.php
+++ b/lib/internal/Magento/Framework/Validator/AllowedProtocols.php
@@ -7,7 +7,7 @@
  */
 namespace Magento\Framework\Validator;
 
-use \Zend\Uri\Uri;
+use Zend\Uri\Uri;
 
 /**
  * Check is URI starts from allowed protocol
diff --git a/lib/internal/Magento/Framework/Validator/Entity/Properties.php b/lib/internal/Magento/Framework/Validator/Entity/Properties.php
index ff04f6cb6da6e..9a0cd8cd61a08 100644
--- a/lib/internal/Magento/Framework/Validator/Entity/Properties.php
+++ b/lib/internal/Magento/Framework/Validator/Entity/Properties.php
@@ -7,7 +7,6 @@
  */
 namespace Magento\Framework\Validator\Entity;
 
-use Magento\Framework\DataObject;
 use Magento\Framework\Model\AbstractModel;
 
 class Properties extends \Magento\Framework\Validator\AbstractValidator
diff --git a/lib/internal/Magento/Framework/Validator/Exception.php b/lib/internal/Magento/Framework/Validator/Exception.php
index c70ecfabb52af..d001d1a76fd30 100644
--- a/lib/internal/Magento/Framework/Validator/Exception.php
+++ b/lib/internal/Magento/Framework/Validator/Exception.php
@@ -8,9 +8,9 @@
 namespace Magento\Framework\Validator;
 
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\Phrase;
 use Magento\Framework\Message\AbstractMessage;
 use Magento\Framework\Message\Error;
+use Magento\Framework\Phrase;
 
 /**
  * Exception to be thrown when data validation fails
diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php
index bf660396790f7..59956428e9256 100644
--- a/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\Validator\Test\Unit;
 
+use Magento\Framework\App\Arguments\ValidationState;
+use Magento\Framework\Config\ValidationStateInterface;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -74,10 +77,9 @@ protected function _initConfig(array $files = null)
         $appObjectManager->configure(
             [
                 'preferences' => [
-                    \Magento\Framework\Config\ValidationStateInterface::class =>
-                        \Magento\Framework\App\Arguments\ValidationState::class,
+                    ValidationStateInterface::class => ValidationState::class,
                 ],
-                \Magento\Framework\App\Arguments\ValidationState::class => [
+                ValidationState::class => [
                     'arguments' => [
                         'appMode' => 'developer',
                     ]
diff --git a/lib/internal/Magento/Framework/View/Asset/Bundle.php b/lib/internal/Magento/Framework/View/Asset/Bundle.php
index 80f35f9d57075..36c6074ab8c96 100644
--- a/lib/internal/Magento/Framework/View/Asset/Bundle.php
+++ b/lib/internal/Magento/Framework/View/Asset/Bundle.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Framework\View\Asset;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\View\Asset\Bundle\Manager;
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\View\Asset\File\FallbackContext;
 
 /**
@@ -287,7 +287,7 @@ protected function save($types)
      */
     protected function fillContent($parts, $context)
     {
-        $index = count($this->content) > 0 ? count($this->content) - 1 : 0 ;
+        $index = count($this->content) > 0 ? count($this->content) - 1 : 0;
         foreach ($parts as $part) {
             if (!isset($this->content[$index])) {
                 $this->content[$index] = '';
diff --git a/lib/internal/Magento/Framework/View/Asset/Bundle/Config.php b/lib/internal/Magento/Framework/View/Asset/Bundle/Config.php
index 8c529e9a2bc1c..03891247ea7f7 100644
--- a/lib/internal/Magento/Framework/View/Asset/Bundle/Config.php
+++ b/lib/internal/Magento/Framework/View/Asset/Bundle/Config.php
@@ -9,8 +9,8 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View;
 use Magento\Framework\View\Asset\Bundle;
-use Magento\Framework\View\Design\Theme\ListInterface;
 use Magento\Framework\View\Asset\File\FallbackContext;
+use Magento\Framework\View\Design\Theme\ListInterface;
 use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php b/lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php
index e1851bc66947a..ad6a80b648258 100644
--- a/lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php
+++ b/lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Framework\View\Asset\Bundle;
 
-use Magento\Framework\View\Asset;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
+use Magento\Framework\View\Asset;
 use Magento\Framework\View\Asset\Bundle;
 use Magento\Framework\View\Asset\LocalInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * BundleService model
diff --git a/lib/internal/Magento/Framework/View/Asset/Config.php b/lib/internal/Magento/Framework/View/Asset/Config.php
index 2a3d0d3dad467..01b643daf344c 100644
--- a/lib/internal/Magento/Framework/View/Asset/Config.php
+++ b/lib/internal/Magento/Framework/View/Asset/Config.php
@@ -6,9 +6,8 @@
 
 namespace Magento\Framework\View\Asset;
 
-use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\State;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * View asset configuration interface
diff --git a/lib/internal/Magento/Framework/View/Asset/ContentProcessorException.php b/lib/internal/Magento/Framework/View/Asset/ContentProcessorException.php
index 86daba29e5be8..fdc3b1848d345 100644
--- a/lib/internal/Magento/Framework/View/Asset/ContentProcessorException.php
+++ b/lib/internal/Magento/Framework/View/Asset/ContentProcessorException.php
@@ -12,5 +12,4 @@
  */
 class ContentProcessorException extends LocalizedException
 {
-
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/ContentProcessorInterface.php b/lib/internal/Magento/Framework/View/Asset/ContentProcessorInterface.php
index bfaa5a8f82eea..4c6509f0fe110 100644
--- a/lib/internal/Magento/Framework/View/Asset/ContentProcessorInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/ContentProcessorInterface.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\View\Asset;
 
-use Magento\Framework\View\Asset\File;
-
 /**
  * Interface ContentProcessorInterface
  */
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php
index 38f2b220dee6f..762a4c46e533c 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSource.php
@@ -5,11 +5,10 @@
  */
 namespace Magento\Framework\View\Asset\PreProcessor;
 
-use Magento\Framework\Filesystem;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\Asset\ContentProcessorInterface;
 use Magento\Framework\View\Asset\File\FallbackContext;
 use Magento\Framework\View\Asset\LockerProcessInterface;
-use Magento\Framework\View\Asset\ContentProcessorInterface;
 use Magento\Framework\View\Asset\PreProcessor\AlternativeSource\AssetBuilder;
 
 /**
diff --git a/lib/internal/Magento/Framework/View/Asset/Repository.php b/lib/internal/Magento/Framework/View/Asset/Repository.php
index 654d80382f4b0..3c2a6853efd4e 100644
--- a/lib/internal/Magento/Framework/View/Asset/Repository.php
+++ b/lib/internal/Magento/Framework/View/Asset/Repository.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Framework\View\Asset;
 
-use Magento\Framework\UrlInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/View/Asset/Source.php b/lib/internal/Magento/Framework/View/Asset/Source.php
index 4afe1be4490bc..487ed24b48a88 100644
--- a/lib/internal/Magento/Framework/View/Asset/Source.php
+++ b/lib/internal/Magento/Framework/View/Asset/Source.php
@@ -7,8 +7,8 @@
 namespace Magento\Framework\View\Asset;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\View\Asset\PreProcessor\ChainFactoryInterface;
 use Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Simple;
 use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
@@ -170,7 +170,7 @@ private function preProcess(LocalInterface $asset)
      */
     public function getSourceContentType(LocalInterface $asset)
     {
-        list(,,$type) = $this->preProcess($asset);
+        list(, , $type) = $this->preProcess($asset);
         return $type;
     }
 
diff --git a/lib/internal/Magento/Framework/View/Config.php b/lib/internal/Magento/Framework/View/Config.php
index 9b334b7e9b84d..f5e5b9dfc0dd1 100644
--- a/lib/internal/Magento/Framework/View/Config.php
+++ b/lib/internal/Magento/Framework/View/Config.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\View;
 
-use Magento\Framework\View\Asset\Repository;
 use Magento\Framework\Config\ViewFactory;
+use Magento\Framework\View\Asset\Repository;
 
 /**
  * Handles theme view.xml files
diff --git a/lib/internal/Magento/Framework/View/Context.php b/lib/internal/Magento/Framework/View/Context.php
index 0c3932ffe4bd7..27adeba0dfd77 100644
--- a/lib/internal/Magento/Framework/View/Context.php
+++ b/lib/internal/Magento/Framework/View/Context.php
@@ -12,11 +12,11 @@
 use Magento\Framework\App\Request\Http as Request;
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\Event\ManagerInterface;
-use Psr\Log\LoggerInterface as Logger;
 use Magento\Framework\Session\SessionManager;
 use Magento\Framework\TranslateInterface;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\ConfigInterface as ViewConfig;
+use Psr\Log\LoggerInterface as Logger;
 
 /**
  * Application Runtime Context
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Simple.php b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Simple.php
index f4a2164e8bb48..01b518e97c210 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Simple.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Simple.php
@@ -5,10 +5,6 @@
  */
 namespace Magento\Framework\View\Design\Fallback\Rule;
 
-use Magento\Framework\Component\ComponentRegistrar;
-use Magento\Framework\Component\ComponentRegistrarInterface;
-use Magento\Framework\Module\Dir\Reader;
-
 /**
  * Class with simple substitution parameters to values
  */
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Theme.php b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Theme.php
index b1e0e117e6efd..6b52b858e984d 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Theme.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Theme.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Framework\View\Design\Fallback\Rule;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Component\ComponentRegistrarInterface;
 use Magento\Framework\View\Design\ThemeInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Fallback Rule Theme
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/RulePool.php b/lib/internal/Magento/Framework/View/Design/Fallback/RulePool.php
index 4a13ef60cb598..b99c8fee9b5c3 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/RulePool.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/RulePool.php
@@ -108,8 +108,7 @@ protected function createLocaleFileRule()
     protected function createTemplateFileRule()
     {
         return $this->modularSwitchFactory->create(
-            ['ruleNonModular' =>
-            $this->themeFactory->create(
+            ['ruleNonModular' => $this->themeFactory->create(
                 ['rule' => $this->simpleFactory->create(['pattern' => "<theme_dir>/templates"])]
             ),
             'ruleModular' => new Composite(
@@ -167,8 +166,7 @@ protected function createViewFileRule()
             ['ruleNonModular' => new Composite(
                 [
                     $this->themeFactory->create(
-                        ['rule' =>
-                        new Composite(
+                        ['rule' => new Composite(
                             [
                                 $this->simpleFactory
                                     ->create([
@@ -191,8 +189,7 @@ protected function createViewFileRule()
             'ruleModular' => new Composite(
                 [
                     $this->themeFactory->create(
-                        ['rule' =>
-                        new Composite(
+                        ['rule' => new Composite(
                             [
                                 $this->simpleFactory->create(
                                     [
@@ -245,8 +242,7 @@ protected function createEmailTemplateFileRule()
         return new Composite(
             [
                 $this->themeFactory->create(
-                    ['rule' =>
-                    $this->simpleFactory->create(
+                    ['rule' => $this->simpleFactory->create(
                         ['pattern' => "<theme_dir>/<module_name>/email"]
                     )]
                 ),
diff --git a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Alternative.php b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Alternative.php
index 0d4975b9eaff8..f630239d8dae7 100644
--- a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Alternative.php
+++ b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Alternative.php
@@ -8,7 +8,6 @@
 
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\View\Design\Fallback\Rule\RuleInterface;
-use Magento\Framework\View\Design\FileResolution\Fallback;
 
 /**
  * Resolver for view files with support of alternative extensions map
diff --git a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Simple.php b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Simple.php
index 16875a0f4bdb2..4223ebd8573b6 100644
--- a/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Simple.php
+++ b/lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Simple.php
@@ -7,7 +7,6 @@
 namespace Magento\Framework\View\Design\FileResolution\Fallback\Resolver;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\View\Design\Fallback\Rule\RuleInterface;
 use Magento\Framework\View\Design\Fallback\RulePool;
@@ -53,7 +52,6 @@ public function __construct(ReadFactory $readFactory, RulePool $rulePool)
      */
     public function resolve($type, $file, $area = null, ThemeInterface $theme = null, $locale = null, $module = null)
     {
-
         $params = ['area' => $area, 'theme' => $theme, 'locale' => $locale];
         foreach ($params as $key => $param) {
             if ($param === null) {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/ThemePackageFactory.php b/lib/internal/Magento/Framework/View/Design/Theme/ThemePackageFactory.php
index eb9b386b5be50..0d74d19346db3 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/ThemePackageFactory.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/ThemePackageFactory.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\View\Design\Theme;
 
-use Magento\Framework\View\Design\Theme\ThemePackage;
-
 /**
  * Factory for theme packages
  */
diff --git a/lib/internal/Magento/Framework/View/Element/Message/Renderer/RenderersPool.php b/lib/internal/Magento/Framework/View/Element/Message/Renderer/RenderersPool.php
index 807f509199a5b..82d04fa9cacdb 100644
--- a/lib/internal/Magento/Framework/View/Element/Message/Renderer/RenderersPool.php
+++ b/lib/internal/Magento/Framework/View/Element/Message/Renderer/RenderersPool.php
@@ -38,6 +38,6 @@ public function get($rendererCode)
     {
         return !isset($this->renderers[$rendererCode])
                 ? null
-                :$this->renderers[$rendererCode];
+                : $this->renderers[$rendererCode];
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php b/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
index 4b4e7e1bad467..d00d1cae90c68 100644
--- a/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
+++ b/lib/internal/Magento/Framework/View/Element/Template/File/Validator.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Element\Template\File;
 
-use \Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Component\ComponentRegistrar;
 
 /**
diff --git a/lib/internal/Magento/Framework/View/Element/Text/ListText.php b/lib/internal/Magento/Framework/View/Element/Text/ListText.php
index a18ed78967139..1469da3e499e7 100644
--- a/lib/internal/Magento/Framework/View/Element/Text/ListText.php
+++ b/lib/internal/Magento/Framework/View/Element/Text/ListText.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\View\Element\Text;
 
-use Magento\Framework\View\Element\Text;
-
 /**
  * Class ListText
  *
diff --git a/lib/internal/Magento/Framework/View/Element/Text/TextList/Item.php b/lib/internal/Magento/Framework/View/Element/Text/TextList/Item.php
index db0749ccbc453..dc49acf2dbcd3 100644
--- a/lib/internal/Magento/Framework/View/Element/Text/TextList/Item.php
+++ b/lib/internal/Magento/Framework/View/Element/Text/TextList/Item.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\View\Element\Text\TextList;
 
-use Magento\Framework\View\Element\Text;
-
 /**
  * Class Item
  */
diff --git a/lib/internal/Magento/Framework/View/Element/Text/TextList/Link.php b/lib/internal/Magento/Framework/View/Element/Text/TextList/Link.php
index c99d29f40b2ba..49332f60dda5c 100644
--- a/lib/internal/Magento/Framework/View/Element/Text/TextList/Link.php
+++ b/lib/internal/Magento/Framework/View/Element/Text/TextList/Link.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\View\Element\Text\TextList;
 
-use Magento\Framework\View\Element\Text;
-
 /**
  * Class Link
  */
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Argument/Interpreter/ConfigurableObject.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Argument/Interpreter/ConfigurableObject.php
index c40d26ab2f500..0e08e67074318 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Argument/Interpreter/ConfigurableObject.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Argument/Interpreter/ConfigurableObject.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\View\Element\UiComponent\Argument\Interpreter;
 
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Data\Argument\InterpreterInterface;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
  * Class ConfigurableObject
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/BlockWrapperInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/BlockWrapperInterface.php
index 0ad4810d2ad4f..736e048dfff4f 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/BlockWrapperInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/BlockWrapperInterface.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\View\Element\UiComponent;
 
-use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\View\Element\BlockInterface;
+use Magento\Framework\View\Element\UiComponentInterface;
 
 /**
  * Interface BlockWrapperInterface
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php
index 17a320164dad3..9da83abca9a86 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php
@@ -7,8 +7,8 @@
 
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\View\DesignInterface;
-use Magento\Framework\View\File\CollectorInterface;
 use Magento\Framework\View\Element\UiComponent\Config\FileCollectorInterface;
+use Magento\Framework\View\File\CollectorInterface;
 
 /**
  * Class AggregatedFileCollector
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php
index 6fd041d582495..58f97eb3cd403 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php
@@ -5,11 +5,10 @@
  */
 namespace Magento\Framework\View\Element\UiComponent\Config\Provider\Component;
 
-use Magento\Framework\Phrase;
 use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\View\Element\UiComponent\Config\Converter;
 use Magento\Framework\View\Element\UiComponent\ArrayObjectFactory;
+use Magento\Framework\View\Element\UiComponent\Config\Converter;
 use Magento\Framework\View\Element\UiComponent\Config\UiReaderInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Reader.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Reader.php
index 4d13e68b69a05..fd5991a8c3431 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Reader.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Reader.php
@@ -5,11 +5,7 @@
  */
 namespace Magento\Framework\View\Element\UiComponent\Config;
 
-use Magento\Framework\Filesystem;
 use Magento\Framework\Config\ConverterInterface;
-use Magento\Framework\Config\FileIteratorFactory;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\Directory\ReadInterface;
 
 /**
  * Class Reader
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Json.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Json.php
index 26a295c81f6cb..ee8ad941bc5c4 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Json.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Json.php
@@ -6,10 +6,10 @@
 namespace Magento\Framework\View\Element\UiComponent\ContentType;
 
 use Magento\Framework\Json\Encoder;
-use Magento\Framework\View\FileSystem;
-use Magento\Framework\View\TemplateEnginePool;
 use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Framework\View\FileSystem;
 use Magento\Framework\View\Layout\Generator\Structure;
+use Magento\Framework\View\TemplateEnginePool;
 
 /**
  * Class Json
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Xml.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Xml.php
index 98e966daef918..fd1dde9c330d9 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Xml.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ContentType/Xml.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\View\Element\UiComponent\ContentType;
 
-use Magento\Framework\Xml\Generator;
+use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\View\FileSystem;
 use Magento\Framework\View\TemplateEnginePool;
-use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Framework\Xml\Generator;
 
 /**
  * Class Xml
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/ContextInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/ContextInterface.php
index fca2abeb3ea45..917912ecd02c7 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/ContextInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/ContextInterface.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Framework\View\Element\UiComponent;
 
-use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\View\Element\UiComponent\ContentType\ContentTypeInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
-use Magento\Framework\View\LayoutInterface as PageLayoutInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Framework\View\LayoutInterface as PageLayoutInterface;
 
 /**
  * Interface ContextInterface
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProviderInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProviderInterface.php
index 9f3121f4e495d..fbce73ce6b95d 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProviderInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProviderInterface.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Framework\View\Element\UiComponent\DataProvider;
 
-use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
-
 /**
  * Interface DataProviderInterface
  *
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Document.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Document.php
index 1562f879ec6b6..62c8071288bbc 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Document.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/Document.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\View\Element\UiComponent\DataProvider;
 
+use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\Search\DocumentInterface;
 use Magento\Framework\DataObject;
-use Magento\Framework\Api\AttributeValueFactory;
 
 /**
  * Class Document
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterPool.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterPool.php
index 24ea542649875..8ea6ed9301714 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterPool.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterPool.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\View\Element\UiComponent\DataProvider;
 
-use Magento\Framework\Data\Collection;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
+use Magento\Framework\Data\Collection;
 
 /**
  * Class FilterPool
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
index e7cbc5000d337..69a4b639e6c91 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FulltextFilter.php
@@ -6,9 +6,9 @@
 
 namespace Magento\Framework\View\Element\UiComponent\DataProvider;
 
+use Magento\Framework\Api\Filter;
 use Magento\Framework\Data\Collection;
 use Magento\Framework\Data\Collection\AbstractDb;
-use Magento\Framework\Api\Filter;
 
 /**
  * Class Fulltext
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/RegularFilter.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/RegularFilter.php
index bcae4dd89cbe9..dbc1bfb4c4b31 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/RegularFilter.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/RegularFilter.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\View\Element\UiComponent\DataProvider;
 
-use Magento\Framework\Data\Collection;
 use Magento\Framework\Api\Filter;
+use Magento\Framework\Data\Collection;
 
 /**
  * Class RegularFilter
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/SearchResult.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/SearchResult.php
index e1aa6a0605dab..1e8ff14c0417f 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/SearchResult.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/SearchResult.php
@@ -7,13 +7,13 @@
 namespace Magento\Framework\View\Element\UiComponent\DataProvider;
 
 use Magento\Framework\Api;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
 use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
 use Magento\Framework\Event\ManagerInterface as EventManager;
 use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
 use Psr\Log\LoggerInterface as Logger;
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Class SearchResult
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
index 93fe88a30f065..5ad6bca14c42e 100755
--- a/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
@@ -7,14 +7,14 @@
 
 use Magento\Framework\Config\DataInterface;
 use Magento\Framework\Config\DataInterfaceFactory;
+use Magento\Framework\Data\Argument\InterpreterInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Data\Argument\InterpreterInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\Phrase;
 use Magento\Framework\View\Element\UiComponent\Config\ManagerInterface;
 use Magento\Framework\View\Element\UiComponent\ContextFactory;
-use Magento\Framework\Phrase;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
 use Magento\Framework\View\Element\UiComponent\Factory\ComponentFactoryInterface;
 
@@ -148,9 +148,9 @@ protected function createChildComponent(
         $components = array_filter($components);
         $componentArguments['components'] = $components;
 
-       /**
-        * Prevent passing ACL restricted blocks to htmlContent constructor
-        */
+        /**
+         * Prevent passing ACL restricted blocks to htmlContent constructor
+         */
         if (isset($componentArguments['block']) && !$componentArguments['block']) {
             return null;
         }
diff --git a/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php b/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php
index 34f32b2f6b7b2..4fd615a8ec15b 100644
--- a/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php
+++ b/lib/internal/Magento/Framework/View/File/Collector/Decorator/ModuleOutput.php
@@ -8,7 +8,6 @@
 
 use Magento\Framework\Module\Manager;
 use Magento\Framework\View\Design\ThemeInterface;
-use Magento\Framework\View\File;
 use Magento\Framework\View\File\CollectorInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/View/File/Collector/Override/Base.php b/lib/internal/Magento/Framework/View/File/Collector/Override/Base.php
index b0e3903b21c05..aa635898e4f11 100644
--- a/lib/internal/Magento/Framework/View/File/Collector/Override/Base.php
+++ b/lib/internal/Magento/Framework/View/File/Collector/Override/Base.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Component\ComponentRegistrarInterface;
-use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\File\CollectorInterface;
diff --git a/lib/internal/Magento/Framework/View/File/Collector/Override/ThemeModular.php b/lib/internal/Magento/Framework/View/File/Collector/Override/ThemeModular.php
index 0be91956be84c..5b5c90c1e8cc3 100644
--- a/lib/internal/Magento/Framework/View/File/Collector/Override/ThemeModular.php
+++ b/lib/internal/Magento/Framework/View/File/Collector/Override/ThemeModular.php
@@ -7,12 +7,12 @@
 
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Component\ComponentRegistrarInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\View\Design\ThemeInterface;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\View\File\CollectorInterface;
-use Magento\Framework\View\Helper\PathPattern;
 use Magento\Framework\View\File\Factory as FileFactory;
+use Magento\Framework\View\Helper\PathPattern;
 
 /**
  * Source of view files that explicitly override modular files of ancestor themes
diff --git a/lib/internal/Magento/Framework/View/File/Collector/Theme.php b/lib/internal/Magento/Framework/View/File/Collector/Theme.php
index 000142ea1ebe3..d23dbe0b52fc4 100644
--- a/lib/internal/Magento/Framework/View/File/Collector/Theme.php
+++ b/lib/internal/Magento/Framework/View/File/Collector/Theme.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Component\ComponentRegistrarInterface;
-use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\File\CollectorInterface;
diff --git a/lib/internal/Magento/Framework/View/Layout/BuilderFactory.php b/lib/internal/Magento/Framework/View/Layout/BuilderFactory.php
index cc8734206f68e..d8a293db02a04 100644
--- a/lib/internal/Magento/Framework/View/Layout/BuilderFactory.php
+++ b/lib/internal/Magento/Framework/View/Layout/BuilderFactory.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\View\Layout;
 
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\View;
 
 /**
  * Class BuilderFactory
diff --git a/lib/internal/Magento/Framework/View/Layout/ConfigCondition.php b/lib/internal/Magento/Framework/View/Layout/ConfigCondition.php
index 4c8be89fada54..0f6a2f5d69e62 100644
--- a/lib/internal/Magento/Framework/View/Layout/ConfigCondition.php
+++ b/lib/internal/Magento/Framework/View/Layout/ConfigCondition.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\View\Layout;
 
-use Magento\Framework\View\Layout\Condition\VisibilityConditionInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\View\Layout\Condition\VisibilityConditionInterface;
 
 /**
  * Check that config flag is set to true,
diff --git a/lib/internal/Magento/Framework/View/Layout/Data/Structure.php b/lib/internal/Magento/Framework/View/Layout/Data/Structure.php
index d9aa739fb04f9..9a574d9374d62 100644
--- a/lib/internal/Magento/Framework/View/Layout/Data/Structure.php
+++ b/lib/internal/Magento/Framework/View/Layout/Data/Structure.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\View\Layout\Data;
 
-use Magento\Framework\Data\Structure as DataStructure;
 use Magento\Framework\App\State;
+use Magento\Framework\Data\Structure as DataStructure;
 
 /**
  * An associative data structure, that features "nested set" parent-child relations
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
index e995b2c20a6ab..063d2cb14a595 100755
--- a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
@@ -222,7 +222,7 @@ protected function generateBlock(
 
         // create block
         $className = isset($attributes['class']) && !empty($attributes['class']) ?
-            $attributes['class'] : $this->defaultClass ;
+            $attributes['class'] : $this->defaultClass;
         $block = $this->createBlock($className, $elementName, [
             'data' => $this->evaluateArguments($data['arguments'])
         ]);
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Structure.php b/lib/internal/Magento/Framework/View/Layout/Generator/Structure.php
index fcd1116bf58a0..ca49d978da82c 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/Structure.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Structure.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\View\Layout\Generator;
 
-use Magento\Framework\View\Layout\Pool as LayoutPool;
-use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\View\Element\UiComponent\LayoutInterface;
+use Magento\Framework\View\Element\UiComponentInterface;
+use Magento\Framework\View\Layout\Pool as LayoutPool;
 
 /**
  * Class Structure
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php b/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php
index b82e79806acf9..7f6e742694edd 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/UiComponent.php
@@ -6,15 +6,15 @@
 namespace Magento\Framework\View\Layout\Generator;
 
 use Magento\Framework\View\Element\BlockFactory;
+use Magento\Framework\View\Element\UiComponent\ContainerInterface;
+use Magento\Framework\View\Element\UiComponent\ContextFactory as UiComponentContextFactory;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\View\Layout\Data\Structure as DataStructure;
 use Magento\Framework\View\Layout\Element;
+use Magento\Framework\View\Layout\Generator\Context as GeneratorContext;
 use Magento\Framework\View\Layout\GeneratorInterface;
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ContainerInterface;
 use Magento\Framework\View\Layout\Reader\Context as ReaderContext;
-use Magento\Framework\View\Layout\Generator\Context as GeneratorContext;
-use Magento\Framework\View\Element\UiComponent\ContextFactory as UiComponentContextFactory;
 use Magento\Framework\View\LayoutInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/View/Layout/Generic.php b/lib/internal/Magento/Framework/View/Layout/Generic.php
index b83545ff3c439..5cca697d29afc 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generic.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generic.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Framework\View\Layout;
 
-use Magento\Framework\View\Element\UiComponent\DataSourceInterface;
 use Magento\Framework\View\Element\UiComponent\BlockWrapperInterface;
+use Magento\Framework\View\Element\UiComponent\DataSourceInterface;
 use Magento\Framework\View\Element\UiComponent\LayoutInterface;
-use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Framework\View\Element\UiComponentInterface;
 
 /**
  * Class Generic
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/Block.php b/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
index ff20eb339c318..9499888d12a68 100755
--- a/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
+++ b/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
@@ -8,8 +8,8 @@
 use Magento\Framework\Data\Argument\InterpreterInterface;
 use Magento\Framework\View\Layout;
 use Magento\Framework\View\Layout\Element;
-use Magento\Framework\View\Layout\ScheduledStructure;
 use Magento\Framework\View\Layout\Reader\Visibility\Condition;
+use Magento\Framework\View\Layout\ScheduledStructure;
 
 /**
  * Block structure reader
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/UiComponent.php b/lib/internal/Magento/Framework/View/Layout/Reader/UiComponent.php
index 3d2bee67229cd..04b5544d5d892 100644
--- a/lib/internal/Magento/Framework/View/Layout/Reader/UiComponent.php
+++ b/lib/internal/Magento/Framework/View/Layout/Reader/UiComponent.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Framework\View\Layout\Reader;
 
-use Magento\Framework\View\Layout\ScheduledStructure\Helper;
-use Magento\Framework\View\Layout\ReaderInterface;
+use Magento\Framework\Config\DataInterfaceFactory;
 use Magento\Framework\View\Layout\Element;
 use Magento\Framework\View\Layout\Reader\Visibility\Condition;
+use Magento\Framework\View\Layout\ReaderInterface;
 use Magento\Framework\View\Layout\ReaderPool;
-use Magento\Framework\Config\DataInterfaceFactory;
+use Magento\Framework\View\Layout\ScheduledStructure\Helper;
 
 /**
  * Class UiComponent
diff --git a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php
index 5319d21048acb..d754aed485959 100644
--- a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php
+++ b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure/Helper.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\View\Layout\ScheduledStructure;
 
-use Magento\Framework\View\Layout;
 use Magento\Framework\App\State;
+use Magento\Framework\View\Layout;
 
 class Helper
 {
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php b/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
index 637d773ddde45..5e79aaaa28bd2 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\View\Page\Config\Generator;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Layout;
 use Magento\Framework\View\Page\Config\Structure;
-use Magento\Framework\App\ObjectManager;
 
 class Head implements Layout\GeneratorInterface
 {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml.php
index 923e249649574..87faced8c9f06 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml.php
@@ -6,13 +6,13 @@
 namespace Magento\Framework\View\TemplateEngine;
 
 use Magento\Framework\View\Element\BlockInterface;
-use Magento\Framework\View\TemplateEngineInterface;
-use Magento\Framework\View\TemplateEngine\Xhtml\Template;
+use Magento\Framework\View\Element\UiComponent\Config\Provider\Template as TemplateProvider;
+use Magento\Framework\View\TemplateEngine\Xhtml\CompilerFactory;
 use Magento\Framework\View\TemplateEngine\Xhtml\ResultFactory;
 use Magento\Framework\View\TemplateEngine\Xhtml\ResultInterface;
-use Magento\Framework\View\TemplateEngine\Xhtml\CompilerFactory;
+use Magento\Framework\View\TemplateEngine\Xhtml\Template;
 use Magento\Framework\View\TemplateEngine\Xhtml\TemplateFactory;
-use Magento\Framework\View\Element\UiComponent\Config\Provider\Template as TemplateProvider;
+use Magento\Framework\View\TemplateEngineInterface;
 
 /**
  * Class Xhtml
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerFactory.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerFactory.php
index 5d251a278ccdc..d67f42b6069d0 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerFactory.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerFactory.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\View\TemplateEngine\Xhtml;
 
-use Magento\Framework\Phrase;
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Phrase;
 
 /**
  * Class CompilerFactory
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/ResultFactory.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/ResultFactory.php
index c0e56a4844840..0be08fe0fadc2 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/ResultFactory.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/ResultFactory.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\View\TemplateEngine\Xhtml;
 
-use Magento\Framework\Phrase;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Phrase;
 
 /**
  * Class ResultFactory
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/TemplateFactory.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/TemplateFactory.php
index cd372399fcbc0..8513dbbaf7a4b 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/TemplateFactory.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/TemplateFactory.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\View\TemplateEngine\Xhtml;
 
-use Magento\Framework\Phrase;
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Phrase;
 
 /**
  * Class TemplateFactory
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/ConfigTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/ConfigTest.php
index 2d6f8843e55fb..eea39c6ff2ca1 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/ConfigTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/ConfigTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\View\Test\Unit\Asset;
 
-use Magento\Framework\App\State;
 use Magento\Framework\View\Asset\Config;
 use Magento\Store\Model\ScopeInterface;
 
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/LockerProcessTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/LockerProcessTest.php
index aba3ff1099cc0..b393c3e30e3f0 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/LockerProcessTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/LockerProcessTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Framework\View\Test\Unit\Asset;
 
-use Magento\Framework\Filesystem;
-use Magento\Framework\View\Asset\LockerProcess;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\App\State;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Asset\LockerProcess;
 
 /**
  * Class LockerProcessTest
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeServiceTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeServiceTest.php
index c4b7cefcfa7c2..1289f599c1764 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeServiceTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeServiceTest.php
@@ -10,9 +10,9 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Asset\AssetInterface;
+use Magento\Framework\View\Asset\ConfigInterface;
 use Magento\Framework\View\Asset\Merged;
 use Magento\Framework\View\Asset\MergeService;
-use Magento\Framework\View\Asset\ConfigInterface;
 use Magento\Framework\View\Asset\MergeStrategy\Checksum;
 use Magento\Framework\View\Asset\MergeStrategy\FileExists;
 
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/ChecksumTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/ChecksumTest.php
index d01a400ebfc52..7692e6613b250 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/ChecksumTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/ChecksumTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\View\Test\Unit\Asset\MergeStrategy;
 
-use \Magento\Framework\View\Asset\MergeStrategy\Checksum;
-
 use Magento\Framework\App\Filesystem\DirectoryList;
+
+use Magento\Framework\View\Asset\MergeStrategy\Checksum;
 use Magento\Framework\View\Asset\Source;
 
 class ChecksumTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/DirectTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/DirectTest.php
index 823ad5c8c8be7..00737d3e4586f 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/DirectTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/DirectTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\View\Test\Unit\Asset\MergeStrategy;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
-use \Magento\Framework\View\Asset\MergeStrategy\Direct;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\View\Asset\MergeStrategy\Direct;
 
 class DirectTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/FileExistsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/FileExistsTest.php
index d36afaad44fc2..4b11a1f03eef1 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/FileExistsTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergeStrategy/FileExistsTest.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Framework\View\Test\Unit\Asset\MergeStrategy;
 
-use \Magento\Framework\View\Asset\MergeStrategy\FileExists;
-
 use Magento\Framework\App\Filesystem\DirectoryList;
 
+use Magento\Framework\View\Asset\MergeStrategy\FileExists;
+
 class FileExistsTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php
index 164a2ca4d4d1b..479cf5028625c 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MergedTest.php
@@ -7,11 +7,11 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Asset\File;
-use Magento\Framework\View\Asset\Merged;
-use Psr\Log\LoggerInterface;
-use Magento\Framework\View\Asset\Repository as AssetRepository;
 use Magento\Framework\View\Asset\MergeableInterface;
+use Magento\Framework\View\Asset\Merged;
 use Magento\Framework\View\Asset\MergeStrategyInterface;
+use Magento\Framework\View\Asset\Repository as AssetRepository;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class MergedTest
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/NotationResolver/VariableTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/NotationResolver/VariableTest.php
index 5fc3c0a38e899..0eb518937cb8c 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/NotationResolver/VariableTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/NotationResolver/VariableTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\View\Test\Unit\Asset\NotationResolver;
 
-use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Asset\File\FallbackContext;
 use Magento\Framework\View\Asset\NotationResolver\Variable;
 use Magento\Framework\View\Asset\Repository;
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/AlternativeSourceTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/AlternativeSourceTest.php
index 4f44e9b165c20..8eafc7097cce6 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/AlternativeSourceTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/AlternativeSourceTest.php
@@ -5,18 +5,17 @@
  */
 namespace Magento\Framework\View\Test\Unit\Asset\PreProcessor;
 
-use Magento\Framework\Filesystem;
-use Magento\Framework\View\Asset\File;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\View\Asset\LocalInterface;
-use Magento\Framework\View\Asset\PreProcessor\Chain;
+use Magento\Framework\View\Asset\ContentProcessorInterface;
+use Magento\Framework\View\Asset\File;
 use Magento\Framework\View\Asset\File\FallbackContext;
+use Magento\Framework\View\Asset\LocalInterface;
 use Magento\Framework\View\Asset\LockerProcessInterface;
-use Magento\Framework\View\Asset\ContentProcessorInterface;
 use Magento\Framework\View\Asset\PreProcessor\AlternativeSource;
+use Magento\Framework\View\Asset\PreProcessor\AlternativeSource\AssetBuilder;
+use Magento\Framework\View\Asset\PreProcessor\Chain;
 use Magento\Framework\View\Asset\PreProcessor\FilenameResolverInterface;
 use Magento\Framework\View\Asset\PreProcessor\Helper\SortInterface;
-use Magento\Framework\View\Asset\PreProcessor\AlternativeSource\AssetBuilder;
 
 /**
  * Class AlternativeSourceTest
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/PoolTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/PoolTest.php
index 5e035d4a62ab8..17e6ad116e5dc 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/PoolTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/PreProcessor/PoolTest.php
@@ -7,10 +7,10 @@
 namespace Magento\Framework\View\Test\Unit\Asset\PreProcessor;
 
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\View\Asset\PreProcessor\Pool;
 use Magento\Framework\View\Asset\PreProcessor\Chain;
-use Magento\Framework\View\Asset\PreProcessorInterface;
 use Magento\Framework\View\Asset\PreProcessor\Helper\SortInterface;
+use Magento\Framework\View\Asset\PreProcessor\Pool;
+use Magento\Framework\View\Asset\PreProcessorInterface;
 
 /**
  * Class PoolTest
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/SourceTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/SourceTest.php
index fe48deac34248..0651c335e32eb 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/SourceTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/SourceTest.php
@@ -11,8 +11,8 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem\DriverPool;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\View\Asset\PreProcessor\ChainFactoryInterface;
 use Magento\Framework\View\Asset\PreProcessor\Chain;
+use Magento\Framework\View\Asset\PreProcessor\ChainFactoryInterface;
 use Magento\Framework\View\Asset\Source;
 use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
 
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/BlockPoolTest.php b/lib/internal/Magento/Framework/View/Test/Unit/BlockPoolTest.php
index 7b4d9b791cf88..93b98def7cc36 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/BlockPoolTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/BlockPoolTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Framework\View\Test\Unit;
 
-use \Magento\Framework\View\BlockPool;
+use Magento\Framework\View\BlockPool;
 
 /**
  * Test for view BlockPool model
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/ContextTest.php b/lib/internal/Magento/Framework/View/Test/Unit/ContextTest.php
index 923ec2ff322b5..bd8c27c5f1dc5 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/ContextTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/ContextTest.php
@@ -9,7 +9,7 @@
  */
 namespace Magento\Framework\View\Test\Unit;
 
-use \Magento\Framework\View\Context;
+use Magento\Framework\View\Context;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/DataSourcePoolTest.php b/lib/internal/Magento/Framework/View/Test/Unit/DataSourcePoolTest.php
index 52e055f11b8a2..76ac05e7d0b00 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/DataSourcePoolTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/DataSourcePoolTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Framework\View\Test\Unit;
 
-use \Magento\Framework\View\DataSourcePool;
+use Magento\Framework\View\DataSourcePool;
 
 /**
  * Test for view Context model
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/CompositeTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/CompositeTest.php
index 1685fadf7da30..e8f8279295da2 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/CompositeTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/CompositeTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Design\Fallback\Rule;
 
-use \Magento\Framework\View\Design\Fallback\Rule\Composite;
+use Magento\Framework\View\Design\Fallback\Rule\Composite;
 
 /**
  * Composite Test
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/ModularSwitchTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/ModularSwitchTest.php
index 8a5ed8d215347..66e70089fa388 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/ModularSwitchTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/ModularSwitchTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Design\Fallback\Rule;
 
-use \Magento\Framework\View\Design\Fallback\Rule\ModularSwitch;
+use Magento\Framework\View\Design\Fallback\Rule\ModularSwitch;
 
 class ModularSwitchTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/ModuleTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/ModuleTest.php
index a98bef59d0e07..9e164812eb1b0 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/ModuleTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/ModuleTest.php
@@ -7,7 +7,7 @@
 
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Component\ComponentRegistrarInterface;
-use \Magento\Framework\View\Design\Fallback\Rule\Module;
+use Magento\Framework\View\Design\Fallback\Rule\Module;
 use Magento\Framework\View\Design\Fallback\Rule\RuleInterface;
 
 class ModuleTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/SimpleTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/SimpleTest.php
index 06dda0185a608..6aaa9377832b3 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/SimpleTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/SimpleTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Design\Fallback\Rule;
 
-use \Magento\Framework\View\Design\Fallback\Rule\Simple;
+use Magento\Framework\View\Design\Fallback\Rule\Simple;
 
 /**
  * Simple Test
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/ThemeTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/ThemeTest.php
index bd1780b93abfa..d825e3e759a8b 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/ThemeTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/Rule/ThemeTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Framework\View\Test\Unit\Design\Fallback\Rule;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Component\ComponentRegistrarInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Design\Fallback\Rule\RuleInterface;
 use Magento\Framework\View\Design\Fallback\Rule\Theme;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class ThemeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/RulePoolTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/RulePoolTest.php
index 4a6dde82c6b5c..ec1b02e075074 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/RulePoolTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Fallback/RulePoolTest.php
@@ -6,8 +6,7 @@
 
 namespace Magento\Framework\View\Test\Unit\Design\Fallback;
 
-use \Magento\Framework\View\Design\Fallback\RulePool;
-use Magento\Framework\Filesystem;
+use Magento\Framework\View\Design\Fallback\RulePool;
 
 class RulePoolTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/FileTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/FileTest.php
index d9da7db69bd9e..92b697f576807 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/FileTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/FileTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Framework\View\Test\Unit\Design\FileResolution\Fallback;
 
-use \Magento\Framework\View\Design\FileResolution\Fallback\File;
-
 use Magento\Framework\View\Design\Fallback\RulePool;
 
+use Magento\Framework\View\Design\FileResolution\Fallback\File;
+
 class FileTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/LocaleFileTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/LocaleFileTest.php
index f880632ddfde2..402c02599879f 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/LocaleFileTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/LocaleFileTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Framework\View\Test\Unit\Design\FileResolution\Fallback;
 
-use \Magento\Framework\View\Design\FileResolution\Fallback\LocaleFile;
-
 use Magento\Framework\View\Design\Fallback\RulePool;
 
+use Magento\Framework\View\Design\FileResolution\Fallback\LocaleFile;
+
 class LocaleFileTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/AlternativeTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/AlternativeTest.php
index 2cf6ff6bdadf1..9a8792ae9f1d2 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/AlternativeTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/AlternativeTest.php
@@ -8,9 +8,7 @@
 
 namespace Magento\Framework\View\Test\Unit\Design\FileResolution\Fallback\Resolver;
 
-use \Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Alternative;
-
-use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Alternative;
 
 class AlternativeTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/SimpleTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/SimpleTest.php
index 1f85a2913aa2f..08cc2dc6d90f0 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/SimpleTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/SimpleTest.php
@@ -6,13 +6,13 @@
 
 namespace Magento\Framework\View\Test\Unit\Design\FileResolution\Fallback\Resolver;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\Framework\Filesystem\DriverPool;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Design\Fallback\RulePool;
-use \Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Simple;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Simple;
 
 class SimpleTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/StaticFileTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/StaticFileTest.php
index e3e7609f0166b..b2d2edfc0bab5 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/StaticFileTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/StaticFileTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Framework\View\Test\Unit\Design\FileResolution\Fallback;
 
-use \Magento\Framework\View\Design\FileResolution\Fallback\StaticFile;
-
 use Magento\Framework\View\Design\Fallback\RulePool;
 
+use Magento\Framework\View\Design\FileResolution\Fallback\StaticFile;
+
 class StaticFileTest extends \PHPUnit\Framework\TestCase
 {
     /**
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/TemplateFileTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/TemplateFileTest.php
index 478a8a4d214e0..4637122a9adbf 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/TemplateFileTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/TemplateFileTest.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\App\State;
 use Magento\Framework\View\Design\Fallback\RulePool;
-use Magento\Framework\View\Design\FileResolution\Fallback\TemplateFile;
 use Magento\Framework\View\Design\FileResolution\Fallback\ResolverInterface;
+use Magento\Framework\View\Design\FileResolution\Fallback\TemplateFile;
 
 class TemplateFileTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/CustomizationTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/CustomizationTest.php
index 9f0f4a33f2e74..e1423ca9b4155 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/CustomizationTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/CustomizationTest.php
@@ -9,7 +9,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Design\Theme;
 
-use \Magento\Framework\View\Design\Theme\Customization;
+use Magento\Framework\View\Design\Theme\Customization;
 
 class CustomizationTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/FlyweightFactoryTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/FlyweightFactoryTest.php
index ec3ae72a12a6e..d645ec5f3a877 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/FlyweightFactoryTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Design/Theme/FlyweightFactoryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Design\Theme;
 
-use \Magento\Framework\View\Design\Theme\FlyweightFactory;
+use Magento\Framework\View\Design\Theme\FlyweightFactory;
 
 class FlyweightFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
index 710b42af3e23f..70a8ffab91adf 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/AbstractBlockTest.php
@@ -8,16 +8,16 @@
 
 namespace Magento\Framework\View\Test\Unit\Element;
 
-use Magento\Framework\View\Element\AbstractBlock;
-use Magento\Framework\View\Element\Context;
-use Magento\Framework\Config\View;
-use Magento\Framework\View\ConfigInterface;
-use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Cache\StateInterface as CacheStateInterface;
 use Magento\Framework\App\CacheInterface;
-use Magento\Framework\Session\SidResolverInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Config\View;
+use Magento\Framework\Event\ManagerInterface as EventManagerInterface;
 use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Framework\Session\SidResolverInterface;
+use Magento\Framework\View\ConfigInterface;
+use Magento\Framework\View\Element\AbstractBlock;
+use Magento\Framework\View\Element\Context;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/CalendarTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/CalendarTest.php
index a2a96ac9f2699..11dca32051013 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/CalendarTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/CalendarTest.php
@@ -10,7 +10,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\Html\Calendar;
 use Magento\Framework\View\Element\Template\Context;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * @see Calendar
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinksTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinksTest.php
index 7fc84baad5288..56fbb4fe3aa9a 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinksTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinksTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\View\Test\Unit\Element\Html;
 
-use Magento\Framework\View\Element\Html\Links;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Element\Html\Links;
 use Magento\Framework\View\Element\Template\Context;
 
 class LinksTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/SelectTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/SelectTest.php
index 1a46ba46c0a8e..18024b9e78bac 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/SelectTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/SelectTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\View\Test\Unit\Element\Html;
 
-use \Magento\Framework\View\Element\Html\Select;
 use Magento\Framework\Escaper;
+use Magento\Framework\View\Element\Html\Select;
 
 class SelectTest extends \PHPUnit\Framework\TestCase
 {
@@ -172,13 +172,13 @@ public function testGetHtml()
         $this->select->setValue($selectedValues);
 
         $result = '<select name="testName" id="testId" class="testClass" title="testTitle" >'
-            .   '<option value="testValue"  paramKey="paramValue" >testLabel</option>'
-            .   '<option value="selectedValue" selected="selected"  paramKey="paramValue" '
-            .       ' paramKey2="paramValue2" >selectedLabel</option>'
-            .   '<optgroup label="groupLabel" data-optgroup-name="groupLabel">'
-            .       '<option value="groupElementValue" >GroupElementLabel</option>'
-            .       '<option value="selectedGroupElementValue" selected="selected" >SelectedGroupElementLabel</option>'
-            .   '</optgroup>'
+            . '<option value="testValue"  paramKey="paramValue" >testLabel</option>'
+            . '<option value="selectedValue" selected="selected"  paramKey="paramValue" '
+            . ' paramKey2="paramValue2" >selectedLabel</option>'
+            . '<optgroup label="groupLabel" data-optgroup-name="groupLabel">'
+            . '<option value="groupElementValue" >GroupElementLabel</option>'
+            . '<option value="selectedGroupElementValue" selected="selected" >SelectedGroupElementLabel</option>'
+            . '</optgroup>'
             . '</select>';
 
         $this->assertEquals($result, $this->select->getHtml());
@@ -199,12 +199,12 @@ public function testGetHtmlEscapes()
         ];
 
         $expectedResult = '<select name="test[name]" id="testId" class="test class" title="ESCAPED" >'
-            .   '<option value="ESCAPED"  paramKey="ESCAPED" >ESCAPED</option>'
-            .   '<option value="ESCAPED" selected="selected" >ESCAPED</option>'
-            .   '<optgroup label="ESCAPED" data-optgroup-name="ESCAPED">'
-            .       '<option value="ESCAPED" >ESCAPED</option>'
-            .       '<option value="ESCAPED" selected="selected" >ESCAPED</option>'
-            .   '</optgroup>'
+            . '<option value="ESCAPED"  paramKey="ESCAPED" >ESCAPED</option>'
+            . '<option value="ESCAPED" selected="selected" >ESCAPED</option>'
+            . '<optgroup label="ESCAPED" data-optgroup-name="ESCAPED">'
+            . '<option value="ESCAPED" >ESCAPED</option>'
+            . '<option value="ESCAPED" selected="selected" >ESCAPED</option>'
+            . '</optgroup>'
             . '</select>';
 
         foreach ($optionsSets as $inOptions) {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/MessageConfigurationsPoolTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/MessageConfigurationsPoolTest.php
index 1330f0563fc71..e21013340874f 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/MessageConfigurationsPoolTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/MessageConfigurationsPoolTest.php
@@ -54,7 +54,7 @@ public function wrongRenderersDataProvider()
         return [
             [['message_identifier' => []]],
             [['message_identifier' => ['renderer' => 5]]],
-            [['message_identifier' => ['renderer' => new \StdClass]]],
+            [['message_identifier' => ['renderer' => new \StdClass()]]],
         ];
     }
 
@@ -80,14 +80,12 @@ public function wrongDataDataProvider()
         return [
             [
                 [
-                    'message_identifier' =>
-                        ['renderer' => 'RendererCode', 'data' => 5]
+                    'message_identifier' => ['renderer' => 'RendererCode', 'data' => 5]
                 ]
             ],
             [
                 [
-                    'message_identifier' =>
-                        ['renderer' => 'RendererCode', 'data' => new \StdClass]
+                    'message_identifier' => ['renderer' => 'RendererCode', 'data' => new \StdClass()]
                 ]
             ],
         ];
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php
index 57fefe4660cb2..bcc6a0c28f561 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php
@@ -10,11 +10,10 @@
 namespace Magento\Framework\View\Test\Unit\Element;
 
 use Magento\Framework\Message\Manager;
+use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
-use \Magento\Framework\View\Element\Messages;
 
-use Magento\Framework\Message\ManagerInterface;
-use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\View\Element\Messages;
 
 class MessagesTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php
index 28d58f4685e80..16e761e80a7a8 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Template/File/ValidatorTest.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Framework\View\Test\Unit\Element\Template\File;
 
-use \Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Component\ComponentRegistrar;
-use \Magento\Framework\Filesystem\DriverPool;
+use Magento\Framework\Filesystem\DriverPool;
 
 /**
  * Class ValidatorTest
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/ItemTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/ItemTest.php
index b2b1db44d6a0b..b37c8cf7cc6f4 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/ItemTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/ItemTest.php
@@ -9,7 +9,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Element\Text\TextList;
 
-use \Magento\Framework\View\Element\Text\TextList\Item;
+use Magento\Framework\View\Element\Text\TextList\Item;
 
 class ItemTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/LinkTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/LinkTest.php
index 785c41c1d6e2f..ac0fb2e3ca2e4 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/LinkTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Text/TextList/LinkTest.php
@@ -9,7 +9,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Element\Text\TextList;
 
-use \Magento\Framework\View\Element\Text\TextList\Link;
+use Magento\Framework\View\Element\Text\TextList\Link;
 
 class LinkTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php
index b7301c4cad5d4..26d68d757943e 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ContextTest.php
@@ -9,8 +9,8 @@
  */
 namespace Magento\Framework\View\Test\Unit\Element\UiComponent;
 
-use Magento\Framework\View\Element\UiComponent\Context;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\View\Element\UiComponent\Context;
 
 class ContextTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/Control/DummyButtonTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/Control/DummyButtonTest.php
index 1a495814b3d62..7208e5fb7529d 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/Control/DummyButtonTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/Control/DummyButtonTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\View\Test\Unit\Element\UiComponent\Control;
 
-use Magento\Framework\View\Element\UiComponent\Control\DummyButton;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\View\Element\UiComponent\Control\DummyButton;
 
 /**
  * Class DummyButtonTest
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/DataProvider/FulltextFilterTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/DataProvider/FulltextFilterTest.php
index 72c08b5a625d8..b99d7be5f5d49 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/DataProvider/FulltextFilterTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/DataProvider/FulltextFilterTest.php
@@ -9,18 +9,18 @@
  */
 namespace Magento\Framework\View\Test\Unit\Element\UiComponent\DataProvider;
 
+use Magento\Framework\Api\Filter;
 use Magento\Framework\Data\Collection\AbstractDb as CollectionAbstractDb;
-use Magento\Framework\View\Element\UiComponent\DataProvider\FulltextFilter;
-use Magento\Framework\Data\Collection\EntityFactoryInterface;
-use Psr\Log\LoggerInterface;
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\DB\Select;
 use Magento\Framework\Data\Collection\EntityFactory;
+use Magento\Framework\Data\Collection\EntityFactoryInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
-use Magento\Framework\Api\Filter;
+use Magento\Framework\DB\Select;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb as ResourceModelAbstractDb;
 use Magento\Framework\Mview\View\Collection as MviewCollection;
+use Magento\Framework\View\Element\UiComponent\DataProvider\FulltextFilter;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class FulltextFilterTest
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ProcessorTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ProcessorTest.php
index c82387d334b5c..9942f1cab0b14 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ProcessorTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/UiComponent/ProcessorTest.php
@@ -9,9 +9,9 @@
  */
 namespace Magento\Framework\View\Test\Unit\Element\UiComponent;
 
+use Magento\Framework\View\Element\UiComponent\ObserverInterface;
 use Magento\Framework\View\Element\UiComponent\Processor;
 use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ObserverInterface;
 
 class ProcessorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/BaseTest.php b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/BaseTest.php
index 0524b38546ae0..d3e789cd8a509 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/BaseTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/Override/BaseTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Framework\View\Test\Unit\File\Collector\Override;
 
 use Magento\Framework\Component\ComponentRegistrar;
-use Magento\Framework\View\File\Collector\Override\Base;
 use Magento\Framework\Filesystem\Directory\Read;
+use Magento\Framework\View\File\Collector\Override\Base;
 use Magento\Framework\View\File\Factory;
 
 class BaseTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/ThemeModularTest.php b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/ThemeModularTest.php
index 49178c8f72a15..658c9faa4d47f 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/ThemeModularTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/ThemeModularTest.php
@@ -6,8 +6,8 @@
 namespace Magento\Framework\View\Test\Unit\File\Collector;
 
 use Magento\Framework\Component\ComponentRegistrar;
-use Magento\Framework\View\File\Collector\ThemeModular;
 use Magento\Framework\Filesystem\Directory\Read;
+use Magento\Framework\View\File\Collector\ThemeModular;
 use Magento\Framework\View\File\Factory;
 
 class ThemeModularTest extends \PHPUnit\Framework\TestCase
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/File/FileList/CollatorTest.php b/lib/internal/Magento/Framework/View/Test/Unit/File/FileList/CollatorTest.php
index 923304a7997fd..c16d8d6a471d6 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/File/FileList/CollatorTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/File/FileList/CollatorTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\View\Test\Unit\File\FileList;
 
-use \Magento\Framework\View\File\FileList\Collator;
+use Magento\Framework\View\File\FileList\Collator;
 
 class CollatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/Decorator/UpdaterTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/Decorator/UpdaterTest.php
index 083b4e0343ae1..17aa11f2b173f 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/Decorator/UpdaterTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/Decorator/UpdaterTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Layout\Argument\Interpreter\Decorator;
 
-use \Magento\Framework\View\Layout\Argument\Interpreter\Decorator\Updater;
+use Magento\Framework\View\Layout\Argument\Interpreter\Decorator\Updater;
 
 class UpdaterTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php
index 458b23a4b15eb..c2497aac57eff 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/HelperMethodTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Layout\Argument\Interpreter;
 
-use \Magento\Framework\View\Layout\Argument\Interpreter\HelperMethod;
+use Magento\Framework\View\Layout\Argument\Interpreter\HelperMethod;
 
 class HelperMethodTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php
index 5ae0b0332f28a..0c28a58c20a7e 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/NamedParamsTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Layout\Argument\Interpreter;
 
-use \Magento\Framework\View\Layout\Argument\Interpreter\NamedParams;
+use Magento\Framework\View\Layout\Argument\Interpreter\NamedParams;
 
 class NamedParamsTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php
index 7cc280a930d9c..6fb385f543dcf 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/ObjectTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Layout\Argument\Interpreter;
 
-use \Magento\Framework\View\Layout\Argument\Interpreter\DataObject;
+use Magento\Framework\View\Layout\Argument\Interpreter\DataObject;
 
 class ObjectTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php
index d3e91cb7c2b7e..faf6a873d0ed5 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/OptionsTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Layout\Argument\Interpreter;
 
-use \Magento\Framework\View\Layout\Argument\Interpreter\Options;
+use Magento\Framework\View\Layout\Argument\Interpreter\Options;
 
 class OptionsTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/PassthroughTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/PassthroughTest.php
index ce96dad99873a..1fd1de1c12745 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/PassthroughTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/PassthroughTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Layout\Argument\Interpreter;
 
-use \Magento\Framework\View\Layout\Argument\Interpreter\Passthrough;
+use Magento\Framework\View\Layout\Argument\Interpreter\Passthrough;
 
 class PassthroughTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/UrlTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/UrlTest.php
index e66d35583d103..8748a1c0036f9 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/UrlTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Argument/Interpreter/UrlTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Layout\Argument\Interpreter;
 
-use \Magento\Framework\View\Layout\Argument\Interpreter\Url;
+use Magento\Framework\View\Layout\Argument\Interpreter\Url;
 
 class UrlTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php
index 703334f896db5..b176411d9bad8 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Data/StructureTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\View\Test\Unit\Layout\Data;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\App\State;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class StructureTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php
index 4db2da1c1ece9..d193327da4266 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/BlockTest.php
@@ -136,8 +136,7 @@ public function testProcess(
                 ->with($testArgumentData['argument'])
                 ->willReturn($argumentData['argument']);
         } else {
-            $argumentInterpreter->expects($this->never())->method('evaluate')
-            ;
+            $argumentInterpreter->expects($this->never())->method('evaluate');
         }
 
         /** @var \Magento\Framework\View\Element\BlockFactory|\PHPUnit_Framework_MockObject_MockObject $blockFactory */
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/ContainerTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/ContainerTest.php
index 68c673e95a82d..66feb0add4e70 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/ContainerTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/ContainerTest.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Framework\View\Test\Unit\Layout\Generator;
 
-use \Magento\Framework\View\Layout\Generator\Container;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 use Magento\Framework\View\Layout;
+use Magento\Framework\View\Layout\Generator\Container;
 use Magento\Framework\View\Layout\ScheduledStructure;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class ContainerTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/UiComponentTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/UiComponentTest.php
index 0a51fed9e1fb8..0642c338d9825 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/UiComponentTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/UiComponentTest.php
@@ -6,11 +6,11 @@
 
 namespace Magento\Framework\View\Test\Unit\Layout\Generator;
 
-use \Magento\Framework\View\Layout\Generator\UiComponent;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 use Magento\Framework\View\Layout;
+use Magento\Framework\View\Layout\Generator\UiComponent;
 use Magento\Framework\View\Layout\ScheduledStructure;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/GeneratorPoolTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/GeneratorPoolTest.php
index 28258675c2d70..4e15f0c7bfc03 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/GeneratorPoolTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/GeneratorPoolTest.php
@@ -9,9 +9,9 @@
  */
 namespace Magento\Framework\View\Test\Unit\Layout;
 
-use \Magento\Framework\View\Layout\GeneratorPool;
-use \Magento\Framework\View\Layout\ScheduledStructure;
-use \Magento\Framework\View\Layout\Data\Structure as DataStructure;
+use Magento\Framework\View\Layout\Data\Structure as DataStructure;
+use Magento\Framework\View\Layout\GeneratorPool;
+use Magento\Framework\View\Layout\ScheduledStructure;
 
 class GeneratorPoolTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php
index e4834accbcc07..d185c47179761 100755
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/ContainerTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Framework\View\Test\Unit\Layout\Reader;
 
-use \Magento\Framework\View\Layout\Reader\Container;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
+use Magento\Framework\View\Layout\Reader\Container;
 use Magento\Framework\View\Layout\ScheduledStructure;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class ContainerTest extends \PHPUnit\Framework\TestCase
 {
@@ -107,7 +107,7 @@ public function testProcess(
                 ->method('unsetElementFromListToRemove')
                 ->with($elementCurrent->getAttribute('name'));
         }
-        
+
         $this->container->interpret($contextMock, $elementCurrent);
     }
 
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/MoveTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/MoveTest.php
index c7186a5d2a2b8..53ef5dffd608e 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/MoveTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/MoveTest.php
@@ -8,8 +8,8 @@
 
 namespace Magento\Framework\View\Test\Unit\Layout\Reader;
 
-use Magento\Framework\View\Layout\ScheduledStructure;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\View\Layout\ScheduledStructure;
 
 class MoveTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/UiComponentTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/UiComponentTest.php
index 1568c381226e2..80e5edc1e71bf 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/UiComponentTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/Reader/UiComponentTest.php
@@ -9,18 +9,18 @@
  */
 namespace Magento\Framework\View\Test\Unit\Layout\Reader;
 
+use Magento\Framework\Config\DataInterface;
+use Magento\Framework\Config\DataInterfaceFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Layout\AclCondition;
 use Magento\Framework\View\Layout\ConfigCondition;
+use Magento\Framework\View\Layout\Element;
 use Magento\Framework\View\Layout\Reader\Context;
 use Magento\Framework\View\Layout\Reader\UiComponent;
 use Magento\Framework\View\Layout\Reader\Visibility\Condition;
-use Magento\Framework\View\Layout\ScheduledStructure\Helper;
-use Magento\Framework\Config\DataInterfaceFactory;
-use Magento\Framework\Config\DataInterface;
-use Magento\Framework\View\Layout\Element;
 use Magento\Framework\View\Layout\ReaderPool;
 use Magento\Framework\View\Layout\ScheduledStructure;
+use Magento\Framework\View\Layout\ScheduledStructure\Helper;
 
 class UiComponentTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php
index 6421610c6dbcd..c41c6a233d9c4 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructure/HelperTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Framework\View\Test\Unit\Layout\ScheduledStructure;
 
-use Magento\Framework\View\Layout;
 use Magento\Framework\App\State;
+use Magento\Framework\View\Layout;
 
 /**
  * Class HelperTest
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructureTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructureTest.php
index f193052edb9e1..7885857978020 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructureTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Layout/ScheduledStructureTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Layout;
 
-use \Magento\Framework\View\Layout\ScheduledStructure;
+use Magento\Framework\View\Layout\ScheduledStructure;
 
 /**
  * Test class for \Magento\Framework\View\Layout\ScheduledStructure
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php
index 755fe0ae564f6..672a22bdd4297 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Framework\View\Test\Unit\Page;
 
-use Magento\Framework;
-
 /**
  * Class BuilderTest
  * @covers \Magento\Framework\View\Page\Builder
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/BodyTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/BodyTest.php
index 0f59c302f943f..1e91bf7401ea7 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/BodyTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/BodyTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Framework\View\Test\Unit\Page\Config\Generator;
 
-use \Magento\Framework\View\Page\Config\Generator\Body;
-
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
+use Magento\Framework\View\Page\Config\Generator\Body;
+
 /**
  * Test for page config generator model
  */
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
index a22689ae7cca4..b575b321dc3db 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Framework\View\Test\Unit\Page\Config\Generator;
 
-use Magento\Framework\View\Page\Config\Generator\Head;
-use Magento\Framework\View\Page\Config as PageConfig;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\View\Layout\Generator\Context;
-use Magento\Framework\View\Page\Config\Structure;
 use Magento\Framework\View\Layout\Reader\Context as ReaderContext;
+use Magento\Framework\View\Page\Config as PageConfig;
+use Magento\Framework\View\Page\Config\Generator\Head;
+use Magento\Framework\View\Page\Config\Structure;
 
 /**
  * Test for page config generator model
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
index 1f110a9ec19b5..f0505c24cff05 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/RendererTest.php
@@ -8,8 +8,8 @@
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Asset\GroupedCollection;
-use Magento\Framework\View\Page\Config\Renderer;
 use Magento\Framework\View\Page\Config\Generator;
+use Magento\Framework\View\Page\Config\Renderer;
 
 /**
  * Test for page config renderer model
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/StructureTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/StructureTest.php
index ed15a356cc4c7..fb89c17771ace 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/StructureTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/Config/StructureTest.php
@@ -6,10 +6,10 @@
 
 namespace Magento\Framework\View\Test\Unit\Page\Config;
 
-use \Magento\Framework\View\Page\Config\Structure;
-
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
+use Magento\Framework\View\Page\Config\Structure;
+
 /**
  * Test for page config structure model
  */
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Result/PageTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Result/PageTest.php
index 399a7ce91e65c..fa8e79dd062dc 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Result/PageTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Result/PageTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Framework\View\Test\Unit\Result;
 
-use Magento\Framework\View\Page\Config as PageConfig;
 use Magento\Framework\View\EntitySpecificHandlesList;
+use Magento\Framework\View\Page\Config as PageConfig;
 
 /**
  * Result Page Test
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/TemplateEngineFactoryTest.php b/lib/internal/Magento/Framework/View/Test/Unit/TemplateEngineFactoryTest.php
index d28ab36f812d9..5f9c6152ff5ce 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/TemplateEngineFactoryTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/TemplateEngineFactoryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit;
 
-use \Magento\Framework\View\TemplateEngineFactory;
+use Magento\Framework\View\TemplateEngineFactory;
 
 class TemplateEngineFactoryTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/TemplateEnginePoolTest.php b/lib/internal/Magento/Framework/View/Test/Unit/TemplateEnginePoolTest.php
index 6ecb51680d392..c36759a40add8 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/TemplateEnginePoolTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/TemplateEnginePoolTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit;
 
-use \Magento\Framework\View\TemplateEnginePool;
+use Magento\Framework\View\TemplateEnginePool;
 
 class TemplateEnginePoolTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Url/CssResolverTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Url/CssResolverTest.php
index 29bafd7f4d2b7..bfac003f4ffe5 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Url/CssResolverTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Url/CssResolverTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\View\Test\Unit\Url;
 
-use \Magento\Framework\View\Url\CssResolver;
+use Magento\Framework\View\Url\CssResolver;
 
 class CssResolverTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Webapi/Exception.php b/lib/internal/Magento/Framework/Webapi/Exception.php
index 97ebbc40865ab..b6c39bba767a4 100644
--- a/lib/internal/Magento/Framework/Webapi/Exception.php
+++ b/lib/internal/Magento/Framework/Webapi/Exception.php
@@ -7,7 +7,6 @@
  */
 namespace Magento\Framework\Webapi;
 
-use Magento\Framework\Exception\ErrorMessage;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
 
diff --git a/lib/internal/Magento/Framework/Webapi/Request.php b/lib/internal/Magento/Framework/Webapi/Request.php
index 47ab6bc7f994e..500d9502a25ec 100644
--- a/lib/internal/Magento/Framework/Webapi/Request.php
+++ b/lib/internal/Magento/Framework/Webapi/Request.php
@@ -11,8 +11,8 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Config\ScopeInterface;
 use Magento\Framework\HTTP\PhpEnvironment\Request as HttpRequest;
-use Magento\Framework\Stdlib\Cookie\CookieReaderInterface;
 use Magento\Framework\Phrase;
+use Magento\Framework\Stdlib\Cookie\CookieReaderInterface;
 use Magento\Framework\Stdlib\StringUtils;
 
 class Request extends HttpRequest implements RequestInterface
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererFactory.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererFactory.php
index 547b8fcb03640..b905334351c66 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererFactory.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererFactory.php
@@ -80,7 +80,7 @@ protected function _getRendererClass()
         /** If server does not have renderer for any of the accepted types it SHOULD send 406 (not acceptable). */
         throw new \Magento\Framework\Webapi\Exception(
             new Phrase(
-                'Server cannot match any of the given Accept HTTP header media type(s) from the request: "%1" '.
+                'Server cannot match any of the given Accept HTTP header media type(s) from the request: "%1" ' .
                 'with media types from the config of response renderer.',
                 $acceptTypes
             ),
@@ -101,7 +101,7 @@ private function getRendererConfig($acceptType)
         if ($acceptType == '*/*' && isset($this->_renders['default'])) {
             return $this->_renders['default'];
         }
-        
+
         foreach ($this->_renders as $rendererConfig) {
             $rendererType = $rendererConfig['type'];
             if ($acceptType == $rendererType
diff --git a/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
index d8e1a3de3670a..cdb6ed799aade 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
@@ -9,7 +9,6 @@
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Reflection\MethodsMap;
-use Magento\Framework\Webapi\ServicePayloadConverterInterface;
 
 /**
  * Data object converter
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/ErrorProcessorTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/ErrorProcessorTest.php
index 26a2fd58164a5..931420eafa496 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/ErrorProcessorTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/ErrorProcessorTest.php
@@ -7,12 +7,12 @@
  */
 namespace Magento\Framework\Webapi\Test\Unit;
 
-use \Magento\Framework\Webapi\ErrorProcessor;
-
 use Magento\Framework\Exception\AuthorizationException;
+
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Webapi\Exception as WebapiException;
 use Magento\Framework\Phrase;
+use Magento\Framework\Webapi\ErrorProcessor;
+use Magento\Framework\Webapi\Exception as WebapiException;
 
 class ErrorProcessorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php
index d4177ceee8d7e..001fb3affc54d 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php
@@ -90,7 +90,7 @@ public function testDeserializeInvalidEncodedBodyExceptionDeveloperModeOff()
         $this->serializerMock
             ->expects($this->once())
             ->method('unserialize')
-            ->will($this->throwException(new \InvalidArgumentException));
+            ->will($this->throwException(new \InvalidArgumentException()));
         $this->_appStateMock->expects($this->once())
             ->method('getMode')
             ->will($this->returnValue('production'));
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php
index 95906ba75e335..3dbdf67a2e9a8 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/FieldsFilterTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Framework\Webapi\Test\Unit\Rest\Response;
 
-use \Magento\Framework\Webapi\Rest\Response\FieldsFilter;
+use Magento\Framework\Webapi\Rest\Response\FieldsFilter;
 
 /**
  * Unit test for FieldsFilter
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php
index dd7aa845f3091..55f3cd0dca8e7 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Response/RendererFactoryTest.php
@@ -72,7 +72,7 @@ public function testGet($acceptTypes, $model)
         );
         $this->_factory->get();
     }
-    
+
     /**
      * Data provider for method testGet
      *
@@ -98,7 +98,7 @@ public function testGetWithWrongAcceptHttpHeader()
             $this->_factory->get();
             $this->fail("Exception is expected to be raised");
         } catch (\Magento\Framework\Webapi\Exception $e) {
-            $exceptionMessage = 'Server cannot match any of the given Accept HTTP header media type(s) '.
+            $exceptionMessage = 'Server cannot match any of the given Accept HTTP header media type(s) ' .
                 'from the request: "" with media types from the config of response renderer.';
             $this->assertInstanceOf(\Magento\Framework\Webapi\Exception::class, $e, 'Exception type is invalid');
             $this->assertEquals($exceptionMessage, $e->getMessage(), 'Exception message is invalid');
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessor/TestService.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessor/TestService.php
index a5f91c101aa56..31214c63f6a2e 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessor/TestService.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessor/TestService.php
@@ -5,11 +5,6 @@
  */
 namespace Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor;
 
-use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\AssociativeArray;
-use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\DataArray;
-use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\Nested;
-use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\SimpleArray;
-
 class TestService
 {
     const DEFAULT_VALUE = 42;
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php
index fe85e59221847..8df68996541bf 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/ServiceInputProcessorTest.php
@@ -8,18 +8,17 @@
 
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Webapi\ServiceInputProcessor;
-use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\WebapiBuilderFactory;
 use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\AssociativeArray;
 use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\DataArray;
-use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\ObjectWithCustomAttributes;
-use Magento\Webapi\Test\Unit\Service\Entity\DataArrayData;
 use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\Nested;
-use Magento\Webapi\Test\Unit\Service\Entity\NestedData;
+use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\ObjectWithCustomAttributes;
 use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\Simple;
 use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\SimpleArray;
+use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\TestService;
+use Magento\Webapi\Test\Unit\Service\Entity\DataArrayData;
+use Magento\Webapi\Test\Unit\Service\Entity\NestedData;
 use Magento\Webapi\Test\Unit\Service\Entity\SimpleArrayData;
 use Magento\Webapi\Test\Unit\Service\Entity\SimpleData;
-use Magento\Framework\Webapi\Test\Unit\ServiceInputProcessor\TestService;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -506,8 +505,7 @@ protected function getObjectWithCustomAttributes($type, $value = [])
                 'custom_attributes' => [
                     TestService::CUSTOM_ATTRIBUTE_CODE => $objectManager->getObject(
                         \Magento\Framework\Api\AttributeValue::class,
-                        ['data' =>
-                            [
+                        ['data' => [
                                 'attribute_code' => TestService::CUSTOM_ATTRIBUTE_CODE,
                                 'value' => $customAttributeValue
                             ]
diff --git a/lib/internal/Magento/Framework/Xml/Security.php b/lib/internal/Magento/Framework/Xml/Security.php
index e502429e4511a..ec901a63ea862 100644
--- a/lib/internal/Magento/Framework/Xml/Security.php
+++ b/lib/internal/Magento/Framework/Xml/Security.php
@@ -6,7 +6,6 @@
 namespace Magento\Framework\Xml;
 
 use DOMDocument;
-use Magento\Framework\Phrase;
 
 /**
  * Class Security