diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
index 91975350b682b..80966c38a40e1 100644
--- a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
+++ b/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php
@@ -37,9 +37,8 @@ public function __construct(
      */
     public function render(\Magento\Framework\DataObject $row)
     {
-        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
-            'Read Details'
-        ) . '</a>' : '';
+        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">'
+            . __('Read Details') . '</a>' : '';
 
         $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
             '*/*/markAsRead/',
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
index 513ef4a2c234e..79f4ac770f898 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
@@ -11,12 +11,14 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Grid;
 
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+
 class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
 {
     /**
      * Add remove filter
      *
-     * @return \Magento\AdminNotification\Model\ResourceModel\Grid\Collection|\Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+     * @return \Magento\AdminNotification\Model\ResourceModel\Grid\Collection|AbstractCollection
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
index 3f107a151e02b..a2a0204de66fb 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
@@ -67,7 +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/Website.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
index 6ad4d2573b47b..7499dd6f6f4b8 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
@@ -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/Authorization/Model/ResourceModel/Rules.php b/app/code/Magento/Authorization/Model/ResourceModel/Rules.php
index 9ff6330f4f205..5e4ae77731a0f 100644
--- a/app/code/Magento/Authorization/Model/ResourceModel/Rules.php
+++ b/app/code/Magento/Authorization/Model/ResourceModel/Rules.php
@@ -99,7 +99,10 @@ public function saveRel(\Magento\Authorization\Model\Rules $rule)
 
                 // If all was selected save it only and nothing else.
                 if ($postedResources === [$this->_rootResource->getId()]) {
-                    $insertData = $this->_prepareDataForTable(new \Magento\Framework\DataObject($row), $this->getMainTable());
+                    $insertData = $this->_prepareDataForTable(
+                        new \Magento\Framework\DataObject($row),
+                        $this->getMainTable()
+                    );
 
                     $connection->insert($this->getMainTable(), $insertData);
                 } else {
@@ -111,7 +114,10 @@ public function saveRel(\Magento\Authorization\Model\Rules $rule)
                         $row['permission'] = in_array($resourceId, $postedResources) ? 'allow' : 'deny';
                         $row['resource_id'] = $resourceId;
 
-                        $insertData = $this->_prepareDataForTable(new \Magento\Framework\DataObject($row), $this->getMainTable());
+                        $insertData = $this->_prepareDataForTable(
+                            new \Magento\Framework\DataObject($row),
+                            $this->getMainTable()
+                        );
                         $connection->insert($this->getMainTable(), $insertData);
                     }
                 }
diff --git a/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php b/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
index c3896c9b2d75e..fcd1243ffa9d1 100644
--- a/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Backend\Block\Dashboard;
 
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+
 /**
  * Adminhtml dashboard tab abstract
  *
@@ -38,7 +40,7 @@ public function __construct(
     }
 
     /**
-     * @return array|\Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection|\Magento\Eav\Model\Entity\Collection\Abstract
+     * @return array|AbstractCollection|\Magento\Eav\Model\Entity\Collection\Abstract
      */
     public function getCollection()
     {
diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php
index 16cde31bb2b50..79d9eb317410a 100644
--- a/app/code/Magento/Backend/Block/Menu.php
+++ b/app/code/Magento/Backend/Block/Menu.php
@@ -132,7 +132,9 @@ protected function _getAnchorLabel($menuItem)
      */
     protected function _renderMouseEvent($menuItem)
     {
-        return $menuItem->hasChildren() ? 'onmouseover="Element.addClassName(this,\'over\')" onmouseout="Element.removeClassName(this,\'over\')"' : '';
+        return $menuItem->hasChildren()
+            ? 'onmouseover="Element.addClassName(this,\'over\')" onmouseout="Element.removeClassName(this,\'over\')"'
+            : '';
     }
 
     /**
diff --git a/app/code/Magento/Backend/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php
index 4e878e4e63ffb..4c0dfff078ffd 100644
--- a/app/code/Magento/Backend/Block/Page/Header.php
+++ b/app/code/Magento/Backend/Block/Page/Header.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Backend\Block\Page;
 
+use Magento\Store\Model\ScopeInterface;
+
 /**
  * Adminhtml header block
  *
@@ -78,6 +80,6 @@ public function getLogoutLink()
      */
     public function displayNoscriptNotice()
     {
-        return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/Backend/Block/Page/Notices.php b/app/code/Magento/Backend/Block/Page/Notices.php
index 84b60b4532363..1ea08c704a037 100644
--- a/app/code/Magento/Backend/Block/Page/Notices.php
+++ b/app/code/Magento/Backend/Block/Page/Notices.php
@@ -11,6 +11,8 @@
  */
 namespace Magento\Backend\Block\Page;
 
+use Magento\Store\Model\ScopeInterface;
+
 class Notices extends \Magento\Backend\Block\Template
 {
     /**
@@ -20,7 +22,7 @@ class Notices extends \Magento\Backend\Block\Template
      */
     public function displayNoscriptNotice()
     {
-        return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -30,6 +32,6 @@ public function displayNoscriptNotice()
      */
     public function displayDemoNotice()
     {
-        return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue('design/head/demonotice', ScopeInterface::SCOPE_STORE);
     }
 }
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 3186eb69bbdf8..a74e103bf4b21 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,10 +6,12 @@
 
 namespace Magento\Backend\Block\Store\Switcher\Form\Renderer;
 
+use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
+
 /**
  * Form fieldset renderer
  */
-class Fieldset extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
+class Fieldset extends \Magento\Backend\Block\Template implements RendererInterface
 {
     /**
      * Form element which re-rendering
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php
index b546245cbbfdb..a59afc6248577 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php
@@ -7,13 +7,14 @@
 namespace Magento\Backend\Block\Widget\Form\Renderer;
 
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
 
 /**
  * Form element default renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Element extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
+class Element extends \Magento\Backend\Block\Template implements RendererInterface
 {
     /**
      * @var AbstractElement
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php
index 1582ee387fc06..ac4e14a2da3fa 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php
@@ -7,13 +7,14 @@
 namespace Magento\Backend\Block\Widget\Form\Renderer;
 
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
 
 /**
  * Form fieldset default renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Fieldset extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
+class Fieldset extends \Magento\Backend\Block\Template implements RendererInterface
 {
     /**
      * @var AbstractElement
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 f416a47b79b3d..ce5f8ca1d37f6 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,13 +7,14 @@
 namespace Magento\Backend\Block\Widget\Form\Renderer\Fieldset;
 
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
 
 /**
  * Fieldset element renderer
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Element extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
+class Element extends \Magento\Backend\Block\Template implements RendererInterface
 {
     /**
      * @var AbstractElement
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
index 790fa95b098e8..6c6e4ba97ff49 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
@@ -153,7 +153,11 @@ protected function _transformActionData(&$action, &$actionCaption, \Magento\Fram
                     break;
 
                 case 'popup':
-                    $action['onclick'] = 'popWin(this.href,\'_blank\',\'width=800,height=700,resizable=1,scrollbars=1\');return false;';
+                    $action['onclick'] = 'popWin(
+                        this.href,
+                        \'_blank\',
+                        \'width=800,height=700,resizable=1,scrollbars=1\'
+                        );return false;';
                     break;
             }
         }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Export.php b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
index ab929e1c06341..55d176ea95a99 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Export.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
@@ -282,8 +282,10 @@ public function _exportIterateCollection($callback, array $args)
      * @param \Magento\Framework\Filesystem\File\WriteInterface $stream
      * @return void
      */
-    protected function _exportCsvItem(\Magento\Framework\DataObject $item, \Magento\Framework\Filesystem\File\WriteInterface $stream)
-    {
+    protected function _exportCsvItem(
+        \Magento\Framework\DataObject $item,
+        \Magento\Framework\Filesystem\File\WriteInterface $stream
+    ) {
         $row = [];
         foreach ($this->_getColumns() as $column) {
             if (!$column->getIsSystem()) {
diff --git a/app/code/Magento/Backend/Model/Menu/Director/Director.php b/app/code/Magento/Backend/Model/Menu/Director/Director.php
index d6009f7c5c590..7f36ec1509c8a 100644
--- a/app/code/Magento/Backend/Model/Menu/Director/Director.php
+++ b/app/code/Magento/Backend/Model/Menu/Director/Director.php
@@ -41,8 +41,11 @@ protected function _getCommand($data, $logger)
      * @param \Psr\Log\LoggerInterface $logger
      * @return void
      */
-    public function direct(array $config, \Magento\Backend\Model\Menu\Builder $builder, \Psr\Log\LoggerInterface $logger)
-    {
+    public function direct(
+        array $config,
+        \Magento\Backend\Model\Menu\Builder $builder,
+        \Psr\Log\LoggerInterface $logger
+    ) {
         foreach ($config as $data) {
             $builder->processCommand($this->_getCommand($data, $logger));
         }
diff --git a/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php b/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php
index 4dd995a1f9037..4903d67809079 100644
--- a/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php
+++ b/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php
@@ -44,8 +44,10 @@ abstract class AbstractTotals implements \Magento\Backend\Model\Widget\Grid\Tota
      * @param \Magento\Framework\DataObject\Factory $factory
      * @param \Magento\Backend\Model\Widget\Grid\Parser $parser
      */
-    public function __construct(\Magento\Framework\DataObject\Factory $factory, \Magento\Backend\Model\Widget\Grid\Parser $parser)
-    {
+    public function __construct(
+        \Magento\Framework\DataObject\Factory $factory,
+        \Magento\Backend\Model\Widget\Grid\Parser $parser
+    ) {
         $this->_factory = $factory;
         $this->_parser = $parser;
     }
diff --git a/app/code/Magento/Backup/Model/ResourceModel/Helper.php b/app/code/Magento/Backup/Model/ResourceModel/Helper.php
index a5ccaaea3ee54..9348f820ebd6b 100644
--- a/app/code/Magento/Backup/Model/ResourceModel/Helper.php
+++ b/app/code/Magento/Backup/Model/ResourceModel/Helper.php
@@ -174,7 +174,9 @@ public function getHeader()
         $dbConfig = $this->getConnection()->getConfig();
 
         $versionRow = $this->getConnection()->fetchRow('SHOW VARIABLES LIKE \'version\'');
-        $hostName = !empty($dbConfig['unix_socket']) ? $dbConfig['unix_socket'] : (!empty($dbConfig['host']) ? $dbConfig['host'] : 'localhost');
+        $hostName = !empty($dbConfig['unix_socket'])
+            ? $dbConfig['unix_socket']
+            : (!empty($dbConfig['host']) ? $dbConfig['host'] : 'localhost');
 
         $header = "-- Magento DB backup\n" .
             "--\n" .
diff --git a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
index 6735c2ec5418f..261c2824e01cf 100644
--- a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
@@ -55,7 +55,8 @@ public function getConfig()
                     'isAllowShippingAddressOverride' => $this->config->isAllowToEditShippingAddress(),
                     'merchantName' => $this->config->getMerchantName(),
                     'locale' => strtolower($this->resolver->getLocale()),
-                    'paymentAcceptanceMarkSrc' => 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png',
+                    'paymentAcceptanceMarkSrc'
+                        => 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png',
                     'vaultCode' => self::PAYPAL_VAULT_CODE,
                     'skipOrderReview' => $this->config->isSkipOrderReview(),
                     'paymentIcon' => $this->config->getPayPalIcon(),
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 c77c528f6b402..8751c2ada8f6b 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
@@ -102,7 +102,8 @@ 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'
+                                => 'https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png',
                             'vaultCode' => ConfigProvider::PAYPAL_VAULT_CODE,
                             'skipOrderReview' => false,
                             'paymentIcon' => [
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 6ee6b29798964..bd44f05eafad6 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -220,7 +220,9 @@ public function getProduct()
     public function getSelectionQtyTitlePrice($selection, $includeContainer = true)
     {
         $this->setFormatProduct($selection);
-        $priceTitle = '<span class="product-name">' . $selection->getSelectionQty() * 1 . ' x ' . $this->escapeHtml($selection->getName()) . '</span>';
+        $priceTitle = '<span class="product-name">'
+            . $selection->getSelectionQty() * 1 . ' x ' . $this->escapeHtml($selection->getName())
+            . '</span>';
 
         $priceTitle .= ' &nbsp; ' . ($includeContainer ? '<span class="price-notice">' : '') . '+' .
             $this->renderPriceString($selection, $includeContainer) . ($includeContainer ? '</span>' : '');
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
index 6d266cc2455fa..7b34e3871f673 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
@@ -185,7 +185,6 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->model = $helper->getObject(
-
             LinkManagement::class,
             [
                 'productRepository' => $this->productRepository,
@@ -654,7 +653,7 @@ public function testSaveChild()
         $productLink->expects($this->any())->method('getQty')->will($this->returnValue($qty));
         $productLink->expects($this->any())->method('getPriceType')->will($this->returnValue($priceType));
         $productLink->expects($this->any())->method('getPrice')->will($this->returnValue($price));
-        $productLink->expects($this->any())->method('getCanChangeQuantity')->will($this->returnValue($canChangeQuantity));
+        $productLink->expects($this->any())->method('getCanChangeQuantity')->willReturn($canChangeQuantity);
         $productLink->expects($this->any())->method('getIsDefault')->will($this->returnValue($isDefault));
 
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn($this->linkField);
diff --git a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
index 2ba92f7578db5..d3f3102a951e6 100644
--- a/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
+++ b/app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
@@ -134,8 +134,10 @@ public function modifyMeta(array $meta)
                                             'autoRender' => false,
                                             'componentType' => 'insertListing',
                                             'dataScope' => 'bundle_product_listing',
-                                            'externalProvider' => 'bundle_product_listing.bundle_product_listing_data_source',
-                                            'selectionsProvider' => 'bundle_product_listing.bundle_product_listing.product_columns.ids',
+                                            'externalProvider' =>
+                                                'bundle_product_listing.bundle_product_listing_data_source',
+                                            'selectionsProvider' =>
+                                                'bundle_product_listing.bundle_product_listing.product_columns.ids',
                                             'ns' => 'bundle_product_listing',
                                             'render_url' => $this->urlBuilder->getUrl('mui/index/render'),
                                             'realTimeLink' => false,
diff --git a/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php b/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php
index 1ee4dbcd35803..63415b9a8b628 100644
--- a/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php
+++ b/app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php
@@ -11,7 +11,9 @@
  */
 namespace Magento\Captcha\Model\Config\Form;
 
-abstract class AbstractForm extends \Magento\Framework\App\Config\Value implements \Magento\Framework\Option\ArrayInterface
+use Magento\Framework\Option\ArrayInterface;
+
+abstract class AbstractForm extends \Magento\Framework\App\Config\Value implements ArrayInterface
 {
     /**
      * @var string
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 12cda865393a9..7d9ada5e441a1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -226,7 +226,7 @@ public function getStoreSwitcherHtml()
     public function getLoadTreeUrl($expanded = null)
     {
         $params = ['_current' => true, 'id' => null, 'store' => null];
-        if ($expanded === null&& $this->_backendSession->getIsTreeWasExpanded() || $expanded == true) {
+        if ($expanded === null && $this->_backendSession->getIsTreeWasExpanded() || $expanded == true) {
             $params['expand_all'] = true;
         }
         return $this->getUrl('*/*/categoriesJson', $params);
@@ -310,12 +310,12 @@ public function getBreadcrumbsJavascript($path, $javascriptVarName)
         foreach ($categories as $key => $category) {
             $categories[$key] = $this->_getNodeJson($category);
         }
-        return '<script>require(["prototype"], function(){' . $javascriptVarName . ' = ' . $this->_jsonEncoder->encode(
-            $categories
-        ) .
-            ';' .
-            ($this->canAddSubCategory() ? '$("add_subcategory_button").show();' : '$("add_subcategory_button").hide();') .
-            '});</script>';
+        return '<script>require(["prototype"], function(){' . $javascriptVarName . ' = '
+            . $this->_jsonEncoder->encode($categories) . ';'
+            . ($this->canAddSubCategory()
+                ? '$("add_subcategory_button").show();'
+                : '$("add_subcategory_button").hide();')
+            . '});</script>';
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
index 2099ab7cd6c88..3927f4538ac3a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
@@ -134,7 +134,8 @@ protected function _getAdditionalElementHtml($element)
         $checkboxLabel = __('Change');
         $html = <<<HTML
 <span class="attribute-change-checkbox">
-    <input type="checkbox" id="$dataCheckboxName" name="$dataCheckboxName" class="checkbox" $nameAttributeHtml onclick="toogleFieldEditMode(this, '{$elementId}')" $dataAttribute />
+    <input type="checkbox" id="$dataCheckboxName" name="$dataCheckboxName" class="checkbox" $nameAttributeHtml 
+           onclick="toogleFieldEditMode(this, '{$elementId}')" $dataAttribute />
     <label class="label" for="$dataCheckboxName">
         {$checkboxLabel}
     </label>
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
index 674398a703c2e..62b9341a95414 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -28,8 +28,14 @@ protected function _prepareLayout()
         )->setId('productAlerts');
         /* @var $accordion \Magento\Backend\Block\Widget\Accordion */
 
-        $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
-        $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        $alertPriceAllow = $this->_scopeConfig->getValue(
+            'catalog/productalert/allow_price',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+        $alertStockAllow = $this->_scopeConfig->getValue(
+            'catalog/productalert/allow_stock',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
 
         if ($alertPriceAllow) {
             $accordion->addItem(
@@ -76,8 +82,14 @@ public function getAccordionHtml()
      */
     public function canShowTab()
     {
-        $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
-        $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        $alertPriceAllow = $this->_scopeConfig->getValue(
+            'catalog/productalert/allow_price',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+        $alertStockAllow = $this->_scopeConfig->getValue(
+            'catalog/productalert/allow_stock',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
         return ($alertPriceAllow || $alertStockAllow) && parent::canShowTab();
     }
 }
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 f619da73e0c45..e4e96b4f62494 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
@@ -342,7 +342,8 @@ public function getOptionValues()
                                 $_value->getStoreTitle() === null,
                                 $_value->getOptionTypeId()
                             );
-                            $value['optionValues'][$i]['scopeTitleDisabled'] = $_value->getStoreTitle() === null ? 'disabled' : null;
+                            $value['optionValues'][$i]['scopeTitleDisabled']
+                                = $_value->getStoreTitle() === null ? 'disabled' : null;
                             if ($scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE) {
                                 $value['optionValues'][$i]['checkboxScopePrice'] = $this->getCheckboxScopeHtml(
                                     $_value->getOptionId(),
@@ -351,7 +352,8 @@ public function getOptionValues()
                                     $_value->getOptionTypeId(),
                                     ['$(this).up(1).previous()']
                                 );
-                                $value['optionValues'][$i]['scopePriceDisabled'] = $_value->getStorePrice() === null ? 'disabled' : null;
+                                $value['optionValues'][$i]['scopePriceDisabled']
+                                    = $_value->getStorePrice() === null ? 'disabled' : null;
                             }
                         }
                         $i++;
diff --git a/app/code/Magento/Catalog/Block/Breadcrumbs.php b/app/code/Magento/Catalog/Block/Breadcrumbs.php
index 74ecefd16d3fc..674c99001b01a 100644
--- a/app/code/Magento/Catalog/Block/Breadcrumbs.php
+++ b/app/code/Magento/Catalog/Block/Breadcrumbs.php
@@ -41,7 +41,11 @@ public function __construct(Context $context, Data $catalogData, array $data = [
      */
     public function getTitleSeparator($store = null)
     {
-        $separator = (string)$this->_scopeConfig->getValue('catalog/seo/title_separator', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        $separator = (string)$this->_scopeConfig->getValue(
+            'catalog/seo/title_separator',
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $store
+        );
         return ' ' . $separator . ' ';
     }
 
diff --git a/app/code/Magento/Catalog/Block/Navigation.php b/app/code/Magento/Catalog/Block/Navigation.php
index 2998703f429e1..095e71bb7f70a 100644
--- a/app/code/Magento/Catalog/Block/Navigation.php
+++ b/app/code/Magento/Catalog/Block/Navigation.php
@@ -8,6 +8,7 @@
 
 use Magento\Catalog\Model\Category;
 use Magento\Customer\Model\Context;
+use Magento\Framework\DataObject\IdentityInterface;
 
 /**
  * Catalog navigation
@@ -15,7 +16,7 @@
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Navigation extends \Magento\Framework\View\Element\Template implements \Magento\Framework\DataObject\IdentityInterface
+class Navigation extends \Magento\Framework\View\Element\Template implements IdentityInterface
 {
     /**
      * @var Category
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
index 2cc42fd4f9bd2..45fd03d9e8244 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
@@ -7,13 +7,14 @@
 namespace Magento\Catalog\Block\Product\ProductList;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\DataObject\IdentityInterface;
 
 /**
  * Catalog product related items block
  *
  * @SuppressWarnings(PHPMD.LongVariable)
  */
-class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements \Magento\Framework\DataObject\IdentityInterface
+class Related extends \Magento\Catalog\Block\Product\AbstractProduct implements IdentityInterface
 {
     /**
      * @var Collection
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
index b8f5891d9351c..f7804d240972d 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
@@ -7,13 +7,14 @@
 namespace Magento\Catalog\Block\Product\ProductList;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\DataObject\IdentityInterface;
 
 /**
  * Catalog product upsell items block
  *
  * @SuppressWarnings(PHPMD.LongVariable)
  */
-class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements \Magento\Framework\DataObject\IdentityInterface
+class Upsell extends \Magento\Catalog\Block\Product\AbstractProduct implements IdentityInterface
 {
     /**
      * @var int
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
index 116a35c82d15c..13358e53ef675 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
@@ -21,7 +21,7 @@ abstract class Attribute extends Action
     const ADMIN_RESOURCE = 'Magento_Catalog::update_attributes';
 
     /**
-     *  @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute
+     * @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute
      */
     protected $attributeHelper;
 
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 76f5a01e97e61..72ffb8de79203 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -126,7 +126,9 @@ public function execute()
             $attributeCode = $this->getRequest()->getParam('attribute_code')
                 ?: $this->generateCode($this->getRequest()->getParam('frontend_label')[0]);
             if (strlen($attributeCode) > 0) {
-                $validatorAttrCode = new \Zend_Validate_Regex(['pattern' => '/^[a-z\x{600}-\x{6FF}][a-z\x{600}-\x{6FF}_0-9]{0,30}$/u']);
+                $validatorAttrCode = new \Zend_Validate_Regex(
+                    ['pattern' => '/^[a-z\x{600}-\x{6FF}][a-z\x{600}-\x{6FF}_0-9]{0,30}$/u']
+                );
                 if (!$validatorAttrCode->isValid($attributeCode)) {
                     $this->messageManager->addError(
                         __(
@@ -193,7 +195,7 @@ public function execute()
 
             $data += ['is_filterable' => 0, 'is_filterable_in_search' => 0, 'apply_to' => []];
 
-            if ($model->getIsUserDefined() === null|| $model->getIsUserDefined() != 0) {
+            if ($model->getIsUserDefined() === null || $model->getIsUserDefined() != 0) {
                 $data['backend_type'] = $model->getBackendTypeByInput($data['frontend_input']);
             }
 
diff --git a/app/code/Magento/Catalog/Helper/Product/ProductList.php b/app/code/Magento/Catalog/Helper/Product/ProductList.php
index 5767fd903b577..6e30aa6f6c0f2 100644
--- a/app/code/Magento/Catalog/Helper/Product/ProductList.php
+++ b/app/code/Magento/Catalog/Helper/Product/ProductList.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Catalog\Helper\Product;
 
+use Magento\Store\Model\ScopeInterface;
+
 /**
  * Class ProductList
  *
@@ -22,6 +24,7 @@ class ProductList
     const VIEW_MODE_GRID = 'grid';
 
     const DEFAULT_SORT_DIRECTION = 'asc';
+
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
      */
@@ -50,7 +53,7 @@ public function __construct(
      */
     public function getAvailableViewMode()
     {
-        switch ($this->scopeConfig->getValue(self::XML_PATH_LIST_MODE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+        switch ($this->scopeConfig->getValue(self::XML_PATH_LIST_MODE, ScopeInterface::SCOPE_STORE)) {
             case 'grid':
                 $availableMode = ['grid' => __('Grid')];
                 break;
@@ -96,7 +99,7 @@ public function getDefaultSortField()
     {
         return $this->scopeConfig->getValue(
             \Magento\Catalog\Model\Config::XML_PATH_LIST_DEFAULT_SORT_BY,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -114,13 +117,13 @@ public function getAvailableLimit($mode)
         $perPageConfigKey = 'catalog/frontend/' . $mode . '_per_page_values';
         $perPageValues = (string)$this->scopeConfig->getValue(
             $perPageConfigKey,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
         $perPageValues = explode(',', $perPageValues);
         $perPageValues = array_combine($perPageValues, $perPageValues);
         if ($this->scopeConfig->isSetFlag(
             'catalog/frontend/list_allow_all',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         )) {
             return ($perPageValues + ['all' => __('All')]);
         } else {
@@ -139,12 +142,12 @@ public function getDefaultLimitPerPageValue($viewMode)
         if ($viewMode == self::VIEW_MODE_LIST) {
             return $this->scopeConfig->getValue(
                 'catalog/frontend/list_per_page',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                ScopeInterface::SCOPE_STORE
             );
         } elseif ($viewMode == self::VIEW_MODE_GRID) {
             return $this->scopeConfig->getValue(
                 'catalog/frontend/grid_per_page',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                ScopeInterface::SCOPE_STORE
             );
         }
         return 0;
diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
index 99f562be43214..d2ffd6f440041 100644
--- a/app/code/Magento/Catalog/Model/Config.php
+++ b/app/code/Magento/Catalog/Model/Config.php
@@ -490,6 +490,10 @@ public function getAttributeUsedForSortByArray()
      */
     public function getProductListDefaultSortBy($store = null)
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_LIST_DEFAULT_SORT_BY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $this->_scopeConfig->getValue(
+            self::XML_PATH_LIST_DEFAULT_SORT_BY,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $store
+        );
     }
 }
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 626f675ed7c76..a3e662fb45bb4 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
@@ -136,7 +136,9 @@ protected function getFlatTableStructure($tableName)
         //Adding columns
         foreach ($this->getColumns() as $fieldName => $fieldProp) {
             $default = $fieldProp['default'];
-            if ($fieldProp['type'][0] == \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP && $default == 'CURRENT_TIMESTAMP') {
+            if ($fieldProp['type'][0] == \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP
+                && $default == 'CURRENT_TIMESTAMP'
+            ) {
                 $default = \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT;
             }
             $table->addColumn(
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 09d05e1ca44c3..8e9499202d6f4 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -440,7 +440,7 @@ protected function createAnchorSelect(\Magento\Store\Model\Store $store)
         )->joinInner(
             ['cpsd' => $this->getTable('catalog_product_entity_int')],
             'cpsd.' . $productLinkField . ' = cpe.' . $productLinkField . ' AND cpsd.store_id = 0'
-                . ' AND cpsd.attribute_id = ' . $statusAttributeId,
+            . ' AND cpsd.attribute_id = ' . $statusAttributeId,
             []
         )->joinLeft(
             ['cpss' => $this->getTable('catalog_product_entity_int')],
@@ -561,6 +561,7 @@ protected function makeTempCategoryTreeIndex()
      * Populate the temporary category tree index table
      *
      * @param string $temporaryName
+     * @return void
      */
     protected function fillTempCategoryTreeIndex($temporaryName)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/MviewState.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/MviewState.php
index dc838caa9705d..3ef814216a38c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/MviewState.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/MviewState.php
@@ -51,8 +51,9 @@ public function __construct(
     public function afterSetStatus(\Magento\Framework\Mview\View\StateInterface $state)
     {
         if (in_array($state->getViewId(), $this->viewIds)) {
-            $viewId = $state->getViewId() ==
-                \Magento\Catalog\Model\Indexer\Category\Product::INDEXER_ID ? \Magento\Catalog\Model\Indexer\Product\Category::INDEXER_ID : \Magento\Catalog\Model\Indexer\Category\Product::INDEXER_ID;
+            $viewId = $state->getViewId() == \Magento\Catalog\Model\Indexer\Category\Product::INDEXER_ID
+                ? \Magento\Catalog\Model\Indexer\Product\Category::INDEXER_ID
+                : \Magento\Catalog\Model\Indexer\Category\Product::INDEXER_ID;
 
             $relatedViewState = $this->state->loadByView($viewId);
 
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php
index ec69191dd7bcd..ef7919193e609 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php
@@ -32,8 +32,10 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processo
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeSave(\Magento\Store\Model\ResourceModel\Store $subject, \Magento\Framework\Model\AbstractModel $object)
-    {
+    public function beforeSave(
+        \Magento\Store\Model\ResourceModel\Store $subject,
+        \Magento\Framework\Model\AbstractModel $object
+    ) {
         if (!$object->getId() || $object->dataHasChangedFor('group_id')) {
             $this->_productFlatIndexerProcessor->markIndexerAsInvalid();
         }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php
index 11f5122098c42..df62fe8d349e4 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php
@@ -32,8 +32,10 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processo
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeSave(\Magento\Store\Model\ResourceModel\Group $subject, \Magento\Framework\Model\AbstractModel $object)
-    {
+    public function beforeSave(
+        \Magento\Store\Model\ResourceModel\Group $subject,
+        \Magento\Framework\Model\AbstractModel $object
+    ) {
         if (!$object->getId() || $object->dataHasChangedFor('root_category_id')) {
             $this->_productFlatIndexerProcessor->markIndexerAsInvalid();
         }
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
index cca03f3196bf2..0372f2750be76 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
@@ -273,7 +273,10 @@ protected function _getItemsData()
     {
         $algorithm = $this->algorithmFactory->create();
 
-        return $algorithm->getItemsData((array)$this->dataProvider->getInterval(), $this->dataProvider->getAdditionalRequestData());
+        return $algorithm->getItemsData(
+            (array)$this->dataProvider->getInterval(),
+            $this->dataProvider->getAdditionalRequestData()
+        );
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Action.php b/app/code/Magento/Catalog/Model/Product/Action.php
index f8075ad7795d9..25e5510bee070 100644
--- a/app/code/Magento/Catalog/Model/Product/Action.php
+++ b/app/code/Magento/Catalog/Model/Product/Action.php
@@ -96,7 +96,7 @@ public function updateAttributes($productIds, $attrData, $storeId)
     {
         $this->_eventManager->dispatch(
             'catalog_product_attribute_update_before',
-            ['attributes_data' => &$attrData, 'product_ids' => &$productIds, 'store_id' => &$storeId]
+            ['attributes_data' => $attrData, 'product_ids' => $productIds, 'store_id' => $storeId]
         );
 
         $this->_getResource()->updateAttributes($productIds, $attrData, $storeId);
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
index 138b800a33e01..9369123f8679f 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -329,6 +329,7 @@ private function getWebsiteId($storeId)
     /**
      * @param \Magento\Catalog\Model\Product $object
      * @param array $priceData
+     * @return void
      */
     public function setPriceData($object, $priceData)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
index fcd3eae9db73d..adbd6579e6828 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Inputtype.php
@@ -29,8 +29,10 @@ class Inputtype extends \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputt
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\Registry $coreRegistry
      */
-    public function __construct(\Magento\Framework\Event\ManagerInterface $eventManager, \Magento\Framework\Registry $coreRegistry)
-    {
+    public function __construct(
+        \Magento\Framework\Event\ManagerInterface $eventManager,
+        \Magento\Framework\Registry $coreRegistry
+    ) {
         $this->_eventManager = $eventManager;
         $this->_coreRegistry = $coreRegistry;
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Media/Config.php b/app/code/Magento/Catalog/Model/Product/Media/Config.php
index 35d9c86ca9836..39addcce22069 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/Config.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/Config.php
@@ -7,6 +7,7 @@
 namespace Magento\Catalog\Model\Product\Media;
 
 use Magento\Eav\Model\Entity\Attribute;
+use Magento\Framework\UrlInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -73,7 +74,7 @@ public function getBaseMediaPath()
      */
     public function getBaseMediaUrl()
     {
-        return $this->storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . 'catalog/product';
+        return $this->storeManager->getStore()->getBaseUrl(UrlInterface::URL_TYPE_MEDIA) . 'catalog/product';
     }
 
     /**
@@ -93,7 +94,7 @@ public function getBaseTmpMediaPath()
     public function getBaseTmpMediaUrl()
     {
         return $this->storeManager->getStore()->getBaseUrl(
-            \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
+            UrlInterface::URL_TYPE_MEDIA
         ) . 'tmp/' . $this->getBaseMediaUrlAddition();
     }
 
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 1736a443287f2..62bc549feb8c8 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -8,6 +8,7 @@
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Catalog product option default type
@@ -191,7 +192,7 @@ public function getRequest()
      */
     public function getConfigData($key)
     {
-        return $this->_scopeConfig->getValue('catalog/custom_options/' . $key, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue('catalog/custom_options/' . $key, ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Product/Option/Value.php
index 21af96dbcb1c1..54e6d59f45d10 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Value.php
@@ -238,7 +238,8 @@ public function getPrice($flag = false)
     public function getRegularPrice()
     {
         if ($this->getPriceType() == self::TYPE_PERCENT) {
-            $basePrice = $this->getOption()->getProduct()->getPriceInfo()->getPrice('regular_price')->getAmount()->getValue();
+            $basePrice = $this->getOption()->getProduct()->getPriceInfo()
+                ->getPrice('regular_price')->getAmount()->getValue();
             $price = $basePrice * ($this->_getData(self::KEY_PRICE) / 100);
             return $price;
         }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
index 9237b41de71ac..1b86ecbcecbd7 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
@@ -7,6 +7,9 @@
 namespace Magento\Catalog\Model\ResourceModel;
 
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
+use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
+use Magento\Eav\Model\Entity\Attribute\Source\AbstractSource;
 
 /**
  * Catalog entity abstract model
@@ -85,18 +88,20 @@ protected function _isApplicableAttribute($object, $attribute)
     /**
      * Check whether attribute instance (attribute, backend, frontend or source) has method and applicable
      *
-     * @param AbstractAttribute|\Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend|\Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend|\Magento\Eav\Model\Entity\Attribute\Source\AbstractSource $instance
+     * @param AbstractAttribute|AbstractBackend|AbstractFrontend|AbstractSource $instance
      * @param string $method
      * @param array $args array of arguments
      * @return boolean
      */
     protected function _isCallableAttributeInstance($instance, $method, $args)
     {
-        if ($instance instanceof \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
+        if ($instance instanceof AbstractBackend
             && ($method == 'beforeSave' || $method == 'afterSave')
         ) {
             $attributeCode = $instance->getAttribute()->getAttributeCode();
-            if (isset($args[0]) && $args[0] instanceof \Magento\Framework\DataObject && $args[0]->getData($attributeCode) === false) {
+            if (isset($args[0]) && $args[0] instanceof \Magento\Framework\DataObject
+                && $args[0]->getData($attributeCode) === false
+            ) {
                 return false;
             }
         }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 1e9b66338d935..409d3d3449b35 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -489,7 +489,7 @@ public function isEnabledFlat()
     protected function _construct()
     {
         if ($this->isEnabledFlat()) {
-            $this->_init(\Magento\Catalog\Model\Product::class, \Magento\Catalog\Model\ResourceModel\Product\Flat::class);
+            $this->_init(\Magento\Catalog\Model\Product::class, Flat::class);
         } else {
             $this->_init(\Magento\Catalog\Model\Product::class, \Magento\Catalog\Model\ResourceModel\Product::class);
         }
@@ -507,7 +507,7 @@ protected function _construct()
     protected function _init($model, $entityModel)
     {
         if ($this->isEnabledFlat()) {
-            $entityModel = \Magento\Catalog\Model\ResourceModel\Product\Flat::class;
+            $entityModel = Flat::class;
         }
         return parent::_init($model, $entityModel);
     }
diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
index 465968f39555e..092ee10618ab3 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
@@ -12,6 +12,8 @@
  */
 namespace Magento\Catalog\Model\Template;
 
+use Magento\Framework\UrlInterface;
+
 /**
  * Work with catalog(store, website) urls
  *
@@ -126,7 +128,7 @@ public function viewDirective($construction)
     public function mediaDirective($construction)
     {
         $params = $this->getParameters($construction[2]);
-        return $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
+        return $this->_storeManager->getStore()->getBaseUrl(UrlInterface::URL_TYPE_MEDIA) . $params['url'];
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Setup/CategorySetup.php b/app/code/Magento/Catalog/Setup/CategorySetup.php
index 8c3b5c7acd6bb..eac11347a4b1a 100644
--- a/app/code/Magento/Catalog/Setup/CategorySetup.php
+++ b/app/code/Magento/Catalog/Setup/CategorySetup.php
@@ -84,7 +84,8 @@ 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'
+                    => \Magento\Catalog\Model\ResourceModel\Category\Attribute\Collection::class,
                 'attributes' => [
                     'name' => [
                         'type' => 'varchar',
@@ -301,7 +302,8 @@ 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'
+                            => \Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\DefaultSortby::class,
                         'global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE,
                         'group' => 'Display Settings',
                     ],
@@ -353,7 +355,8 @@ 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'
+                    => \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection::class,
                 'attributes' => [
                     'name' => [
                         'type' => 'varchar',
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Button/AddAttributeTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Button/AddAttributeTest.php
index fa11fc626361e..bcfa1b642dcbf 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Button/AddAttributeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Button/AddAttributeTest.php
@@ -27,7 +27,8 @@ public function testGetButtonData()
                                     'actionName' => 'toggleModal'
                                 ],
                                 [
-                                    'targetName' => 'product_form.product_form.add_attribute_modal.product_attributes_grid',
+                                    'targetName' =>
+                                        'product_form.product_form.add_attribute_modal.product_attributes_grid',
                                     'actionName' => 'render'
                                 ]
                             ]
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/CustomlayoutupdateTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/CustomlayoutupdateTest.php
index 88ec2c3ed5347..302b61f545b63 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/CustomlayoutupdateTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/CustomlayoutupdateTest.php
@@ -93,17 +93,15 @@ private function getMockedValidator()
         $mock->expects($this->any())
             ->method('isValid')
             ->will(
-                /**
-                 * @param string $xml
-                 * $return bool
-                 */
                 $this->returnCallback(
+                    // @codingStandardsIgnoreStart
+                    /**
+                     * @param string $xml
+                     * $return bool
+                     */
+                    // @codingStandardsIgnoreEnd
                     function ($xml) {
-                        if ($xml == 'exception') {
-                            return false;
-                        } else {
-                            return true;
-                        }
+                        return $xml != 'exception';
                     }
                 )
             );
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
index a805410f6842e..176cb65073662 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php
@@ -375,8 +375,12 @@ public function reindexFlatEnabledTestDataProvider()
      *
      * @dataProvider reindexFlatEnabledTestDataProvider
      */
-    public function testReindexFlatEnabled($flatScheduled, $productScheduled, $expectedFlatReindexCalls, $expectedProductReindexCall)
-    {
+    public function testReindexFlatEnabled(
+        $flatScheduled,
+        $productScheduled,
+        $expectedFlatReindexCalls,
+        $expectedProductReindexCall
+    ) {
         $affectedProductIds = ["1", "2"];
         $this->category->setAffectedProductIds($affectedProductIds);
         $pathIds = ['path/1/2', 'path/2/3'];
@@ -390,8 +394,9 @@ public function testReindexFlatEnabled($flatScheduled, $productScheduled, $expec
         $this->flatIndexer->expects($this->exactly(1))->method('isScheduled')->will($this->returnValue($flatScheduled));
         $this->flatIndexer->expects($this->exactly($expectedFlatReindexCalls))->method('reindexRow')->with('123');
 
-        $this->productIndexer->expects($this->exactly(1))->method('isScheduled')->will($this->returnValue($productScheduled));
-        $this->productIndexer->expects($this->exactly($expectedProductReindexCall))->method('reindexList')->with($pathIds);
+        $this->productIndexer->expects($this->exactly(1))->method('isScheduled')->willReturn($productScheduled);
+        $this->productIndexer->expects($this->exactly($expectedProductReindexCall))
+            ->method('reindexList')->with($pathIds);
 
         $this->indexerRegistry->expects($this->at(0))
             ->method('get')
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 ba1a3871a89ee..c149d4111d62c 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
@@ -6,6 +6,8 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Layer\Category;
 
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
+
 class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -14,7 +16,7 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
     protected $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
+     * @var \PHPUnit_Framework_MockObject_MockObject|CollectionFactory
      */
     protected $collectionFactoryMock;
 
@@ -26,7 +28,7 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->collectionFactoryMock = $this->getMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory::class,
+            CollectionFactory::class,
             ['create'],
             [],
             '',
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 df3b286f2feb9..ac0a785fbcd95 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
@@ -6,6 +6,8 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Layer\Search;
 
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
+
 class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -14,7 +16,7 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
     protected $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
+     * @var \PHPUnit_Framework_MockObject_MockObject|CollectionFactory
      */
     protected $collectionFactoryMock;
 
@@ -26,7 +28,7 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->collectionFactoryMock = $this->getMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory::class,
+            CollectionFactory::class,
             ['create'],
             [],
             '',
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
index fd6244231f394..abedf27a1057b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
@@ -1311,8 +1311,8 @@ public function testSaveWithDifferentWebsites()
                 2 => ['second'],
                 3 => ['third']
             ]);
-        $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([1,2,3]);
-        $this->productMock->expects($this->once())->method('setWebsiteIds')->willReturn([2,3]);
+        $this->productMock->expects($this->once())->method('getWebsiteIds')->willReturn([1, 2, 3]);
+        $this->productMock->expects($this->once())->method('setWebsiteIds')->willReturn([2, 3]);
 
         $this->assertEquals($this->productMock, $this->model->save($this->productMock));
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
index 5aff975e5b2b4..8c879464dc0f5 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -1281,7 +1281,8 @@ public function testGetMediaGalleryImagesMerging()
             ->disableOriginalConstructor()
             ->getMock();
         $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($imagesCollectionMock);
-        $imagesCollectionMock->expects($this->at(2))->method('getItemById')->with(1)->willReturn($expectedImageDataObject);
+        $imagesCollectionMock->expects($this->at(2))->method('getItemById')->with(1)
+            ->willReturn($expectedImageDataObject);
         $this->mediaConfig->expects($this->at(0))
             ->method('getMediaUrl')
             ->willReturn('http://magento.dev/pub/imageFile.jpg');
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Eav/AttributeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Eav/AttributeTest.php
index 31482104625d5..58565054a3a52 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Eav/AttributeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Eav/AttributeTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Eav;
 
+use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -146,9 +148,9 @@ public function testIndexerAfterSaveScopeChangeAttribute()
     {
         $this->_processor->expects($this->once())->method('markIndexerAsInvalid');
 
-        $this->_model->setOrigData('is_global', \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_STORE);
+        $this->_model->setOrigData('is_global', ScopedAttributeInterface::SCOPE_STORE);
         $this->_model->setOrigData('used_in_product_listing', 1);
-        $this->_model->setIsGlobal(\Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL);
+        $this->_model->setIsGlobal(ScopedAttributeInterface::SCOPE_GLOBAL);
         $this->_model->afterSave();
     }
 
@@ -187,7 +189,7 @@ public function testGetScopeGlobal()
                 'indexerEavProcessor' => $this->_eavProcessor,
                 'resource' => $this->resourceMock,
                 'data' => [
-                    'is_global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL
+                    'is_global' => ScopedAttributeInterface::SCOPE_GLOBAL
                 ]
             ]
         );
@@ -205,7 +207,7 @@ public function testGetScopeWebiste()
                 'indexerEavProcessor' => $this->_eavProcessor,
                 'resource' => $this->resourceMock,
                 'data' => [
-                    'is_global' => \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE
+                    'is_global' => ScopedAttributeInterface::SCOPE_WEBSITE
                 ]
             ]
         );
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 72f9dc19eda2d..3614c7a1de25d 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
@@ -381,7 +381,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(
@@ -418,7 +419,10 @@ 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
+                        ),
                     ],
                 ],
             ],
@@ -552,7 +556,10 @@ 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/Categories.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
index e3300bb200d63..704797c1b29ac 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
@@ -262,11 +262,13 @@ protected function customizeCategoriesField(array $meta)
                                             'actionName' => 'toggleModal',
                                         ],
                                         [
-                                            'targetName' => 'product_form.product_form.create_category_modal.create_category',
+                                            'targetName'
+                                                => 'product_form.product_form.create_category_modal.create_category',
                                             'actionName' => 'render'
                                         ],
                                         [
-                                            'targetName' => 'product_form.product_form.create_category_modal.create_category',
+                                            'targetName'
+                                                => 'product_form.product_form.create_category_modal.create_category',
                                             'actionName' => 'resetForm'
                                         ]
                                     ],
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 5eafd25342343..1f5bbe690f013 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -177,6 +177,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @var string
      */
     protected $mediaGalleryValueTableName;
+
     /**
      * @var string
      */
@@ -268,6 +269,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         ValidatorInterface::ERROR_EXCEEDED_MAX_LENGTH => 'Attribute %s exceeded max length',
         ValidatorInterface::ERROR_INVALID_ATTRIBUTE_TYPE => 'Value for \'%s\' attribute contains incorrect value',
         ValidatorInterface::ERROR_ABSENT_REQUIRED_ATTRIBUTE => 'Attribute %s is required',
+        // @codingStandardsIgnoreStart
         ValidatorInterface::ERROR_INVALID_ATTRIBUTE_OPTION => 'Value for \'%s\' attribute contains incorrect value, see acceptable values on settings specified for Admin',
         ValidatorInterface::ERROR_DUPLICATE_UNIQUE_ATTRIBUTE => 'Duplicated unique attribute',
         ValidatorInterface::ERROR_INVALID_VARIATIONS_CUSTOM_OPTIONS => 'Value for \'%s\' sub attribute in \'%s\' attribute contains incorrect value, acceptable values are: \'dropdown\', \'checkbox\', \'radio\', \'text\'',
@@ -276,6 +278,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
         ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE => 'Imported resource (image) could not be downloaded from external resource due to timeout or access permissions',
         ValidatorInterface::ERROR_INVALID_WEIGHT => 'Product weight is invalid',
         ValidatorInterface::ERROR_DUPLICATE_URL_KEY => 'Url key: \'%s\' was already generated for an item with the SKU: \'%s\'. You need to specify the unique URL key manually'
+        // @codingStandardsIgnoreEnd
     ];
 
     /**
@@ -666,8 +669,8 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
      * @param \Magento\CatalogInventory\Model\Spi\StockStateProviderInterface $stockStateProvider
      * @param \Magento\Catalog\Helper\Data $catalogData
-     * @param \Magento\ImportExport\Model\Import\Config $importConfig
-     * @param Proxy\Product\ResourceFactory $resourceFactory
+     * @param Import\Config $importConfig
+     * @param Proxy\Product\ResourceModelFactory $resourceFactory
      * @param Product\OptionFactory $optionFactory
      * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory $setColFactory
      * @param Product\Type\Factory $productTypeFactory
@@ -688,10 +691,10 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @param TransactionManagerInterface $transactionManager
      * @param Product\TaxClassProcessor $taxClassProcessor
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Catalog\Model\Product\Url $productUrl
      * @param array $data
      * @param array $dateAttrCodes
      * @throws \Magento\Framework\Exception\LocalizedException
-     *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -926,7 +929,10 @@ protected function _deleteProducts()
                     $this->transactionManager->rollBack();
                     throw $e;
                 }
-                $this->_eventManager->dispatch('catalog_product_import_bunch_delete_after', ['adapter' => $this, 'bunch' => $bunch]);
+                $this->_eventManager->dispatch(
+                    'catalog_product_import_bunch_delete_after',
+                    ['adapter' => $this, 'bunch' => $bunch]
+                );
             }
         }
         return $this;
@@ -1060,6 +1066,7 @@ protected function _initTypeModels()
 
     /**
      * Initialize Product error templates
+     * @return void
      */
     protected function _initErrorTemplates()
     {
@@ -1159,7 +1166,7 @@ protected function _saveLinks()
                             : [];
                         foreach ($linkSkus as $linkedKey => $linkedSku) {
                             $linkedSku = trim($linkedSku);
-                            if (($this->skuProcessor->getNewSku($linkedSku) !== null|| isset(
+                            if (($this->skuProcessor->getNewSku($linkedSku) !== null || isset(
                                 $this->_oldSku[$linkedSku]
                             )) && $linkedSku != $sku
                             ) {
@@ -1559,7 +1566,8 @@ protected function _saveProducts()
                     // existing row
                     $entityRowsUp[] = [
                         'updated_at' => (new \DateTime())->format(DateTime::DATETIME_PHP_FORMAT),
-                        $this->getProductEntityLinkField() => $this->_oldSku[$rowSku][$this->getProductEntityLinkField()],
+                        $this->getProductEntityLinkField()
+                            => $this->_oldSku[$rowSku][$this->getProductEntityLinkField()],
                     ];
                 } else {
                     if (!$productLimit || $productsQty < $productLimit) {
@@ -1661,7 +1669,8 @@ protected function _saveProducts()
                         if ($uploadedFile && !isset($mediaGallery[$rowSku][$uploadedFile])) {
                             if (isset($existingImages[$rowSku][$uploadedFile])) {
                                 if (isset($rowLabels[$column][$columnImageKey])
-                                    && $rowLabels[$column][$columnImageKey] != $existingImages[$rowSku][$uploadedFile]['label']
+                                    && $rowLabels[$column][$columnImageKey]
+                                        != $existingImages[$rowSku][$uploadedFile]['label']
                                 ) {
                                     $labelsForUpdate[] = [
                                         'label' => $rowLabels[$column][$columnImageKey],
@@ -1674,7 +1683,9 @@ protected function _saveProducts()
                                 }
                                 $mediaGallery[$rowSku][$uploadedFile] = [
                                     'attribute_id' => $this->getMediaGalleryAttributeId(),
-                                    'label' => isset($rowLabels[$column][$columnImageKey]) ? $rowLabels[$column][$columnImageKey] : '',
+                                    'label' => isset($rowLabels[$column][$columnImageKey])
+                                        ? $rowLabels[$column][$columnImageKey]
+                                        : '',
                                     'position' => ++$position,
                                     'disabled' => isset($disabledImages[$columnImage]) ? '1' : '0',
                                     'value' => $uploadedFile,
@@ -1700,7 +1711,7 @@ protected function _saveProducts()
                     if ($prevAttributeSet !== null) {
                         $rowData[self::COL_ATTR_SET] = $prevAttributeSet;
                     }
-                    if ($productType === null&& $previousType !== null) {
+                    if ($productType === null && $previousType !== null) {
                         $productType = $previousType;
                     }
                     if ($productType === null) {
@@ -1961,6 +1972,7 @@ public function getUploader()
      * Return a new file name if the same file is already exists.
      *
      * @param string $fileName
+     * @param bool $renameFileOff
      * @return string
      */
     protected function uploadMediaFiles($fileName, $renameFileOff = false)
@@ -2241,7 +2253,7 @@ public function getEntityTypeCode()
     /**
      * New products SKU data.
      *
-     * @var string $sku
+     * @param string $sku
      * @return array
      */
     public function getNewSku($sku = null)
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index 23dac6d6b7917..cb86559553a08 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -1347,16 +1347,19 @@ protected function _collectOptionTypeData(
 
                 // ensure default title is set
                 if (!isset($typeTitles[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID])) {
-                    $typeTitles[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID] = $specificTypeData['title'];
+                    $typeTitles[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID]
+                        = $specificTypeData['title'];
                 }
 
                 if ($specificTypeData['price']) {
                     if ($this->_isPriceGlobal) {
-                        $typePrices[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID] = $specificTypeData['price'];
+                        $typePrices[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID]
+                            = $specificTypeData['price'];
                     } else {
                         // ensure default price is set
                         if (!isset($typePrices[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID])) {
-                            $typePrices[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID] = $specificTypeData['price'];
+                            $typePrices[$nextValueId][\Magento\Store\Model\Store::DEFAULT_STORE_ID]
+                                = $specificTypeData['price'];
                         }
                         $typePrices[$nextValueId][$this->_rowStoreId] = $specificTypeData['price'];
                     }
@@ -1373,7 +1376,8 @@ protected function _collectOptionTypeData(
             if (!isset($childCount[$this->_rowStoreId][$prevOptionId])) {
                 $childCount[$this->_rowStoreId][$prevOptionId] = 0;
             }
-            $parentValueId = $nextValueId - $parentCount[$prevOptionId] + $childCount[$this->_rowStoreId][$prevOptionId];
+            $parentValueId = $nextValueId - $parentCount[$prevOptionId]
+                + $childCount[$this->_rowStoreId][$prevOptionId];
             $specificTypeData = $this->_getSpecificTypeData($rowData, $parentValueId, false);
             //For others stores
             if ($specificTypeData) {
@@ -1826,7 +1830,11 @@ protected function _parseCustomOptions($rowData)
         if (empty($rowData['custom_options'])) {
             return $rowData;
         }
-        $rowData['custom_options'] = str_replace($beforeOptionValueSkuDelimiter, $this->_productEntity->getMultipleValueSeparator(), $rowData['custom_options']);
+        $rowData['custom_options'] = str_replace(
+            $beforeOptionValueSkuDelimiter,
+            $this->_productEntity->getMultipleValueSeparator(),
+            $rowData['custom_options']
+        );
         $options = [];
         $optionValues = explode(Product::PSEUDO_MULTI_LINE_SEPARATOR, $rowData['custom_options']);
         $k = 0;
diff --git a/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php b/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php
index d0df26266d1f4..d8a926f7cfe31 100644
--- a/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php
+++ b/app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php
@@ -16,8 +16,9 @@ class Import
     /**
      * @param \Magento\Catalog\Model\Indexer\Category\Product\Processor $indexerCategoryProductProcessor
      */
-    public function __construct(\Magento\Catalog\Model\Indexer\Category\Product\Processor $indexerCategoryProductProcessor)
-    {
+    public function __construct(
+        \Magento\Catalog\Model\Indexer\Category\Product\Processor $indexerCategoryProductProcessor
+    ) {
         $this->_indexerCategoryProductProcessor = $indexerCategoryProductProcessor;
     }
 
diff --git a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php
index cfb03035889f7..0d0d4ea80530a 100644
--- a/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php
+++ b/app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php
@@ -16,8 +16,9 @@ class Import
     /**
      * @param \Magento\Catalog\Model\Indexer\Product\Category\Processor $indexerProductCategoryProcessor
      */
-    public function __construct(\Magento\Catalog\Model\Indexer\Product\Category\Processor $indexerProductCategoryProcessor)
-    {
+    public function __construct(
+        \Magento\Catalog\Model\Indexer\Product\Category\Processor $indexerProductCategoryProcessor
+    ) {
         $this->_indexerProductCategoryProcessor = $indexerProductCategoryProcessor;
     }
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
index 0078cb5bcca9a..5ea290a05784f 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php
@@ -5,7 +5,15 @@
  */
 namespace Magento\CatalogImportExport\Test\Unit\Model\Import;
 
+use Magento\CatalogImportExport\Model\Import\Product;
+use Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor;
+use Magento\CatalogImportExport\Model\Import\Product\StoreResolver;
+use Magento\CatalogImportExport\Model\Import\Product\TaxClassProcessor;
+use Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor;
+use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\ImportExport\Model\Import;
 
@@ -90,7 +98,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
     protected $_resourceFactory;
 
     // @codingStandardsIgnoreStart
-    /** @var  \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  CollectionFactory|\PHPUnit_Framework_MockObject_MockObject */
     protected $_setColFactory;
 
     /** @var  \Magento\CatalogImportExport\Model\Import\Product\Type\Factory|\PHPUnit_Framework_MockObject_MockObject */
@@ -111,7 +119,7 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
     /** @var  \Magento\Framework\Filesystem\Directory\WriteInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $_mediaDirectory;
 
-    /** @var  \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  ItemFactory|\PHPUnit_Framework_MockObject_MockObject */
     protected $_stockResItemFac;
 
     /** @var  \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -123,29 +131,29 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
     /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject  */
     protected $_logger;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\StoreResolver|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  StoreResolver|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeResolver;
 
     /** @var  \Magento\CatalogImportExport\Model\Import\Product\SkuProcessor|\PHPUnit_Framework_MockObject_MockObject */
     protected $skuProcessor;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  CategoryProcessor|\PHPUnit_Framework_MockObject_MockObject */
     protected $categoryProcessor;
 
     /** @var  \Magento\CatalogImportExport\Model\Import\Product\Validator|\PHPUnit_Framework_MockObject_MockObject */
     protected $validator;
 
-    /** @var  \Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  ObjectRelationProcessor|\PHPUnit_Framework_MockObject_MockObject */
     protected $objectRelationProcessor;
 
-    /** @var  \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  TransactionManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $transactionManager;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product\TaxClassProcessor|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var  TaxClassProcessor|\PHPUnit_Framework_MockObject_MockObject */
     // @codingStandardsIgnoreEnd
     protected $taxClassProcessor;
 
-    /** @var  \Magento\CatalogImportExport\Model\Import\Product */
+    /** @var  Product */
     protected $importProduct;
 
     /**
@@ -235,7 +243,7 @@ protected function setUp()
             false
         );
         $this->_setColFactory = $this->getMock(
-            \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory::class,
+            CollectionFactory::class,
             ['create'],
             [],
             '',
@@ -277,7 +285,7 @@ protected function setUp()
             $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\WriteInterface::class)
                 ->getMock();
         $this->_stockResItemFac = $this->getMock(
-            \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory::class,
+            ItemFactory::class,
             ['create'],
             [],
             '',
@@ -298,7 +306,7 @@ protected function setUp()
             $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
                 ->getMock();
         $this->storeResolver =
-            $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product\StoreResolver::class)
+            $this->getMockBuilder(StoreResolver::class)
                 ->setMethods([
                     'getStoreCodeToId',
                 ])
@@ -314,7 +322,7 @@ protected function setUp()
         $reflectionProperty->setValue($this->skuProcessor, $metadataPoolMock);
 
         $this->categoryProcessor =
-            $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor::class)
+            $this->getMockBuilder(CategoryProcessor::class)
                 ->disableOriginalConstructor()
                 ->getMock();
         $this->validator =
@@ -323,15 +331,15 @@ protected function setUp()
                 ->disableOriginalConstructor()
                 ->getMock();
         $this->objectRelationProcessor =
-            $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor::class)
+            $this->getMockBuilder(ObjectRelationProcessor::class)
                 ->disableOriginalConstructor()
                 ->getMock();
         $this->transactionManager =
-            $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface::class)
+            $this->getMockBuilder(TransactionManagerInterface::class)
                 ->getMock();
 
         $this->taxClassProcessor =
-            $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product\TaxClassProcessor::class)
+            $this->getMockBuilder(TaxClassProcessor::class)
                 ->disableOriginalConstructor()
                 ->getMock();
 
@@ -356,7 +364,7 @@ protected function setUp()
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->importProduct = $objectManager->getObject(
-            \Magento\CatalogImportExport\Model\Import\Product::class,
+            Product::class,
             [
                 'jsonHelper' => $this->jsonHelper,
                 'importExportData' => $this->importExportData,
@@ -397,7 +405,7 @@ protected function setUp()
                 'data' => $this->data
             ]
         );
-        $reflection = new \ReflectionClass(\Magento\CatalogImportExport\Model\Import\Product::class);
+        $reflection = new \ReflectionClass(Product::class);
         $reflectionProperty = $reflection->getProperty('metadataPool');
         $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($this->importProduct, $metadataPoolMock);
@@ -627,7 +635,7 @@ public function testGetMultipleValueSeparatorFromParameters()
 
     public function testDeleteProductsForReplacement()
     {
-        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
+        $importProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods([
                 'setParameters', '_deleteProducts'
@@ -693,7 +701,7 @@ public function testValidateRowIsAlreadyValidated()
      */
     public function testValidateRow($rowScope, $oldSku, $expectedResult, $behaviour = Import::BEHAVIOR_DELETE)
     {
-        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
+        $importProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods(['getBehavior', 'getRowScope', 'getErrorAggregator'])
             ->getMock();
@@ -705,7 +713,7 @@ public function testValidateRow($rowScope, $oldSku, $expectedResult, $behaviour
             ->method('getErrorAggregator')
             ->willReturn($this->getErrorAggregatorObject());
         $importProduct->expects($this->once())->method('getRowScope')->willReturn($rowScope);
-        $skuKey = \Magento\CatalogImportExport\Model\Import\Product::COL_SKU;
+        $skuKey = Product::COL_SKU;
         $rowData = [
             $skuKey => 'sku',
         ];
@@ -717,7 +725,7 @@ public function testValidateRow($rowScope, $oldSku, $expectedResult, $behaviour
 
     public function testValidateRowDeleteBehaviourAddRowErrorCall()
     {
-        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
+        $importProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods(['getBehavior', 'getRowScope', 'addRowError'])
             ->getMock();
@@ -725,10 +733,10 @@ public function testValidateRowDeleteBehaviourAddRowErrorCall()
         $importProduct->expects($this->exactly(2))->method('getBehavior')
             ->willReturn(\Magento\ImportExport\Model\Import::BEHAVIOR_DELETE);
         $importProduct->expects($this->once())->method('getRowScope')
-            ->willReturn(\Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT);
+            ->willReturn(Product::SCOPE_DEFAULT);
         $importProduct->expects($this->once())->method('addRowError');
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => 'sku',
+            Product::COL_SKU => 'sku',
         ];
 
         $importProduct->validateRow($rowData, 0);
@@ -739,7 +747,7 @@ public function testValidateRowValidatorCheck()
         $messages = ['validator message'];
         $this->validator->expects($this->once())->method('getMessages')->willReturn($messages);
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => 'sku',
+            Product::COL_SKU => 'sku',
         ];
         $rowNum = 0;
         $this->importProduct->validateRow($rowData, $rowNum);
@@ -838,7 +846,7 @@ public function getStoreIdByCodeDataProvider()
         return [
             [
                 '$storeCode' => null,
-                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
+                '$expectedResult' => Product::SCOPE_DEFAULT,
             ],
             [
                 '$storeCode' => 'value',
@@ -859,8 +867,8 @@ public function testValidateRowCheckSpecifiedSku($sku, $expectedError)
 
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_STORE => '',
+            Product::COL_SKU => $sku,
+            Product::COL_STORE => '',
         ];
 
         $this->storeResolver->expects($this->any())->method('getStoreCodeToId')->willReturn(null);
@@ -872,7 +880,7 @@ public function testValidateRowCheckSpecifiedSku($sku, $expectedError)
         $importProduct
             ->expects($this->once())
             ->method('getRowScope')
-            ->willReturn(\Magento\CatalogImportExport\Model\Import\Product::SCOPE_STORE);
+            ->willReturn(Product::SCOPE_STORE);
         $importProduct->expects($this->at(1))->method('addRowError')->with($expectedError, $rowNum)->willReturn(null);
 
         $importProduct->validateRow($rowData, $rowNum);
@@ -886,7 +894,7 @@ public function testValidateRowProcessEntityIncrement()
         $errorAggregator->method('isRowInvalid')->willReturn(true);
         $this->setPropertyValue($this->importProduct, '_processedEntitiesCount', $count);
         $this->setPropertyValue($this->importProduct, 'errorAggregator', $errorAggregator);
-        $rowData = [\Magento\CatalogImportExport\Model\Import\Product::COL_SKU => false];
+        $rowData = [Product::COL_SKU => false];
         //suppress validator
         $this->_setValidatorMockInImportProduct($this->importProduct);
         $this->importProduct->validateRow($rowData, $rowNum);
@@ -903,7 +911,7 @@ public function testValidateRowValidateExistingProductTypeAddNewSku()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
+            Product::COL_SKU => $sku,
         ];
         $oldSku = [
             $sku => [
@@ -944,7 +952,7 @@ public function testValidateRowValidateExistingProductTypeAddErrorRowCall()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
+            Product::COL_SKU => $sku,
         ];
         $oldSku = [
             $sku => [
@@ -972,7 +980,7 @@ public function testValidateRowValidateExistingProductTypeResetSku()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
+            Product::COL_SKU => $sku,
         ];
         $oldSku = [
             $sku => [
@@ -1018,15 +1026,15 @@ public function testValidateRowValidateNewProductTypeAddRowErrorCall(
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_TYPE => $colType,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => $colAttrSet,
+            Product::COL_SKU => $sku,
+            Product::COL_TYPE => $colType,
+            Product::COL_ATTR_SET => $colAttrSet,
         ];
         $_attrSetNameToId = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => $attrSetNameToIdColAttrSet,
+            $rowData[Product::COL_ATTR_SET] => $attrSetNameToIdColAttrSet,
         ];
         $_productTypeModels = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE] => $productTypeModelsColType,
+            $rowData[Product::COL_TYPE] => $productTypeModelsColType,
         ];
         $oldSku = [
             $sku => null,
@@ -1054,25 +1062,25 @@ public function testValidateRowValidateNewProductTypeGetNewSkuCall()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_TYPE => 'value',
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'value',
+            Product::COL_SKU => $sku,
+            Product::COL_TYPE => 'value',
+            Product::COL_ATTR_SET => 'value',
         ];
         $_productTypeModels = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE] => 'value',
+            $rowData[Product::COL_TYPE] => 'value',
         ];
         $oldSku = [
             $sku => null,
         ];
         $_attrSetNameToId = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => 'attr_set_code_val'
+            $rowData[Product::COL_ATTR_SET] => 'attr_set_code_val'
         ];
         $expectedData = [
             'entity_id' => null,
-            'type_id' => $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE],//value
+            'type_id' => $rowData[Product::COL_TYPE],//value
             //attr_set_id_val
-            'attr_set_id' => $_attrSetNameToId[$rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET]],
-            'attr_set_code' => $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET],//value
+            'attr_set_id' => $_attrSetNameToId[$rowData[Product::COL_ATTR_SET]],
+            'attr_set_code' => $rowData[Product::COL_ATTR_SET],//value
             'row_id' => null
         ];
         $importProduct = $this->createModelMockWithErrorAggregator(
@@ -1098,9 +1106,9 @@ public function testValidateRowValidateNewProductTypeResetSku()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_TYPE => 'value',
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'value',
+            Product::COL_SKU => $sku,
+            Product::COL_TYPE => 'value',
+            Product::COL_ATTR_SET => 'value',
         ];
 
         $oldSku = [
@@ -1109,10 +1117,10 @@ public function testValidateRowValidateNewProductTypeResetSku()
             ],
         ];
         $_productTypeModels = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_TYPE] => 'value',
+            $rowData[Product::COL_TYPE] => 'value',
         ];
         $_attrSetNameToId = [
-            $rowData[\Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET] => 'attr_set_code_val'
+            $rowData[Product::COL_ATTR_SET] => 'attr_set_code_val'
         ];
 
         $importProduct = $this->createModelMockWithErrorAggregator(
@@ -1155,19 +1163,19 @@ public function testValidateDefaultScopeNotValidAttributesResetSku()
         $this->setPropertyValue($this->importProduct, 'string', $stringUtilsMock);
 
         $scopeMock = $this->getMock(
-            \Magento\CatalogImportExport\Model\Import\Product::class,
+            Product::class,
             ['getRowScope'],
             [],
             '',
             false
         );
 
-        $colStore = \Magento\CatalogImportExport\Model\Import\Product::COL_STORE;
+        $colStore = Product::COL_STORE;
         $scopeRowData = [
             $sku => 'sku',
             $colStore => null,
         ];
-        $scopeResult = \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT;
+        $scopeResult = Product::SCOPE_DEFAULT;
         $scopeMock->expects($this->any())->method('getRowScope')->with($scopeRowData)->willReturn($scopeResult);
         $oldSku = [
             $sku => [
@@ -1191,7 +1199,7 @@ public function testValidateDefaultScopeNotValidAttributesResetSku()
         $attrRowData = [
             'code' => str_repeat(
                 'a',
-                \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH + 1
+                Product::DB_MAX_VARCHAR_LENGTH + 1
             ),
         ];
 
@@ -1208,8 +1216,8 @@ public function testValidateRowSetAttributeSetCodeIntoRowData()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'col_attr_set_val',
+            Product::COL_SKU => $sku,
+            Product::COL_ATTR_SET => 'col_attr_set_val',
         ];
         $expectedAttrSetCode = 'new_attr_set_code';
         $newSku = [
@@ -1217,8 +1225,8 @@ public function testValidateRowSetAttributeSetCodeIntoRowData()
             'type_id' => 'new_type_id_val',
         ];
         $expectedRowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => $newSku['attr_set_code'],
+            Product::COL_SKU => $sku,
+            Product::COL_ATTR_SET => $newSku['attr_set_code'],
         ];
         $oldSku = [
             $sku => [
@@ -1252,8 +1260,8 @@ public function testValidateValidateOptionEntity()
         $sku = 'sku';
         $rowNum = 0;
         $rowData = [
-            \Magento\CatalogImportExport\Model\Import\Product::COL_SKU => $sku,
-            \Magento\CatalogImportExport\Model\Import\Product::COL_ATTR_SET => 'col_attr_set_val',
+            Product::COL_SKU => $sku,
+            Product::COL_ATTR_SET => 'col_attr_set_val',
         ];
         $oldSku = [
             $sku => [
@@ -1434,7 +1442,7 @@ public function validateRowDataProvider()
     {
         return [
             [
-                '$rowScope' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
+                '$rowScope' => Product::SCOPE_DEFAULT,
                 '$oldSku' => null,
                 '$expectedResult' => false,
             ],
@@ -1449,12 +1457,12 @@ public function validateRowDataProvider()
                 '$expectedResult' => true,
             ],
             [
-                '$rowScope' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
+                '$rowScope' => Product::SCOPE_DEFAULT,
                 '$oldSku' => true,
                 '$expectedResult' => true,
             ],
             [
-                '$rowScope' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT,
+                '$rowScope' => Product::SCOPE_DEFAULT,
                 '$oldSku' => null,
                 '$expectedResult' => false,
                 '$behaviour' => Import::BEHAVIOR_REPLACE
@@ -1475,7 +1483,7 @@ public function isAttributeValidAssertAttrValidDataProvider()
                 '$rowData' => [
                     'code' => str_repeat(
                         'a',
-                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH - 1
+                        Product::DB_MAX_VARCHAR_LENGTH - 1
                     ),
                 ],
             ],
@@ -1528,7 +1536,7 @@ public function isAttributeValidAssertAttrValidDataProvider()
                 '$rowData' => [
                     'code' => str_repeat(
                         'a',
-                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_TEXT_LENGTH - 1
+                        Product::DB_MAX_TEXT_LENGTH - 1
                     ),
                 ],
             ],
@@ -1548,7 +1556,7 @@ public function isAttributeValidAssertAttrInvalidDataProvider()
                 '$rowData' => [
                     'code' => str_repeat(
                         'a',
-                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_VARCHAR_LENGTH + 1
+                        Product::DB_MAX_VARCHAR_LENGTH + 1
                     ),
                 ],
             ],
@@ -1601,7 +1609,7 @@ public function isAttributeValidAssertAttrInvalidDataProvider()
                 '$rowData' => [
                     'code' => str_repeat(
                         'a',
-                        \Magento\CatalogImportExport\Model\Import\Product::DB_MAX_TEXT_LENGTH + 1
+                        Product::DB_MAX_TEXT_LENGTH + 1
                     ),
                 ],
             ],
@@ -1613,8 +1621,8 @@ public function isAttributeValidAssertAttrInvalidDataProvider()
      */
     public function getRowScopeDataProvider()
     {
-        $colSku = \Magento\CatalogImportExport\Model\Import\Product::COL_SKU;
-        $colStore = \Magento\CatalogImportExport\Model\Import\Product::COL_STORE;
+        $colSku = Product::COL_SKU;
+        $colStore = Product::COL_STORE;
 
         return [
             [
@@ -1622,21 +1630,21 @@ public function getRowScopeDataProvider()
                     $colSku => null,
                     $colStore => 'store',
                 ],
-                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_STORE
+                '$expectedResult' => Product::SCOPE_STORE
             ],
             [
                 '$rowData' => [
                     $colSku => 'sku',
                     $colStore => null,
                 ],
-                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_DEFAULT
+                '$expectedResult' => Product::SCOPE_DEFAULT
             ],
             [
                 '$rowData' => [
                     $colSku => 'sku',
                     $colStore => 'store',
                 ],
-                '$expectedResult' => \Magento\CatalogImportExport\Model\Import\Product::SCOPE_STORE
+                '$expectedResult' => Product::SCOPE_STORE
             ],
         ];
     }
@@ -1768,7 +1776,7 @@ private function _rewriteGetOptionEntityInImportProduct($importProduct)
     protected function createModelMockWithErrorAggregator(array $methods = [], array $errorAggregatorMethods = [])
     {
         $methods[] = 'getErrorAggregator';
-        $importProduct = $this->getMockBuilder(\Magento\CatalogImportExport\Model\Import\Product::class)
+        $importProduct = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods($methods)
             ->getMock();
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
index 0484065c42b48..b3898f2c3a3eb 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
@@ -18,7 +18,7 @@ class StockItemCriteria extends AbstractCriteria implements \Magento\CatalogInve
      */
     public function __construct($mapper = '')
     {
-        $this->mapperInterfaceName = $mapper ?: \Magento\CatalogInventory\Model\ResourceModel\Stock\Item\StockItemCriteriaMapper::class;
+        $this->mapperInterfaceName = $mapper ?: StockItemCriteriaMapper::class;
         $this->data['initial_condition'] = true;
     }
 
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
index 828c16ba75635..c30d0d43287f8 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
@@ -18,7 +18,7 @@ class StockStatusCriteria extends AbstractCriteria implements \Magento\CatalogIn
      */
     public function __construct($mapper = '')
     {
-        $this->mapperInterfaceName = $mapper ?: \Magento\CatalogInventory\Model\ResourceModel\Stock\Status\StockStatusCriteriaMapper::class;
+        $this->mapperInterfaceName = $mapper ?: StockStatusCriteriaMapper::class;
         $this->data['initial_condition'] = true;
     }
 
diff --git a/app/code/Magento/CatalogInventory/Model/StockIndex.php b/app/code/Magento/CatalogInventory/Model/StockIndex.php
index ab12ec3f0e25e..8104737adb6b5 100644
--- a/app/code/Magento/CatalogInventory/Model/StockIndex.php
+++ b/app/code/Magento/CatalogInventory/Model/StockIndex.php
@@ -7,6 +7,7 @@
 namespace Magento\CatalogInventory\Model;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Type as ProductType;
 use Magento\Catalog\Model\Product\Website as ProductWebsite;
 use Magento\CatalogInventory\Api\StockIndexInterface;
@@ -173,7 +174,7 @@ protected function processChildren(
                         if (isset($childrenStatus[$childId])
                             && isset($childrenWebsites[$childId])
                             && in_array($websiteId, $childrenWebsites[$childId])
-                            && $childrenStatus[$childId] == \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+                            && $childrenStatus[$childId] == Status::STATUS_ENABLED
                             && isset($childrenStock[$childId])
                             && $childrenStock[$childId] == \Magento\CatalogInventory\Model\Stock\Status::STATUS_IN_STOCK
                         ) {
@@ -204,7 +205,7 @@ protected function getWebsitesWithDefaultStores($websiteId = null)
             $this->websites = $resource->getWebsiteStores();
         }
         $websites = $this->websites;
-        if ($websiteId !== null&& isset($this->websites[$websiteId])) {
+        if ($websiteId !== null && isset($this->websites[$websiteId])) {
             $websites = [$websiteId => $this->websites[$websiteId]];
         }
         return $websites;
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
index 82755808ee8e8..5f3ae9897334a 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
@@ -6,12 +6,14 @@
 
 namespace Magento\CatalogSearch\Model\ResourceModel\Search;
 
+use Magento\Search\Model\SearchCollectionInterface;
+
 /**
  * Search collection
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection implements \Magento\Search\Model\SearchCollectionInterface
+class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection implements SearchCollectionInterface
 {
     /**
      * Attribute collection
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
index b82a22eb0fcce..3106f28e4606f 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -5,15 +5,18 @@
  */
 namespace Magento\CatalogUrlRewrite\Observer;
 
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+
 class UrlRewriteHandler
 {
     /** @var \Magento\CatalogUrlRewrite\Model\Category\ChildrenCategoriesProvider */
     protected $childrenCategoriesProvider;
 
-    /** @var \Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator */
+    /** @var CategoryUrlRewriteGenerator */
     protected $categoryUrlRewriteGenerator;
 
-    /** @var \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator */
+    /** @var ProductUrlRewriteGenerator */
     protected $productUrlRewriteGenerator;
 
     /** @var \Magento\UrlRewrite\Model\UrlPersistInterface */
@@ -36,8 +39,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\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
@@ -45,8 +48,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\UrlRewrite\Model\MergeDataProviderFactory $mergeDataProviderFactory = null,
@@ -186,13 +189,16 @@ public function deleteCategoryRewritesForChildren(\Magento\Catalog\Model\Categor
             $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,
+                    \Magento\UrlRewrite\Service\V1\Data\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,
+                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::METADATA
+                        => $this->serializer->serialize(['category_id' => $categoryId]),
+                    \Magento\UrlRewrite\Service\V1\Data\UrlRewrite::ENTITY_TYPE
+                        => ProductUrlRewriteGenerator::ENTITY_TYPE,
                 ]
             );
         }
diff --git a/app/code/Magento/Cms/Block/Block.php b/app/code/Magento/Cms/Block/Block.php
index ea6139cc347d6..7a850145cde2f 100644
--- a/app/code/Magento/Cms/Block/Block.php
+++ b/app/code/Magento/Cms/Block/Block.php
@@ -6,10 +6,12 @@
 
 namespace Magento\Cms\Block;
 
+use Magento\Framework\DataObject\IdentityInterface;
+
 /**
  * Cms block content block
  */
-class Block extends \Magento\Framework\View\Element\AbstractBlock implements \Magento\Framework\DataObject\IdentityInterface
+class Block extends \Magento\Framework\View\Element\AbstractBlock implements IdentityInterface
 {
     /**
      * @var \Magento\Cms\Model\Template\FilterProvider
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
index 7cd113ab33b0a..88d440cfa84ae 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
@@ -24,8 +24,10 @@ class Collection extends \Magento\Framework\Data\Collection\Filesystem
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Magento\Framework\Filesystem $filesystem
      */
-    public function __construct(\Magento\Framework\Data\Collection\EntityFactory $entityFactory, \Magento\Framework\Filesystem $filesystem)
-    {
+    public function __construct(
+        \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
+        \Magento\Framework\Filesystem $filesystem
+    ) {
         $this->_filesystem = $filesystem;
         parent::__construct($entityFactory);
     }
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field.php b/app/code/Magento/Config/Block/System/Config/Form/Field.php
index 5a58c6acdc737..bbbc6bcd8d97e 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field.php
@@ -12,13 +12,15 @@
  */
 namespace Magento\Config\Block\System\Config\Form;
 
+use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
+
 /**
  * Render field html element in Stores Configuration
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
-class Field extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
+class Field extends \Magento\Backend\Block\Template implements RendererInterface
 {
     /**
      * Retrieve element HTML markup
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
index 27e64081d5d07..2aaaf5a4bc75b 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
@@ -82,7 +82,9 @@ public function addColumn($name, $params)
             'class' => $this->_getParam($params, 'class'),
             'renderer' => false,
         ];
-        if (!empty($params['renderer']) && $params['renderer'] instanceof \Magento\Framework\View\Element\AbstractBlock) {
+        if (!empty($params['renderer'])
+            && $params['renderer'] instanceof \Magento\Framework\View\Element\AbstractBlock
+        ) {
             $this->_columns[$name]['renderer'] = $params['renderer'];
         }
     }
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 eadd811564853..1647328d90d65 100644
--- a/app/code/Magento/Config/Model/Config/Structure/Mapper/Factory.php
+++ b/app/code/Magento/Config/Model/Config/Structure/Mapper/Factory.php
@@ -36,7 +36,7 @@ class Factory
         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_ATTRIBUTE_INHERITANCE => Attribute\Inheritance::class,
         self::MAPPER_EXTENDS => \Magento\Config\Model\Config\Structure\Mapper\ExtendsMapper::class,
     ];
 
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/FieldTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/FieldTest.php
index 63fcaea870167..d7cd8dc3c6d71 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/FieldTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Structure/Element/FieldTest.php
@@ -324,7 +324,8 @@ public function testGetOptionsWithConstantValOptions()
         $option = [
             [
                 'label' => 'test',
-                'value' => "{{\Magento\Config\Test\Unit\Model\Config\Structure\Element\FieldTest::FIELD_TEST_CONSTANT}}",
+                'value' =>
+                    "{{\Magento\Config\Test\Unit\Model\Config\Structure\Element\FieldTest::FIELD_TEST_CONSTANT}}",
             ],
         ];
         $expected = [
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 6362efdd9bcbe..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,7 +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',
@@ -138,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/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
index e72d73dc07636..85904310d0301 100644
--- a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
@@ -835,7 +835,13 @@ public function isRowValid(array $rowData, $rowNum, $isNewProduct = true)
             if (isset($option['_super_products_sku'])) {
                 if (in_array($option['_super_products_sku'], $skus)) {
                     $error = true;
-                    $this->_entityModel->addRowError(sprintf($this->_messageTemplates[self::ERROR_DUPLICATED_VARIATIONS], $option['_super_products_sku']), $rowNum);
+                    $this->_entityModel->addRowError(
+                        sprintf(
+                            $this->_messageTemplates[self::ERROR_DUPLICATED_VARIATIONS],
+                            $option['_super_products_sku']
+                        ),
+                        $rowNum
+                    );
                 }
                 $skus[] = $option['_super_products_sku'];
             }
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 3e37109106411..f1af0317aea09 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
@@ -494,16 +494,25 @@ protected function _getSuperAttributes()
     public function testSaveData()
     {
         $this->_entityModel->expects($this->any())->method('getNewSku')->will($this->returnValue([
-            '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'],
+            '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'],
+            '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'],
         ]));
 
         // at(0) is select() call, quoteIdentifier() is invoked at(1) and at(2)
diff --git a/app/code/Magento/Customer/Model/Address/Mapper.php b/app/code/Magento/Customer/Model/Address/Mapper.php
index 3d0f675a2fc9f..629673ca7189b 100644
--- a/app/code/Magento/Customer/Model/Address/Mapper.php
+++ b/app/code/Magento/Customer/Model/Address/Mapper.php
@@ -37,7 +37,11 @@ public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectC
      */
     public function toFlatArray($addressDataObject)
     {
-        $flatAddressArray = $this->extensibleDataObjectConverter->toFlatArray($addressDataObject, [], \Magento\Customer\Api\Data\AddressInterface::class);
+        $flatAddressArray = $this->extensibleDataObjectConverter->toFlatArray(
+            $addressDataObject,
+            [],
+            \Magento\Customer\Api\Data\AddressInterface::class
+        );
         //preserve street
         $street = $addressDataObject->getStreet();
         if (!empty($street) && is_array($street)) {
diff --git a/app/code/Magento/Customer/Model/Customer/Mapper.php b/app/code/Magento/Customer/Model/Customer/Mapper.php
index af16016471f49..074f49f218f7d 100644
--- a/app/code/Magento/Customer/Model/Customer/Mapper.php
+++ b/app/code/Magento/Customer/Model/Customer/Mapper.php
@@ -36,7 +36,7 @@ public function __construct(ExtensibleDataObjectConverter $extensibleDataObjectC
      */
     public function toFlatArray(CustomerInterface $customer)
     {
-        $flatArray = $this->extensibleDataObjectConverter->toNestedArray($customer, [], \Magento\Customer\Api\Data\CustomerInterface::class);
+        $flatArray = $this->extensibleDataObjectConverter->toNestedArray($customer, [], CustomerInterface::class);
         unset($flatArray["addresses"]);
         return ConvertArray::toFlatArray($flatArray);
     }
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 a889206135be6..a86b652f7c7d2 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Group/Grid/ServiceCollection.php
@@ -69,7 +69,7 @@ public function loadData($printQuery = false, $logQuery = false)
             $groups = $searchResults->getItems();
             foreach ($groups as $group) {
                 $groupItem = new \Magento\Framework\DataObject();
-                $groupItem->addData($this->simpleDataObjectConverter->toFlatArray($group, \Magento\Customer\Api\Data\GroupInterface::class));
+                $groupItem->addData($this->simpleDataObjectConverter->toFlatArray($group, GroupInterface::class));
                 $this->_addItem($groupItem);
             }
             $this->_setIsLoaded();
diff --git a/app/code/Magento/Customer/Setup/CustomerSetup.php b/app/code/Magento/Customer/Setup/CustomerSetup.php
index ad08add91098a..4c478d420b3a4 100644
--- a/app/code/Magento/Customer/Setup/CustomerSetup.php
+++ b/app/code/Magento/Customer/Setup/CustomerSetup.php
@@ -345,7 +345,8 @@ 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'
+                    => \Magento\Customer\Model\ResourceModel\Address\Attribute\Collection::class,
                 'attributes' => [
                     'prefix' => [
                         'type' => 'static',
diff --git a/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php b/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php
index 905f41570b736..09a9c4c166dc5 100644
--- a/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php
+++ b/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php
@@ -60,8 +60,14 @@ public function render(\Magento\Framework\View\Element\BlockInterface $block, $t
     protected function _renderTemplateHints($blockHtml, $templateFile)
     {
         return <<<HTML
-<div class="debugging-hints" style="position: relative; border: 1px dotted red; margin: 6px 2px; padding: 18px 2px 2px 2px;">
-<div class="debugging-hint-template-file" style="position: absolute; top: 0; padding: 2px 5px; font: normal 11px Arial; background: red; left: 0; color: white; white-space: nowrap;" onmouseover="this.style.zIndex = 999;" onmouseout="this.style.zIndex = 'auto';" title="{$templateFile}">{$templateFile}</div>
+<div class="debugging-hints" 
+     style="position: relative; border: 1px dotted red; margin: 6px 2px; padding: 18px 2px 2px 2px;">
+<div class="debugging-hint-template-file" 
+     style="position: absolute; top: 0; padding: 2px 5px; font: normal 11px Arial; background: red; left: 0; 
+            color: white; white-space: nowrap;" 
+     onmouseover="this.style.zIndex = 999;" onmouseout="this.style.zIndex = 'auto';" 
+     title="{$templateFile}">{$templateFile}
+</div>
 {$blockHtml}
 </div>
 HTML;
@@ -78,7 +84,12 @@ protected function _renderBlockHints($blockHtml, \Magento\Framework\View\Element
     {
         $blockClass = get_class($block);
         return <<<HTML
-<div class="debugging-hint-block-class" style="position: absolute; top: 0; padding: 2px 5px; font: normal 11px Arial; background: red; right: 0; color: blue; white-space: nowrap;" onmouseover="this.style.zIndex = 999;" onmouseout="this.style.zIndex = 'auto';" title="{$blockClass}">{$blockClass}</div>
+<div class="debugging-hint-block-class" 
+     style="position: absolute; top: 0; padding: 2px 5px; font: normal 11px Arial; background: red; right: 0; 
+            color: blue; white-space: nowrap;" 
+     onmouseover="this.style.zIndex = 999;" onmouseout="this.style.zIndex = 'auto';" title="{$blockClass}">
+    {$blockClass}
+</div>
 {$blockHtml}
 HTML;
     }
diff --git a/app/code/Magento/Directory/Model/Country.php b/app/code/Magento/Directory/Model/Country.php
index bc94fbc174bcf..653bc3479190c 100644
--- a/app/code/Magento/Directory/Model/Country.php
+++ b/app/code/Magento/Directory/Model/Country.php
@@ -196,6 +196,7 @@ public function getFormat($type)
     /**
      * Get country name
      *
+     * @param string|null $locale
      * @return string
      */
     public function getName($locale = null)
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Factory.php b/app/code/Magento/Directory/Model/Currency/Import/Factory.php
index 688ad9eec001e..49500002c6fb5 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/Factory.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/Factory.php
@@ -53,7 +53,8 @@ public function create($serviceName, array $data = [])
         $serviceInstance = $this->_objectManager->create($serviceClass, $data);
         if (!$serviceInstance instanceof \Magento\Directory\Model\Currency\Import\ImportInterface) {
             throw new \UnexpectedValueException(
-                "Class '{$serviceClass}' has to implement \\Magento\\Directory\\Model\\Currency\\Import\\ImportInterface."
+                "Class '{$serviceClass}' has to implement "
+                . "\\Magento\\Directory\\Model\\Currency\\Import\\ImportInterface."
             );
         }
         return $serviceInstance;
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
index 537508e619de8..bd2b80c54726b 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
@@ -54,7 +54,10 @@ public function getSamplesTitle()
         if ($this->getProduct()->getSamplesTitle()) {
             return $this->getProduct()->getSamplesTitle();
         }
-        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Sample::XML_PATH_SAMPLES_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(
+            \Magento\Downloadable\Model\Sample::XML_PATH_SAMPLES_TITLE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
     }
 
     /**
@@ -65,6 +68,9 @@ public function getSamplesTitle()
      */
     public function getIsOpenInNewWindow()
     {
-        return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->isSetFlag(
+            \Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
     }
 }
diff --git a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
index 25e2a69e4c529..dc044e3435b6e 100644
--- a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
+++ b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
@@ -163,6 +163,9 @@ public function getDownloadUrl($item)
      */
     public function getIsOpenInNewWindow()
     {
-        return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->isSetFlag(
+            \Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
     }
 }
diff --git a/app/code/Magento/Downloadable/Controller/Customer/Products.php b/app/code/Magento/Downloadable/Controller/Customer/Products.php
index 9162994b0c772..004725ae00bd4 100644
--- a/app/code/Magento/Downloadable/Controller/Customer/Products.php
+++ b/app/code/Magento/Downloadable/Controller/Customer/Products.php
@@ -20,8 +20,10 @@ class Products extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      */
-    public function __construct(\Magento\Framework\App\Action\Context $context, \Magento\Customer\Model\Session $customerSession)
-    {
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Customer\Model\Session $customerSession
+    ) {
         $this->_customerSession = $customerSession;
         parent::__construct($context);
     }
diff --git a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
index 3d3c72d994c9b..a9f5ead86578c 100644
--- a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
+++ b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
@@ -67,7 +67,10 @@ public function getLinksTitle($product)
         if (strlen($title)) {
             return $title;
         }
-        return $this->scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->scopeConfig->getValue(
+            \Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
     }
 
     /**
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index d1b6e8c0bc9dc..05320c4509d51 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -280,6 +280,10 @@ public function output()
      */
     public function getContentDisposition($store = null)
     {
-        return $this->scopeConfig->getValue(self::XML_PATH_CONTENT_DISPOSITION, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $this->scopeConfig->getValue(
+            self::XML_PATH_CONTENT_DISPOSITION,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $store
+        );
     }
 }
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
index f8646f2fe1748..1caf555cb1855 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -105,6 +105,9 @@ public function getLinksTitle()
         if ($this->_purchasedLinks->getLinkSectionTitle()) {
             return $this->_purchasedLinks->getLinkSectionTitle();
         }
-        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(
+            \Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
     }
 }
diff --git a/app/code/Magento/DownloadableImportExport/Test/Unit/Model/Import/Product/Type/DownloadableTest.php b/app/code/Magento/DownloadableImportExport/Test/Unit/Model/Import/Product/Type/DownloadableTest.php
index fd4f6c76cbf57..5b662e56f2014 100644
--- a/app/code/Magento/DownloadableImportExport/Test/Unit/Model/Import/Product/Type/DownloadableTest.php
+++ b/app/code/Magento/DownloadableImportExport/Test/Unit/Model/Import/Product/Type/DownloadableTest.php
@@ -601,8 +601,8 @@ public function isRowValidData()
                     'downloadable_samples' => 'group_title=Group Title Samples, title=Title 1, file=media/file.mp4'
                         . ',sortorder=1|group_title=Group Title, title=Title 2, url=media/file2.mp4,sortorder=0',
                     'downloadable_links' => 'group_title=Group Title Links, title=Title 1, price=10,'
-                        . ' downloads=unlimited, file=media/file.mp4,sortorder=1|group_title=Group Title, title=Title 2,'
-                        . ' price=10, downloads=unlimited, url=media/file2.mp4,sortorder=0',
+                        . ' downloads=unlimited, file=media/file.mp4,sortorder=1|group_title=Group Title,'
+                        . ' title=Title 2, price=10, downloads=unlimited, url=media/file2.mp4,sortorder=0',
                 ],
                 1,
                 true
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 e692dfcc6c1e0..17a1287e38aaa 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
@@ -110,7 +110,6 @@ 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/Model/Attribute.php b/app/code/Magento/Eav/Model/Attribute.php
index 518a0c8078608..96f8e58ba9481 100644
--- a/app/code/Magento/Eav/Model/Attribute.php
+++ b/app/code/Magento/Eav/Model/Attribute.php
@@ -7,12 +7,13 @@
 /**
  * EAV attribute resource model (Using Forms)
  *
- * @method \Magento\Eav\Model\Attribute\Data\AbstractData|null getDataModel() Get data model linked to attribute or null.
+ * @method AbstractData|null getDataModel() Get data model linked to attribute or null.
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Eav\Model;
 
+use Magento\Eav\Model\Attribute\Data\AbstractData;
 use Magento\Store\Model\Website;
 
 class Attribute extends \Magento\Eav\Model\Entity\Attribute
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index bd0ee3bd81fe9..1b9f3e6f2abf2 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -1879,6 +1879,7 @@ protected function getAttributeLoader()
      * Perform actions after entity load
      *
      * @param \Magento\Framework\DataObject $object
+     * @return void
      */
     public function afterLoad(\Magento\Framework\DataObject $object)
     {
@@ -1889,6 +1890,7 @@ public function afterLoad(\Magento\Framework\DataObject $object)
      * Perform actions before entity save
      *
      * @param \Magento\Framework\DataObject $object
+     * @return void
      */
     public function beforeSave(\Magento\Framework\DataObject $object)
     {
@@ -1899,6 +1901,7 @@ public function beforeSave(\Magento\Framework\DataObject $object)
      * Perform actions after entity save
      *
      * @param \Magento\Framework\DataObject $object
+     * @return void
      */
     public function afterSave(\Magento\Framework\DataObject $object)
     {
@@ -1909,6 +1912,7 @@ public function afterSave(\Magento\Framework\DataObject $object)
      * Perform actions before entity delete
      *
      * @param \Magento\Framework\DataObject $object
+     * @return void
      */
     public function beforeDelete(\Magento\Framework\DataObject $object)
     {
@@ -1919,6 +1923,7 @@ public function beforeDelete(\Magento\Framework\DataObject $object)
      * Perform actions after entity delete
      *
      * @param \Magento\Framework\DataObject $object
+     * @return void
      */
     public function afterDelete(\Magento\Framework\DataObject $object)
     {
diff --git a/app/code/Magento/Eav/Test/Unit/Model/EavCustomAttributeTypeLocatorTest.php b/app/code/Magento/Eav/Test/Unit/Model/EavCustomAttributeTypeLocatorTest.php
index 58b8ce9c5573b..f3267bb82ed17 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/EavCustomAttributeTypeLocatorTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/EavCustomAttributeTypeLocatorTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Eav\Test\Unit\Model;
 
 use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Eav\Model\Attribute\Data\Image;
 use Magento\Eav\Model\EavCustomAttributeTypeLocator;
 use Magento\Eav\Model\EavCustomAttributeTypeLocator\ComplexType as ComplexTypeLocator;
 use Magento\Eav\Model\EavCustomAttributeTypeLocator\SimpleType as SimpleTypeLocator;
@@ -186,8 +187,7 @@ public function getTypeDataProvider()
                 'stringUtility' => $stringUtility,
                 'serviceEntityTypeMapData' => [$serviceInterface => 'image'],
                 'serviceBackendModelDataInterfaceMapData' => [
-                        $serviceInterface => [\Magento\Eav\Model\Attribute\Data\Image::class => $mediaAttributeDataInterface
-                            ]
+                        $serviceInterface => [Image::class => $mediaAttributeDataInterface]
                     ],
                 'expected' => $mediaAttributeDataInterface
             ]
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 f029e7fa6864b..32888b618c735 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
@@ -104,11 +104,13 @@ 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',
@@ -119,11 +121,13 @@ 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',
@@ -134,7 +138,8 @@ 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',
@@ -145,7 +150,8 @@ 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/Email/Test/Unit/Model/BackendTemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php
index 352c1e0e63997..a0bf3e3950c3b 100644
--- a/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/BackendTemplateTest.php
@@ -63,7 +63,8 @@ protected function setUp()
             '',
             false
         );
-        $this->resourceModelMock->expects($this->any())->method('getSystemConfigByPathsAndTemplateId')->willReturn(['test_config' => 2015]);
+        $this->resourceModelMock->expects($this->any())->method('getSystemConfigByPathsAndTemplateId')
+            ->willReturn(['test_config' => 2015]);
         /** @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManagerMock*/
         $objectManagerMock = $this->getMock(\Magento\Framework\ObjectManagerInterface::class);
         $objectManagerMock->expects($this->any())
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
index 49372b1f96d49..3d3cf9b4e3eb4 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
@@ -31,7 +31,9 @@ public function mergedXmlDataProvider()
     {
         return [
             'valid' => [
-                '<config><template id="test" label="Test" file="test.txt" type="text" module="Module" area="frontend"/></config>',
+                '<config>
+                    <template id="test" label="Test" file="test.txt" type="text" module="Module" area="frontend"/>
+                </config>',
                 [],
             ],
             'empty root node' => [
@@ -48,13 +50,17 @@ public function mergedXmlDataProvider()
             ],
             'node "template" with value' => [
                 '<config>
-                    <template id="test" label="Test" file="test.txt" type="text" module="Module" area="frontend">invalid</template>
+                    <template id="test" label="Test" file="test.txt" type="text" module="Module" area="frontend">
+                        invalid
+                    </template>
                 </config>',
                 ["Element 'template': Character content is not allowed, because the content type is empty."],
             ],
             'node "template" with children' => [
                 '<config>
-                    <template id="test" label="Test" file="test.txt" type="text" module="Module" area="frontend"><invalid/></template>
+                    <template id="test" label="Test" file="test.txt" type="text" module="Module" area="frontend"
+                        ><invalid/>
+                    </template>
                 </config>',
                 ["Element 'template': Element content is not allowed, because the content type is empty."],
             ],
@@ -75,7 +81,9 @@ public function mergedXmlDataProvider()
                 ["Element 'template': The attribute 'type' is required but missing."],
             ],
             'node "template" with invalid attribute "type"' => [
-                '<config><template id="test" label="Test" file="test.txt" type="invalid" module="Module" area="frontend"/></config>',
+                '<config>
+                    <template id="test" label="Test" file="test.txt" type="invalid" module="Module" area="frontend"/>
+                </config>',
                 [
                     "Element 'template', attribute 'type': " .
                     "[facet 'enumeration'] The value 'invalid' is not an element of the set {'html', 'text'}.",
@@ -88,7 +96,9 @@ public function mergedXmlDataProvider()
                 ["Element 'template': The attribute 'area' is required but missing."],
             ],
             'node "template" with invalid attribute "area"' => [
-                '<config><template id="test" label="Test" file="test.txt" type="text" module="Module" area="invalid"/></config>',
+                '<config>
+                    <template id="test" label="Test" file="test.txt" type="text" module="Module" area="invalid"/>
+                </config>',
                 [
                     "Element 'template', attribute 'area': " .
                     "[facet 'enumeration'] The value 'invalid' is not an element of the set {'frontend', 'adminhtml'}.",
@@ -98,7 +108,8 @@ public function mergedXmlDataProvider()
             ],
             'node "template" with unknown attribute' => [
                 '<config>
-                    <template id="test" label="Test" file="test.txt" type="text" module="Module" area="frontend" unknown="true"/>
+                    <template id="test" label="Test" file="test.txt" type="text" module="Module" area="frontend" 
+                        unknown="true"/>
                 </config>',
                 ["Element 'template', attribute 'unknown': The attribute 'unknown' is not allowed."],
             ]
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index 6726175c9118e..0cd460632db48 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -1714,6 +1714,7 @@ private function processTrackDetailsEvents(array $events)
      * Append error message to rate result instance
      * @param string $trackingValue
      * @param string $errorMessage
+     * @return void
      */
     private function appendTrackingError($trackingValue, $errorMessage)
     {
diff --git a/app/code/Magento/GoogleAnalytics/Block/Ga.php b/app/code/Magento/GoogleAnalytics/Block/Ga.php
index 3b389fa1bd249..584c999ea7fd0 100644
--- a/app/code/Magento/GoogleAnalytics/Block/Ga.php
+++ b/app/code/Magento/GoogleAnalytics/Block/Ga.php
@@ -90,8 +90,10 @@ public function getPageTrackingCode($accountId)
     /**
      * Render information about specified orders and their items
      *
+     * @codingStandardsIgnoreStart
      * @link https://developers.google.com/analytics/devguides/collection/analyticsjs/enhanced-ecommerce#checkout-options
      * @link https://developers.google.com/analytics/devguides/collection/analyticsjs/enhanced-ecommerce#measuring-transactions
+     * @codingStandardsIgnoreEnd
      * @link https://developers.google.com/analytics/devguides/collection/analyticsjs/enhanced-ecommerce#transaction
      *
      * @return string|void
diff --git a/app/code/Magento/GoogleAnalytics/Helper/Data.php b/app/code/Magento/GoogleAnalytics/Helper/Data.php
index fee723385ab4f..32d7d95994e96 100644
--- a/app/code/Magento/GoogleAnalytics/Helper/Data.php
+++ b/app/code/Magento/GoogleAnalytics/Helper/Data.php
@@ -6,6 +6,7 @@
 
 namespace Magento\GoogleAnalytics\Helper;
 
+use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 
 /**
@@ -31,8 +32,8 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     public function isGoogleAnalyticsAvailable($store = null)
     {
-        $accountId = $this->scopeConfig->getValue(self::XML_PATH_ACCOUNT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
-        return $accountId && $this->scopeConfig->isSetFlag(self::XML_PATH_ACTIVE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        $accountId = $this->scopeConfig->getValue(self::XML_PATH_ACCOUNT, ScopeInterface::SCOPE_STORE, $store);
+        return $accountId && $this->scopeConfig->isSetFlag(self::XML_PATH_ACTIVE, ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -43,7 +44,7 @@ public function isGoogleAnalyticsAvailable($store = null)
      */
     public function isAnonymizedIpActive($store = null)
     {
-        $anonymize = $this->scopeConfig->getValue(self::XML_PATH_ANONYMIZE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        $anonymize = $this->scopeConfig->getValue(self::XML_PATH_ANONYMIZE, ScopeInterface::SCOPE_STORE, $store);
         return $anonymize;
     }
 }
diff --git a/app/code/Magento/GoogleOptimizer/Block/Code/Category.php b/app/code/Magento/GoogleOptimizer/Block/Code/Category.php
index 2865caa4eb92c..24dff43dc53fe 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Code/Category.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Code/Category.php
@@ -8,7 +8,9 @@
 
 namespace Magento\GoogleOptimizer\Block\Code;
 
-class Category extends \Magento\GoogleOptimizer\Block\AbstractCode implements \Magento\Framework\DataObject\IdentityInterface
+use Magento\Framework\DataObject\IdentityInterface;
+
+class Category extends \Magento\GoogleOptimizer\Block\AbstractCode implements IdentityInterface
 {
     /**
      * @var string Entity name in registry
diff --git a/app/code/Magento/GoogleOptimizer/Block/Code/Product.php b/app/code/Magento/GoogleOptimizer/Block/Code/Product.php
index b0595dc57a95c..618f0ec121666 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Code/Product.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Code/Product.php
@@ -8,7 +8,9 @@
 
 namespace Magento\GoogleOptimizer\Block\Code;
 
-class Product extends \Magento\GoogleOptimizer\Block\AbstractCode implements \Magento\Framework\DataObject\IdentityInterface
+use Magento\Framework\DataObject\IdentityInterface;
+
+class Product extends \Magento\GoogleOptimizer\Block\AbstractCode implements IdentityInterface
 {
     /**
      * @var Product name in registry
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 52fe30baa272d..6e855c6d9b66b 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
@@ -404,7 +404,8 @@ protected function getButtonSet()
                                 'component' => 'Magento_Ui/js/form/components/button',
                                 'actions' => [
                                     [
-                                        'targetName' => $this->uiComponentsConfig['form'] . '.' . $this->uiComponentsConfig['form']
+                                        'targetName' => $this->uiComponentsConfig['form']
+                                            . '.' . $this->uiComponentsConfig['form']
                                             . '.'
                                             . static::GROUP_GROUPED
                                             . '.'
@@ -412,7 +413,8 @@ protected function getButtonSet()
                                         'actionName' => 'openModal',
                                     ],
                                     [
-                                        'targetName' => $this->uiComponentsConfig['form'] . '.' . $this->uiComponentsConfig['form']
+                                        'targetName' => $this->uiComponentsConfig['form']
+                                            . '.' . $this->uiComponentsConfig['form']
                                             . '.'
                                             . static::GROUP_GROUPED
                                             . '.'
diff --git a/app/code/Magento/ImportExport/Helper/Data.php b/app/code/Magento/ImportExport/Helper/Data.php
index d3e315dbce5d3..47e5b2a4f0bf3 100644
--- a/app/code/Magento/ImportExport/Helper/Data.php
+++ b/app/code/Magento/ImportExport/Helper/Data.php
@@ -6,6 +6,8 @@
 
 namespace Magento\ImportExport\Helper;
 
+use Magento\Store\Model\ScopeInterface;
+
 /**
  * ImportExport data helper
  *
@@ -64,7 +66,7 @@ public function getMaxUploadSizeMessage()
      */
     public function getLocalValidPaths()
     {
-        $paths = $this->scopeConfig->getValue(self::XML_PATH_EXPORT_LOCAL_VALID_PATH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        $paths = $this->scopeConfig->getValue(self::XML_PATH_EXPORT_LOCAL_VALID_PATH, ScopeInterface::SCOPE_STORE);
         return $paths;
     }
 
@@ -75,6 +77,6 @@ public function getLocalValidPaths()
      */
     public function getBunchSize()
     {
-        return (int)$this->scopeConfig->getValue(self::XML_PATH_BUNCH_SIZE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return (int)$this->scopeConfig->getValue(self::XML_PATH_BUNCH_SIZE, ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/ImportExport/Model/Export.php b/app/code/Magento/ImportExport/Model/Export.php
index 864a00a8a2d98..6f7acb382607f 100644
--- a/app/code/Magento/ImportExport/Model/Export.php
+++ b/app/code/Magento/ImportExport/Model/Export.php
@@ -37,7 +37,7 @@ class Export extends \Magento\ImportExport\Model\AbstractModel
     /**
      * Entity adapter.
      *
-     * @var \Magento\ImportExport\Model\Export\Entity\AbstractEntity
+     * @var Export\Entity\AbstractEntity
      */
     protected $_entityAdapter;
 
@@ -88,7 +88,7 @@ public function __construct(
     /**
      * Create instance of entity adapter and return it
      *
-     * @return \Magento\ImportExport\Model\Export\Entity\AbstractEntity|\Magento\ImportExport\Model\Export\AbstractEntity
+     * @return Export\Entity\AbstractEntity|Export\AbstractEntity
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _getEntityAdapter()
@@ -105,14 +105,14 @@ protected function _getEntityAdapter()
                         __('Please enter a correct entity model.')
                     );
                 }
-                if (!$this->_entityAdapter instanceof \Magento\ImportExport\Model\Export\Entity\AbstractEntity &&
-                    !$this->_entityAdapter instanceof \Magento\ImportExport\Model\Export\AbstractEntity
+                if (!$this->_entityAdapter instanceof Export\Entity\AbstractEntity &&
+                    !$this->_entityAdapter instanceof Export\AbstractEntity
                 ) {
                     throw new \Magento\Framework\Exception\LocalizedException(
                         __(
                             'The entity adapter object must be an instance of %1 or %2.',
-                            \Magento\ImportExport\Model\Export\Entity\AbstractEntity::class,
-                            \Magento\ImportExport\Model\Export\AbstractEntity::class
+                            Export\Entity\AbstractEntity::class,
+                            Export\AbstractEntity::class
                         )
                     );
                 }
@@ -317,7 +317,7 @@ public function getFileName()
     {
         $fileName = null;
         $entityAdapter = $this->_getEntityAdapter();
-        if ($entityAdapter instanceof \Magento\ImportExport\Model\Export\AbstractEntity) {
+        if ($entityAdapter instanceof Export\AbstractEntity) {
             $fileName = $entityAdapter->getFileName();
         }
         if (!$fileName) {
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index ca392be673f2d..d65795f76b150 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -104,7 +104,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
     /**
      * Entity adapter.
      *
-     * @var \Magento\ImportExport\Model\Import\Entity\AbstractEntity
+     * @var Import\Entity\AbstractEntity
      */
     protected $_entityAdapter;
 
@@ -174,7 +174,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      * @param Source\Import\Behavior\Factory $behaviorFactory
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
      * @param History $importHistoryModel
-     * @param \Magento\Framework\Stdlib\DateTime\DateTime
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $localeDate
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -215,7 +215,7 @@ public function __construct(
      * Create instance of entity adapter and return it
      *
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @return \Magento\ImportExport\Model\Import\Entity\AbstractEntity|\Magento\ImportExport\Model\Import\AbstractEntity
+     * @return Import\Entity\AbstractEntity|Import\AbstractEntity
      */
     protected function _getEntityAdapter()
     {
@@ -230,14 +230,14 @@ protected function _getEntityAdapter()
                         __('Please enter a correct entity model.')
                     );
                 }
-                if (!$this->_entityAdapter instanceof \Magento\ImportExport\Model\Import\Entity\AbstractEntity &&
-                    !$this->_entityAdapter instanceof \Magento\ImportExport\Model\Import\AbstractEntity
+                if (!$this->_entityAdapter instanceof Import\Entity\AbstractEntity &&
+                    !$this->_entityAdapter instanceof Import\AbstractEntity
                 ) {
                     throw new \Magento\Framework\Exception\LocalizedException(
                         __(
                             'The entity adapter object must be an instance of %1 or %2.',
-                            \Magento\ImportExport\Model\Import\Entity\AbstractEntity::class,
-                            \Magento\ImportExport\Model\Import\AbstractEntity::class
+                            Import\Entity\AbstractEntity::class,
+                            Import\AbstractEntity::class
                         )
                     );
                 }
@@ -449,7 +449,7 @@ protected function processImport()
             $this->_getEntityAdapter()->importData();
         } catch (\Exception $e) {
             $errorAggregator->addError(
-                \Magento\ImportExport\Model\Import\Entity\AbstractEntity::ERROR_CODE_SYSTEM_EXCEPTION,
+                Import\Entity\AbstractEntity::ERROR_CODE_SYSTEM_EXCEPTION,
                 ProcessingError::ERROR_LEVEL_CRITICAL,
                 null,
                 null,
@@ -583,7 +583,7 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource
             $adapter->validateData();
         } catch (\Exception $e) {
             $errorAggregator->addError(
-                \Magento\ImportExport\Model\Import\Entity\AbstractEntity::ERROR_CODE_SYSTEM_EXCEPTION,
+                Import\Entity\AbstractEntity::ERROR_CODE_SYSTEM_EXCEPTION,
                 ProcessingError::ERROR_LEVEL_CRITICAL,
                 null,
                 null,
diff --git a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
index bd1014a864eb6..92dcd7c6cfa2a 100644
--- a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
@@ -71,7 +71,8 @@ abstract class AbstractEntity
         self::ERROR_CODE_COLUMNS_NUMBER => "Number of columns does not correspond to the number of rows in the header",
         self::ERROR_EXCEEDED_MAX_LENGTH => 'Attribute %s exceeded max length',
         self::ERROR_INVALID_ATTRIBUTE_TYPE => 'Value for \'%s\' attribute contains incorrect value',
-        self::ERROR_INVALID_ATTRIBUTE_OPTION => "Value for %s attribute contains incorrect value, see acceptable values on settings specified for Admin",
+        self::ERROR_INVALID_ATTRIBUTE_OPTION
+            => "Value for %s attribute contains incorrect value, see acceptable values on settings specified for Admin",
     ];
 
     /**#@-*/
diff --git a/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php b/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php
index c5c7ec421767d..b265d2ff4914d 100644
--- a/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Model/AdminTokenServiceTest.php
@@ -8,21 +8,25 @@
 
 namespace Magento\Integration\Test\Unit\Model;
 
+use Magento\Integration\Model\ResourceModel\Oauth\Token\CollectionFactory;
+
 class AdminTokenServiceTest extends \PHPUnit_Framework_TestCase
 {
-    /** \Magento\Integration\Model\AdminTokenService */
+    /** @var \Magento\Integration\Model\AdminTokenService */
     protected $_tokenService;
 
-    /** \Magento\Integration\Model\Oauth\TokenFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Integration\Model\Oauth\TokenFactory|\PHPUnit_Framework_MockObject_MockObject */
     protected $_tokenFactoryMock;
 
-    /** \Magento\User\Model\User|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\User\Model\User|\PHPUnit_Framework_MockObject_MockObject */
     protected $_userModelMock;
 
-    /** \Magento\Integration\Model\ResourceModel\Oauth\Token\Collection|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Integration\Model\ResourceModel\Oauth\Token\Collection|\PHPUnit_Framework_MockObject_MockObject */
     protected $_tokenModelCollectionMock;
 
-    /** \Magento\Integration\Model\ResourceModel\Oauth\Token\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /**
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
     protected $_tokenModelCollectionFactoryMock;
 
     /** @var \Magento\Integration\Model\CredentialsValidator|\PHPUnit_Framework_MockObject_MockObject */
@@ -54,7 +58,7 @@ protected function setUp()
         )->getMock();
 
         $this->_tokenModelCollectionFactoryMock = $this->getMockBuilder(
-            \Magento\Integration\Model\ResourceModel\Oauth\Token\CollectionFactory::class
+            CollectionFactory::class
         )->setMethods(['create'])->disableOriginalConstructor()->getMock();
 
         $this->_tokenModelCollectionFactoryMock->expects($this->once())
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage.php b/app/code/Magento/MediaStorage/Model/File/Storage.php
index ca0b9cd3a351a..25798fc1b7b9f 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage.php
@@ -292,7 +292,10 @@ public function getScriptConfig()
             $config['allowed_resources'][] = $allowedResource;
         }
 
-        $config['update_time'] = $this->_scopeConfig->getValue(self::XML_PATH_MEDIA_UPDATE_TIME, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        $config['update_time'] = $this->_scopeConfig->getValue(
+            self::XML_PATH_MEDIA_UPDATE_TIME,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
 
         return $config;
     }
diff --git a/app/code/Magento/MediaStorage/Model/File/Validator/NotProtectedExtension.php b/app/code/Magento/MediaStorage/Model/File/Validator/NotProtectedExtension.php
index cfcbc83e23297..18a2e5e6de54c 100644
--- a/app/code/Magento/MediaStorage/Model/File/Validator/NotProtectedExtension.php
+++ b/app/code/Magento/MediaStorage/Model/File/Validator/NotProtectedExtension.php
@@ -97,7 +97,11 @@ protected function _initProtectedFileExtensions()
      */
     public function getProtectedFileExtensions($store = null)
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_PROTECTED_FILE_EXTENSIONS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $this->_scopeConfig->getValue(
+            self::XML_PATH_PROTECTED_FILE_EXTENSIONS,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $store
+        );
     }
 
     /**
diff --git a/app/code/Magento/Multishipping/Helper/Data.php b/app/code/Magento/Multishipping/Helper/Data.php
index 163bae81f6607..7f5731feb1be2 100644
--- a/app/code/Magento/Multishipping/Helper/Data.php
+++ b/app/code/Magento/Multishipping/Helper/Data.php
@@ -58,7 +58,10 @@ public function getQuote()
      */
     public function getMaximumQty()
     {
-        return (int)$this->scopeConfig->getValue(self::XML_PATH_CHECKOUT_MULTIPLE_MAXIMUM_QUANTITY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return (int)$this->scopeConfig->getValue(
+            self::XML_PATH_CHECKOUT_MULTIPLE_MAXIMUM_QUANTITY,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
     }
 
     /**
@@ -70,7 +73,10 @@ public function getMaximumQty()
     public function isMultishippingCheckoutAvailable()
     {
         $quote = $this->getQuote();
-        $isMultiShipping = $this->scopeConfig->isSetFlag(self::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        $isMultiShipping = $this->scopeConfig->isSetFlag(
+            self::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
         if (!$quote || !$quote->hasItems()) {
             return $isMultiShipping;
         }
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index a6866dcb93aca..3b71997e65145 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -957,7 +957,7 @@ public function getCustomer()
     /**
      * Check if specified address ID belongs to customer.
      *
-     * @param $addressId
+     * @param int $addressId
      * @return bool
      */
     protected function isAddressIdApplicable($addressId)
diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php
index b0a9998c93e80..ca13c62f1682a 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php
@@ -25,6 +25,7 @@ class SuccessTest extends \PHPUnit_Framework_TestCase
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
     protected $contextMock;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
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 f063ca49ff21d..7adc4bf993dd3 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportCountsTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportCountsTest.php
@@ -9,6 +9,7 @@
 use Magento\Catalog\Api\ProductManagementInterface;
 use Magento\ConfigurableProduct\Api\ConfigurableProductManagementInterface;
 use Magento\NewRelicReporting\Model\Cron\ReportCounts;
+use Magento\NewRelicReporting\Model\ResourceModel\Counts\CollectionFactory;
 
 /**
  * Class ReportCountsTest
@@ -52,7 +53,7 @@ class ReportCountsTest extends \PHPUnit_Framework_TestCase
     protected $countsModelMock;
 
     /**
-     * @var \Magento\NewRelicReporting\Model\ResourceModel\Counts\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $countsCollectionFactoryMock;
 
@@ -90,7 +91,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->countsCollectionFactoryMock = $this
-            ->getMockBuilder(\Magento\NewRelicReporting\Model\ResourceModel\Counts\CollectionFactory::class)
+            ->getMockBuilder(CollectionFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
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 bdf6ee05246ac..e2d1088f23e60 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Module\Manager;
 use Magento\Framework\Module\ModuleListInterface;
 use Magento\NewRelicReporting\Model\Module\Collect;
+use Magento\NewRelicReporting\Model\ResourceModel\Module\CollectionFactory;
 
 /**
  * Class CollectTest
@@ -42,7 +43,7 @@ class CollectTest extends \PHPUnit_Framework_TestCase
     protected $moduleFactoryMock;
 
     /**
-     * @var \Magento\NewRelicReporting\Model\ResourceModel\Module\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $moduleCollectionFactoryMock;
 
@@ -72,7 +73,7 @@ protected function setUp()
         );
 
         $this->moduleCollectionFactoryMock = $this->getMock(
-            \Magento\NewRelicReporting\Model\ResourceModel\Module\CollectionFactory::class,
+            CollectionFactory::class,
             ['create'],
             [],
             '',
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Grid/Collection.php
index ac1b1cc9e824d..3f469ee55dd6c 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Grid/Collection.php
@@ -11,12 +11,14 @@
  */
 namespace Magento\Newsletter\Model\ResourceModel\Grid;
 
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+
 class Collection extends \Magento\Newsletter\Model\ResourceModel\Problem\Collection
 {
     /**
      * Adds queue info to grid
      *
-     * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection|\Magento\Newsletter\Model\ResourceModel\Grid\Collection
+     * @return AbstractCollection|\Magento\Newsletter\Model\ResourceModel\Grid\Collection
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/PageCache/Test/Unit/App/CacheIdentifierPluginTest.php b/app/code/Magento/PageCache/Test/Unit/App/CacheIdentifierPluginTest.php
index 5b8e49a236f02..67580728990ac 100644
--- a/app/code/Magento/PageCache/Test/Unit/App/CacheIdentifierPluginTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/App/CacheIdentifierPluginTest.php
@@ -99,8 +99,10 @@ public function testAfterGetValueDataProvider()
             '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, with design exception' => [Config::BUILT_IN, true, 'aa123aa', '7', '7aa123aa']
+            '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/Observer/ProcessLayoutRenderElementTest.php b/app/code/Magento/PageCache/Test/Unit/Observer/ProcessLayoutRenderElementTest.php
index e74db9646965b..3910c182c8ad7 100644
--- a/app/code/Magento/PageCache/Test/Unit/Observer/ProcessLayoutRenderElementTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Observer/ProcessLayoutRenderElementTest.php
@@ -140,8 +140,13 @@ public function testExecute(
                     ->will($this->returnValue($blockTtl));
                 $this->_blockMock->expects($this->any())
                     ->method('getUrl')
-                    ->with('page_cache/block/esi', ['blocks' => '[null]', 'handles' => 'WyJkZWZhdWx0IiwiY2F0YWxvZ19wcm9kdWN0X3ZpZXciXQ=='])
-                    ->will($this->returnValue('page_cache/block/wrapesi/with/handles/WyJkZWZhdWx0IiwiY2F0YWxvZ19wcm9kdWN0X3ZpZXciXQ=='));
+                    ->with(
+                        'page_cache/block/esi',
+                        ['blocks' => '[null]', 'handles' => 'WyJkZWZhdWx0IiwiY2F0YWxvZ19wcm9kdWN0X3ZpZXciXQ==']
+                    )
+                    ->willReturn(
+                        'page_cache/block/wrapesi/with/handles/WyJkZWZhdWx0IiwiY2F0YWxvZ19wcm9kdWN0X3ZpZXciXQ=='
+                    );
             }
             if ($scopeIsPrivate) {
                 $this->_blockMock->expects($this->once())
@@ -162,7 +167,7 @@ public function testExecuteWithBase64Encode()
     {
         $expectedOutput = '<!-- bad ESI request: bad ESI request -->';
         $eventMock = $this->getMock(
-            'Magento\Framework\Event',
+            \Magento\Framework\Event::class,
             ['getLayout', 'getElementName', 'getTransport'],
             [],
             '',
@@ -234,7 +239,8 @@ public function processLayoutRenderDataProvider()
                 true,
                 false,
                 360,
-                '<!-- bad ESI request: bad ESI request -->',
+                '',
             ],
             'full_page type and Varnish enabled, public scope, ttl is not set' => [
                 true,
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 54631df9f3b5a..04d260e802413 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,8 +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
                 ]
@@ -71,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/Paypal/Block/Express/Review.php b/app/code/Magento/Paypal/Block/Express/Review.php
index bad9f89e77907..799d930c3df23 100644
--- a/app/code/Magento/Paypal/Block/Express/Review.php
+++ b/app/code/Magento/Paypal/Block/Express/Review.php
@@ -132,7 +132,10 @@ public function renderAddress($address)
      */
     public function getCarrierName($carrierCode)
     {
-        if ($name = $this->_scopeConfig->getValue("carriers/{$carrierCode}/title", \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
+        if ($name = $this->_scopeConfig->getValue(
+            "carriers/{$carrierCode}/title",
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        )) {
             return $name;
         }
         return $carrierCode;
diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php
index a9af02bb5eae0..a81c4b88da300 100644
--- a/app/code/Magento/Paypal/Model/Api/Nvp.php
+++ b/app/code/Magento/Paypal/Model/Api/Nvp.php
@@ -805,7 +805,9 @@ public function getBillingAgreementType()
      * TODO: put together style and giropay settings
      *
      * @return void
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_SetExpressCheckout
+     * @codingStandardsIgnoreEnd
      */
     public function callSetExpressCheckout()
     {
@@ -836,7 +838,9 @@ public function callSetExpressCheckout()
      * GetExpressCheckoutDetails call
      *
      * @return void
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_GetExpressCheckoutDetails
+     * @codingStandardsIgnoreEnd
      */
     public function callGetExpressCheckoutDetails()
     {
@@ -851,7 +855,9 @@ public function callGetExpressCheckoutDetails()
      * DoExpressCheckout call
      *
      * @return void
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_DoExpressCheckoutPayment
+     * @codingStandardsIgnoreEnd
      */
     public function callDoExpressCheckoutPayment()
     {
@@ -890,7 +896,9 @@ public function callDoDirectPayment()
      * Do Reference Transaction call
      *
      * @return void
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_DoReferenceTransaction
+     * @codingStandardsIgnoreEnd
      */
     public function callDoReferenceTransaction()
     {
@@ -942,7 +950,9 @@ public function callDoCapture()
      * DoAuthorization call
      *
      * @return $this
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_DoAuthorization
+     * @codingStandardsIgnoreEnd
      */
     public function callDoAuthorization()
     {
@@ -970,7 +980,9 @@ public function callDoVoid()
      * GetTransactionDetails
      *
      * @return void
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_GetTransactionDetails
+     * @codingStandardsIgnoreEnd
      */
     public function callGetTransactionDetails()
     {
@@ -983,7 +995,9 @@ public function callGetTransactionDetails()
      * RefundTransaction call
      *
      * @return void
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_RefundTransaction
+     * @codingStandardsIgnoreEnd
      */
     public function callRefundTransaction()
     {
@@ -999,7 +1013,9 @@ public function callRefundTransaction()
      * ManagePendingTransactionStatus
      *
      * @return void
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_ManagePendingTransactionStatus
+     * @codingStandardsIgnoreEnd
      */
     public function callManagePendingTransactionStatus()
     {
@@ -1028,7 +1044,9 @@ public function callGetPalDetails()
      * Set Customer BillingA greement call
      *
      * @return void
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_SetCustomerBillingAgreement
+     * @codingStandardsIgnoreEnd
      */
     public function callSetCustomerBillingAgreement()
     {
@@ -1041,7 +1059,9 @@ public function callSetCustomerBillingAgreement()
      * Get Billing Agreement Customer Details call
      *
      * @return void
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_GetBillingAgreementCustomerDetails
+     * @codingStandardsIgnoreEnd
      */
     public function callGetBillingAgreementCustomerDetails()
     {
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 135ce18e1a4e9..419e0a5f85919 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -11,7 +11,6 @@
 /**
  * Config model that is aware of all \Magento\Paypal payment methods
  * Works with PayPal-specific system configuration
-
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
@@ -556,7 +555,9 @@ class Config extends AbstractConfig
      * Locale codes supported by misc images (marks, shortcuts etc)
      *
      * @var string[]
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_ECButtonIntegration#id089QD0O0TX4__id08AH904I0YK
+     * @codingStandardsIgnoreEnd
      */
     protected $_supportedImageLocales = [
         'de_DE',
@@ -1194,7 +1195,7 @@ public function getPaymentActions()
             self::PAYMENT_ACTION_AUTH => __('Authorization'),
             self::PAYMENT_ACTION_SALE => __('Sale'),
         ];
-        if ($this->_methodCode !== null&& $this->_methodCode == self::METHOD_WPP_EXPRESS) {
+        if ($this->_methodCode !== null && $this->_methodCode == self::METHOD_WPP_EXPRESS) {
             $paymentActions[self::PAYMENT_ACTION_ORDER] = __('Order');
         }
         return $paymentActions;
diff --git a/app/code/Magento/Paypal/Model/Info.php b/app/code/Magento/Paypal/Model/Info.php
index 95334464e4f27..678ed87da95c1 100644
--- a/app/code/Magento/Paypal/Model/Info.php
+++ b/app/code/Magento/Paypal/Model/Info.php
@@ -428,8 +428,10 @@ public static function isPaymentFailed(\Magento\Payment\Model\InfoInterface $pay
      *
      * @param string $code
      * @return \Magento\Framework\Phrase
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_html_IPNandPDTVariables
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_GetTransactionDetails
+     * @codingStandardsIgnoreEnd
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public static function explainPendingReason($code)
@@ -453,15 +455,11 @@ public static function explainPendingReason($code)
             case 'paymentreview':
                 return __('The payment is pending while it is being reviewed by PayPal for risk.');
             case 'unilateral':
-                return __(
-                    'The payment is pending because it was made to an email address that is not yet registered or confirmed.'
-                );
+                return __('The payment is pending because it was made to an email address that is not yet registered or confirmed.');
             case 'verify':
                 return __('The merchant account is not yet verified.');
             case 'upgrade':
-                return __(
-                    'The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.'
-                );
+                return __('The payment was made via credit card. In order to receive funds merchant must upgrade account to Business or Premier status.');
             case 'none':
                 // break is intentionally omitted
             case 'other':
@@ -476,8 +474,10 @@ public static function explainPendingReason($code)
      *
      * @param string $code
      * @return string
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_html_IPNandPDTVariables
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_r_GetTransactionDetails
+     * @codingStandardsIgnoreEnd
      */
     public static function explainReasonCode($code)
     {
@@ -486,12 +486,8 @@ public static function explainReasonCode($code)
             'guarantee' => __(
                 'A reversal has occurred on this transaction due to your customer triggering a money-back guarantee.'
             ),
-            'buyer-complaint' => __(
-                'A reversal has occurred on this transaction due to a complaint about the transaction from your customer.'
-            ),
-            'buyer_complaint' => __(
-                'A reversal has occurred on this transaction due to a complaint about the transaction from your customer.'
-            ),
+            'buyer-complaint' => __('A reversal has occurred on this transaction due to a complaint about the transaction from your customer.'),
+            'buyer_complaint' => __('A reversal has occurred on this transaction due to a complaint about the transaction from your customer.'),
             'refund' => __(
                 'A reversal has occurred on this transaction because you have given the customer a refund.'
             ),
@@ -500,13 +496,9 @@ public static function explainReasonCode($code)
             'admin_reversal' => __('Transaction reversal by PayPal administrators.'),
             'chargeback_reimbursement' => __('Reimbursement for a chargeback.'),
             'chargeback_settlement' => __('Settlement of a chargeback.'),
-            'unauthorized_spoof' => __(
-                'A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.'
-            ),
+            'unauthorized_spoof' => __('A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.'),
             'non_receipt' => __('Buyer claims that he did not receive goods or service.'),
-            'not_as_described' => __(
-                'Buyer claims that the goods or service received differ from merchant’s description of the goods or service.'
-            ),
+            'not_as_described' => __('Buyer claims that the goods or service received differ from merchant’s description of the goods or service.'),
             'unauthorized' => __('Buyer claims that he/she did not authorize transaction.'),
             'adjustment_reimburse' => __('A case that has been resolved and close requires a reimbursement.'),
             'duplicate' => __('Buyer claims that a possible duplicate payment was made to the merchant.'),
@@ -669,7 +661,9 @@ protected function _getValue($value, $key)
      *
      * @param string $value
      * @return string
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_AVSResponseCodes
+     * @codingStandardsIgnoreEnd
      */
     protected function _getAvsLabel($value)
     {
@@ -716,7 +710,9 @@ protected function _getAvsLabel($value)
      *
      * @param string $value
      * @return string
+     * @codingStandardsIgnoreStart
      * @link https://cms.paypal.com/us/cgi-bin/?&cmd=_render-content&content_ID=developer/e_howto_api_nvp_AVSResponseCodes
+     * @codingStandardsIgnoreEnd
      */
     protected function _getCvv2Label($value)
     {
diff --git a/app/code/Magento/Paypal/Model/Ipn.php b/app/code/Magento/Paypal/Model/Ipn.php
index abfe2f6b0bdf1..361e83bda325d 100644
--- a/app/code/Magento/Paypal/Model/Ipn.php
+++ b/app/code/Magento/Paypal/Model/Ipn.php
@@ -107,7 +107,9 @@ protected function _getConfig()
         if (!$this->_config->isMethodActive($methodCode) || !$this->_config->isMethodAvailable()) {
             throw new Exception(sprintf('Method "%s" is not available.', $methodCode));
         }
+        // @codingStandardsIgnoreStart
         /** @link https://cms.paypal.com/cgi-bin/marketingweb?cmd=_render-content&content_ID=developer/e_howto_admin_IPNIntro */
+        // @codingStandardsIgnoreEnd
         // verify merchant email intended to receive notification
         $merchantEmail = $this->_config->getValue('businessAccount');
         if (!$merchantEmail) {
diff --git a/app/code/Magento/Paypal/Model/Payflowlink.php b/app/code/Magento/Paypal/Model/Payflowlink.php
index 4f571717e6d76..fec3e0df4ef43 100644
--- a/app/code/Magento/Paypal/Model/Payflowlink.php
+++ b/app/code/Magento/Paypal/Model/Payflowlink.php
@@ -6,10 +6,12 @@
 
 namespace Magento\Paypal\Model;
 
+use Magento\Framework\UrlInterface;
 use Magento\Payment\Model\Method\AbstractMethod;
 use Magento\Payment\Model\Method\ConfigInterfaceFactory;
 use Magento\Paypal\Model\Payflow\Service\Response\Handler\HandlerInterface;
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
+use Magento\Store\Model\Store;
 
 /**
  * Payflow Link payment gateway model
@@ -573,11 +575,11 @@ protected function _getCallbackUrl($actionName)
             /** @var $website \Magento\Store\Model\Website */
             $website = $this->_websiteFactory->create()->load($this->_requestHttp->getParam('website'));
             $secure = $this->_scopeConfig->isSetFlag(
-                \Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
+                Store::XML_PATH_SECURE_IN_FRONTEND,
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $website->getDefaultStore()
             );
-            $path = $secure ? \Magento\Store\Model\Store::XML_PATH_SECURE_BASE_LINK_URL : \Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_LINK_URL;
+            $path = $secure ? Store::XML_PATH_SECURE_BASE_LINK_URL : Store::XML_PATH_UNSECURE_BASE_LINK_URL;
             $websiteUrl = $this->_scopeConfig->getValue(
                 $path,
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
@@ -585,10 +587,10 @@ protected function _getCallbackUrl($actionName)
             );
         } else {
             $secure = $this->_scopeConfig->isSetFlag(
-                \Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
+                Store::XML_PATH_SECURE_IN_FRONTEND,
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
-            $websiteUrl = $this->storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_LINK, $secure);
+            $websiteUrl = $this->storeManager->getStore()->getBaseUrl(UrlInterface::URL_TYPE_LINK, $secure);
         }
 
         return $websiteUrl . 'paypal/' . $this->_callbackController . '/' . $actionName;
diff --git a/app/code/Magento/Paypal/Model/Pro.php b/app/code/Magento/Paypal/Model/Pro.php
index 95f37149c4615..7ef80e31a3a70 100644
--- a/app/code/Magento/Paypal/Model/Pro.php
+++ b/app/code/Magento/Paypal/Model/Pro.php
@@ -25,7 +25,7 @@ class Pro
     /**
      * Config instance
      *
-     * @var \Magento\Paypal\Model\Config
+     * @var Config
      */
     protected $_config;
 
@@ -55,7 +55,7 @@ class Pro
      *
      * @var string
      */
-    protected $_configType = \Magento\Paypal\Model\Config::class;
+    protected $_configType = Config::class;
 
     /**
      * @var \Magento\Paypal\Model\Config\Factory
@@ -122,11 +122,11 @@ public function setMethod($code, $storeId = null)
     /**
      * Config instance setter
      *
-     * @param \Magento\Paypal\Model\Config $instace
+     * @param Config $instace
      * @param int|null $storeId
      * @return $this
      */
-    public function setConfig(\Magento\Paypal\Model\Config $instance, $storeId = null)
+    public function setConfig(Config $instance, $storeId = null)
     {
         $this->_config = $instance;
         if (null !== $storeId) {
@@ -138,7 +138,7 @@ public function setConfig(\Magento\Paypal\Model\Config $instance, $storeId = nul
     /**
      * Config instance getter
      *
-     * @return \Magento\Paypal\Model\Config
+     * @return Config
      */
     public function getConfig()
     {
@@ -296,9 +296,7 @@ public function refund(\Magento\Framework\DataObject $payment, $amount)
             $canRefundMore = $payment->getCreditmemo()->getInvoice()->canRefund();
             $isFullRefund = !$canRefundMore &&
                 0 == (double)$order->getBaseTotalOnlineRefunded() + (double)$order->getBaseTotalOfflineRefunded();
-            $api->setRefundType(
-                $isFullRefund ? \Magento\Paypal\Model\Config::REFUND_TYPE_FULL : \Magento\Paypal\Model\Config::REFUND_TYPE_PARTIAL
-            );
+            $api->setRefundType($isFullRefund ? Config::REFUND_TYPE_FULL : Config::REFUND_TYPE_PARTIAL);
             $api->callRefundTransaction();
             $this->_importRefundResultToPayment($api, $payment, $canRefundMore);
         } else {
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
index 4e516303b8728..5ff4b6b0b226c 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
@@ -86,7 +86,7 @@ public function testIsCollapseState($expanded, $expected)
         $html = $this->_model->render($this->_element);
         $this->assertContains(
             '<input id="' . $this->_element->getHtmlId() . '-state" name="config_state['
-                . $this->_element->getId() . ']" type="hidden" value="' . $expected . '" />',
+            . $this->_element->getId() . ']" type="hidden" value="' . $expected . '" />',
             $html
         );
     }
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 6e97029ebb872..fdd69533eb21e 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
@@ -202,7 +202,7 @@ public function testCallGetExpressCheckoutDetails()
         $this->model->callGetExpressCheckoutDetails();
         $address = $this->model->getExportedShippingAddress();
         $this->assertEquals('Ship To Name', $address->getData('firstname'));
-        $this->assertEquals(implode("\n", ['testStreet','testApartment']), $address->getStreet());
+        $this->assertEquals(implode("\n", ['testStreet', 'testApartment']), $address->getStreet());
         $this->assertEquals('testCompany', $address->getCompany());
         $this->assertEquals('testCity', $address->getCity());
         $this->assertEquals('223322', $address->getTelephone());
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php b/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
index 8dc387793f7b0..eb7e195d90afd 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/CartTest.php
@@ -245,7 +245,8 @@ protected function _prepareInvalidModelData($values, $transferDiscount)
         $taxContainer = new \Magento\Framework\DataObject(
             [
                 'base_discount_tax_compensation_amount' => $values['base_discount_tax_compensation_amount'],
-                'base_shipping_discount_tax_compensation_amnt' => $values['base_shipping_discount_tax_compensation_amnt'],
+                'base_shipping_discount_tax_compensation_amnt'
+                    => $values['base_shipping_discount_tax_compensation_amnt'],
             ]
         );
         $expectedSubtotal = $values['base_subtotal'];
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 a3ea3fc6943d2..33e2224e2c022 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Express/CheckoutTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Express/CheckoutTest.php
@@ -17,6 +17,7 @@
 class CheckoutTest extends \PHPUnit_Framework_TestCase
 {
     const SHIPPING_METHOD = 'new_shipping_method';
+
     /**
      * @var \Magento\Paypal\Model\Express\Checkout | \Magento\Paypal\Model\Express\Checkout
      */
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 1c07844e076f6..1752b54f52d5b 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
@@ -142,7 +142,8 @@ private function getRulesXmlString($fileName = 'fps_prexmldata.xml')
     private function getRulesExpectedDictionary()
     {
         return [
-            'Total Purchase Price Ceiling' => 'The purchase amount of 7501 is greater than the ceiling value set of 7500',
+            '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',
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php
index 08f90aabf8446..0f00260291aca 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ProTest.php
@@ -23,6 +23,7 @@ class ProTest extends \PHPUnit_Framework_TestCase
      * @var \Magento\Paypal\Model\Pro
      */
     protected $pro;
+
     /** @var \PHPUnit_Framework_MockObject_MockObject */
     protected $apiMock;
 
diff --git a/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php b/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php
index 000d58b079f03..b98ba0d905ef2 100644
--- a/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php
+++ b/app/code/Magento/ProductAlert/Block/Email/AbstractEmail.php
@@ -65,11 +65,11 @@ public function __construct(
     }
 
     /**
-    * Filter malicious code before insert content to email
-    *
-    * @param  string|array $content
-    * @return string|array
-    */
+     * Filter malicious code before insert content to email
+     *
+     * @param  string|array $content
+     * @return string|array
+     */
     public function getFilteredContent($content)
     {
         return $this->_maliciousCode->filter($content);
diff --git a/app/code/Magento/ProductAlert/Model/ResourceModel/Price.php b/app/code/Magento/ProductAlert/Model/ResourceModel/Price.php
index 977491df38d23..c62407caf6348 100644
--- a/app/code/Magento/ProductAlert/Model/ResourceModel/Price.php
+++ b/app/code/Magento/ProductAlert/Model/ResourceModel/Price.php
@@ -50,7 +50,8 @@ protected function _construct()
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
-        if ($object->getId() === null&& $object->getCustomerId() && $object->getProductId() && $object->getWebsiteId()
+        if ($object->getId() === null && $object->getCustomerId()
+            && $object->getProductId() && $object->getWebsiteId()
         ) {
             if ($row = $this->_getAlertRow($object)) {
                 $price = $object->getPrice();
diff --git a/app/code/Magento/ProductAlert/Model/ResourceModel/Stock.php b/app/code/Magento/ProductAlert/Model/ResourceModel/Stock.php
index 350e47e1502b3..ab53fabf83517 100644
--- a/app/code/Magento/ProductAlert/Model/ResourceModel/Stock.php
+++ b/app/code/Magento/ProductAlert/Model/ResourceModel/Stock.php
@@ -50,7 +50,8 @@ protected function _construct()
      */
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
-        if ($object->getId() === null&& $object->getCustomerId() && $object->getProductId() && $object->getWebsiteId()
+        if ($object->getId() === null && $object->getCustomerId()
+            && $object->getProductId() && $object->getWebsiteId()
         ) {
             if ($row = $this->_getAlertRow($object)) {
                 $object->addData($row);
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 d73d3e52ad9b3..e69e78a2399b9 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
@@ -123,7 +123,11 @@ public function testConvert()
         $this->orderPaymentRepositoryMock->expects($this->once())->method('create')->willReturn($orderPayment);
         $this->dataObjectHelper->expects($this->once())
             ->method('populateWithArray')
-            ->with($orderPayment, array_merge($paymentData, $data), \Magento\Sales\Api\Data\OrderPaymentInterface::class)
+            ->with(
+                $orderPayment,
+                array_merge($paymentData, $data),
+                \Magento\Sales\Api\Data\OrderPaymentInterface::class
+            )
             ->willReturnSelf();
 
         $this->assertSame($orderPayment, $this->converter->convert($this->paymentMock, $data));
diff --git a/app/code/Magento/Review/Block/Adminhtml/Add.php b/app/code/Magento/Review/Block/Adminhtml/Add.php
index 6d8cadf60f53d..05a34dd1dbba0 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Add.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add.php
@@ -72,7 +72,10 @@ protected function _construct()
                         toggleVis("reset_button");
                     },
                     updateRating: function() {
-                        elements = [$("select_stores"), $("rating_detail").getElementsBySelector("input[type=\'radio\']")].flatten();
+                        elements = [
+                            $("select_stores"), 
+                            $("rating_detail").getElementsBySelector("input[type=\'radio\']")
+                        ].flatten();
                         $(\'save_button\').disabled = true;
                         var params = Form.serializeElements(elements);
                         if (!params.isAjax) {
@@ -85,7 +88,10 @@ protected function _construct()
             $this->getUrl(
                 'review/product/ratingItems'
             ) .
-            '", {parameters:params, evalScripts: true,  onComplete:function(){ $(\'save_button\').disabled = false; } });
+            '", {
+                parameters:params, 
+                evalScripts: true,  
+                onComplete:function(){ $(\'save_button\').disabled = false; } });
                     },
 
                     reqSuccess :function(response) {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Grid.php
index a4afd1ecd5d31..3d9e85b285965 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid.php
@@ -4,19 +4,19 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Review\Block\Adminhtml;
+
 /**
  * Adminhtml reviews grid
  *
  * @method int getProductId() getProductId()
- * @method \Magento\Review\Block\Adminhtml\Grid setProductId() setProductId(int $productId)
+ * @method Grid setProductId() setProductId(int $productId)
  * @method int getCustomerId() getCustomerId()
- * @method \Magento\Review\Block\Adminhtml\Grid setCustomerId() setCustomerId(int $customerId)
- * @method \Magento\Review\Block\Adminhtml\Grid setMassactionIdFieldOnlyIndexValue() setMassactionIdFieldOnlyIndexValue(bool $onlyIndex)
+ * @method Grid setCustomerId() setCustomerId(int $customerId)
+ * @method Grid setMassactionIdFieldOnlyIndexValue() setMassactionIdFieldOnlyIndexValue(bool $onlyIndex)
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Review\Block\Adminhtml;
-
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
@@ -112,7 +112,7 @@ protected function _afterLoadCollection()
     /**
      * Prepare collection
      *
-     * @return \Magento\Review\Block\Adminhtml\Grid
+     * @return Grid
      */
     protected function _prepareCollection()
     {
diff --git a/app/code/Magento/Review/Helper/Action/Pager.php b/app/code/Magento/Review/Helper/Action/Pager.php
index c806642d999b8..b7f125faa8e5e 100644
--- a/app/code/Magento/Review/Helper/Action/Pager.php
+++ b/app/code/Magento/Review/Helper/Action/Pager.php
@@ -42,8 +42,10 @@ class Pager extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Backend\Model\Session $backendSession
      */
-    public function __construct(\Magento\Framework\App\Helper\Context $context, \Magento\Backend\Model\Session $backendSession)
-    {
+    public function __construct(
+        \Magento\Framework\App\Helper\Context $context,
+        \Magento\Backend\Model\Session $backendSession
+    ) {
         $this->_backendSession = $backendSession;
         parent::__construct($context);
     }
diff --git a/app/code/Magento/Review/Helper/Data.php b/app/code/Magento/Review/Helper/Data.php
index 2c9925d4ce314..3ed850cad6f97 100644
--- a/app/code/Magento/Review/Helper/Data.php
+++ b/app/code/Magento/Review/Helper/Data.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Review\Helper;
 
+use Magento\Store\Model\ScopeInterface;
+
 /**
  * Default review helper
  */
@@ -72,7 +74,7 @@ public function getDetailHtml($origDetail)
      */
     public function getIsGuestAllowToWrite()
     {
-        return $this->scopeConfig->isSetFlag(self::XML_REVIEW_GUETS_ALLOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->scopeConfig->isSetFlag(self::XML_REVIEW_GUETS_ALLOW, ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Api/CreditmemoCommentRepositoryInterface.php b/app/code/Magento/Sales/Api/CreditmemoCommentRepositoryInterface.php
index 07792667e73ac..d128a97650312 100644
--- a/app/code/Magento/Sales/Api/CreditmemoCommentRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/CreditmemoCommentRepositoryInterface.php
@@ -25,6 +25,7 @@ interface CreditmemoCommentRepositoryInterface
      */
     public function get($id);
 
+    // @codingStandardsIgnoreStart
     /**
      * Lists credit memo comments that match specified search criteria.
      *
@@ -34,6 +35,7 @@ public function get($id);
      * @return \Magento\Sales\Api\Data\CreditmemoCommentSearchResultInterface Credit memo comment search results interface.
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
+    // @codingStandardsIgnoreEnd
 
     /**
      * Deletes a specified credit memo comment.
diff --git a/app/code/Magento/Sales/Api/CreditmemoManagementInterface.php b/app/code/Magento/Sales/Api/CreditmemoManagementInterface.php
index 9ae95ff46a28f..21f144de0584c 100644
--- a/app/code/Magento/Sales/Api/CreditmemoManagementInterface.php
+++ b/app/code/Magento/Sales/Api/CreditmemoManagementInterface.php
@@ -25,6 +25,7 @@ interface CreditmemoManagementInterface
      */
     public function cancel($id);
 
+    // @codingStandardsIgnoreStart
     /**
      * Lists comments for a specified credit memo.
      *
@@ -32,6 +33,7 @@ public function cancel($id);
      * @return \Magento\Sales\Api\Data\CreditmemoCommentSearchResultInterface Credit memo comment search results interface.
      */
     public function getCommentsList($id);
+    // @codingStandardsIgnoreEnd
 
     /**
      * Emails a user a specified credit memo.
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php
index e36273c9dc1cf..643b4ae2645f5 100644
--- a/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php
+++ b/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php
@@ -611,12 +611,14 @@ public function getItems();
      */
     public function setItems($items);
 
+    // @codingStandardsIgnoreStart
     /**
      * Gets credit memo comments.
      *
      * @return \Magento\Sales\Api\Data\CreditmemoCommentInterface[]|null Array of any credit memo comments. Otherwise, null.
      */
     public function getComments();
+    // @codingStandardsIgnoreEnd
 
     /**
      * Sets credit memo comments.
diff --git a/app/code/Magento/Sales/Api/OrderManagementInterface.php b/app/code/Magento/Sales/Api/OrderManagementInterface.php
index 879d97246bd33..c12a427ae319c 100644
--- a/app/code/Magento/Sales/Api/OrderManagementInterface.php
+++ b/app/code/Magento/Sales/Api/OrderManagementInterface.php
@@ -24,6 +24,7 @@ interface OrderManagementInterface
      */
     public function cancel($id);
 
+    // @codingStandardsIgnoreStart
     /**
      * Lists comments for a specified order.
      *
@@ -31,6 +32,7 @@ public function cancel($id);
      * @return \Magento\Sales\Api\Data\OrderStatusHistorySearchResultInterface Order status history search results interface.
      */
     public function getCommentsList($id);
+    // @codingStandardsIgnoreEnd
 
     /**
      * Adds a comment to a specified order.
diff --git a/app/code/Magento/Sales/Api/OrderStatusHistoryRepositoryInterface.php b/app/code/Magento/Sales/Api/OrderStatusHistoryRepositoryInterface.php
index c6ebcf43d2301..06813737049e2 100644
--- a/app/code/Magento/Sales/Api/OrderStatusHistoryRepositoryInterface.php
+++ b/app/code/Magento/Sales/Api/OrderStatusHistoryRepositoryInterface.php
@@ -16,6 +16,7 @@
  */
 interface OrderStatusHistoryRepositoryInterface
 {
+    // @codingStandardsIgnoreStart
     /**
      * Lists order status history comments that match specified search criteria.
      *
@@ -23,6 +24,7 @@ interface OrderStatusHistoryRepositoryInterface
      * @return \Magento\Sales\Api\Data\OrderStatusHistorySearchResultInterface Order status history search result interface.
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
+    // @codingStandardsIgnoreEnd
 
     /**
      * Loads a specified order status comment.
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index 8278ffdfa16a5..b993850d5c641 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Form;
 
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
@@ -164,7 +165,9 @@ public function getFormValues()
         } catch (\Exception $e) {
             /** If customer does not exist do nothing. */
         }
-        $data = isset($customer) ? $this->_extensibleDataObjectConverter->toFlatArray($customer, [], \Magento\Customer\Api\Data\CustomerInterface::class) : [];
+        $data = isset($customer)
+            ? $this->_extensibleDataObjectConverter->toFlatArray($customer, [], CustomerInterface::class)
+            : [];
         foreach ($this->getQuote()->getData() as $key => $value) {
             if (strpos($key, 'customer_') === 0) {
                 $data[substr($key, 9)] = $value;
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
index bfd2ef44ff624..86238c854915d 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
@@ -302,7 +302,11 @@ public function updateBackButtonUrl($flag)
                     'setLocation(\'' . $this->getInvoice()->getBackUrl() . '\')'
                 );
             }
-            return $this->buttonList->update('back', 'onclick', 'setLocation(\'' . $this->getUrl('sales/invoice/') . '\')');
+            return $this->buttonList->update(
+                'back',
+                'onclick',
+                'setLocation(\'' . $this->getUrl('sales/invoice/') . '\')'
+            );
         }
         return $this;
     }
diff --git a/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php b/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php
index 5b9b609bb5331..8d5fef8d00389 100644
--- a/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php
+++ b/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php
@@ -95,26 +95,6 @@ protected function _initTotals()
             );
             $this->addTotal($total);
         }
-        /**
-                <?php if ($this->getCanDisplayTotalPaid()): ?>
-                <tr>
-           <td colspan="6" class="a-right"><strong><?php echo __('Total Paid') ?></strong></td>
-           <td class="last a-right"><strong><?php echo $_order->formatPrice($_creditmemo->getTotalPaid()) ?></strong></td>
-                </tr>
-                <?php endif; ?>
-                <?php if ($this->getCanDisplayTotalRefunded()): ?>
-                <tr>
-           <td colspan="6" class="a-right"><strong><?php echo __('Total Refunded') ?></strong></td>
-           <td class="last a-right"><strong><?php echo $_order->formatPrice($_creditmemo->getTotalRefunded()) ?></strong></td>
-                </tr>
-                <?php endif; ?>
-                <?php if ($this->getCanDisplayTotalDue()): ?>
-                <tr>
-           <td colspan="6" class="a-right"><strong><?php echo __('Total Due') ?></strong></td>
-           <td class="last a-right"><strong><?php echo $_order->formatPrice($_creditmemo->getTotalDue()) ?></strong></td>
-                </tr>
-                <?php endif; ?>
-        */
         return $this;
     }
 }
diff --git a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
index 6a772352baf94..cd3dcd6ab9212 100644
--- a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
@@ -170,7 +170,8 @@ public function getFormatedOptionValue($optionValue)
         $result = ['value' => $truncatedValue];
 
         if ($this->string->strlen($optionValue) > 55) {
-            $result['value'] = $result['value'] . ' <a href="#" class="dots tooltip toggle" onclick="return false">...</a>';
+            $result['value'] = $result['value']
+                . ' <a href="#" class="dots tooltip toggle" onclick="return false">...</a>';
             $optionValue = nl2br($optionValue);
             $result = array_merge($result, ['full_view' => $optionValue]);
         }
diff --git a/app/code/Magento/Sales/Helper/Reorder.php b/app/code/Magento/Sales/Helper/Reorder.php
index 89d82ba1fed1d..eae5122d8a85e 100644
--- a/app/code/Magento/Sales/Helper/Reorder.php
+++ b/app/code/Magento/Sales/Helper/Reorder.php
@@ -56,7 +56,11 @@ public function isAllow()
      */
     public function isAllowed($store = null)
     {
-        if ($this->scopeConfig->getValue(self::XML_PATH_SALES_REORDER_ALLOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)) {
+        if ($this->scopeConfig->getValue(
+            self::XML_PATH_SALES_REORDER_ALLOW,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $store
+        )) {
             return true;
         }
         return false;
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 36fddf21c6f88..7fff81589b6d2 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -665,7 +665,7 @@ public function initFromOrderItem(\Magento\Sales\Model\Order\Item $orderItem, $q
      */
     public function getCustomerWishlist($cacheReload = false)
     {
-        if ($this->_wishlist !== null&& !$cacheReload) {
+        if ($this->_wishlist !== null && !$cacheReload) {
             return $this->_wishlist;
         }
 
@@ -1330,7 +1330,6 @@ 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,
diff --git a/app/code/Magento/Sales/Model/Order/Email/NotifySender.php b/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
index 6c61e5066a121..f01621583f476 100644
--- a/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
@@ -35,7 +35,8 @@ protected function checkAndSend(Order $order, $notify = true)
         if ($notify) {
             $sender->send();
         } else {
-            // Email copies are sent as separated emails if their copy method is 'copy' or a customer should not be notified
+            // Email copies are sent as separated emails
+            // if their copy method is 'copy' or a customer should not be notified
             $sender->sendCopyTo();
         }
 
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index ab770d360ff48..2abfda4b63b8b 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -252,6 +252,7 @@ public function getParentTransactionId()
     /**
      * Returns transaction parent
      *
+     * @param string $txnId
      * @return string
      */
     public function setParentTransactionId($txnId)
@@ -980,6 +981,7 @@ public function update($isOnline = true)
      * Triggers invoice pay and updates base_amount_paid_online total.
      *
      * @param \Magento\Sales\Model\Order\Invoice|false $invoice
+     * @return void
      */
     protected function updateBaseAmountPaidOnlineTotal($invoice)
     {
@@ -994,6 +996,7 @@ protected function updateBaseAmountPaidOnlineTotal($invoice)
      * Sets order state to 'processing' with appropriate message
      *
      * @param \Magento\Framework\Phrase|string $message
+     * @return void
      */
     protected function setOrderStateProcessing($message)
     {
@@ -1007,6 +1010,7 @@ protected function setOrderStateProcessing($message)
      *
      * @param Invoice|false $invoice
      * @param string $message
+     * @return void
      */
     protected function cancelInvoiceAndRegisterCancellation($invoice, $message)
     {
@@ -1022,6 +1026,7 @@ protected function cancelInvoiceAndRegisterCancellation($invoice, $message)
      *
      * @param string $message
      * @param int|null $transactionId
+     * @return void
      */
     protected function setOrderStatePaymentReview($message, $transactionId)
     {
@@ -1158,6 +1163,11 @@ public function addTransaction($type, $salesDocument = null, $failSafe = false)
         return $builder->build($type);
     }
 
+    /**
+     * @param Transaction|null $transaction
+     * @param string $message
+     * @return void
+     */
     public function addTransactionCommentsToOrder($transaction, $message)
     {
         $order = $this->getOrder();
@@ -1344,10 +1354,10 @@ public function resetTransactionAdditionalInfo()
     /**
      * Prepare credit memo
      *
-     * @param $amount
-     * @param $baseGrandTotal
+     * @param float $amount
+     * @param float $baseGrandTotal
      * @param false|Invoice $invoice
-     * @return mixed
+     * @return Creditmemo
      */
     protected function prepareCreditMemo($amount, $baseGrandTotal, $invoice)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
index 1d5c94a7e2e84..14a92963c2598 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
@@ -17,7 +17,6 @@
  *
  * @method \Magento\Sales\Model\ResourceModel\Order\Payment\Transaction _getResource()
  * @method \Magento\Sales\Model\ResourceModel\Order\Payment\Transaction getResource()
-
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -133,10 +132,12 @@ class Transaction extends AbstractModel implements TransactionInterface
      * @param \Magento\Framework\Api\ExtensionAttributesFactory $extensionFactory
      * @param AttributeValueFactory $customAttributeFactory
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
+     * @param \Magento\Sales\Api\OrderPaymentRepositoryInterface $orderPaymentRepository
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
      * @param \Magento\Framework\Stdlib\DateTime\DateTimeFactory $dateFactory
      * @param TransactionFactory $transactionFactory
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
index f9a98e164a450..12e2855ae3ea3 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -7,13 +7,14 @@
 namespace Magento\Sales\Model\Order\Pdf;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\DataObject;
 
 /**
  * Sales Order PDF abstract model
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-abstract class AbstractPdf extends \Magento\Framework\DataObject
+abstract class AbstractPdf extends DataObject
 {
     /**
      * Y coordinate
@@ -439,7 +440,9 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
         /* Shipping Address and Method */
         if (!$order->getIsVirtual()) {
             /* Shipping Address */
-            $shippingAddress = $this->_formatAddress($this->addressRenderer->format($order->getShippingAddress(), 'pdf'));
+            $shippingAddress = $this->_formatAddress(
+                $this->addressRenderer->format($order->getShippingAddress(), 'pdf')
+            );
             $shippingMethod = $order->getShippingDescription();
         }
 
@@ -708,7 +711,7 @@ protected function insertTotals($page, $source)
     /**
      * Parse item description
      *
-     * @param  \Magento\Framework\DataObject $item
+     * @param  DataObject $item
      * @return array
      */
     protected function _parseItemDescription($item)
@@ -822,12 +825,12 @@ public function getRenderer($type)
     /**
      * Draw Item process
      *
-     * @param  \Magento\Framework\DataObject $item
+     * @param  DataObject $item
      * @param  \Zend_Pdf_Page $page
      * @param  \Magento\Sales\Model\Order $order
      * @return \Zend_Pdf_Page
      */
-    protected function _drawItem(\Magento\Framework\DataObject $item, \Zend_Pdf_Page $page, \Magento\Sales\Model\Order $order)
+    protected function _drawItem(DataObject $item, \Zend_Pdf_Page $page, \Magento\Sales\Model\Order $order)
     {
         $type = $item->getOrderItem()->getProductType();
         $renderer = $this->_getRenderer($type);
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php
index d057028d6e4fd..8474cd0845a04 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php
@@ -376,14 +376,14 @@ public function testGetSubtotalWithDiscount($orderData, $displayTotalsIncludeTax
     {
         $quoteAddressMock = $this->getMock(
             \Magento\Quote\Model\Quote\Address::class,
-            ['getSubtotal', 'getTaxAmount','getDiscountTaxCompensationAmount','getDiscountAmount'],
+            ['getSubtotal', 'getTaxAmount', 'getDiscountTaxCompensationAmount', 'getDiscountAmount'],
             [],
             '',
             false
         );
         $gridMock = $this->getMock(
             \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid::class,
-            ['getQuoteAddress','displayTotalsIncludeTax'],
+            ['getQuoteAddress', 'displayTotalsIncludeTax'],
             [],
             '',
             false
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Order/Item/Renderer/DefaultRendererTest.php b/app/code/Magento/Sales/Test/Unit/Block/Order/Item/Renderer/DefaultRendererTest.php
index 2a946f8a0857f..c22bb5cef7986 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Order/Item/Renderer/DefaultRendererTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Order/Item/Renderer/DefaultRendererTest.php
@@ -140,7 +140,8 @@ public function testGetTotalAmount()
         $discountAmount = 20;
         $weeeTaxAppliedRowAmount = 10;
 
-        $expectedResult = $rowTotal + $taxAmount + $discountTaxCompensationAmount - $discountAmount + $weeeTaxAppliedRowAmount;
+        $expectedResult = $rowTotal + $taxAmount + $discountTaxCompensationAmount - $discountAmount
+            + $weeeTaxAppliedRowAmount;
         $this->itemMock->expects($this->once())
             ->method('getRowTotal')
             ->will($this->returnValue($rowTotal));
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 64359b82ad73c..3c98e07817040 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,16 +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'];
@@ -86,13 +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();
@@ -100,16 +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'];
@@ -130,17 +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/GridPoolTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/GridPoolTest.php
index 27a2e1330e834..3b19e32b52db3 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/GridPoolTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/GridPoolTest.php
@@ -15,22 +15,27 @@ class GridPoolTest extends \PHPUnit_Framework_TestCase
      * @var \Magento\Sales\Model\ResourceModel\GridPool
      */
     protected $gridPool;
+
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Grid|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $orderGridMock;
+
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Invoice\Grid|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $invoiceGridMock;
+
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Shipment\Grid|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $shipmentGridMock;
+
     /**
      * @var \Magento\Sales\Model\ResourceModel\Order\Creditmemo\Grid|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $creditmemoGridMock;
+
     /**
      * @var \Zend_Db_Statement_Interface
      */
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
index 9a383cbee24b0..eab23ac394506 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit/Tab/Coupons/Grid.php
@@ -103,7 +103,7 @@ protected function _prepareColumns()
                 'width' => '100',
                 'type' => 'options',
                 'options' => [__('No'), __('Yes')],
-                'renderer' => \Magento\SalesRule\Block\Adminhtml\Promo\Quote\Edit\Tab\Coupons\Grid\Column\Renderer\Used::class,
+                'renderer' => Grid\Column\Renderer\Used::class,
                 'filter_condition_callback' => [$this->_salesRuleCoupon->create(), 'addIsUsedFilterCallback']
             ]
         );
diff --git a/app/code/Magento/SalesRule/Helper/Coupon.php b/app/code/Magento/SalesRule/Helper/Coupon.php
index 829ac3fc32c4b..a07c509a2bc59 100644
--- a/app/code/Magento/SalesRule/Helper/Coupon.php
+++ b/app/code/Magento/SalesRule/Helper/Coupon.php
@@ -6,6 +6,8 @@
 
 namespace Magento\SalesRule\Helper;
 
+use Magento\Store\Model\ScopeInterface;
+
 /**
  * Helper for coupon codes creating and managing
  *
@@ -78,7 +80,7 @@ public function getFormatsList()
      */
     public function getDefaultLength()
     {
-        return (int)$this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return (int)$this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_LENGTH, ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -88,7 +90,7 @@ public function getDefaultLength()
      */
     public function getDefaultFormat()
     {
-        return $this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_FORMAT, ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -98,7 +100,7 @@ public function getDefaultFormat()
      */
     public function getDefaultPrefix()
     {
-        return $this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_PREFIX, ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -108,7 +110,7 @@ public function getDefaultPrefix()
      */
     public function getDefaultSuffix()
     {
-        return $this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return $this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_SUFFIX, ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -118,7 +120,10 @@ public function getDefaultSuffix()
      */
     public function getDefaultDashInterval()
     {
-        return (int)$this->scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        return (int)$this->scopeConfig->getValue(
+            self::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL,
+            ScopeInterface::SCOPE_STORE
+        );
     }
 
     /**
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 e8f7ed0e60f7b..39fe3dc95662e 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Report/Rule/Createdat.php
@@ -93,7 +93,8 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
                         'base_subtotal_canceled',
                         0
                     ) . ' - ' . $connection->getIfNullSql(
-                        'ABS(base_discount_amount) - ABS(' . $connection->getIfNullSql('base_discount_canceled', 0) . ')',
+                        'ABS(base_discount_amount) - ABS('
+                        . $connection->getIfNullSql('base_discount_canceled', 0) . ')',
                         0
                     ) . ' + ' . $connection->getIfNullSql(
                         'base_tax_amount - ' . $connection->getIfNullSql('base_tax_canceled', 0),
@@ -122,7 +123,8 @@ protected function _aggregateByOrder($aggregationField, $from, $to)
                         'base_subtotal_refunded',
                         0
                     ) . ' - ' . $connection->getIfNullSql(
-                        'ABS(base_discount_invoiced) - ABS(' . $connection->getIfNullSql('base_discount_refunded', 0) . ')',
+                        'ABS(base_discount_invoiced) - ABS('
+                        . $connection->getIfNullSql('base_discount_refunded', 0) . ')',
                         0
                     ) . ' + ' . $connection->getIfNullSql(
                         'base_tax_invoiced - ' . $connection->getIfNullSql('base_tax_refunded', 0),
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 30ec6d21f3bb0..05edd5d6189cd 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,12 +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 => \Magento\SalesRule\Model\Rule\Action\Discount\ToPercent::class,
+        Rule::BY_PERCENT_ACTION => \Magento\SalesRule\Model\Rule\Action\Discount\ByPercent::class,
+        Rule::TO_FIXED_ACTION => \Magento\SalesRule\Model\Rule\Action\Discount\ToFixed::class,
+        Rule::BY_FIXED_ACTION => \Magento\SalesRule\Model\Rule\Action\Discount\ByFixed::class,
+        Rule::CART_FIXED_ACTION => \Magento\SalesRule\Model\Rule\Action\Discount\CartFixed::class,
+        Rule::BUY_X_GET_Y_ACTION => \Magento\SalesRule\Model\Rule\Action\Discount\BuyXGetY::class,
     ];
 
     /**
diff --git a/app/code/Magento/Search/Model/ResourceModel/Query.php b/app/code/Magento/Search/Model/ResourceModel/Query.php
index fcfc903dd0c1c..a20bd626089b8 100644
--- a/app/code/Magento/Search/Model/ResourceModel/Query.php
+++ b/app/code/Magento/Search/Model/ResourceModel/Query.php
@@ -12,7 +12,6 @@
 
 /**
  * Search query resource model
-
  */
 class Query extends AbstractDb
 {
diff --git a/app/code/Magento/SendFriend/Helper/Data.php b/app/code/Magento/SendFriend/Helper/Data.php
index cd9a78e34987f..c0c87bb3c49fe 100644
--- a/app/code/Magento/SendFriend/Helper/Data.php
+++ b/app/code/Magento/SendFriend/Helper/Data.php
@@ -6,6 +6,8 @@
 
 namespace Magento\SendFriend\Helper;
 
+use Magento\Store\Model\ScopeInterface;
+
 /**
  * SendFriend Data Helper
  *
@@ -41,7 +43,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     public function isEnabled($store = null)
     {
-        return $this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED, ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -52,7 +54,7 @@ public function isEnabled($store = null)
      */
     public function isAllowForGuest($store = null)
     {
-        return $this->scopeConfig->isSetFlag(self::XML_PATH_ALLOW_FOR_GUEST, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_ALLOW_FOR_GUEST, ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -63,7 +65,7 @@ public function isAllowForGuest($store = null)
      */
     public function getMaxRecipients($store = null)
     {
-        return (int)$this->scopeConfig->getValue(self::XML_PATH_MAX_RECIPIENTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return (int)$this->scopeConfig->getValue(self::XML_PATH_MAX_RECIPIENTS, ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -74,7 +76,7 @@ public function getMaxRecipients($store = null)
      */
     public function getMaxEmailPerPeriod($store = null)
     {
-        return (int)$this->scopeConfig->getValue(self::XML_PATH_MAX_PER_HOUR, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return (int)$this->scopeConfig->getValue(self::XML_PATH_MAX_PER_HOUR, ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -95,7 +97,7 @@ public function getPeriod()
      */
     public function getLimitBy($store = null)
     {
-        return (int)$this->scopeConfig->getValue(self::XML_PATH_LIMIT_BY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return (int)$this->scopeConfig->getValue(self::XML_PATH_LIMIT_BY, ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -106,7 +108,7 @@ public function getLimitBy($store = null)
      */
     public function getEmailTemplate($store = null)
     {
-        return $this->scopeConfig->getValue(self::XML_PATH_EMAIL_TEMPLATE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $this->scopeConfig->getValue(self::XML_PATH_EMAIL_TEMPLATE, ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
diff --git a/app/code/Magento/Shipping/Helper/Data.php b/app/code/Magento/Shipping/Helper/Data.php
index 935a6715742d7..a47259751d05d 100644
--- a/app/code/Magento/Shipping/Helper/Data.php
+++ b/app/code/Magento/Shipping/Helper/Data.php
@@ -9,6 +9,8 @@
  */
 namespace Magento\Shipping\Helper;
 
+use Magento\Sales\Model\Order\Shipment\Track;
+
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
@@ -54,7 +56,7 @@ public function decodeTrackingHash($hash)
      * Retrieve tracking url with params
      *
      * @param  string $key
-     * @param  \Magento\Sales\Model\Order|\Magento\Sales\Model\Order\Shipment|\Magento\Sales\Model\Order\Shipment\Track $model
+     * @param  \Magento\Sales\Model\Order|\Magento\Sales\Model\Order\Shipment|Track $model
      * @param  string $method Optional - method of a model to get id
      * @return string
      */
@@ -82,7 +84,7 @@ public function getTrackingPopupUrlBySalesModel($model)
             return $this->_getTrackingUrl('order_id', $model);
         } elseif ($model instanceof \Magento\Sales\Model\Order\Shipment) {
             return $this->_getTrackingUrl('ship_id', $model);
-        } elseif ($model instanceof \Magento\Sales\Model\Order\Shipment\Track) {
+        } elseif ($model instanceof Track) {
             return $this->_getTrackingUrl('track_id', $model, 'getEntityId');
         }
         return '';
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index 894f3cf3c443a..07798ca1ea383 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -281,9 +281,7 @@ public function getDeliveryConfirmationTypes(\Magento\Framework\DataObject $para
     public function checkAvailableShipCountries(\Magento\Framework\DataObject $request)
     {
         $speCountriesAllow = $this->getConfigData('sallowspecific');
-        /*
-         * for specific countries, the flag will be 1
-         */
+        // for specific countries, the flag will be 1
         if ($speCountriesAllow && $speCountriesAllow == 1) {
             $showMethod = $this->getConfigData('showmethod');
             $availableCountries = [];
@@ -310,9 +308,8 @@ public function checkAvailableShipCountries(\Magento\Framework\DataObject $reque
 
                 return $error;
             } else {
-                /*
-                 * The admin set not to show the shipping module if the delivery country is not within specific countries
-                 */
+                // The admin set not to show the shipping module
+                // if the delivery country is not within specific countries
                 return false;
             }
         }
diff --git a/app/code/Magento/Shipping/Model/Config.php b/app/code/Magento/Shipping/Model/Config.php
index c49b7f1a4d4db..313c183aa7168 100644
--- a/app/code/Magento/Shipping/Model/Config.php
+++ b/app/code/Magento/Shipping/Model/Config.php
@@ -63,7 +63,11 @@ public function getActiveCarriers($store = null)
         $carriers = [];
         $config = $this->_scopeConfig->getValue('carriers', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
         foreach (array_keys($config) as $carrierCode) {
-            if ($this->_scopeConfig->isSetFlag('carriers/' . $carrierCode . '/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)) {
+            if ($this->_scopeConfig->isSetFlag(
+                'carriers/' . $carrierCode . '/active',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $store
+            )) {
                 $carrierModel = $this->_carrierFactory->create($carrierCode, $store);
                 if ($carrierModel) {
                     $carriers[$carrierCode] = $carrierModel;
diff --git a/app/code/Magento/Shipping/Model/Shipping/Labels.php b/app/code/Magento/Shipping/Model/Shipping/Labels.php
index c6eb35ebb0027..c3997b6dc9641 100644
--- a/app/code/Magento/Shipping/Model/Shipping/Labels.php
+++ b/app/code/Magento/Shipping/Model/Shipping/Labels.php
@@ -138,9 +138,7 @@ public function requestToShipment(Shipment $orderShipment)
             )
         ) {
             throw new LocalizedException(
-                __(
-                    'We don\'t have enough information to create shipping labels. Please make sure your store information and settings are complete.'
-                )
+                __('We don\'t have enough information to create shipping labels. Please make sure your store information and settings are complete.')
             );
         }
 
@@ -166,9 +164,9 @@ public function requestToShipment(Shipment $orderShipment)
      * @param \Magento\Shipping\Model\Shipment\Request $request
      * @param \Magento\User\Model\User $storeAdmin
      * @param \Magento\Framework\DataObject $store
-     * @param $shipmentStoreId
-     * @param $regionCode
-     * @param $originStreet
+     * @param int $shipmentStoreId
+     * @param string $regionCode
+     * @param string $originStreet
      * @return void
      */
     protected function setShipperDetails(
diff --git a/app/code/Magento/Store/Test/Unit/Model/PathConfigTest.php b/app/code/Magento/Store/Test/Unit/Model/PathConfigTest.php
index 001728c6e935c..c5e7999f3edf0 100644
--- a/app/code/Magento/Store/Test/Unit/Model/PathConfigTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/PathConfigTest.php
@@ -15,12 +15,16 @@ class PathConfigTest extends \PHPUnit_Framework_TestCase
 {
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface | \PHPUnit_Framework_MockObject_MockObject*/
     private $scopeConfigMock;
+
     /** @var \Magento\Framework\Url\SecurityInfoInterface | \PHPUnit_Framework_MockObject_MockObject*/
     private $urlSecurityInfoMock;
+
     /** @var StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject*/
     private $storeManagerMock;
+
     /** @var Store | \PHPUnit_Framework_MockObject_MockObject*/
     private $storeMock;
+
     /** @var \Magento\Store\Model\RouteConfig */
     protected $model;
 
diff --git a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
index 646410169ea18..d0821cb369ddf 100644
--- a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
@@ -595,7 +595,8 @@ public function isCurrentlySecureDataProvider()
             'unsecure request, no secure base url registered' => [false, 443, false, true, null],
             'unsecure request, not using registered port' => [false, 80],
             'unsecure request, using registered port, not using secure in frontend' => [false, 443, false, false],
-            'unsecure request, no secure base url registered, not using secure in frontend' => [false, 443, false, false, null],
+            'unsecure request, no secure base url registered, not using secure in frontend'
+                => [false, 443, false, false, null],
             'unsecure request, not using registered port, not using secure in frontend' => [false, 80, false, false],
         ];
     }
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index d84ed69501e7f..cd79a3c1257a5 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -133,7 +133,9 @@ protected function _prepareForm()
         }
 
         $sessionFormValues = (array)$this->_coreRegistry->registry(RegistryConstants::CURRENT_TAX_RATE_FORM_DATA);
-        $formData = isset($taxRateDataObject) ? $this->_taxRateConverter->createArrayFromServiceObject($taxRateDataObject) : [];
+        $formData = isset($taxRateDataObject)
+            ? $this->_taxRateConverter->createArrayFromServiceObject($taxRateDataObject)
+            : [];
         $formData = array_merge($formData, $sessionFormValues);
 
         if (isset($formData['zip_is_range']) && $formData['zip_is_range'] && !isset($formData['tax_postcode'])) {
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 78db3427b007d..68b803156d8c4 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -573,7 +573,7 @@ public function getCalculationAlgorithm($store = null)
      *  )
      * )
      *
-     * @param  \Magento\Sales\Model\Order|\Magento\Sales\Model\Order\Invoice|\Magento\Sales\Model\Order\Creditmemo $source
+     * @param  \Magento\Sales\Model\Order|Invoice|Creditmemo $source
      * @return array
      */
     public function getCalculatedTaxes($source)
diff --git a/app/code/Magento/Tax/Model/Calculation/Rate.php b/app/code/Magento/Tax/Model/Calculation/Rate.php
index 87d645e65b04e..5b04b84e945a4 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rate.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rate.php
@@ -57,6 +57,7 @@ class Rate extends \Magento\Framework\Model\AbstractExtensibleModel implements T
      * @var \Magento\Tax\Model\Calculation\Rate\TitleFactory
      */
     protected $_titleFactory;
+
     /**
      * @var Region
      */
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 8ab15163f798c..20639b3d3ab8e 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -308,7 +308,12 @@ public function mapItems(
             }
 
             if ($item->getHasChildren() && $item->isChildrenCalculated()) {
-                $parentItemDataObject = $this->mapItem($itemDataObjectFactory, $item, $priceIncludesTax, $useBaseCurrency);
+                $parentItemDataObject = $this->mapItem(
+                    $itemDataObjectFactory,
+                    $item,
+                    $priceIncludesTax,
+                    $useBaseCurrency
+                );
                 $itemDataObjects[] = $parentItemDataObject;
                 foreach ($item->getChildren() as $child) {
                     $childItemDataObject = $this->mapItem(
@@ -540,6 +545,7 @@ protected function processProductItems(
      * Process applied taxes for items and quote
      *
      * @param QuoteAddress\Total $total
+     * @param ShippingAssignmentInterface $shippingAssignment
      * @param array $itemsByType
      * @return $this
      */
@@ -672,8 +678,14 @@ protected function processShippingTaxInfo(
     ) {
         $total->setTotalAmount('shipping', $shippingTaxDetails->getRowTotal());
         $total->setBaseTotalAmount('shipping', $baseShippingTaxDetails->getRowTotal());
-        $total->setTotalAmount('shipping_discount_tax_compensation', $shippingTaxDetails->getDiscountTaxCompensationAmount());
-        $total->setBaseTotalAmount('shipping_discount_tax_compensation', $baseShippingTaxDetails->getDiscountTaxCompensationAmount());
+        $total->setTotalAmount(
+            'shipping_discount_tax_compensation',
+            $shippingTaxDetails->getDiscountTaxCompensationAmount()
+        );
+        $total->setBaseTotalAmount(
+            'shipping_discount_tax_compensation',
+            $baseShippingTaxDetails->getDiscountTaxCompensationAmount()
+        );
 
         $total->setShippingInclTax($shippingTaxDetails->getRowTotalInclTax());
         $total->setBaseShippingInclTax($baseShippingTaxDetails->getRowTotalInclTax());
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Design.php b/app/code/Magento/Theme/Model/ResourceModel/Design.php
index a59e86c7388a8..8a4c2b5227f9f 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Design.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Design.php
@@ -62,8 +62,9 @@ public function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
             $object->setDateTo(null);
         }
 
-        if ($object->getDateFrom() !== null&& $object->getDateTo() !== null&& (new \DateTime($object->getDateFrom()))->getTimestamp()
-            > (new \DateTime($object->getDateTo()))->getTimestamp()
+        if ($object->getDateFrom() !== null && $object->getDateTo() !== null
+            && (new \DateTime($object->getDateFrom()))->getTimestamp()
+                > (new \DateTime($object->getDateTo()))->getTimestamp()
         ) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('The start date can\'t follow the end date.')
@@ -134,18 +135,18 @@ protected function _checkIntersection($storeId, $dateFrom, $dateTo, $currentId)
             $dateConditions[] = 'date_to IS NULL';
         }
 
-        if ($dateFrom === null&& $dateTo !== null) {
+        if ($dateFrom === null && $dateTo !== null) {
             $dateConditions[] = 'date_to <= :date_to OR date_from <= :date_to';
         }
 
-        if ($dateFrom !== null&& $dateTo === null) {
+        if ($dateFrom !== null && $dateTo === null) {
             $dateConditions[] = 'date_to >= :date_from OR date_from >= :date_from';
         }
 
-        if ($dateFrom !== null&& $dateTo !== null) {
+        if ($dateFrom !== null && $dateTo !== null) {
             $dateConditions[] = 'date_from BETWEEN :date_from AND :date_to';
             $dateConditions[] = 'date_to BETWEEN :date_from AND :date_to';
-        } elseif ($dateFrom === null&& $dateTo === null) {
+        } elseif ($dateFrom === null && $dateTo === null) {
             $dateConditions = [];
         }
 
diff --git a/app/code/Magento/Theme/Test/Unit/Helper/ThemeTest.php b/app/code/Magento/Theme/Test/Unit/Helper/ThemeTest.php
index 5e19fd2ab34a1..50d29d77dfb2c 100644
--- a/app/code/Magento/Theme/Test/Unit/Helper/ThemeTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Helper/ThemeTest.php
@@ -78,7 +78,9 @@ public function getCssAssetsDataProvider()
                         <arguments><argument name="file" xsi:type="string">testh.css</argument></arguments>
                     </block>
                     <block class="Magento\Theme\Block\Html\Head\Css" name="magento-loader-js">
-                        <arguments><argument name="file" xsi:type="string">Magento_Theme::test.css</argument></arguments>
+                        <arguments>
+                            <argument name="file" xsi:type="string">Magento_Theme::test.css</argument>
+                        </arguments>
                     </block>
                 </referenceBlock>
                 <block type="Some_Block_Class">
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 33a7f36841184..990b9655f10a0 100644
--- a/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Model/Js/DataProviderTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\State;
 use Magento\Framework\App\Utility\Files;
+use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Filesystem\File\ReadInterface;
 use Magento\Framework\Phrase\Renderer\Translate;
 use Magento\Translation\Model\Js\Config;
@@ -74,7 +75,7 @@ protected function setUp()
                 'translate' => $this->translateMock,
                 'dirSearch' => $dirSearch,
                 'filesUtility' => $this->filesUtilityMock,
-                'componentRegistrar' => $this->getMock(\Magento\Framework\Component\ComponentRegistrar::class, [], [], '', false)
+                'componentRegistrar' => $this->getMock(ComponentRegistrar::class, [], [], '', false)
             ]
         );
     }
diff --git a/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php b/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php
index 056649954dbca..4718a3ec8126a 100644
--- a/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Model/ManagerTest.php
@@ -200,7 +200,8 @@ public function getComponentData()
                     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 => [],
                         ],
                     ],
@@ -219,7 +220,8 @@ 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 => [],
                             ]
                         ]
@@ -233,7 +235,8 @@ public function getComponentData()
                             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 => [],
                                 ],
                             ],
@@ -256,7 +259,8 @@ 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/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index f66b1689ab0c5..4129c05aff10d 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -411,7 +411,6 @@ protected function _getXmlQuotes()
 
         if ($this->_isUSCountry($r->getDestCountryId())) {
             $xml = $this->_xmlElFactory->create(
-
                 ['data' => '<?xml version="1.0" encoding="UTF-8"?><RateV4Request/>']
             );
             $xml->addAttribute('USERID', $r->getUserId());
@@ -458,7 +457,6 @@ protected function _getXmlQuotes()
             $api = 'RateV4';
         } else {
             $xml = $this->_xmlElFactory->create(
-
                 ['data' => '<?xml version = "1.0" encoding = "UTF-8"?><IntlRateV2Request/>']
             );
             $xml->addAttribute('USERID', $r->getUserId());
diff --git a/app/code/Magento/Usps/Model/Source/Method.php b/app/code/Magento/Usps/Model/Source/Method.php
index 28a168bf5769f..e8ef6fdf1da76 100644
--- a/app/code/Magento/Usps/Model/Source/Method.php
+++ b/app/code/Magento/Usps/Model/Source/Method.php
@@ -7,8 +7,8 @@
 namespace Magento\Usps\Model\Source;
 
 /**
-* Method source
-*/
+ * Method source
+ */
 class Method extends Generic
 {
     /**
diff --git a/app/code/Magento/Variable/Model/ResourceModel/Variable.php b/app/code/Magento/Variable/Model/ResourceModel/Variable.php
index 9fd8d2e790776..4d1d4ceaa1798 100644
--- a/app/code/Magento/Variable/Model/ResourceModel/Variable.php
+++ b/app/code/Magento/Variable/Model/ResourceModel/Variable.php
@@ -84,7 +84,10 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
                 'plain_value' => $object->getPlainValue(),
                 'html_value' => $object->getHtmlValue(),
             ];
-            $data = $this->_prepareDataForTable(new \Magento\Framework\DataObject($data), $this->getTable('variable_value'));
+            $data = $this->_prepareDataForTable(
+                new \Magento\Framework\DataObject($data),
+                $this->getTable('variable_value')
+            );
             $this->getConnection()->insertOnDuplicate(
                 $this->getTable('variable_value'),
                 $data,
@@ -121,7 +124,11 @@ protected function _addValueToSelect(
         $storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID
     ) {
         $connection = $this->getConnection();
-        $ifNullPlainValue = $connection->getCheckSql('store.plain_value IS NULL', 'def.plain_value', 'store.plain_value');
+        $ifNullPlainValue = $connection->getCheckSql(
+            'store.plain_value IS NULL',
+            'def.plain_value',
+            'store.plain_value'
+        );
         $ifNullHtmlValue = $connection->getCheckSql('store.html_value IS NULL', 'def.html_value', 'store.html_value');
 
         $select->joinLeft(
diff --git a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
index 04a5809eba6ef..3b238bde3b9b5 100644
--- a/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
+++ b/app/code/Magento/Weee/Block/Renderer/Weee/Tax.php
@@ -7,11 +7,12 @@
 namespace Magento\Weee\Block\Renderer\Weee;
 
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
 
 /**
  * Adminhtml weee tax item renderer
  */
-class Tax extends \Magento\Backend\Block\Widget implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
+class Tax extends \Magento\Backend\Block\Widget implements RendererInterface
 {
     /**
      * @var AbstractElement|null
diff --git a/app/code/Magento/Weee/Model/Total/Quote/Weee.php b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
index 96a40c9533f8f..47fd89a1549ea 100644
--- a/app/code/Magento/Weee/Model/Total/Quote/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
@@ -17,6 +17,7 @@ class Weee extends AbstractTotal
      * Constant for weee item code prefix
      */
     const ITEM_CODE_WEEE_PREFIX = 'weee';
+
     /**
      * Constant for weee item type
      */
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 da72abfc13a7c..896df3683ec95 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
@@ -150,7 +150,8 @@ protected function setupTotalMock($itemMock, $isWeeeTaxable, $itemWeeeTaxDetails
                     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_BASE_ROW_TOTAL_INCL_TAX => $itemData['base_weee_tax_applied_row_amnt_incl_tax'],
+                    CTC::KEY_TAX_DETAILS_BASE_ROW_TOTAL_INCL_TAX
+                        => $itemData['base_weee_tax_applied_row_amnt_incl_tax'],
                     ];
             }
             $extraDetails = [
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget.php b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
index b94664984d398..e52c57facbeea 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget.php
@@ -34,12 +34,14 @@ protected function _construct()
         $this->buttonList->update('save', 'region', 'footer');
         $this->buttonList->update('save', 'data_attribute', []);
 
-        $this->_formScripts[] = 'require(["mage/adminhtml/wysiwyg/widget"], function(){wWidget = new WysiwygWidget.Widget(' .
-            '"widget_options_form", "select_widget_type", "widget_options", "' .
-            $this->getUrl(
-                'adminhtml/*/loadOptions'
-            ) . '", "' . $this->getRequest()->getParam(
-                'widget_target_id'
-            ) . '");});';
+        $this->_formScripts[] = 'require(
+            ["mage/adminhtml/wysiwyg/widget"], 
+            function(){wWidget = new WysiwygWidget.Widget(
+                "widget_options_form", 
+                "select_widget_type", 
+                "widget_options", 
+                "' . $this->getUrl('adminhtml/*/loadOptions') . '", 
+                "' . $this->getRequest()->getParam('widget_target_id') . '"
+            );});';
     }
 }
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 88685a963bc6f..3a28b514b7b55 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
@@ -7,13 +7,14 @@
 namespace Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Main;
 
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
 
 /**
  * Widget Instance page groups (predefined layouts group) to display on
  *
  * @method \Magento\Widget\Model\Widget\Instance getWidgetInstance()
  */
-class Layout extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
+class Layout extends \Magento\Backend\Block\Template implements RendererInterface
 {
     /**
      * @var AbstractElement|null
diff --git a/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/DataObjectServiceInterface.php b/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/DataObjectServiceInterface.php
index 276c60aec5b7e..d40752ae84541 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/DataObjectServiceInterface.php
+++ b/dev/tests/api-functional/_files/Magento/TestModule4/Service/V1/DataObjectServiceInterface.php
@@ -44,5 +44,8 @@ public function scalarResponse($id);
      * @param \Magento\TestModule4\Service\V1\Entity\ExtensibleRequestInterface $request
      * @return \Magento\TestModule4\Service\V1\Entity\DataObjectResponse
      */
-    public function extensibleDataObject($id, \Magento\TestModule4\Service\V1\Entity\ExtensibleRequestInterface $request);
+    public function extensibleDataObject(
+        $id,
+        \Magento\TestModule4\Service\V1\Entity\ExtensibleRequestInterface $request
+    );
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/CartRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/CartRepositoryTest.php
index 1fc85cd7ab7bf..f61875adc90b5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/CartRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/CartRepositoryTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\GiftMessage\Api;
 
+use Magento\GiftMessage\Model\Message;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 class CartRepositoryTest extends WebapiAbstract
@@ -133,8 +134,8 @@ public function testSave()
         $this->assertTrue($this->_webApiCall($serviceInfo, $requestData));
         $quote->load('test_order_item_with_message', 'reserved_order_id');
         $quote->getGiftMessageId();
-        /** @var  \Magento\GiftMessage\Model\Message $message */
-        $message = $this->objectManager->create(\Magento\GiftMessage\Model\Message::class)->load($quote->getGiftMessageId());
+        /** @var  Message $message */
+        $message = $this->objectManager->create(Message::class)->load($quote->getGiftMessageId());
         $this->assertEquals('John Doe', $message->getRecipient());
         $this->assertEquals('Jane Roe', $message->getSender());
         $this->assertEquals('Gift Message Text New', $message->getMessage());
@@ -179,8 +180,8 @@ public function testSaveForMyCart()
         $quote = $this->objectManager->create(\Magento\Quote\Model\Quote::class);
         $quote->load('test_order_item_with_message', 'reserved_order_id');
         $quote->getGiftMessageId();
-        /** @var  \Magento\GiftMessage\Model\Message $message */
-        $message = $this->objectManager->create(\Magento\GiftMessage\Model\Message::class)->load($quote->getGiftMessageId());
+        /** @var  Message $message */
+        $message = $this->objectManager->create(Message::class)->load($quote->getGiftMessageId());
         $this->assertEquals('John Doe', $message->getRecipient());
         $this->assertEquals('Jane Roe', $message->getSender());
         $this->assertEquals('Gift Message Text New', $message->getMessage());
diff --git a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
index c3f5a4eefd5cc..3648983d58e4c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GiftMessage/Api/ItemRepositoryTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\GiftMessage\Api;
 
+use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 class ItemRepositoryTest extends WebapiAbstract
@@ -72,8 +73,8 @@ public function testGetForMyCart()
         $this->_markTestAsRestOnly();
 
         // get customer ID token
-        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = $this->objectManager->create(\Magento\Integration\Api\CustomerTokenServiceInterface::class);
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = $this->objectManager->create(CustomerTokenServiceInterface::class);
         $token = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
 
         /** @var \Magento\Quote\Model\Quote $quote */
@@ -159,8 +160,8 @@ public function testSaveForMyCart()
         $this->_markTestAsRestOnly();
 
         // get customer ID token
-        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = $this->objectManager->create(\Magento\Integration\Api\CustomerTokenServiceInterface::class);
+        /** @var CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = $this->objectManager->create(CustomerTokenServiceInterface::class);
         $token = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
 
         // sales/gift_options/allow_items must be set to 1 in system configuration
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
index 1863d8f9546ea..c5ecead00ce29 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderStatusHistoryAddTest.php
@@ -72,8 +72,14 @@ public function testOrderCommentAdd()
 
         $commentData = reset($comments);
         foreach ($commentData as $key => $value) {
-            $this->assertEquals($commentData[OrderStatusHistoryInterface::COMMENT], $statusHistoryComment->getComment());
-            $this->assertEquals($commentData[OrderStatusHistoryInterface::PARENT_ID], $statusHistoryComment->getParentId());
+            $this->assertEquals(
+                $commentData[OrderStatusHistoryInterface::COMMENT],
+                $statusHistoryComment->getComment()
+            );
+            $this->assertEquals(
+                $commentData[OrderStatusHistoryInterface::PARENT_ID],
+                $statusHistoryComment->getParentId()
+            );
             $this->assertEquals(
                 $commentData[OrderStatusHistoryInterface::IS_CUSTOMER_NOTIFIED],
                 $statusHistoryComment->getIsCustomerNotified()
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php
index 64203628bd466..a24589e6ab941 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php
@@ -35,7 +35,7 @@ protected function setUp()
         $this->storeCode = Bootstrap::getObjectManager()->get(\Magento\Store\Model\StoreManagerInterface::class)
             ->getStore()->getCode();
 
-        $this->productMetadata =  Bootstrap::getObjectManager()->get(\Magento\Framework\App\ProductMetadataInterface::class);
+        $this->productMetadata = Bootstrap::getObjectManager()->get(ProductMetadataInterface::class);
 
         parent::setUp();
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
index 6482ff8fea553..22dc62adabaa1 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
@@ -35,7 +35,8 @@ protected function setUp()
 
     public function testMultiServiceWsdl()
     {
-        $this->_soapUrl = "{$this->_baseUrl}/soap/{$this->_storeCode}?services=testModule5AllSoapAndRestV1%2CtestModule5AllSoapAndRestV2";
+        $this->_soapUrl = "{$this->_baseUrl}/soap/{$this->_storeCode}"
+            . "?services=testModule5AllSoapAndRestV1%2CtestModule5AllSoapAndRestV2";
         $wsdlUrl = $this->_getBaseWsdlUrl() . 'testModule5AllSoapAndRestV1,testModule5AllSoapAndRestV2';
         $wsdlContent = $this->_convertXmlToString($this->_getWsdlContent($wsdlUrl));
         $this->isSingleService = false;
@@ -926,7 +927,7 @@ protected function _checkFaultsComplexTypeSection($wsdlContent)
     </xsd:sequence>
 </xsd:complexType>
 PARAMETERS_COMPLEX_TYPE;
-        // @codingStandardsIgnoreEnd
+
         $this->assertContains(
             $this->_convertXmlToString($detailsParametersType),
             $wsdlContent,
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/_files/template/products_variation_2.php b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/_files/template/products_variation_2.php
index 7bb15e6c6d5fa..b3685ef39b15c 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/_files/template/products_variation_2.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/_files/template/products_variation_2.php
@@ -60,7 +60,8 @@
                     'additional_attributes' => '%configurable_additional_attributes%=black',
                     'weight' => '30',
                     'qty' => '50',
-                    'configurable_variations' => "sku=%configurable_attribute_sku%,%configurable_additional_attributes%=black"
+                    'configurable_variations'
+                        => "sku=%configurable_attribute_sku%,%configurable_additional_attributes%=black"
                 ],
         ],
 ];
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/_files/template/products_variation_3.php b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/_files/template/products_variation_3.php
index 48c431bf30a2a..383089e07bfff 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/_files/template/products_variation_3.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/_files/template/products_variation_3.php
@@ -59,7 +59,8 @@
                     'additional_attributes' => '%configurable_additional_attributes%=black',
                     'weight' => '30',
                     'qty' => '50',
-                    'configurable_variations' => "sku=%configurable_attribute_sku%,%configurable_additional_attributes%=black",
+                    'configurable_variations'
+                        => "sku=%configurable_attribute_sku%,%configurable_additional_attributes%=black",
                     'associated_skus' => '',
                     'bundle_shipment_type' => '',
                     'bundle_values' => '',
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductInGrid.php
index 65d7823cc7c24..78b421545a5c6 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductInGrid.php
@@ -86,7 +86,8 @@ public function processAssert(
                     'store_id' => $storeName
                 ],
                 [
-                    'request_path' => $rootCategoryArray[$rootCategoryName]['name'] . '/' . $product->getUrlKey() . '.html',
+                    'request_path'
+                        => $rootCategoryArray[$rootCategoryName]['name'] . '/' . $product->getUrlKey() . '.html',
                     'target_path' => $this->getTargetPath($product, $category),
                     'store_id' => $storeName
                 ],
diff --git a/dev/tests/integration/etc/di/preferences/ce.php b/dev/tests/integration/etc/di/preferences/ce.php
index a9a1598983dc3..0c00d40a0b88d 100644
--- a/dev/tests/integration/etc/di/preferences/ce.php
+++ b/dev/tests/integration/etc/di/preferences/ce.php
@@ -6,17 +6,21 @@
  * See COPYING.txt for license details.
  */
 
+use Magento\TestFramework\Db\ConnectionAdapter;
+use Magento\TestFramework\ObjectManager\Config;
+use Magento\TestFramework\ObjectManager\Configurator;
+
 return [
     \Magento\Framework\Stdlib\CookieManagerInterface::class => \Magento\TestFramework\CookieManager::class,
-    \Magento\Framework\ObjectManager\DynamicConfigInterface::class => \Magento\TestFramework\ObjectManager\Configurator::class,
+    \Magento\Framework\ObjectManager\DynamicConfigInterface::class => Configurator::class,
     \Magento\Framework\App\RequestInterface::class => \Magento\TestFramework\Request::class,
     \Magento\Framework\App\Request\Http::class => \Magento\TestFramework\Request::class,
     \Magento\Framework\App\ResponseInterface::class => \Magento\TestFramework\Response::class,
     \Magento\Framework\App\Response\Http::class => \Magento\TestFramework\Response::class,
     \Magento\Framework\Interception\PluginListInterface::class => \Magento\TestFramework\Interception\PluginList::class,
-    \Magento\Framework\Interception\ObjectManager\Config\Developer::class => \Magento\TestFramework\ObjectManager\Config::class,
+    \Magento\Framework\Interception\ObjectManager\Config\Developer::class => Config::class,
     \Magento\Framework\View\LayoutInterface::class => \Magento\TestFramework\View\Layout::class,
-    \Magento\Framework\App\ResourceConnection\ConnectionAdapterInterface::class => \Magento\TestFramework\Db\ConnectionAdapter::class,
+    \Magento\Framework\App\ResourceConnection\ConnectionAdapterInterface::class => ConnectionAdapter::class,
     \Magento\Framework\Filesystem\DriverInterface::class => \Magento\Framework\Filesystem\Driver\File::class,
     \Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class
 ];
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php
index 631dc53a91b19..5544854b7ef36 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Application.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php
@@ -11,6 +11,8 @@
 use Magento\Framework\Autoload\AutoloaderInterface;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\Filesystem\Glob;
+use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\Mail\TransportInterface;
 
 /**
  * Encapsulates application installation, initialization and uninstall
@@ -338,8 +340,8 @@ public function initialize($overriddenParams = [])
         $objectManagerConfiguration = [
             'preferences' => [
                 \Magento\Framework\App\State::class => \Magento\TestFramework\App\State::class,
-                \Magento\Framework\Mail\TransportInterface::class => \Magento\TestFramework\Mail\TransportInterfaceMock::class,
-                \Magento\Framework\Mail\Template\TransportBuilder::class => \Magento\TestFramework\Mail\Template\TransportBuilderMock::class,
+                TransportInterface::class => \Magento\TestFramework\Mail\TransportInterfaceMock::class,
+                TransportBuilder::class => \Magento\TestFramework\Mail\Template\TransportBuilderMock::class,
             ]
         ];
         if ($this->loadTestExtensionAttributes) {
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Backend/App/Config.php b/dev/tests/integration/framework/Magento/TestFramework/Backend/App/Config.php
index 3476318916638..31cd5bee76d6e 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Backend/App/Config.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Backend/App/Config.php
@@ -25,8 +25,10 @@ class Config extends \Magento\Backend\App\Config
      * @param \Magento\TestFramework\App\Config $appConfig
      * @param \Magento\TestFramework\App\MutableScopeConfig $mutableScopeConfig
      */
-    public function __construct(\Magento\TestFramework\App\Config $appConfig, \Magento\TestFramework\App\MutableScopeConfig $mutableScopeConfig)
-    {
+    public function __construct(
+        \Magento\TestFramework\App\Config $appConfig,
+        \Magento\TestFramework\App\MutableScopeConfig $mutableScopeConfig
+    ) {
         parent::__construct($appConfig);
         $this->mutableScopeConfig = $mutableScopeConfig;
     }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php b/dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php
index e327e449da838..f24cf94fbccde 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Db/Adapter/Mysql.php
@@ -9,7 +9,7 @@
  */
 namespace Magento\TestFramework\Db\Adapter;
 
-class Mysql extends \Magento\Framework\DB\Adapter\Pdo\Mysql implements \Magento\TestFramework\Db\Adapter\TransactionInterface
+class Mysql extends \Magento\Framework\DB\Adapter\Pdo\Mysql implements TransactionInterface
 {
     /**
      * @var int
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/ObjectManagerTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/ObjectManagerTest.php
index 8bad0f362c7ae..97909f7362c23 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/ObjectManagerTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/ObjectManagerTest.php
@@ -9,6 +9,10 @@
  */
 namespace Magento\Test;
 
+use Magento\Framework\Cache\FrontendInterface;
+use Magento\Framework\Config\CacheInterface;
+use Magento\Framework\Config\ScopeInterface;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -69,9 +73,9 @@ function ($className) {
             \Magento\Framework\Config\ReaderInterface::class => $this->getMock(
                 \Magento\Framework\Config\ReaderInterface::class
             ),
-            \Magento\Framework\Config\ScopeInterface::class => $this->getMock(\Magento\Framework\Config\ScopeInterface::class),
-            \Magento\Framework\Config\CacheInterface::class => $this->getMock(\Magento\Framework\Config\CacheInterface::class),
-            \Magento\Framework\Cache\FrontendInterface::class => $this->getMock(\Magento\Framework\Cache\FrontendInterface::class),
+            ScopeInterface::class => $this->getMock(ScopeInterface::class),
+            CacheInterface::class => $this->getMock(CacheInterface::class),
+            FrontendInterface::class => $this->getMock(FrontendInterface::class),
             \Magento\Framework\App\ResourceConnection::class => $connectionMock,
             \Magento\Framework\App\ResourceConnection\Config::class => $this->getMock(
                 \Magento\Framework\App\ResourceConnection\Config::class,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 1897dbbe00581..fb5dbaa78ca78 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -685,7 +685,7 @@ protected function csvToArray($content, $entityId = null)
                 $data['header'] = str_getcsv($line);
             } else {
                 $row = array_combine($data['header'], str_getcsv($line));
-                if ($entityId !== null&& !empty($row[$entityId])) {
+                if ($entityId !== null && !empty($row[$entityId])) {
                     $data['data'][$row[$entityId]] = $row;
                 } else {
                     $data['data'][] = $row;
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Block/Adminhtml/Form/Field/CustomergroupTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Block/Adminhtml/Form/Field/CustomergroupTest.php
index 3f018070ff818..009242b7cd311 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Block/Adminhtml/Form/Field/CustomergroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Block/Adminhtml/Form/Field/CustomergroupTest.php
@@ -20,7 +20,7 @@ protected function setUp()
         );
     }
 
-    public function test_toHtml()
+    public function testToHtml()
     {
         $this->_block->setClass('customer_group_select');
         $this->_block->setId('123');
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
index a561dc807bd17..a0c7eec374aaf 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
@@ -357,12 +357,14 @@ public function testActiveUserConfirmationAction()
         );
     }
 
+    // @codingStandardsIgnoreStart
     /**
      * @magentoConfigFixture current_store customer/password/limit_password_reset_requests_method 0
      * @magentoConfigFixture current_store customer/password/forgot_email_template customer_password_forgot_email_template
      * @magentoConfigFixture current_store customer/password/forgot_email_identity support
      * @magentoDataFixture Magento/Customer/_files/customer.php
      */
+    // @codingStandardsIgnoreEnd
     public function testForgotPasswordPostAction()
     {
         $email = 'customer@example.com';
@@ -456,8 +458,11 @@ public function testEditAction()
         $this->assertEquals(200, $this->getResponse()->getHttpResponseCode(), $body);
         $this->assertContains('<div class="field field-name-firstname required">', $body);
         // Verify the password check box is not checked
-        $this->assertContains('<input type="checkbox" name="change_password" id="change-password" '
-            . 'data-role="change-password" value="1" title="Change&#x20;Password" class="checkbox" />', $body);
+        $this->assertContains(
+            '<input type="checkbox" name="change_password" id="change-password" '
+            . 'data-role="change-password" value="1" title="Change&#x20;Password" class="checkbox" />',
+            $body
+        );
     }
 
     /**
@@ -481,11 +486,13 @@ public function testChangePasswordEditAction()
         );
     }
 
+    // @codingStandardsIgnoreStart
     /**
      * @magentoConfigFixture current_store customer/account_information/change_email_template customer_account_information_change_email_and_password_template
      * @magentoConfigFixture current_store customer/password/forgot_email_identity support
      * @magentoDataFixture Magento/Customer/_files/customer.php
      */
+    // @codingStandardsIgnoreEnd
     public function testEditPostAction()
     {
         /** @var $customerRepository \Magento\Customer\Api\CustomerRepositoryInterface */
@@ -522,11 +529,13 @@ public function testEditPostAction()
         $this->assertEquals('johndoe@email.com', $customer->getEmail());
     }
 
+    // @codingStandardsIgnoreStart
     /**
      * @magentoConfigFixture current_store customer/account_information/change_email_and_password_template customer_account_information_change_email_and_password_template
      * @magentoConfigFixture current_store customer/password/forgot_email_identity support
      * @magentoDataFixture Magento/Customer/_files/customer.php
      */
+    // @codingStandardsIgnoreEnd
     public function testChangePasswordEditPostAction()
     {
         /** @var $customerRepository \Magento\Customer\Api\CustomerRepositoryInterface */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php
index e0d6cb8481692..bd58d93bf8a08 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php
@@ -70,8 +70,10 @@ public function testRetrieveCached()
         //Verify presence of Customer in registry
         $this->assertEquals($customerBeforeDeletion, $this->_model->retrieve(self::CUSTOMER_ID));
         //Verify presence of Customer in email registry
-        $this->assertEquals($customerBeforeDeletion, $this->_model
-                ->retrieveByEmail(self::CUSTOMER_EMAIL, self::WEBSITE_ID));
+        $this->assertEquals(
+            $customerBeforeDeletion,
+            $this->_model->retrieveByEmail(self::CUSTOMER_EMAIL, self::WEBSITE_ID)
+        );
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
index 1258fdc763a5c..f771bd51c973c 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
@@ -214,7 +214,7 @@ protected function _csvToArray($content, $entityId = null)
                 $data['header'] = str_getcsv($line);
             } else {
                 $row = array_combine($data['header'], str_getcsv($line));
-                if ($entityId !== null&& !empty($row[$entityId])) {
+                if ($entityId !== null && !empty($row[$entityId])) {
                     $data['data'][$row[$entityId]] = $row;
                 } else {
                     $data['data'][] = $row;
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Api/AbstractExtensibleObjectTest.php b/dev/tests/integration/testsuite/Magento/Framework/Api/AbstractExtensibleObjectTest.php
index 2b57e8080d0a8..7cac42bf94204 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Api/AbstractExtensibleObjectTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Api/AbstractExtensibleObjectTest.php
@@ -21,8 +21,10 @@ protected function setUp()
         $this->_objectManager->configure(
             [
                 'preferences' => [
-                    \Magento\Wonderland\Api\Data\FakeAddressInterface::class => \Magento\Wonderland\Model\FakeAddress::class,
-                    \Magento\Wonderland\Api\Data\FakeRegionInterface::class => \Magento\Wonderland\Model\FakeRegion::class,
+                    \Magento\Wonderland\Api\Data\FakeAddressInterface::class
+                        => \Magento\Wonderland\Model\FakeAddress::class,
+                    \Magento\Wonderland\Api\Data\FakeRegionInterface::class
+                        => \Magento\Wonderland\Model\FakeRegion::class,
                 ],
             ]
         );
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Response/HeaderProvider/AbstractHeaderTestCase.php b/dev/tests/integration/testsuite/Magento/Framework/App/Response/HeaderProvider/AbstractHeaderTestCase.php
index af96800f22603..e3a5e6c8ff369 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/App/Response/HeaderProvider/AbstractHeaderTestCase.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Response/HeaderProvider/AbstractHeaderTestCase.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\App\Response\HeaderProvider;
 
+use Magento\Framework\App\Response\Http\Interceptor;
+
 abstract class AbstractHeaderTestCase extends \Magento\TestFramework\TestCase\AbstractController
 {
     /** @var  \Magento\Framework\App\Response\Http */
@@ -16,8 +18,8 @@ public function setUp()
         $this->_objectManager->configure(
             [
                 'preferences' => [
-                        \Magento\Framework\App\Response\Http::class => \Magento\Framework\App\Response\Http\Interceptor::class
-                    ]
+                    \Magento\Framework\App\Response\Http::class => Interceptor::class
+                ]
             ]
         );
         $this->interceptedResponse = $this->_objectManager->create(\Magento\Framework\App\Response\Http::class);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
index fe04d873ba8eb..05894a9b384fa 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php
@@ -53,7 +53,7 @@ protected function setUp()
                 'generatedEntities' => [
                     DIGenerator\Factory::ENTITY_TYPE => \Magento\Framework\ObjectManager\Code\Generator\Factory::class,
                     DIGenerator\Proxy::ENTITY_TYPE => \Magento\Framework\ObjectManager\Code\Generator\Proxy::class,
-                    InterceptionGenerator\Interceptor::ENTITY_TYPE => \Magento\Framework\Interception\Code\Generator\Interceptor::class,
+                    InterceptionGenerator\Interceptor::ENTITY_TYPE => InterceptionGenerator\Interceptor::class,
                 ]
             ]
         );
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Translate/_files/_translation_data.php b/dev/tests/integration/testsuite/Magento/Framework/Translate/_files/_translation_data.php
index 65551e95bae4a..eed4e7cd575b5 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Translate/_files/_translation_data.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Translate/_files/_translation_data.php
@@ -9,6 +9,7 @@
     'Magento_Store::Text with different translation on different modules' => 'Text translation by Magento_Store module',
     'Some non-translated value for Magento_Catalog' => 'Translation for some value for Magento_Catalog',
     'Another non-translated value for Magento_Catalog' => 'Translation for another value for Magento_Catalog',
-    'Magento_Catalog::Text with different translation on different modules' => 'Text translation by Magento_Catalog module',
+    'Magento_Catalog::Text with different translation on different modules'
+        => 'Text translation by Magento_Catalog module',
     'Design value to translate' => 'Design translated value',
 ];
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php
index 65d0b98d9bd4d..04de0aa412897 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Import/ValidateTest.php
@@ -59,7 +59,8 @@ public function testValidationReturn($fileName, $message)
         $this->_objectManager->configure(
             [
                 'preferences' => [
-                    \Magento\Framework\HTTP\Adapter\FileTransferFactory::class => \Magento\ImportExport\Controller\Adminhtml\Import\HttpFactoryMock::class
+                    \Magento\Framework\HTTP\Adapter\FileTransferFactory::class
+                        => \Magento\ImportExport\Controller\Adminhtml\Import\HttpFactoryMock::class
                 ]
             ]
         );
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
index 51d4b9ffc352e..ffc363ef7b99d 100644
--- a/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
@@ -39,7 +39,7 @@ public function testGetAddressAsHtml()
         $addressAsHtml = $this->_selectBlock->getAddressAsHtml($address);
         $this->assertEquals(
             "John Smith<br />CompanyName<br />Green str, 67<br />CityM,  Alabama, 75477"
-                . "<br />United States<br />T: <a href=\"tel:3468676\">3468676</a>",
+            . "<br />United States<br />T: <a href=\"tel:3468676\">3468676</a>",
             str_replace("\n", '', $addressAsHtml),
             "Address was represented as HTML incorrectly"
         );
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
index 2b6f5c8306f0d..fea361dda2723 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Model\ProductRepository;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Model\GroupManagement;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -394,7 +395,7 @@ protected function _getCustomerDataArray()
             \Magento\Customer\Model\Data\Customer::EMAIL => 'qa@example.com',
             \Magento\Customer\Model\Data\Customer::FIRSTNAME => 'Joe',
             \Magento\Customer\Model\Data\Customer::GENDER => 'Male',
-            \Magento\Customer\Model\Data\Customer::GROUP_ID => \Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID,
+            \Magento\Customer\Model\Data\Customer::GROUP_ID => GroupManagement::NOT_LOGGED_IN_ID,
             \Magento\Customer\Model\Data\Customer::ID => 1,
             \Magento\Customer\Model\Data\Customer::LASTNAME => 'Dou',
             \Magento\Customer\Model\Data\Customer::MIDDLENAME => 'Ivan',
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php b/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php
index 49e2f0a306a95..549a901e623a2 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Controller/Adminhtml/Report/Product/ViewedTest.php
@@ -20,8 +20,10 @@ public function testExecute()
 
     public function testExecuteWithoutError()
     {
-        $this->dispatch('backend/reports/report_product/viewed/filter/' .
-            'cGVyaW9kX3R5cGU9ZGF5JmZyb209MDIlMkYxJTJGMjAxNSZ0bz0wMiUyRjE2JTJGMjAxNSZzaG93X2VtcHR5X3Jvd3M9MA');
+        $this->dispatch(
+            'backend/reports/report_product/viewed/filter/'
+            . 'cGVyaW9kX3R5cGU9ZGF5JmZyb209MDIlMkYxJTJGMjAxNSZ0bz0wMiUyRjE2JTJGMjAxNSZzaG93X2VtcHR5X3Jvd3M9MA'
+        );
         $actual = $this->getResponse()->getBody();
         $this->assertContains('Product Views Report', $actual);
         $this->assertNotContains('An error occurred while showing the product views report.', $actual);
@@ -30,8 +32,10 @@ public function testExecuteWithoutError()
     public function testExecuteWithError()
     {
         $this->markTestSkipped('MAGETWO-38528');
-        $this->dispatch('backend/reports/report_product/viewed/filter/' .
-            'cGVyaW9kX3R5cGU9ZGF5JmZyb209NyUyRjElMkY2NyZ0bz1odG1sJTIwZm90bSZzaG93X2VtcHR5X3Jvd3M9MA==');
+        $this->dispatch(
+            'backend/reports/report_product/viewed/filter/'
+            . 'cGVyaW9kX3R5cGU9ZGF5JmZyb209NyUyRjElMkY2NyZ0bz1odG1sJTIwZm90bSZzaG93X2VtcHR5X3Jvd3M9MA=='
+        );
         $actual = $this->getResponse()->getBody();
         $this->assertEquals('', $actual);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/StatusTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/StatusTest.php
index 4882e5fb50103..283acf478f9dd 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/StatusTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/StatusTest.php
@@ -39,10 +39,13 @@ public function testUnassignState()
     {
         $this->resourceModel->unassignState('fake_status_do_not_use_it', 'fake_state_do_not_use_it');
         $this->assertTrue(true);
-        $this->assertFalse((bool)
-            $this->resourceModel->getConnection()->fetchOne($this->resourceModel->getConnection()->select()
-            ->from($this->resourceModel->getTable('sales_order_status_state'), [new \Zend_Db_Expr(1)])
-            ->where('status = ?', 'fake_status_do_not_use_it')
-            ->where('state = ?', 'fake_state_do_not_use_it')));
+        $this->assertFalse(
+            (bool)$this->resourceModel->getConnection()->fetchOne(
+                $this->resourceModel->getConnection()->select()
+                    ->from($this->resourceModel->getTable('sales_order_status_state'), [new \Zend_Db_Expr(1)])
+                    ->where('status = ?', 'fake_status_do_not_use_it')
+                    ->where('state = ?', 'fake_state_do_not_use_it')
+            )
+        );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
index 5fa173ae0f51e..c15092063f2d8 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
@@ -61,7 +61,7 @@ protected function _getStoreModel()
             'websiteRepository' => $objectManager->get(\Magento\Store\Api\WebsiteRepositoryInterface::class),
         ];
 
-        return $this->getMock(\Magento\Store\Model\Store::class, ['getUrl'], $this->modelParams);
+        return $this->getMock(Store::class, ['getUrl'], $this->modelParams);
     }
 
     protected function tearDown()
@@ -287,7 +287,7 @@ public function testCRUD()
             'sort_order' => 0,
             'is_active' => 1,
         ]);
-        $crud = new \Magento\TestFramework\Entity($this->model, ['name' => 'new name'], \Magento\Store\Model\Store::class);
+        $crud = new \Magento\TestFramework\Entity($this->model, ['name' => 'new name'], Store::class);
         $crud->testCrud();
     }
 
@@ -349,7 +349,7 @@ public function testIsUseStoreInUrl($storeInUrl, $disableStoreInUrl, $expectedRe
             ->will($this->returnValue($storeInUrl));
 
         $params['config'] = $configMock;
-        $model = $objectManager->create(\Magento\Store\Model\Store::class, $params);
+        $model = $objectManager->create(Store::class, $params);
         $model->setDisableStoreInUrl($disableStoreInUrl);
         $this->assertEquals($expectedResult, $model->isUseStoreInUrl());
     }
@@ -380,7 +380,7 @@ public function testIsCurrentlySecure($expected, $serverValues)
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         /** @var Store $model */
-        $model = $objectManager->create(\Magento\Store\Model\Store::class);
+        $model = $objectManager->create(Store::class);
 
         $request = $objectManager->get(\Magento\Framework\App\RequestInterface::class);
         $request->setServer(new Parameters(array_merge($_SERVER, $serverValues)));
@@ -408,7 +408,7 @@ public function testIsCurrentlySecureNoSecureBaseUrl()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         /** @var Store $model */
-        $model = $objectManager->create(\Magento\Store\Model\Store::class);
+        $model = $objectManager->create(Store::class);
 
         $server = $_SERVER;
         $_SERVER['SERVER_PORT'] = 80;
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Pricing/AdjustmentTest.php b/dev/tests/integration/testsuite/Magento/Tax/Pricing/AdjustmentTest.php
index 5b017ce2e071a..0ace49db2a954 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Pricing/AdjustmentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Pricing/AdjustmentTest.php
@@ -31,7 +31,7 @@ protected function isIncludedInBasePricePrice($isShippingPriceExcludeTax, $expec
      * @param bool $isShippingPriceExcludeTax
      * @param bool $expectedResult
      * @magentoConfigFixture current_store tax/calculation/price_includes_tax 1
-     * @dataProvider IsIncludedInBasePricePriceIncludeTaxEnabledDataProvider
+     * @dataProvider isIncludedInBasePricePriceIncludeTaxEnabledDataProvider
      */
     public function testIsIncludedInBasePricePriceIncludeTacEnabled($isShippingPriceExcludeTax, $expectedResult)
     {
@@ -42,7 +42,7 @@ public function testIsIncludedInBasePricePriceIncludeTacEnabled($isShippingPrice
      * @param bool $isShippingPriceExcludeTax
      * @param bool $expectedResult
      * @magentoConfigFixture current_store tax/calculation/price_includes_tax 0
-     * @dataProvider IsIncludedInBasePricePriceIncludeTaxDisabledDataProvider
+     * @dataProvider isIncludedInBasePricePriceIncludeTaxDisabledDataProvider
      */
     public function testIsIncludedInBasePricePriceIncludeTacDisabled($isShippingPriceExcludeTax, $expectedResult)
     {
@@ -52,7 +52,7 @@ public function testIsIncludedInBasePricePriceIncludeTacDisabled($isShippingPric
     /**
      * @return array
      */
-    public function IsIncludedInBasePricePriceIncludeTaxEnabledDataProvider()
+    public function isIncludedInBasePricePriceIncludeTaxEnabledDataProvider()
     {
         return [
             [0, true],
@@ -63,7 +63,7 @@ public function IsIncludedInBasePricePriceIncludeTaxEnabledDataProvider()
     /**
      * @return array
      */
-    public function IsIncludedInBasePricePriceIncludeTaxDisabledDataProvider()
+    public function isIncludedInBasePricePriceIncludeTaxDisabledDataProvider()
     {
         return [
             [0, false],
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
index 1caf3e845319b..89d98ae2c3b13 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
@@ -238,7 +238,11 @@ function ($themeFile, $theme) {
                 );
 
                 // Search for the overridden file in the ancestor theme
-                $ancestorFiles = self::_getCachedFiles($ancestorTheme->getFullPath(), \Magento\Framework\View\File\Collector\ThemeModular::class, $ancestorTheme);
+                $ancestorFiles = self::_getCachedFiles(
+                    $ancestorTheme->getFullPath(),
+                    \Magento\Framework\View\File\Collector\ThemeModular::class,
+                    $ancestorTheme
+                );
                 $fileKey = $themeFile->getModule() . '/' . $themeFile->getName();
                 $this->assertArrayHasKey(
                     $fileKey,
diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php
index 71a1b869cd9b6..1365c42113b36 100644
--- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php
@@ -80,7 +80,7 @@ public function testInvalidateMultipleTokens()
     /**
      * @magentoDataFixture Magento/User/_files/user_with_role.php
      */
-    public function testInvalidateToken_NoTokens()
+    public function testInvalidateTokenWhenUserHasNoTokens()
     {
         /** @var \Magento\User\Model\User $userModel */
         $userModel = Bootstrap::getObjectManager()->get(\Magento\User\Model\User::class);
@@ -95,7 +95,7 @@ public function testInvalidateToken_NoTokens()
         );
     }
 
-    public function testInvalidateToken_NoUser()
+    public function testInvalidateTokenWhenNoUser()
     {
         $this->dispatch('backend/admin/user/invalidateToken');
         $this->assertSessionMessages(
@@ -104,7 +104,7 @@ public function testInvalidateToken_NoUser()
         );
     }
 
-    public function testInvalidateToken_InvalidUser()
+    public function testInvalidateTokenWhenUserIsInvalid()
     {
         $adminUserId = 999;
         // invalidate token
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ConfigTest.php
index 296ce4c2c02ef..5c06f68031bdd 100644
--- a/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ConfigTest.php
@@ -35,7 +35,8 @@ public function testGetRequestedSoapServices()
                         'resources' => [
                             'Magento_Customer::manage'
                         ],
-                        'documentation' => 'Activate a customer account using a key that was sent in a confirmation email.',
+                        'documentation'
+                            => 'Activate a customer account using a key that was sent in a confirmation email.',
                         'interface' => [
                             'in' => [
                                 'parameters' => [
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
index 753348b7b2325..59835e65d2e8f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
@@ -306,8 +306,8 @@ public function testConstructorIntegrity()
                 Converter::ENTITY_TYPE => \Magento\Framework\ObjectManager\Code\Generator\Converter::class,
                 Mapper::ENTITY_TYPE => \Magento\Framework\Api\Code\Generator\Mapper::class,
                 SearchResults::ENTITY_TYPE => \Magento\Framework\Api\Code\Generator\SearchResults::class,
-                ExtensionAttributesInterfaceGenerator::ENTITY_TYPE => \Magento\Framework\Api\Code\Generator\ExtensionAttributesInterfaceGenerator::class,
-                ExtensionAttributesGenerator::ENTITY_TYPE => \Magento\Framework\Api\Code\Generator\ExtensionAttributesGenerator::class
+                ExtensionAttributesInterfaceGenerator::ENTITY_TYPE => ExtensionAttributesInterfaceGenerator::class,
+                ExtensionAttributesGenerator::ENTITY_TYPE => ExtensionAttributesGenerator::class
             ]
         );
         $generationAutoloader = new \Magento\Framework\Code\Generator\Autoloader($generator);
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php
index efb37754ed584..59e0b33a54d2b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_config_nodes.php
@@ -12,11 +12,16 @@
     '/config/global/fieldsets' => '',
     '/config/global/cache/betatypes' => '',
     '/config/admin/fieldsets' => '',
-    '/config/general/locale' => 'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
-    '/config/global/can_use_base_url' => 'This configuration moved to Di configuration of \Magento\Backend\App\Action\Context class',
-    '/config/global/locale/allow/codes' => 'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
-    '/config/global/locale/allow/currencies' => 'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
-    '/config/global/mime/types' => 'This configuration moved to Di configuration for \Magento\Downloadable\Helper\File class',
+    '/config/general/locale'
+        => 'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
+    '/config/global/can_use_base_url'
+        => 'This configuration moved to Di configuration of \Magento\Backend\App\Action\Context class',
+    '/config/global/locale/allow/codes'
+        => 'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
+    '/config/global/locale/allow/currencies'
+        => 'This configuration moved to Di configuration of \Magento\Framework\Locale\ConfigInterface',
+    '/config/global/mime/types'
+        => 'This configuration moved to Di configuration for \Magento\Downloadable\Helper\File class',
     '/config/global/models/*/deprecatedNode' => '',
     '/config/global/models/*/entities/*/table' => '',
     '/config/global/models/*/class' => '',
@@ -25,15 +30,18 @@
     '/config/global/models/*/resourceModel' => '',
     '/config/global/page/layouts' => 'Moved to page_layouts.xml',
     '/config/global/cms/layouts' => 'This was never used and is no longer supported',
-    '/config/global/payment/cc/types/*/validator' => 'This configuration was moved to DI configuration of \Magento\Centinel\Model\StateFactory',
+    '/config/global/payment/cc/types/*/validator'
+        => 'This configuration was moved to DI configuration of \Magento\Centinel\Model\StateFactory',
     '/config/global/payment' => 'Move them to payment.xml.',
     '/config/adminhtml/menu' => 'Move them to adminhtml.xml.',
     '/config/adminhtml/acl' => 'Move them to adminhtml.xml.',
-    '/config/adminhtml/global_search' => 'This configuration moved to Di configuration of \Magento\Backend\Controller\Index',
+    '/config/adminhtml/global_search'
+        => 'This configuration moved to Di configuration of \Magento\Backend\Controller\Index',
     '/config/*[self::global|self::adminhtml|self::frontend]/di' => 'This configuration moved to di.xml file',
     '/config/*[self::global|self::adminhtml|self::frontend]/events' => 'This configuration moved to events.xml file',
-    '/config/*[self::global|self::adminhtml|self::frontend]/routers' => 'Routes configuration moved to routes.xml file,' .
-    'routers list can be set through Di configuration of \Magento\Framework\App\RouterList model',
+    '/config/*[self::global|self::adminhtml|self::frontend]/routers'
+        => 'Routes configuration moved to routes.xml file,'
+            . 'routers list can be set through Di configuration of \Magento\Framework\App\RouterList model',
     '/config/global/importexport' => 'This configuration moved to import.xml and export.xml files',
     '/config/global/catalog/product/type' => 'This configuration moved to product_types.xml file',
     '/config/global/catalog/product/options' => 'This configuration moved to product_options.xml file',
@@ -45,28 +53,42 @@
     '/config/global/salesrule' => 'This configuration moved to Di configuration of \Magento\SalesRule\Helper\Coupon',
     '/config/global/session' => 'This configuration moved to Di configuration of \Magento\Framework\Session\Validator',
     '/config/global/ignore_user_agents' => 'This configuration moved to Di configuration of \Magento\Log\Model\Visitor',
-    '/config/global/request' => 'This configuration moved to Di configuration of \Magento\Framework\App\RequestInterface',
-    '/config/global/secure_url' => 'This configuration moved to Di configuration of \Magento\Framework\Url\SecurityInfo',
+    '/config/global/request'
+        => 'This configuration moved to Di configuration of \Magento\Framework\App\RequestInterface',
+    '/config/global/secure_url'
+        => 'This configuration moved to Di configuration of \Magento\Framework\Url\SecurityInfo',
     '/config/global/dev' => 'This configuration moved to Di configuration of \Magento\Framework\App\Action\Context',
-    '/config/global/webapi' => 'This configuration moved to Di configuration of \Magento\Webapi\Controller\Request\Rest\Interpreter\Factory' .
-    ' and \Magento\Webapi\Controller\Response\Rest\Renderer\Factory',
-    '/config/global/cms' => 'This configuration moved to Di configuration of \Magento\Cms\Model\Wysiwyg\Images\Storage' .
-    ' and \Magento\Cms\Model\Wysiwyg\Config',
-    '/config/global/widget' => 'This configuration moved to Di configuration of \Magento\Cms\Model\Template\FilterProvider',
-    '/config/global/catalog/product/flat/max_index_count' => 'This configuration moved to Di configuration of \Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
-    '/config/global/catalog/product/flat/attribute_groups' => 'This configuration moved to Di configuration of \Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
-    '/config/global/catalog/product/flat/add_filterable_attributes' => 'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
-    '/config/global/catalog/product/flat/add_child_data' => 'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
-    '/config/global/catalog/content/template_filter' => 'This configuration moved to Di configuration of \Magento\Catalog\Helper\Data',
-    '/config/frontend/catalog/per_page_values/list' => 'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\ListPerPage',
-    '/config/frontend/catalog/per_page_values/grid' => 'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\GridPerPage',
-    '/config/global/catalog/product/design' => 'This configuration moved to Di configuration of' .
-    ' \Magento\Catalog\Model\Entity\Product\Attribute\Design\Option\Container',
+    '/config/global/webapi'
+        => 'This configuration moved to Di configuration of \Magento\Webapi\Controller\Request\Rest\Interpreter\Factory'
+            . ' and \Magento\Webapi\Controller\Response\Rest\Renderer\Factory',
+    '/config/global/cms' => 'This configuration moved to Di configuration of \Magento\Cms\Model\Wysiwyg\Images\Storage'
+        . ' and \Magento\Cms\Model\Wysiwyg\Config',
+    '/config/global/widget'
+        => 'This configuration moved to Di configuration of \Magento\Cms\Model\Template\FilterProvider',
+    '/config/global/catalog/product/flat/max_index_count'
+        => 'This configuration moved to Di configuration of \Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
+    '/config/global/catalog/product/flat/attribute_groups'
+        => 'This configuration moved to Di configuration of \Magento\Catalog\Model\ResourceModel\Product\Flat\Indexer',
+    '/config/global/catalog/product/flat/add_filterable_attributes'
+        => 'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
+    '/config/global/catalog/product/flat/add_child_data'
+        => 'This configuration moved to Di configuration of \Magento\Catalog\Helper\Product\Flat\Indexer',
+    '/config/global/catalog/content/template_filter'
+        => 'This configuration moved to Di configuration of \Magento\Catalog\Helper\Data',
+    '/config/frontend/catalog/per_page_values/list'
+        => 'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\ListPerPage',
+    '/config/frontend/catalog/per_page_values/grid'
+        => 'This configuration moved to Di configuration of \Magento\Catalog\Model\Config\Source\GridPerPage',
+    '/config/global/catalog/product/design'
+        => 'This configuration moved to Di configuration of'
+            . ' \Magento\Catalog\Model\Entity\Product\Attribute\Design\Option\Container',
     '/config/global/catalog/product/attributes' => 'This configuration moved catalog_attributes.xml',
     '/config/global/eav_frontendclasses' => 'This configuration was removed. ' .
     'Please pluginize \Magento\Eav\Helper\Data::getFrontendClasses to extend frontend classes list',
-    '/config/global/resources' => 'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
-    '/config/global/resource' => 'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
+    '/config/global/resources'
+        => 'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
+    '/config/global/resource'
+        => 'This configuration moved to Di configuration of \Magento\Framework\App\ResourceConnection',
     '/config/*/events/core_block_abstract_to_html_after' => 'Event has been replaced with "core_layout_render_element"',
     '/config/*/events/catalog_controller_product_delete' => '',
     '/config//observers/*/args' => 'This was an undocumented and unused feature in event subscribers',
@@ -79,10 +101,14 @@
     '/config/global/disable_local_modules' => '',
     '/config/global/newsletter/tempate_filter' => 'Use DI configs to setup model for template processing',
     '/config/*/layout' => 'Use convention for layout files placement instead of configuration',
-    '/config/frontend/product/collection/attributes' => 'Use /config/group[@name="catalog_product"] of catalog_attributes.xml',
-    '/config/frontend/category/collection/attributes' => 'Use /config/group[@name="catalog_category"] of catalog_attributes.xml',
-    '/config/global/sales/quote/item/product_attributes' => 'Use /config/group[@name="quote_item"] of catalog_attributes.xml',
-    '/config/global/wishlist/item/product_attributes' => 'Use /config/group[@name="wishlist_item"] of catalog_attributes.xml',
+    '/config/frontend/product/collection/attributes'
+    => 'Use /config/group[@name="catalog_product"] of catalog_attributes.xml',
+    '/config/frontend/category/collection/attributes'
+    => 'Use /config/group[@name="catalog_category"] of catalog_attributes.xml',
+    '/config/global/sales/quote/item/product_attributes'
+    => 'Use /config/group[@name="quote_item"] of catalog_attributes.xml',
+    '/config/global/wishlist/item/product_attributes'
+    => 'Use /config/group[@name="wishlist_item"] of catalog_attributes.xml',
     '/config/global/catalog/product/flat/attribute_nodes' => 'Use /config/global/catalog/product/flat/attribute_groups',
     '/config/global/customer/address/formats' => 'Use /config/format of address_formats.xml',
     '/config/global/pdf' => 'Use configuration in pdf.xml',
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
index 216a2ad50694d..e69943b7fa211 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
@@ -103,19 +103,31 @@
         'Magento\Core\Model\Design\PackageInterface',
         'Magento_Core_Model_Design_Package::PUBLIC_MODULE_DIR',
     ],
-    ['PUBLIC_MODULE_DIR', 'Magento\Framework\View\Publisher', 'Magento\Framework\View\Publisher\FileInterface::PUBLIC_MODULE_DIR'],
+    [
+        'PUBLIC_MODULE_DIR',
+        'Magento\Framework\View\Publisher',
+        'Magento\Framework\View\Publisher\FileInterface::PUBLIC_MODULE_DIR'
+    ],
     [
         'PUBLIC_THEME_DIR',
         'Magento\Core\Model\Design\PackageInterface',
         'Magento_Core_Model_Design_Package::PUBLIC_THEME_DIR',
     ],
-    ['PUBLIC_THEME_DIR', 'Magento\Framework\View\Publisher', 'Magento\Framework\View\Publisher\FileInterface::PUBLIC_THEME_DIR'],
+    [
+        'PUBLIC_THEME_DIR',
+        'Magento\Framework\View\Publisher',
+        'Magento\Framework\View\Publisher\FileInterface::PUBLIC_THEME_DIR'
+    ],
     [
         'PUBLIC_VIEW_DIR',
         'Magento\Core\Model\Design\PackageInterface',
         'Magento_Core_Model_Design_Package::PUBLIC_VIEW_DIR',
     ],
-    ['PUBLIC_VIEW_DIR', 'Magento\Framework\View\Publisher', 'Magento\Framework\View\Publisher\FileInterface::PUBLIC_VIEW_DIR'],
+    [
+        'PUBLIC_VIEW_DIR',
+        'Magento\Framework\View\Publisher',
+        'Magento\Framework\View\Publisher\FileInterface::PUBLIC_VIEW_DIR'
+    ],
     ['REGISTRY_FORM_PARAMS_KEY', null, 'direct value'],
     ['RULE_PERM_ALLOW', '\Magento\Framework\Math\Random'],
     ['RULE_PERM_DENY', '\Magento\Framework\Math\Random'],
@@ -506,7 +518,11 @@
     ['CONTAINER_OPT_HTML_CLASS', 'Magento\Framework\View\Layout', '\Magento\Framework\View\Layout\Element'],
     ['CONTAINER_OPT_HTML_ID', 'Magento\Framework\View\Layout', '\Magento\Framework\View\Layout\Element'],
     ['CONTAINER_OPT_LABEL', 'Magento\Framework\View\Layout', '\Magento\Framework\View\Layout\Element'],
-    ['XML_PATH_THEME_ID', 'Magento\Core\Model\View\Design', '\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID'],
+    [
+        'XML_PATH_THEME_ID',
+        'Magento\Core\Model\View\Design',
+        '\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID'
+    ],
     ['UPLOAD_ROOT', 'Magento\Backend\Model\Config\Backend\Logo'],
     ['UPLOAD_ROOT', 'Magento\Backend\Model\Config\Backend\Favicon'],
     ['DIRECTORY_SEPARATOR', 'Magento\Framework\Filesystem'],
@@ -648,26 +664,74 @@
     ['VAT_CLASS_INVALID', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::VAT_CLASS_INVALID'],
     ['VAT_CLASS_INTRA_UNION', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::VAT_CLASS_INTRA_UNION'],
     ['VAT_CLASS_DOMESTIC', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::VAT_CLASS_DOMESTIC'],
-    ['XML_PATH_CUSTOMER_VIV_INTRA_UNION_GROUP', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::XML_PATH_CUSTOMER_VIV_INTRA_UNION_GROUP'],
-    ['XML_PATH_CUSTOMER_VIV_DOMESTIC_GROUP', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::XML_PATH_CUSTOMER_VIV_DOMESTIC_GROUP'],
-    ['XML_PATH_CUSTOMER_VIV_INVALID_GROUP', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::XML_PATH_CUSTOMER_VIV_INVALID_GROUP'],
-    ['XML_PATH_CUSTOMER_VIV_ERROR_GROUP', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::XML_PATH_CUSTOMER_VIV_ERROR_GROUP'],
+    [
+        'XML_PATH_CUSTOMER_VIV_INTRA_UNION_GROUP',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Vat::XML_PATH_CUSTOMER_VIV_INTRA_UNION_GROUP'
+    ],
+    [
+        'XML_PATH_CUSTOMER_VIV_DOMESTIC_GROUP',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Vat::XML_PATH_CUSTOMER_VIV_DOMESTIC_GROUP'
+    ],
+    [
+        'XML_PATH_CUSTOMER_VIV_INVALID_GROUP',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Vat::XML_PATH_CUSTOMER_VIV_INVALID_GROUP'
+    ],
+    [
+        'XML_PATH_CUSTOMER_VIV_ERROR_GROUP',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Vat::XML_PATH_CUSTOMER_VIV_ERROR_GROUP'
+    ],
     ['VAT_VALIDATION_WSDL_URL', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::VAT_VALIDATION_WSDL_URL'],
-    ['XML_PATH_CUSTOMER_GROUP_AUTO_ASSIGN', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::XML_PATH_CUSTOMER_GROUP_AUTO_ASSIGN'],
-    ['XML_PATH_EU_COUNTRIES_LIST', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::XML_PATH_EU_COUNTRIES_LIST'],
-    ['XML_PATH_MERCHANT_COUNTRY_CODE', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::XML_PATH_MERCHANT_COUNTRY_CODE'],
-    ['XML_PATH_MERCHANT_VAT_NUMBER', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::XML_PATH_MERCHANT_VAT_NUMBER'],
+    [
+        'XML_PATH_CUSTOMER_GROUP_AUTO_ASSIGN',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Vat::XML_PATH_CUSTOMER_GROUP_AUTO_ASSIGN'
+    ],
+    [
+        'XML_PATH_EU_COUNTRIES_LIST',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Vat::XML_PATH_EU_COUNTRIES_LIST'
+    ],
+    [
+        'XML_PATH_MERCHANT_COUNTRY_CODE',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Vat::XML_PATH_MERCHANT_COUNTRY_CODE'
+    ],
+    [
+        'XML_PATH_MERCHANT_VAT_NUMBER',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Vat::XML_PATH_MERCHANT_VAT_NUMBER'
+    ],
     ['ROUTE_ACCOUNT_LOGIN', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Url::ROUTE_ACCOUNT_LOGIN'],
-    ['XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Url::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD'],
-    ['REFERER_QUERY_PARAM_NAME', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Url::REFERER_QUERY_PARAM_NAME'],
-    ['XML_PATH_CUSTOMER_RESET_PASSWORD_LINK_EXPIRATION_PERIOD', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Customer::XML_PATH_CUSTOMER_RESET_PASSWORD_LINK_EXPIRATION_PERIOD'],
+    [
+        'XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Url::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD'
+    ],
+    [
+        'REFERER_QUERY_PARAM_NAME',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Url::REFERER_QUERY_PARAM_NAME'
+    ],
+    [
+        'XML_PATH_CUSTOMER_RESET_PASSWORD_LINK_EXPIRATION_PERIOD',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Customer::XML_PATH_CUSTOMER_RESET_PASSWORD_LINK_EXPIRATION_PERIOD'
+    ],
     ['XML_PATH_SUPPORT_EMAIL', 'Magento\Customer\Helper\Data'],
     ['CONTEXT_AUTH', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Context::CONTEXT_AUTH'],
     ['CONTEXT_CURRENCY', 'Magento\Customer\Helper\Data', 'Magento\Framework\App\Http\Context::CONTEXT_CURRENCY'],
     ['CONTEXT_GROUP', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Context::CONTEXT_GROUP'],
     ['CONTEXT_STORE', 'Magento\Customer\Helper\Data', 'Magento\Store\Model\StoreManagerInterface::CONTEXT_STORE'],
     ['DEBUG_CONNECT', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\LoggerInterface::TYPE_CONNECT'],
-    ['DEBUG_TRANSACTION', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\LoggerInterface::TYPE_TRANSACTION'],
+    [
+        'DEBUG_TRANSACTION',
+        'Magento\Framework\DB\Adapter\Pdo\Mysql',
+        'Magento\Framework\DB\LoggerInterface::TYPE_TRANSACTION'
+    ],
     ['DEBUG_QUERY', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\LoggerInterface::TYPE_QUERY'],
     [
         'PARAM_ALLOWED_MODULES',
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 42e94c348e50a..4e8253cde34d9 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -34,8 +34,16 @@
     ['_avoidDoubleTransactionProcessing'],
     ['_beforeChildToHtml'],
     ['_beforeMove', 'Magento\Catalog\Model\ResourceModel\Category\Tree'],
-    ['_getIsActiveAttributeId', 'Magento\Catalog\Model\ResourceModel\Category\Tree', 'Magento\Catalog\Model\ResourceModel\Category::getIsActiveAttributeId'],
-    ['_getIsActiveAttributeId', 'Magento\Catalog\Model\ResourceModel\Category', 'Magento\Catalog\Model\ResourceModel\Category::getIsActiveAttributeId'],
+    [
+        '_getIsActiveAttributeId',
+        'Magento\Catalog\Model\ResourceModel\Category\Tree',
+        'Magento\Catalog\Model\ResourceModel\Category::getIsActiveAttributeId'
+    ],
+    [
+        '_getIsActiveAttributeId',
+        'Magento\Catalog\Model\ResourceModel\Category',
+        'Magento\Catalog\Model\ResourceModel\Category::getIsActiveAttributeId'
+    ],
     ['_bytesToMbytes', 'Magento\Catalog\Model\Product\Option\Type\File'],
     ['_calculatePrice', 'Magento\Quote\Model\Quote\Item\AbstractItem'],
     ['_canBeStoreCodeInUrl', 'Magento\Framework\App\Request\Http'],
@@ -1892,9 +1900,21 @@
     ['_addWelcomeMessage', 'Magento\Customer\Controller\Account'],
     ['_isVatValidationEnabled', 'Magento\Customer\Controller\Account'],
     ['_createUrl', 'Magento\Customer\Controller\Account'],
-    ['_extractAddress', 'Magento\Customer\Controller\Account\CreatePost', 'Magento\Customer\Controller\Account\CreatePost::extractAddress'],
-    ['_loginPostRedirect', 'Magento\Customer\Controller\Account\LoginPost', 'Magento\Customer\Model\Account\Redirect::getRedirect'],
-    ['_getAllowedActions', 'Magento\Customer\Controller\Account', 'Magento\Customer\Controller\Account::getAllowedActions'],
+    [
+        '_extractAddress',
+        'Magento\Customer\Controller\Account\CreatePost',
+        'Magento\Customer\Controller\Account\CreatePost::extractAddress'
+    ],
+    [
+        '_loginPostRedirect',
+        'Magento\Customer\Controller\Account\LoginPost',
+        'Magento\Customer\Model\Account\Redirect::getRedirect'
+    ],
+    [
+        '_getAllowedActions',
+        'Magento\Customer\Controller\Account',
+        'Magento\Customer\Controller\Account::getAllowedActions'
+    ],
     ['isRegistrationAllowed', 'Magento\Customer\Controller\Account\CreatePost'],
     ['isRegistrationAllowed', 'Magento\Invitation\Controller\Customer\Account\CreatePost'],
     ['getNoDisplay', 'Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Category'],
@@ -1913,15 +1933,27 @@
     ['getLoginUrlParams', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Url::getLoginUrlParams'],
     ['getMerchantCountryCode', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::getMerchantCountryCode'],
     ['getMerchantVatNumber', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::getMerchantVatNumber'],
-    ['getCustomerGroupIdBasedOnVatNumber', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::getCustomerGroupIdBasedOnVatNumber'],
+    [
+        'getCustomerGroupIdBasedOnVatNumber',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Vat::getCustomerGroupIdBasedOnVatNumber'
+    ],
     ['checkVatNumber', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::checkVatNumber'],
-    ['createVatNumberValidationSoapClient', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::createVatNumberValidationSoapClient'],
+    [
+        'createVatNumberValidationSoapClient',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Vat::createVatNumberValidationSoapClient'
+    ],
     ['canCheckVatNumber', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::canCheckVatNumber'],
     ['getCustomerVatClass', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::getCustomerVatClass'],
     ['isCountryInEU', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Vat::isCountryInEU'],
     ['generateResetPasswordLinkToken', 'Magento\Customer\Helper\Data'],
     ['isLoggedIn', 'Magento\Customer\Helper\Data'],
-    ['getResetPasswordLinkExpirationPeriod', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Customer::getResetPasswordLinkExpirationPeriod'],
+    [
+        'getResetPasswordLinkExpirationPeriod',
+        'Magento\Customer\Helper\Data',
+        'Magento\Customer\Model\Customer::getResetPasswordLinkExpirationPeriod'
+    ],
     ['isRegistrationAllowed', 'Magento\Customer\Helper\Data', 'Magento\Customer\Model\Registration::isAllowed'],
     ['getFlatIndexer', 'Magento\Catalog\Model\Category'],
     ['getProductIndexer', 'Magento\Catalog\Model\Category'],
@@ -1934,35 +1966,83 @@
     ['getIndexer', 'Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\AbstractPlugin'],
     ['getRemoteResource', 'Magento\Framework\Filesystem', 'Magento\Framework\Filesystem\File\ReadFactory::create'],
     ['setCache', 'Magento\Framework\App\Magento\Framework\App\ResourceConnection'],
-    ['setTablePrefix', 'Magento\Framework\App\Magento\Framework\App\ResourceConnection', 'Can be passed through constructor only'],
+    [
+        'setTablePrefix',
+        'Magento\Framework\App\Magento\Framework\App\ResourceConnection',
+        'Can be passed through constructor only'
+    ],
     ['_debugTimer', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\Logger\LoggerAbstract::startTimer'],
     ['_debugStat', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\Logger\File::logStats'],
     ['_debugException', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\Logger\File::critical'],
     ['_debugWriteToFile', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\Logger\File::log'],
-    ['applyDataUpdates', 'Magento\Framework\Module\Setup', '\Magento\Framework\Setup\ModuleDataSetupInterface::applyDataUpdates'],
+    [
+        'applyDataUpdates',
+        'Magento\Framework\Module\Setup',
+        '\Magento\Framework\Setup\ModuleDataSetupInterface::applyDataUpdates'
+    ],
     ['_installData', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::_installData'],
     ['_upgradeData', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::_upgradeData'],
-    ['_getAvailableDataFiles', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::_getAvailableDataFiles'],
+    [
+        '_getAvailableDataFiles',
+        'Magento\Framework\Module\Setup',
+        'Magento\Setup\Module\DataSetup::_getAvailableDataFiles'
+    ],
     ['_modifyResourceDb', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::_modifyResourceDb'],
     ['_includeFile', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::_includeFile'],
     ['_getModifySqlFiles', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::_getModifySqlFiles'],
     ['getTableRow', 'Magento\Framework\Module\Setup', '\Magento\Framework\Setup\ModuleDataSetupInterface::getTableRow'],
-    ['deleteTableRow', 'Magento\Framework\Module\Setup', '\Magento\Framework\Setup\ModuleDataSetupInterface::deleteTableRow'],
-    ['updateTableRow', 'Magento\Framework\Module\Setup', '\Magento\Framework\Setup\ModuleDataSetupInterface::updateTableRow'],
-    ['getCallAfterApplyAllUpdates', 'Magento\Framework\Module\Setup', '\Magento\Framework\Setup\ModuleDataSetupInterface::getCallAfterApplyAllUpdates'],
-    ['afterApplyAllUpdates', 'Magento\Framework\Module\Setup', '\\Magento\Framework\Setup\ModuleDataSetupInterface::afterApplyAllUpdates'],
-    ['getEventManager', 'Magento\Framework\Module\Setup', '\Magento\Framework\Setup\ModuleDataSetupInterface::getEventManager'],
-    ['getFilesystem', 'Magento\Framework\Module\Setup', '\Magento\Framework\Setup\ModuleDataSetupInterface::getFilesystem'],
-    ['createMigrationSetup', 'Magento\Framework\Module\Setup', '\Magento\Framework\Setup\ModuleDataSetupInterface::createMigrationSetup'],
+    [
+        'deleteTableRow',
+        'Magento\Framework\Module\Setup',
+        '\Magento\Framework\Setup\ModuleDataSetupInterface::deleteTableRow'
+    ],
+    [
+        'updateTableRow',
+        'Magento\Framework\Module\Setup',
+        '\Magento\Framework\Setup\ModuleDataSetupInterface::updateTableRow'
+    ],
+    [
+        'getCallAfterApplyAllUpdates',
+        'Magento\Framework\Module\Setup',
+        '\Magento\Framework\Setup\ModuleDataSetupInterface::getCallAfterApplyAllUpdates'
+    ],
+    [
+        'afterApplyAllUpdates',
+        'Magento\Framework\Module\Setup',
+        '\\Magento\Framework\Setup\ModuleDataSetupInterface::afterApplyAllUpdates'
+    ],
+    [
+        'getEventManager',
+        'Magento\Framework\Module\Setup',
+        '\Magento\Framework\Setup\ModuleDataSetupInterface::getEventManager'
+    ],
+    [
+        'getFilesystem',
+        'Magento\Framework\Module\Setup',
+        '\Magento\Framework\Setup\ModuleDataSetupInterface::getFilesystem'
+    ],
+    [
+        'createMigrationSetup',
+        'Magento\Framework\Module\Setup',
+        '\Magento\Framework\Setup\ModuleDataSetupInterface::createMigrationSetup'
+    ],
     ['getModules', 'Magento\Framework\Module\ModuleList', 'getAll'],
     ['getModules', 'Magento\Framework\Module\ModuleListInterface', 'getAll'],
     ['getModule', 'Magento\Framework\Module\ModuleList', 'getOne'],
     ['getModule', 'Magento\Framework\Module\ModuleListInterface', 'getOne'],
     ['_getNewConditionModelInstance', 'Magento\Rule\Model\Condition\Combine'],
     ['getItemsRandomCollection', 'Magento\Sales\Model\Order'],
-    ['importOrderAddress', 'Magento\Quote\Model\Quote\Address', 'Magento\Quote\Model\Quote\Address::importCustomerAddressData'],
+    [
+        'importOrderAddress',
+        'Magento\Quote\Model\Quote\Address',
+        'Magento\Quote\Model\Quote\Address::importCustomerAddressData'
+    ],
     ['_getUsedAttributes', 'Magento\SalesRule\Model\Rule'],
-    ['getDefaultCustomerGroupId', 'Magento\Customer\Model\Vat', 'Magento\Customer\Api\GroupManagementInterface::getDefaultGroup'],
+    [
+        'getDefaultCustomerGroupId',
+        'Magento\Customer\Model\Vat',
+        'Magento\Customer\Api\GroupManagementInterface::getDefaultGroup'
+    ],
     [
         'getRatesByCustomerAndProductTaxClassId',
         'Magento\Tax\Service\V1\TaxRuleServiceInterface',
@@ -1976,7 +2056,11 @@
     ['urlEncode', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Url\EncoderInterface::encode'],
     ['urlDecode', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Url\DecoderInterface::decode'],
     ['isModuleEnabled', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Module\Manager::isEnabled()'],
-    ['isModuleOutputEnabled', 'Magento\Framework\App\Helper\AbstractHelper', 'Magento\Framework\Module\Manager::isOutputEnabled()'],
+    [
+        'isModuleOutputEnabled',
+        'Magento\Framework\App\Helper\AbstractHelper',
+        'Magento\Framework\Module\Manager::isOutputEnabled()'
+    ],
     ['_packToTar', 'Magento\Framework\Archive\Tar'],
     ['_parseHeader', 'Magento\Framework\Archive\Tar'],
     ['getIdentities', 'Magento\Wishlist\Block\Link'],
@@ -2036,7 +2120,11 @@
     ['_renderPage', 'Magento\Cms\Helper\Page'],
     ['beforeGenerateBlock', 'Magento\Backend\Model\View\Layout\Builder'],
     ['beforeGenerateBlock', 'Magento\Backend\Model\View\Page\Builder'],
-    ['filterAclNodes', 'Magento\Backend\Model\View\Layout\Filter\Acl', 'Magento\Backend\Model\View\Layout\Filter\Acl::filterAclElements'],
+    [
+        'filterAclNodes',
+        'Magento\Backend\Model\View\Layout\Filter\Acl',
+        'Magento\Backend\Model\View\Layout\Filter\Acl::filterAclElements'
+    ],
     ['getModuleName', 'Magento\Framework\App\Console\Request'],
     ['setModuleName', 'Magento\Framework\App\Console\Request'],
     ['getActionName', 'Magento\Framework\App\Console\Request'],
@@ -2111,13 +2199,21 @@
     ],
     ['isReviewOwner', 'Magento\Review\Block\Customer\View'],
     ['getRegistration', 'Magento\Customer\Block\Form\Login', 'Magento\Customer\Block\Form\Login\Info::getRegistration'],
-    ['getCreateAccountUrl', 'Magento\Customer\Block\Form\Login', 'Magento\Customer\Block\Form\Login\Info::getCreateAccountUrl'],
+    [
+        'getCreateAccountUrl',
+        'Magento\Customer\Block\Form\Login',
+        'Magento\Customer\Block\Form\Login\Info::getCreateAccountUrl'
+    ],
     ['getSuccessMessage', 'Magento\Newsletter\Block\Subscribe'],
     ['getErrorMessage', 'Magento\Newsletter\Block\Subscribe'],
     ['_initCollection', 'Magento\Review\Block\Customer\ListCustomer'],
     ['count', 'Magento\Review\Block\Customer\ListCustomer'],
     ['_getCollection', 'Magento\Review\Block\Customer\ListCustomer'],
-    ['getCollection', 'Magento\Review\Block\Customer\ListCustomer', 'Magento\Review\Block\Customer\ListCustomer::getReviews'],
+    [
+        'getCollection',
+        'Magento\Review\Block\Customer\ListCustomer',
+        'Magento\Review\Block\Customer\ListCustomer::getReviews'
+    ],
     ['_initCollection', 'Magento\Review\Block\Customer\Recent'],
     ['count', 'Magento\Review\Block\Customer\Recent'],
     ['_getCollection', 'Magento\Review\Block\Customer\Recent'],
@@ -2309,9 +2405,20 @@
     ['getChilds', 'Magento\Bundle\Block\Sales\Order\Items\Renderer', 'getChildren'],
     ['getChilds', 'Magento\Bundle\Model\Sales\Order\Pdf\Items\AbstractItems', 'getChildren'],
     ['prepareIndexdata', 'Magento\Search\Helper\Data'],
-    ['isAssetMinification', 'Magento\Framework\View\Asset\ConfigInterface', 'Magento\Framework\View\Asset\Minification::isEnabled'],
-    ['isAssetMinification', 'Magento\Framework\View\Asset\Config', 'Magento\Framework\View\Asset\Minification::isEnabled'],
-    ['getPriceValues', 'Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection'],
+    [
+        'isAssetMinification',
+        'Magento\Framework\View\Asset\ConfigInterface',
+        'Magento\Framework\View\Asset\Minification::isEnabled'
+    ],
+    [
+        'isAssetMinification',
+        'Magento\Framework\View\Asset\Config',
+        'Magento\Framework\View\Asset\Minification::isEnabled'
+    ],
+    [
+        'getPriceValues',
+        'Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection'
+    ],
     ['getPricingValue', 'Magento\ConfigurableProduct\Model\Product\Type\Configurable\OptionValue'],
     ['getIsPercent', 'Magento\ConfigurableProduct\Model\Product\Type\Configurable\OptionValue'],
     ['addPrice', 'Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute'],
@@ -2385,26 +2492,78 @@
     ['initOptionRenderer', 'Magento\Bundle\Model\Observer', 'Magento\Bundle\Observer\InitOptionRenderer::invoke'],
     ['setAttributeTabBlock', 'Magento\Bundle\Model\Observer', 'Magento\Bundle\Observer\SetAttributeTabBlock::invoke'],
     ['appendUpsellProducts', 'Magento\Bundle\Model\Observer', 'Magento\Bundle\Observer\AppendUpsellProducts::invoke'],
-    ['prepareCatalogProductCollectionPrices', 'Magento\CatalogRule\Model\Observer', 'Magento\CatalogRule\Observer\PrepareCatalogProductCollectionPrices::invoke'],
-    ['processAdminFinalPrice', 'Magento\CatalogRule\Model\Observer', 'Magento\CatalogRule\Observer\ProcessAdminFinalPrice::invoke'],
-    ['processFrontFinalPrice', 'Magento\CatalogRule\Model\Observer', 'Magento\CatalogRule\Observer\ProcessFrontFinalPrice::invoke'],
+    [
+        'prepareCatalogProductCollectionPrices',
+        'Magento\CatalogRule\Model\Observer',
+        'Magento\CatalogRule\Observer\PrepareCatalogProductCollectionPrices::invoke'
+    ],
+    [
+        'processAdminFinalPrice',
+        'Magento\CatalogRule\Model\Observer',
+        'Magento\CatalogRule\Observer\ProcessAdminFinalPrice::invoke'
+    ],
+    [
+        'processFrontFinalPrice',
+        'Magento\CatalogRule\Model\Observer',
+        'Magento\CatalogRule\Observer\ProcessFrontFinalPrice::invoke'
+    ],
     ['salesEventConvertQuoteAddressToOrder', 'Magento\Tax\Model\Observer'],
-    ['aggregateSalesReportTaxData', 'Magento\Tax\Model\Observer', 'Magento\Tax\Observer\AggregateSalesReportTaxData::invoke'],
+    [
+        'aggregateSalesReportTaxData',
+        'Magento\Tax\Model\Observer',
+        'Magento\Tax\Observer\AggregateSalesReportTaxData::invoke'
+    ],
     ['quoteCollectTotalsBefore', 'Magento\Tax\Model\Observer', 'Magento\Tax\Observer\QuoteCollectTotalsBefore::invoke'],
     ['updateProductOptions', 'Magento\Tax\Model\Observer', 'Magento\Tax\Observer\UpdateProductOptionsObserver::invoke'],
-    ['invalidateVarnish', 'Magento\CacheInvalidate\Model\Observer', 'Magento\CacheInvalidate\Observer\InvalidateVarnish::invoke'],
-    ['flushAllCache', 'Magento\CacheInvalidate\Model\Observer', 'Magento\CacheInvalidate\Observer\FlushAllCache::invoke'],
-    ['sendPurgeRequest', 'Magento\CacheInvalidate\Model\Observer', 'Magento\CacheInvalidate\Model\PurgeCache::sendPurgeRequest'],
-    ['addCatalogToTopmenuItems', 'Magento\Catalog\Model\Observer', 'Magento\Catalog\Observer\AddCatalogToTopmenuItems::invoke'],
-    ['catalogCheckIsUsingStaticUrlsAllowed', 'Magento\Catalog\Model\Observer', 'Magento\Catalog\Observer\CatalogCheckIsUsingStaticUrlsAllowed::invoke'],
-    ['_addCategoriesToMenu', 'Magento\Catalog\Model\Observer', 'Magento\Catalog\Observer\AddCatalogToTopmenuItems::_addCategoriesToMenu'],
+    [
+        'invalidateVarnish',
+        'Magento\CacheInvalidate\Model\Observer',
+        'Magento\CacheInvalidate\Observer\InvalidateVarnish::invoke'
+    ],
+    [
+        'flushAllCache',
+        'Magento\CacheInvalidate\Model\Observer',
+        'Magento\CacheInvalidate\Observer\FlushAllCache::invoke'
+    ],
+    [
+        'sendPurgeRequest',
+        'Magento\CacheInvalidate\Model\Observer',
+        'Magento\CacheInvalidate\Model\PurgeCache::sendPurgeRequest'
+    ],
+    [
+        'addCatalogToTopmenuItems',
+        'Magento\Catalog\Model\Observer',
+        'Magento\Catalog\Observer\AddCatalogToTopmenuItems::invoke'
+    ],
+    [
+        'catalogCheckIsUsingStaticUrlsAllowed',
+        'Magento\Catalog\Model\Observer',
+        'Magento\Catalog\Observer\CatalogCheckIsUsingStaticUrlsAllowed::invoke'
+    ],
+    [
+        '_addCategoriesToMenu',
+        'Magento\Catalog\Model\Observer',
+        'Magento\Catalog\Observer\AddCatalogToTopmenuItems::_addCategoriesToMenu'
+    ],
     ['hasActive', 'Magento\Catalog\Model\Observer', 'Magento\Catalog\Observer\AddCatalogToTopmenuItems::hasActive'],
-    ['getCatalogLayer', 'Magento\Catalog\Model\Observer', 'Magento\Catalog\Observer\AddCatalogToTopmenuItems::getCatalogLayer'],
-    ['getMenuCategoryData', 'Magento\Catalog\Model\Observer', 'Magento\Catalog\Observer\MenuCategoryData::getMenuCategoryData'],
+    [
+        'getCatalogLayer',
+        'Magento\Catalog\Model\Observer',
+        'Magento\Catalog\Observer\AddCatalogToTopmenuItems::getCatalogLayer'
+    ],
+    [
+        'getMenuCategoryData',
+        'Magento\Catalog\Model\Observer',
+        'Magento\Catalog\Observer\MenuCategoryData::getMenuCategoryData'
+    ],
     ['loadCustomerQuote', 'Magento\Checkout\Model\Observer', 'Magento\Checkout\Observer\LoadCustomerQuote::invoke'],
     ['salesQuoteSaveAfter', 'Magento\Checkout\Model\Observer', 'Magento\Checkout\Observer\SalesQuoteSaveAfter::invoke'],
     ['unsetAll', 'Magento\Checkout\Model\Observer', 'Magento\Checkout\Observer\UnsetAll::invoke'],
-    ['currencyDisplayOptions', 'Magento\CurrencySymbol\Model\Observer', 'Magento\CurrencySymbol\Observer\CurrencyDisplayOptions::invoke'],
+    [
+        'currencyDisplayOptions',
+        'Magento\CurrencySymbol\Model\Observer',
+        'Magento\CurrencySymbol\Observer\CurrencyDisplayOptions::invoke'
+    ],
     ['__toString', 'Magento\Catalog\Helper\Image'],
     ['getProductImageView', 'Magento\Catalog\Block\Product\Image'],
     ['init', 'Magento\Catalog\Block\Product\Image'],
@@ -2433,13 +2592,25 @@
     ['getThumbnailUrl', 'Magento\ProductAlert\Block\Email\AbstractEmail'],
     ['getProductThumbnail', 'Magento\Checkout\Block\Cart\Item\Renderer'],
     ['prepareInvoice', 'Magento\Sales\Api\InvoiceManagementInterface'],
-    ['getColumnsComponent', 'Magento\Ui\Model\Export\ConvertToCsv', 'Magento\Ui\Model\Export\MetadataProvider::getColumnsComponent'],
+    [
+        'getColumnsComponent',
+        'Magento\Ui\Model\Export\ConvertToCsv',
+        'Magento\Ui\Model\Export\MetadataProvider::getColumnsComponent'
+    ],
     ['getColumns', 'Magento\Ui\Model\Export\ConvertToCsv', 'Magento\Ui\Model\Export\MetadataProvider::getColumns'],
     ['getHeaders', 'Magento\Ui\Model\Export\ConvertToCsv', 'Magento\Ui\Model\Export\MetadataProvider::getHeaders'],
     ['getFields', 'Magento\Ui\Model\Export\ConvertToCsv', 'Magento\Ui\Model\Export\MetadataProvider::getFields'],
     ['getRowData', 'Magento\Ui\Model\Export\ConvertToCsv', 'Magento\Ui\Model\Export\MetadataProvider::getRowData'],
-    ['getComplexLabel', 'Magento\Ui\Model\Export\ConvertToCsv', 'Magento\Ui\Model\Export\MetadataProvider::getComplexLabel'],
-    ['getFilterOptions', 'Magento\Ui\Model\Export\ConvertToCsv', 'Magento\Ui\Model\Export\MetadataProvider::getFilterOptions'],
+    [
+        'getComplexLabel',
+        'Magento\Ui\Model\Export\ConvertToCsv',
+        'Magento\Ui\Model\Export\MetadataProvider::getComplexLabel'
+    ],
+    [
+        'getFilterOptions',
+        'Magento\Ui\Model\Export\ConvertToCsv',
+        'Magento\Ui\Model\Export\MetadataProvider::getFilterOptions'
+    ],
     ['getOptions', 'Magento\Ui\Model\Export\ConvertToCsv', 'Magento\Ui\Model\Export\MetadataProvider::getOptions'],
     [
         'generateSimpleProducts',
@@ -2500,23 +2671,71 @@
     ['getProductMedia', 'Magento\Swatches\Helper\Data'],
     ['createSwatchProduct', 'Magento\Swatches\Helper\Data'],
     ['create', 'Magento\Quote\Model\QuoteRepository'],
-    ['set', 'Magento\Quote\Api\GuestShippingMethodManagementInterface', 'Magento\Quote\Model\GuestCart\GuestShippingMethodManagementInterface::set'],
-    ['get', 'Magento\Quote\Api\GuestShippingMethodManagementInterface', 'Magento\Quote\Model\GuestCart\GuestShippingMethodManagementInterface::get'],
-    ['get', 'Magento\Quote\Api\ShippingMethodManagementInterface', 'Magento\Quote\Model\ShippingMethodManagementInterface::get'],
-    ['set', 'Magento\Quote\Api\ShippingMethodManagementInterface', 'Magento\Quote\Model\ShippingMethodManagementInterface::get'],
+    [
+        'set',
+        'Magento\Quote\Api\GuestShippingMethodManagementInterface',
+        'Magento\Quote\Model\GuestCart\GuestShippingMethodManagementInterface::set'
+    ],
+    [
+        'get',
+        'Magento\Quote\Api\GuestShippingMethodManagementInterface',
+        'Magento\Quote\Model\GuestCart\GuestShippingMethodManagementInterface::get'
+    ],
+    [
+        'get',
+        'Magento\Quote\Api\ShippingMethodManagementInterface',
+        'Magento\Quote\Model\ShippingMethodManagementInterface::get'
+    ],
+    [
+        'set',
+        'Magento\Quote\Api\ShippingMethodManagementInterface',
+        'Magento\Quote\Model\ShippingMethodManagementInterface::get'
+    ],
     ['getTypeSwitcherData', 'Magento\Catalog\Block\Adminhtml\Product'],
     ['_afterLoad', 'Magento\CatalogRule\Model\ResourceModel\Rule'],
     ['_afterSave', 'Magento\CatalogRule\Model\ResourceModel\Rule'],
     ['_beforeDelete', 'Magento\Cms\Model\ResourceModel\Page'],
-    ['_afterSave', 'Magento\Cms\Model\ResourceModel\Page', 'Magento\Cms\Model\ResourceModel\Page\Relation\Store\SaveHandler::execute'],
-    ['_afterLoad', 'Magento\Cms\Model\ResourceModel\Page', 'Magento\Cms\Model\ResourceModel\Page\Relation\Store\ReadHandler::execute'],
+    [
+        '_afterSave',
+        'Magento\Cms\Model\ResourceModel\Page',
+        'Magento\Cms\Model\ResourceModel\Page\Relation\Store\SaveHandler::execute'
+    ],
+    [
+        '_afterLoad',
+        'Magento\Cms\Model\ResourceModel\Page',
+        'Magento\Cms\Model\ResourceModel\Page\Relation\Store\ReadHandler::execute'
+    ],
     ['_beforeDelete', 'Magento\Cms\Model\ResourceModel\Block'],
-    ['_afterSave', 'Magento\Cms\Model\ResourceModel\Block', 'Magento\Cms\Model\ResourceModel\Block\Relation\Store\SaveHandler::execute'],
-    ['_afterLoad', 'Magento\Cms\Model\ResourceModel\Block', 'Magento\Cms\Model\ResourceModel\Block\Relation\Store\ReadHandler::execute'],
-    ['getTabElement', 'Magento\Backend\Test\Block\Widget\FormTabs', 'Magento\Ui\Test\Block\Adminhtml\AbstractFormContainers::getContainerElement'],
-    ['getFieldsByTabs', 'Magento\Backend\Test\Block\Widget\FormTabs', 'Magento\Ui\Test\Block\Adminhtml\AbstractFormContainers::getFixtureFieldsByContainers'],
-    ['fillFormTab', 'Magento\Backend\Test\Block\Widget\Tab', 'Magento\Ui\Test\Block\Adminhtml\AbstractContainer::setFieldsData'],
-    ['getDataFormTab', 'Magento\Backend\Test\Block\Widget\Tab', 'Magento\Ui\Test\Block\Adminhtml\AbstractContainer::getFieldsData'],
+    [
+        '_afterSave',
+        'Magento\Cms\Model\ResourceModel\Block',
+        'Magento\Cms\Model\ResourceModel\Block\Relation\Store\SaveHandler::execute'
+    ],
+    [
+        '_afterLoad',
+        'Magento\Cms\Model\ResourceModel\Block',
+        'Magento\Cms\Model\ResourceModel\Block\Relation\Store\ReadHandler::execute'
+    ],
+    [
+        'getTabElement',
+        'Magento\Backend\Test\Block\Widget\FormTabs',
+        'Magento\Ui\Test\Block\Adminhtml\AbstractFormContainers::getContainerElement'
+    ],
+    [
+        'getFieldsByTabs',
+        'Magento\Backend\Test\Block\Widget\FormTabs',
+        'Magento\Ui\Test\Block\Adminhtml\AbstractFormContainers::getFixtureFieldsByContainers'
+    ],
+    [
+        'fillFormTab',
+        'Magento\Backend\Test\Block\Widget\Tab',
+        'Magento\Ui\Test\Block\Adminhtml\AbstractContainer::setFieldsData'
+    ],
+    [
+        'getDataFormTab',
+        'Magento\Backend\Test\Block\Widget\Tab',
+        'Magento\Ui\Test\Block\Adminhtml\AbstractContainer::getFieldsData'
+    ],
     ['getBunchImages', 'Magento\CatalogImportExport\Model\Import\Product'],
     ['_isAttributeValueEmpty', 'Magento\Catalog\Model\ResourceModel\AbstractResource'],
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
index f3afbf44bd2ad..14682d9d93ab3 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
@@ -321,23 +321,75 @@
     ['_resourceList', 'Magento\Framework\Module\Updater'],
     ['_storeManager', 'Magento\Customer\Controller\Account'],
     ['_urlFactory', 'Magento\Customer\Controller\Account'],
-    ['_addressHelper', 'Magento\Customer\Controller\Account', 'Magento\Customer\Controller\Account\Confirm::$addressHelper'],
+    [
+        '_addressHelper',
+        'Magento\Customer\Controller\Account',
+        'Magento\Customer\Controller\Account\Confirm::$addressHelper'
+    ],
     ['_scopeConfig', 'Magento\Customer\Controller\Account'],
     ['_customerAccountService', 'Magento\Customer\Controller\Account'],
-    ['_formFactory', 'Magento\Customer\Controller\Account\CreatePost', 'Magento\Customer\Controller\Account\CreatePost::formFactory'],
-    ['_subscriberFactory', 'Magento\Customer\Controller\Account\CreatePost', 'Magento\Customer\Controller\Account\CreatePost::subscriberFactory'],
-    ['_regionBuilder', 'Magento\Customer\Controller\Account\CreatePost', 'Magento\Customer\Controller\Account\CreatePost::regionBuilder'],
-    ['_addressBuilder', 'Magento\Customer\Controller\Account\CreatePost', 'Magento\Customer\Controller\Account\CreatePost::addressBuilder'],
-    ['_customerDetailsBuilder', 'Magento\Customer\Controller\Account\CreatePost', 'Magento\Customer\Controller\Account\CreatePost::customerDetailsBuilder'],
-    ['_customerBuilder', 'Magento\Customer\Controller\Account\Edit', 'Magento\Customer\Controller\Account\Edit::customerBuilder'],
-    ['_customerBuilder', 'Magento\Customer\Controller\Account\EditPost', 'Magento\Customer\Controller\Account\EditPost::customerBuilder'],
-    ['_customerDetailsBuilder', 'Magento\Customer\Controller\Account\EditPost', 'Magento\Customer\Controller\Account\EditPost::customerDetailsBuilder'],
-    ['_formKeyValidator', 'Magento\Customer\Controller\Account\EditPost', 'Magento\Customer\Controller\Account\EditPost::formKeyValidator'],
-    ['_customerHelperData', 'Magento\Customer\Controller\Account\LoginPost', 'Magento\Customer\Controller\Account\LoginPost::customerHelperData'],
-    ['_formKeyValidator', 'Magento\Customer\Controller\Account\LoginPost', 'Magento\Customer\Controller\Account\LoginPost::formKeyValidator'],
+    [
+        '_formFactory',
+        'Magento\Customer\Controller\Account\CreatePost',
+        'Magento\Customer\Controller\Account\CreatePost::formFactory'
+    ],
+    [
+        '_subscriberFactory',
+        'Magento\Customer\Controller\Account\CreatePost',
+        'Magento\Customer\Controller\Account\CreatePost::subscriberFactory'
+    ],
+    [
+        '_regionBuilder',
+        'Magento\Customer\Controller\Account\CreatePost',
+        'Magento\Customer\Controller\Account\CreatePost::regionBuilder'
+    ],
+    [
+        '_addressBuilder',
+        'Magento\Customer\Controller\Account\CreatePost',
+        'Magento\Customer\Controller\Account\CreatePost::addressBuilder'
+    ],
+    [
+        '_customerDetailsBuilder',
+        'Magento\Customer\Controller\Account\CreatePost',
+        'Magento\Customer\Controller\Account\CreatePost::customerDetailsBuilder'
+    ],
+    [
+        '_customerBuilder',
+        'Magento\Customer\Controller\Account\Edit',
+        'Magento\Customer\Controller\Account\Edit::customerBuilder'
+    ],
+    [
+        '_customerBuilder',
+        'Magento\Customer\Controller\Account\EditPost',
+        'Magento\Customer\Controller\Account\EditPost::customerBuilder'
+    ],
+    [
+        '_customerDetailsBuilder',
+        'Magento\Customer\Controller\Account\EditPost',
+        'Magento\Customer\Controller\Account\EditPost::customerDetailsBuilder'
+    ],
+    [
+        '_formKeyValidator',
+        'Magento\Customer\Controller\Account\EditPost',
+        'Magento\Customer\Controller\Account\EditPost::formKeyValidator'
+    ],
+    [
+        '_customerHelperData',
+        'Magento\Customer\Controller\Account\LoginPost',
+        'Magento\Customer\Controller\Account\LoginPost::customerHelperData'
+    ],
+    [
+        '_formKeyValidator',
+        'Magento\Customer\Controller\Account\LoginPost',
+        'Magento\Customer\Controller\Account\LoginPost::formKeyValidator'
+    ],
     ['_openActions', 'Magento\Customer\Controller\Account', 'Magento\Customer\Controller\Account::openActions'],
     ['_session', 'Magento\Customer\Controller\Account', 'Magento\Customer\Controller\Account::session'],
-    ['_cache', 'Magento\Framework\App\Magento\Framework\App\ResourceConnection', 'Magento\Framework\App\ResourceConnection\ConnectionFactory'],
+    [
+        '_cache',
+        'Magento\Framework\App\Magento\Framework\App\ResourceConnection',
+        'Magento\Framework\App\ResourceConnection\ConnectionFactory'
+    ],
     ['_debug', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'logger'],
     ['_logQueryTime', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\Logger\LoggerAbstract'],
     ['_logAllQueries', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\Logger\LoggerAbstract'],
@@ -347,7 +399,11 @@
     ['_debugTimer', 'Magento\Framework\DB\Adapter\Pdo\Mysql', 'Magento\Framework\DB\Logger\LoggerAbstract'],
     ['_resourceName', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::_resourceName'],
     ['_moduleConfig', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::_moduleConfig'],
-    ['_callAfterApplyAllUpdates', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::_callAfterApplyAllUpdates'],
+    [
+        '_callAfterApplyAllUpdates',
+        'Magento\Framework\Module\Setup',
+        'Magento\Setup\Module\DataSetup::_callAfterApplyAllUpdates'
+    ],
     ['_setupCache', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::_setupCache'],
     ['_modulesReader', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::_modulesReader'],
     ['_eventManager', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::_eventManager'],
@@ -356,7 +412,11 @@
     ['_migrationFactory', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::_migrationFactory'],
     ['filesystem', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::filesystem'],
     ['modulesDir', 'Magento\Framework\Module\Setup', 'Magento\Setup\Module\DataSetup::modulesDir'],
-    ['_directoryData', 'Magento\Customer\Model\Attribute\Data\Postcode', 'Magento\Customer\Model\Attribute\Data\Postcode::directoryHelper'],
+    [
+        '_directoryData',
+        'Magento\Customer\Model\Attribute\Data\Postcode',
+        'Magento\Customer\Model\Attribute\Data\Postcode::directoryHelper'
+    ],
     ['_conditionModels', 'Magento\Rule\Model\Condition\Combine'],
     ['_lables', 'Magento\SalesRule\Model\Rule'],
     ['_catalogData', 'Magento\Catalog\Block\Product\AbstractProduct'],
@@ -365,7 +425,11 @@
     ['_view', 'Magento\Cms\Helper\Page'],
     ['aclFilter', 'Magento\Backend\Model\View\Layout\Builder'],
     ['aclFilter', 'Magento\Backend\Model\View\Page\Builder'],
-    ['_authorization', 'Magento\Backend\Model\View\Layout\Filter\Acl', 'Magento\Backend\Model\View\Layout\Filter\Acl::authorization'],
+    [
+        '_authorization',
+        'Magento\Backend\Model\View\Layout\Filter\Acl',
+        'Magento\Backend\Model\View\Layout\Filter\Acl::authorization'
+    ],
     ['scheduledStructure', 'Magento\Framework\View\Layout'],
     ['pageConfigStructure', 'Magento\Framework\View\Layout'],
     ['scopeConfig', 'Magento\Framework\View\Layout\Reader\Block'],
@@ -378,7 +442,11 @@
     ['_requestedRouteName', 'Magento\Framework\App\Request\Http'],
     ['_isStraight', 'Magento\Framework\App\Request\Http'],
     ['_originalPathInfo', 'Magento\Framework\App\Request\Http', 'originalPathInfo'],
-    ['_requestString', 'Magento\Framework\App\Request\Http', 'Magento\Framework\HTTP\PhpEnvironment\Request::requestString'],
+    [
+        '_requestString',
+        'Magento\Framework\App\Request\Http',
+        'Magento\Framework\HTTP\PhpEnvironment\Request::requestString'
+    ],
     ['_pathInfoProcessor', 'Magento\Framework\App\Request\Http', 'pathInfoProcessor'],
     ['_objectManager', 'Magento\Framework\App\Request\Http', 'objectManager'],
     ['_directFrontNames', 'Magento\Framework\App\Request\Http', 'directFrontNames'],
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 75586af467389..0e87c549f172c 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
@@ -6,13 +6,15 @@
 
 namespace Magento\Framework\Model\ResourceModel\Db\Collection;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection\SourceProviderInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
 
 /**
  * Abstract Resource Collection
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
-abstract class AbstractCollection extends \Magento\Framework\Data\Collection\AbstractDb implements SourceProviderInterface
+abstract class AbstractCollection extends AbstractDb implements SourceProviderInterface
 {
     /**
      * Model name
@@ -456,7 +458,7 @@ public function getResourceModelName()
     public function getResource()
     {
         if (empty($this->_resource)) {
-            $this->_resource = \Magento\Framework\App\ObjectManager::getInstance()->create($this->getResourceModelName());
+            $this->_resource = ObjectManager::getInstance()->create($this->getResourceModelName());
         }
         return $this->_resource;
     }
@@ -608,7 +610,7 @@ public function __sleep()
     public function __wakeup()
     {
         parent::__wakeup();
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $objectManager = ObjectManager::getInstance();
         $this->_eventManager = $objectManager->get(\Magento\Framework\Event\ManagerInterface::class);
     }
 }
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php
index 5c03460cda12e..3cd39491e3f74 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php
@@ -498,7 +498,7 @@ public function testPrepareDataForUpdate()
         $abstractModelMock->afterLoad();
         $this->assertEquals($abstractModelMock->getData(), $abstractModelMock->getStoredData());
         $newData = ['value' => 'Test Value New'];
-        $this->_model->expects($this->atLeastOnce())->method('_prepareDataForTable')->will($this->returnValue($newData));
+        $this->_model->expects($this->atLeastOnce())->method('_prepareDataForTable')->willReturn($newData);
         $abstractModelMock->addData($newData);
         $this->assertNotEquals($abstractModelMock->getData(), $abstractModelMock->getStoredData());
         $abstractModelMock->isObjectNew(false);
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 2b1442f7e9784..9ee668c228893 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
@@ -45,7 +45,7 @@ class AbstractCollectionTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\DB\Adapter\Pdo\Mysql|\PHPUnit_Framework_MockObject_MockObject */
     protected $connectionMock;
 
-    /** @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject  */
+    /** @var Select|\PHPUnit_Framework_MockObject_MockObject  */
     protected $selectMock;
 
     /** @var \Magento\Framework\App\ObjectManager|\PHPUnit_Framework_MockObject_MockObject */
@@ -72,7 +72,7 @@ protected function setUp()
             ->will($this->returnValue($this->connectionMock));
 
         $this->selectMock = $this->getMock(
-            \Magento\Framework\DB\Select::class,
+            Select::class,
             ['getPart', 'setPart', 'from', 'columns'],
             [$this->connectionMock, $renderer]
         );
@@ -215,7 +215,7 @@ public function testGetSelect($idFieldNameRet, $getPartRet, $expected)
             ->method('getPart')
             ->will($this->returnValue($getPartRet));
 
-        $this->selectMock->expects($this->once())->method('setPart')->with(\Magento\Framework\DB\Select::COLUMNS, $expected);
+        $this->selectMock->expects($this->once())->method('setPart')->with(Select::COLUMNS, $expected);
         $this->assertTrue($this->uut->getSelect() instanceof Select);
     }
 
diff --git a/lib/internal/Magento/Framework/Mview/ActionFactory.php b/lib/internal/Magento/Framework/Mview/ActionFactory.php
index a2bdec53a449b..807e30ca60cdf 100644
--- a/lib/internal/Magento/Framework/Mview/ActionFactory.php
+++ b/lib/internal/Magento/Framework/Mview/ActionFactory.php
@@ -32,7 +32,9 @@ public function get($className)
     {
         $action = $this->objectManager->get($className);
         if (!$action instanceof ActionInterface) {
-            throw new \InvalidArgumentException($className . ' doesn\'t implement \Magento\Framework\Mview\ActionInterface');
+            throw new \InvalidArgumentException(
+                $className . ' doesn\'t implement \Magento\Framework\Mview\ActionInterface'
+            );
         }
 
         return $action;
diff --git a/lib/internal/Magento/Framework/Mview/View/Subscription.php b/lib/internal/Magento/Framework/Mview/View/Subscription.php
index 35ebcbe6e3f33..56656dd950f71 100644
--- a/lib/internal/Magento/Framework/Mview/View/Subscription.php
+++ b/lib/internal/Magento/Framework/Mview/View/Subscription.php
@@ -152,7 +152,7 @@ public function remove()
     protected function getLinkedViews()
     {
         if (!$this->linkedViews) {
-            $viewList = $this->viewCollection->getViewsByStateMode(\Magento\Framework\Mview\View\StateInterface::MODE_ENABLED);
+            $viewList = $this->viewCollection->getViewsByStateMode(StateInterface::MODE_ENABLED);
 
             foreach ($viewList as $view) {
                 /** @var \Magento\Framework\Mview\ViewInterface $view */
diff --git a/lib/internal/Magento/Framework/Validator/Builder.php b/lib/internal/Magento/Framework/Validator/Builder.php
index d4c30a6a68b80..d2be3f4489d64 100644
--- a/lib/internal/Magento/Framework/Validator/Builder.php
+++ b/lib/internal/Magento/Framework/Validator/Builder.php
@@ -255,7 +255,7 @@ protected function _createConstraint(array $data)
         }
 
         if (\Magento\Framework\Validator\Config::CONSTRAINT_TYPE_PROPERTY == $data['type']) {
-            $result = new \Magento\Framework\Validator\Constraint\Property($validator, $data['property'], $data['alias']);
+            $result = new Constraint\Property($validator, $data['property'], $data['alias']);
         } else {
             $result = $this->_constraintFactory->create(['validator' => $validator, 'alias' => $data['alias']]);
         }
@@ -267,7 +267,7 @@ protected function _createConstraint(array $data)
      * Create constraint validator instance
      *
      * @param array $data
-     * @return \Magento\Framework\Validator\ValidatorInterface
+     * @return ValidatorInterface
      * @throws \InvalidArgumentException
      */
     protected function _createConstraintValidator(array $data)
@@ -282,9 +282,12 @@ protected function _createConstraintValidator(array $data)
         );
 
         // Check validator type
-        if (!$validator instanceof \Magento\Framework\Validator\ValidatorInterface) {
+        if (!$validator instanceof ValidatorInterface) {
             throw new \InvalidArgumentException(
-                sprintf('Constraint class "%s" must implement \Magento\Framework\Validator\ValidatorInterface', $data['class'])
+                sprintf(
+                    'Constraint class "%s" must implement \Magento\Framework\Validator\ValidatorInterface',
+                    $data['class']
+                )
             );
         }
 
@@ -294,11 +297,11 @@ protected function _createConstraintValidator(array $data)
     /**
      * Configure validator
      *
-     * @param \Magento\Framework\Validator\ValidatorInterface $validator
+     * @param ValidatorInterface $validator
      * @param array $options
      * @return void
      */
-    protected function _configureConstraintValidator(\Magento\Framework\Validator\ValidatorInterface $validator, array $options)
+    protected function _configureConstraintValidator(ValidatorInterface $validator, array $options)
     {
         // Call all validator methods according to configuration
         if (isset($options['methods'])) {
diff --git a/lib/internal/Magento/Framework/Validator/Constraint/Property.php b/lib/internal/Magento/Framework/Validator/Constraint/Property.php
index 008d644ddbe56..75580f53008d4 100644
--- a/lib/internal/Magento/Framework/Validator/Constraint/Property.php
+++ b/lib/internal/Magento/Framework/Validator/Constraint/Property.php
@@ -31,8 +31,8 @@ public function __construct(\Magento\Framework\Validator\ValidatorInterface $val
     }
 
     /**
-     * Get value that should be validated. Tries to extract value's property if \Magento\Framework\DataObject or \ArrayAccess or array
-     * is passed
+     * Get value that should be validated. Tries to extract value's property
+     * if \Magento\Framework\DataObject or \ArrayAccess or array is passed
      *
      * @param mixed $value
      * @return mixed
diff --git a/lib/internal/Magento/Framework/Validator/ConstraintFactory.php b/lib/internal/Magento/Framework/Validator/ConstraintFactory.php
index 61383fcfb3227..d90c4ee47338a 100644
--- a/lib/internal/Magento/Framework/Validator/ConstraintFactory.php
+++ b/lib/internal/Magento/Framework/Validator/ConstraintFactory.php
@@ -31,8 +31,10 @@ class ConstraintFactory
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param string $instanceName
      */
-    public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager, $instanceName = \Magento\Framework\Validator\Constraint::class)
-    {
+    public function __construct(
+        \Magento\Framework\ObjectManagerInterface $objectManager,
+        $instanceName = \Magento\Framework\Validator\Constraint::class
+    ) {
         $this->_objectManager = $objectManager;
         $this->_instanceName = $instanceName;
     }
diff --git a/lib/internal/Magento/Framework/Validator/Factory.php b/lib/internal/Magento/Framework/Validator/Factory.php
index 6dc791415bf03..b752bb47f47c3 100644
--- a/lib/internal/Magento/Framework/Validator/Factory.php
+++ b/lib/internal/Magento/Framework/Validator/Factory.php
@@ -72,6 +72,8 @@ public function __construct(
 
     /**
      * Init cached list of validation files
+     *
+     * @return void
      */
     protected function _initializeConfigList()
     {
diff --git a/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php
index 6e43469881b4b..e943e2684d792 100644
--- a/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Validator/Test/Unit/ConfigTest.php
@@ -7,6 +7,8 @@
  */
 namespace Magento\Framework\Validator\Test\Unit;
 
+use Magento\Framework\App\Arguments\ValidationState;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -74,9 +76,9 @@ protected function _initConfig(array $files = null)
         $appObjectManager->configure(
             [
                 'preferences' => [
-                    \Magento\Framework\Config\ValidationStateInterface::class => \Magento\Framework\App\Arguments\ValidationState::class,
+                    \Magento\Framework\Config\ValidationStateInterface::class => ValidationState::class,
                 ],
-                \Magento\Framework\App\Arguments\ValidationState::class => [
+                ValidationState::class => [
                     'arguments' => [
                         'appMode' => 'developer',
                     ]
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 cb0e8ca42402f..cbf81ff1bf850 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
@@ -54,8 +54,11 @@ protected function setUp()
      */
     public function testConstructorException(array $alternativeExtensions)
     {
-        $this->setExpectedException('\InvalidArgumentException', "\$alternativeExtensions must be an array with format:"
-            . " array('ext1' => array('ext1', 'ext2'), 'ext3' => array(...)]");
+        $this->setExpectedException(
+            '\InvalidArgumentException',
+            "\$alternativeExtensions must be an array with format:"
+            . " array('ext1' => array('ext1', 'ext2'), 'ext3' => array(...)]"
+        );
 
         $readFactory = $this->getMock(\Magento\Framework\Filesystem\Directory\ReadFactory::class, [], [], '', false);
         $rulePool = $this->getMock(\Magento\Framework\View\Design\Fallback\RulePool::class, [], [], '', false);
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/FileSystemTest.php b/lib/internal/Magento/Framework/View/Test/Unit/FileSystemTest.php
index ee4350f6eed37..d0c871b35b3fe 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/FileSystemTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/FileSystemTest.php
@@ -9,6 +9,8 @@
  */
 namespace Magento\Framework\View\Test\Unit;
 
+use Magento\Framework\View\Design\FileResolution\Fallback\EmailTemplateFile;
+
 class FileSystemTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -37,7 +39,7 @@ class FileSystemTest extends \PHPUnit_Framework_TestCase
     protected $_staticFileResolution;
 
     /**
-     * @var \Magento\Framework\View\Design\FileResolution\Fallback\EmailTemplateFile|\PHPUnit_Framework_MockObject_MockObject
+     * @var EmailTemplateFile|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_emailTemplateFileResolution;
 
@@ -77,7 +79,7 @@ protected function setUp()
             false
         );
         $this->_emailTemplateFileResolution = $this->getMock(
-            \Magento\Framework\View\Design\FileResolution\Fallback\EmailTemplateFile::class,
+            EmailTemplateFile::class,
             [],
             [],
             '',
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 ec11c67442cc9..76d84f1ecae90 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
@@ -75,9 +75,9 @@ public function processDataProvider()
     {
         return [
             'move_before' => [
-                'element' => new \Magento\Framework\View\Layout\Element('
-                    <move element="product" destination="product.info" before="before.block" as="as.product.info"/>
-                '),
+                'element' => new \Magento\Framework\View\Layout\Element(
+                    '<move element="product" destination="product.info" before="before.block" as="as.product.info"/>'
+                ),
                 'destination' => 'product.info',
                 'siblingName' => 'before.block',
                 'isAfter' => false,
@@ -85,9 +85,9 @@ public function processDataProvider()
                 'parentElement' => new \Magento\Framework\View\Layout\Element('<element/>'),
             ],
             'move_after' => [
-                'element' => new \Magento\Framework\View\Layout\Element('
-                    <move element="product" destination="product.info" after="after.block" as="as.product.info"/>
-                '),
+                'element' => new \Magento\Framework\View\Layout\Element(
+                    '<move element="product" destination="product.info" after="after.block" as="as.product.info"/>'
+                ),
                 'destination' => 'product.info',
                 'siblingName' => 'after.block',
                 'isAfter' => true,
diff --git a/setup/config/di.config.php b/setup/config/di.config.php
index bdbd8013b8e15..169f996d8a6e4 100644
--- a/setup/config/di.config.php
+++ b/setup/config/di.config.php
@@ -51,8 +51,10 @@
                 \Zend\ServiceManager\ServiceLocatorInterface::class => 'ServiceManager',
                 \Magento\Framework\DB\LoggerInterface::class => \Magento\Framework\DB\Logger\Quiet::class,
                 \Magento\Framework\Locale\ConfigInterface::class => \Magento\Framework\Locale\Config::class,
-                \Magento\Framework\Filesystem\DriverInterface::class => \Magento\Framework\Filesystem\Driver\File::class,
-                \Magento\Framework\Component\ComponentRegistrarInterface::class => \Magento\Framework\Component\ComponentRegistrar::class,
+                \Magento\Framework\Filesystem\DriverInterface::class
+                    => \Magento\Framework\Filesystem\Driver\File::class,
+                \Magento\Framework\Component\ComponentRegistrarInterface::class
+                    => \Magento\Framework\Component\ComponentRegistrar::class,
             ],
         ],
     ],
diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
index b2d781b1eb954..3b2a5a1bb4661 100644
--- a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
@@ -270,14 +270,23 @@ private function configureObjectManager(OutputInterface $output)
     {
         $this->objectManager->configure(
             [
-                'preferences' => [\Magento\Setup\Module\Di\Compiler\Config\WriterInterface::class => \Magento\Setup\Module\Di\Compiler\Config\Writer\Filesystem::class,
+                'preferences' => [
+                    \Magento\Setup\Module\Di\Compiler\Config\WriterInterface::class
+                        => \Magento\Setup\Module\Di\Compiler\Config\Writer\Filesystem::class,
                 ], \Magento\Setup\Module\Di\Compiler\Config\ModificationChain::class => [
                     'arguments' => [
                         'modificationsList' => [
-                            'BackslashTrim' => ['instance' => \Magento\Setup\Module\Di\Compiler\Config\Chain\BackslashTrim::class],
-                            'PreferencesResolving' => ['instance' => \Magento\Setup\Module\Di\Compiler\Config\Chain\PreferencesResolving::class],
-                            'InterceptorSubstitution' => ['instance' => \Magento\Setup\Module\Di\Compiler\Config\Chain\InterceptorSubstitution::class],
-                            'InterceptionPreferencesResolving' => ['instance' => \Magento\Setup\Module\Di\Compiler\Config\Chain\PreferencesResolving::class],
+                            'BackslashTrim'
+                                => ['instance' => \Magento\Setup\Module\Di\Compiler\Config\Chain\BackslashTrim::class],
+                            'PreferencesResolving'
+                                => ['instance'
+                                    => \Magento\Setup\Module\Di\Compiler\Config\Chain\PreferencesResolving::class],
+                            'InterceptorSubstitution'
+                                => ['instance'
+                                    => \Magento\Setup\Module\Di\Compiler\Config\Chain\InterceptorSubstitution::class],
+                            'InterceptionPreferencesResolving'
+                                => ['instance'
+                                    => \Magento\Setup\Module\Di\Compiler\Config\Chain\PreferencesResolving::class],
                         ]
                     ]
                 ], \Magento\Setup\Module\Di\Code\Generator\PluginList::class => [
diff --git a/setup/src/Magento/Setup/Model/ModuleRegistryUninstaller.php b/setup/src/Magento/Setup/Model/ModuleRegistryUninstaller.php
index 1bddcba1820c5..72e7c7ca28285 100644
--- a/setup/src/Magento/Setup/Model/ModuleRegistryUninstaller.php
+++ b/setup/src/Magento/Setup/Model/ModuleRegistryUninstaller.php
@@ -96,7 +96,8 @@ public function removeModulesFromDeploymentConfig(OutputInterface $output, array
         }
         $this->writer->saveConfig(
             [
-                \Magento\Framework\Config\File\ConfigFilePool::APP_CONFIG => [\Magento\Framework\Config\ConfigOptionsListConstants::KEY_MODULES => $newModules]
+                \Magento\Framework\Config\File\ConfigFilePool::APP_CONFIG
+                    => [\Magento\Framework\Config\ConfigOptionsListConstants::KEY_MODULES => $newModules]
             ],
             true
         );
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php b/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php
index aa97cab5e5231..2ed4500f9c273 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php
@@ -53,7 +53,8 @@ class OperationFactory
      * @var array
      */
     private $operationsDefinitions = [
-        self::DATA_ATTRIBUTES_GENERATOR => \Magento\Setup\Module\Di\App\Task\Operation\ServiceDataAttributesGenerator::class,
+        self::DATA_ATTRIBUTES_GENERATOR
+            => \Magento\Setup\Module\Di\App\Task\Operation\ServiceDataAttributesGenerator::class,
         self::AREA_CONFIG_GENERATOR => \Magento\Setup\Module\Di\App\Task\Operation\Area::class,
         self::APPLICATION_CODE_GENERATOR => \Magento\Setup\Module\Di\App\Task\Operation\ApplicationCodeGenerator::class,
         self::INTERCEPTION => \Magento\Setup\Module\Di\App\Task\Operation\Interception::class,
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/FileScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/FileScanner.php
index a739ab35e9fac..d330bfa6e8ed0 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/FileScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/FileScanner.php
@@ -308,11 +308,14 @@ protected function scan()
 
                 // process the name
                 if ($infos[$infoIndex]['shortName'] == ''
-                    && (($this->tokenType === T_CLASS || $this->tokenType === T_INTERFACE || $this->tokenType === T_TRAIT) && $infos[$infoIndex]['type'] === 'class' && $tokens[$tokenIndex - 1][0] !== T_DOUBLE_COLON
+                    && (($this->tokenType === T_CLASS
+                            || $this->tokenType === T_INTERFACE || $this->tokenType === T_TRAIT)
+                        && $infos[$infoIndex]['type'] === 'class' && $tokens[$tokenIndex - 1][0] !== T_DOUBLE_COLON
                         || ($this->tokenType === T_FUNCTION && $infos[$infoIndex]['type'] === 'function'))
                 ) {
                     $infos[$infoIndex]['shortName'] = $tokens[$tokenIndex + 2][1];
-                    $infos[$infoIndex]['name'] = (($namespace !== null) ? $namespace . '\\' : '') . $infos[$infoIndex]['shortName'];
+                    $infos[$infoIndex]['name'] = (($namespace !== null) ? $namespace . '\\' : '')
+                        . $infos[$infoIndex]['shortName'];
                 }
 
                 if ($this->tokenType === null) {
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
index 5c2baf5247c19..302b85508638b 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Setup\Test\Unit\Module\Di\App\Task;
 
+use Magento\Setup\Model\ObjectManagerProvider;
+use Magento\Setup\Module\Di\App\Task\Operation\InterceptionCache;
 use Magento\Setup\Module\Di\App\Task\OperationException;
 use Magento\Setup\Module\Di\App\Task\OperationFactory;
 
@@ -26,7 +28,7 @@ protected function setUp()
         $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
             ->setMethods([])
             ->getMock();
-        $objectManagerProviderMock = $this->getMock(\Magento\Setup\Model\ObjectManagerProvider::class, [], [], '', false);
+        $objectManagerProviderMock = $this->getMock(ObjectManagerProvider::class, [], [], '', false);
         $objectManagerProviderMock->expects($this->once())->method('get')->willReturn($this->objectManagerMock);
         $this->factory = new OperationFactory(
             $objectManagerProviderMock
@@ -70,7 +72,7 @@ public function aliasesDataProvider()
         return  [
             [OperationFactory::AREA_CONFIG_GENERATOR, [], \Magento\Setup\Module\Di\App\Task\Operation\Area::class],
             [OperationFactory::INTERCEPTION, null, \Magento\Setup\Module\Di\App\Task\Operation\Interception::class],
-            [OperationFactory::INTERCEPTION_CACHE, 1, \Magento\Setup\Module\Di\App\Task\Operation\InterceptionCache::class],
+            [OperationFactory::INTERCEPTION_CACHE, 1, InterceptionCache::class],
         ];
     }
 }