diff --git a/app/code/Magento/Catalog/Block/Product/Context.php b/app/code/Magento/Catalog/Block/Product/Context.php
index 7b4afffc3cf27..8c15075747ed1 100644
--- a/app/code/Magento/Catalog/Block/Product/Context.php
+++ b/app/code/Magento/Catalog/Block/Product/Context.php
@@ -16,7 +16,7 @@
  * As Magento moves from inheritance-based APIs all such classes will be deprecated together with
  * the classes they were introduced for.
  *
- * @deprecated 
+ * @deprecated
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Context extends \Magento\Framework\View\Element\Template\Context
diff --git a/app/code/Magento/Catalog/Model/ProductVisibilityCondition.php b/app/code/Magento/Catalog/Model/ProductVisibilityCondition.php
index cdaa8da793b87..08475ec3d052f 100644
--- a/app/code/Magento/Catalog/Model/ProductVisibilityCondition.php
+++ b/app/code/Magento/Catalog/Model/ProductVisibilityCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Model;
diff --git a/app/code/Magento/Catalog/Model/Widget/RecentlyComparedStorageConfiguration.php b/app/code/Magento/Catalog/Model/Widget/RecentlyComparedStorageConfiguration.php
index befd4306787d0..ff5765f3e3795 100644
--- a/app/code/Magento/Catalog/Model/Widget/RecentlyComparedStorageConfiguration.php
+++ b/app/code/Magento/Catalog/Model/Widget/RecentlyComparedStorageConfiguration.php
@@ -32,7 +32,7 @@ public function __construct(ScopeConfigInterface $scopeConfig)
 
     /**
      * Parse lifetime of recently compared products in widget
-     * 
+     *
      * @inheritdoc
      */
     public function get()
diff --git a/app/code/Magento/Catalog/Model/Widget/RecentlyViewedStorageConfiguration.php b/app/code/Magento/Catalog/Model/Widget/RecentlyViewedStorageConfiguration.php
index 54ddc66e634e1..a1cdaf64425d4 100644
--- a/app/code/Magento/Catalog/Model/Widget/RecentlyViewedStorageConfiguration.php
+++ b/app/code/Magento/Catalog/Model/Widget/RecentlyViewedStorageConfiguration.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Model\Widget;
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/FrontendStorageManagerTest.php b/app/code/Magento/Catalog/Test/Unit/Block/FrontendStorageManagerTest.php
index 231a5c2c5ef86..37ee054c5c457 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/FrontendStorageManagerTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/FrontendStorageManagerTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Test\Unit\Block;
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/FrontendStorageConfigurationPoolTest.php b/app/code/Magento/Catalog/Test/Unit/Model/FrontendStorageConfigurationPoolTest.php
index e217b11fe4382..22865358c8b2e 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/FrontendStorageConfigurationPoolTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/FrontendStorageConfigurationPoolTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Test\Unit\Model;
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/PricePersistenceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/PricePersistenceTest.php
index 58ab1149da47f..94f69c62a61af 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/PricePersistenceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/PricePersistenceTest.php
@@ -93,14 +93,12 @@ public function testGet()
         $attributeId = 5;
         $skus = ['sku_1', 'sku_2'];
         $idsBySku = [
-            'sku_1' =>
-                [
-                    1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
-                ],
-            'sku_2' =>
-                [
-                    2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
-                ]
+            'sku_1' => [
+                1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+            ],
+            'sku_2' => [
+                2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
+            ]
         ];
         $select = $this->getMockBuilder(\Magento\Framework\DB\Select::class)
             ->disableOriginalConstructor()->getMock();
@@ -228,14 +226,12 @@ public function testDelete()
         $attributeId = 5;
         $skus = ['sku_1', 'sku_2'];
         $idsBySku = [
-            'sku_1' =>
-                [
-                    1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
-                ],
-            'sku_2' =>
-                [
-                    2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
-                ]
+            'sku_1' => [
+                1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+            ],
+            'sku_2' => [
+                2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
+            ]
         ];
         $this->productIdLocator
             ->expects($this->once())
@@ -278,14 +274,12 @@ public function testDeleteWithException()
         $attributeId = 5;
         $skus = ['sku_1', 'sku_2'];
         $idsBySku = [
-            'sku_1' =>
-                [
-                    1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
-                ],
-            'sku_2' =>
-                [
-                    2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
-                ]
+            'sku_1' => [
+                1 => \Magento\Catalog\Model\Product\Type::TYPE_SIMPLE
+            ],
+            'sku_2' => [
+                2 => \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
+            ]
         ];
         $this->productIdLocator
             ->expects($this->once())
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRenderListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRenderListTest.php
index b50297101d687..f407ccf33ab63 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductRenderListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductRenderListTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Test\Unit\Model;
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/UrlTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/UrlTest.php
index 91f79ea9af765..492345af48c5c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/UrlTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Listing/Collector/UrlTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Listing\Collector;
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 cd2bccd7b7385..592f955f8ac4f 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
@@ -27,7 +27,7 @@
 
 /**
  * Class AdvancedPricing
- * 
+ *
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/AdditionalInfo.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/AdditionalInfo.php
index 10d9fdd1ce77c..db058f5087075 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/AdditionalInfo.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/AdditionalInfo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Ui\DataProvider\Product\Listing\Collector;
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
index 8ca6946a63643..2fc9ef76aa00d 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Price.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Price.php
index 73380b11e6635..337182abf084c 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Price.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Price.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Url.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Url.php
index 6d8d7d32b9d10..f2dfed7ae4b34 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Url.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Url.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
index 9f02baf99c05c..3090734df0144 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/DataProvider.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php
index a53e12295cc91..359b1a1a948f8 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorComposite.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Ui\DataProvider\Product;
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
index a39d6b0b8a647..c2bbb9fe3fe68 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Ui\DataProvider\Product;
diff --git a/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml b/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml
index 48dfadf3e76c7..4c103b40ba28c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/frontend_storage_manager.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// @codingStandardsIgnoreFile
 ?>
 <script type="text/x-magento-init">
         {
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
index d5d46172745c0..94b829eb92137 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
@@ -7,8 +7,8 @@
 <?php /** @var $block \Magento\Catalog\Block\Product\Image */ ?>
 
 <img class="photo image"
-     <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
-     src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
-     width="<?= /* @escapeNotVerified */ $block->getWidth() ?>"
-     height="<?= /* @escapeNotVerified */ $block->getHeight() ?>"
-     alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>" />
+    <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
+    src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
+    width="<?= /* @escapeNotVerified */ $block->getWidth() ?>"
+    height="<?= /* @escapeNotVerified */ $block->getHeight() ?>"
+    alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>" />
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index 71fc8d54e9123..0352f7f276630 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -11,9 +11,9 @@
     <span class="product-image-wrapper"
           style="padding-bottom: <?= /* @escapeNotVerified */ ($block->getRatio() * 100) ?>%;">
         <img class="product-image-photo"
-             <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
-             src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
-             width="<?= /* @escapeNotVerified */ $block->getResizedImageWidth() ?>"
-             height="<?= /* @escapeNotVerified */ $block->getResizedImageHeight() ?>"
-             alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>"/></span>
+            <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
+            src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
+            width="<?= /* @escapeNotVerified */ $block->getResizedImageWidth() ?>"
+            height="<?= /* @escapeNotVerified */ $block->getResizedImageHeight() ?>"
+            alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>"/></span>
 </span>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
index 08810f9b57140..578630a11e930 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/grid.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 ?>
@@ -10,13 +10,11 @@
  */
 ?>
 
-<?= /* @escapeNotVerified */ $block->renderApp(
-    [
-        'widget_columns' => [
-            'displayMode' => 'grid'
-        ],
-        'image' => [
-            'imageCode' => 'recently_viewed_products_grid_content_widget'
-        ]
+<?= /* @escapeNotVerified */ $block->renderApp([
+    'widget_columns' => [
+        'displayMode' => 'grid'
+    ],
+    'image' => [
+        'imageCode' => 'recently_viewed_products_grid_content_widget'
     ]
-);
+]);
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
index 400851a94a71c..3770c330ad73e 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/viewed/list.phtml
@@ -10,13 +10,11 @@
  */
 ?>
 
-<?= /* @escapeNotVerified */ $block->renderApp(
-    [
-        'widget_columns' => [
-            'displayMode' => 'list'
-        ],
-        'image' => [
-            'imageCode' => 'recently_viewed_products_list_content_widget'
-        ]
+<?= /* @escapeNotVerified */ $block->renderApp([
+    'widget_columns' => [
+        'displayMode' => 'list'
+    ],
+    'image' => [
+        'imageCode' => 'recently_viewed_products_list_content_widget'
     ]
-);
+]);
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/VirtualTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/VirtualTest.php
index 203f8b570ecd0..04ab6143b6df0 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/VirtualTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/VirtualTest.php
@@ -34,14 +34,10 @@ public function testPrepareAttributesWithDefaultValueForSave()
                         'is_unique' => '0',
                         'frontend_label' => 'Name',
                         'is_static' => false,
-                        'apply_to' =>
-                            [
-                            ],
+                        'apply_to' => [],
                         'type' => 'varchar',
                         'default_value' => null,
-                        'options' =>
-                            [
-                            ],
+                        'options' => [],
                     ],
                     'sku' => [
                         'id' => '70',
@@ -51,14 +47,10 @@ public function testPrepareAttributesWithDefaultValueForSave()
                         'is_unique' => '1',
                         'frontend_label' => 'SKU',
                         'is_static' => true,
-                        'apply_to' =>
-                            [
-                            ],
+                        'apply_to' => [],
                         'type' => 'varchar',
                         'default_value' => null,
-                        'options' =>
-                            [
-                            ],
+                        'options' => [],
                     ]
                 ]
             ]
diff --git a/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php b/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php
index d47c9b96e0436..8de5f9821d143 100644
--- a/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php
+++ b/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\CatalogInventory\Model;
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
index 28ca68ad75b25..16ee3fadcf446 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -355,7 +355,6 @@ public function rebuildStoreIndex($storeId, $productIds = null)
         $products = $this->dataProvider
             ->getSearchableProducts($storeId, $staticFields, $productIds, $lastProductId);
         while (count($products) > 0) {
-
             $productsIds = array_column($products, 'entity_id');
             $relatedProducts = $this->getRelatedProducts($products);
             $productsIds = array_merge($productsIds, array_values($relatedProducts));
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
index c4f0aa7684309..0388b724da89e 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
@@ -185,7 +185,9 @@ protected function _renderFiltersBefore()
                 $searchResult = $this->searchResultFactory->create()->setItems([]);
             } catch (NonExistingRequestNameException $e) {
                 $this->_logger->error($e->getMessage());
-                throw new LocalizedException(__('Sorry, something went wrong. You can find out more in the error log.'));
+                throw new LocalizedException(
+                    __('Sorry, something went wrong. You can find out more in the error log.')
+                );
             }
             $temporaryStorage = $this->temporaryStorageFactory->create();
             $table = $temporaryStorage->storeApiDocuments($searchResult->getItems());
diff --git a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
index 93e31ee08cf80..65759685c2b62 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
@@ -45,8 +45,7 @@ public function __construct(
      */
     public function mapSelectContainerToStrategy(SelectContainer $selectContainer)
     {
-        if (
-            $selectContainer->isFullTextSearchRequired()
+        if ($selectContainer->isFullTextSearchRequired()
             && !$selectContainer->hasCustomAttributesFilters()
             && !$selectContainer->hasVisibilityFilter()
         ) {
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
index c8816b8e4daf7..8e38d64eca166 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -149,8 +149,7 @@ public function getCategoryProductsUrlRewrites(
             ->addAttributeToSelect('url_path');
 
         foreach ($productCollection as $product) {
-            if (
-                isset($this->isSkippedProduct[$category->getEntityId()]) &&
+            if (isset($this->isSkippedProduct[$category->getEntityId()]) &&
                 in_array($product->getId(), $this->isSkippedProduct[$category->getEntityId()])
             ) {
                 continue;
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/LayoutProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/LayoutProcessorTest.php
index 15c8fab220682..2e10cb3fde7a9 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/LayoutProcessorTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/LayoutProcessorTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Checkout\Test\Unit\Block\Cart;
 
-
 class LayoutProcessorTest extends \PHPUnit_Framework_TestCase
 {
 
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/TotalsProcessorTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/TotalsProcessorTest.php
index f774a83987783..32dfcc405a1f2 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/TotalsProcessorTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/TotalsProcessorTest.php
@@ -33,18 +33,21 @@ protected function setUp()
 
     public function testProcess()
     {
+        $jsLayoutData = [
+            'sub-total' => [],
+            'grand-total' => [],
+            'non-existant-total' => null
+        ];
+        $expectedResultData = [
+            'sub-total' => ['sortOrder' => 10],
+            'grand-total' => ['sortOrder' => 20],
+            'non-existant-total' => null
+        ];
         $jsLayout['components']['checkout']['children']['sidebar']['children']['summary']
-            ['children']['totals']['children'] = [
-                'sub-total' => [],
-                'grand-total' => [],
-                'non-existant-total' => null
-            ];
+            ['children']['totals']['children'] = $jsLayoutData;
         $expectedResult['components']['checkout']['children']['sidebar']['children']['summary']
-            ['children']['totals']['children'] = [
-                'sub-total' => ['sortOrder' => 10],
-                'grand-total' => ['sortOrder' => 20],
-                'non-existant-total' => null
-            ];
+            ['children']['totals']['children'] = $expectedResultData;
+
         $configData = ['sub_total' => 10, 'grand_total' => 20];
 
         $this->scopeConfigMock->expects($this->once())->method('getValue')->with('sales/totals_sort')
diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index a5bb7ab163e07..220affe2b441b 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -92,7 +92,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
     protected $_configStructure;
 
     /**
-     *Form fieldset factory
+     * Form fieldset factory
      *
      * @var \Magento\Config\Block\System\Config\Form\Fieldset\Factory
      */
diff --git a/app/code/Magento/Config/Model/Config/Structure.php b/app/code/Magento/Config/Model/Config/Structure.php
index 9ee51dd4c3f47..45179ab5959fc 100644
--- a/app/code/Magento/Config/Model/Config/Structure.php
+++ b/app/code/Magento/Config/Model/Config/Structure.php
@@ -358,7 +358,7 @@ protected function _getGroupFieldPathsByAttribute(array $fields, $parentPath, $a
      * 'section/group/field' => [
      *      'section_id/group_id/field_two_id'
      * ]
-     *```
+     * ```
      *
      * @return array An array of config path to config structure path map
      */
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
index 0486554c6e9a4..4b0329fead780 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -245,7 +245,6 @@ protected function getOptionImages()
     {
         $images = [];
         foreach ($this->getAllowProducts() as $product) {
-
             $productImages = $this->helper->getGalleryImages($product) ?: [];
             foreach ($productImages as $image) {
                 $images[$product->getId()][] =
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
index c8e4af088a0fe..958d802682d52 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php
@@ -17,14 +17,14 @@ class OptionSelectBuilder implements OptionSelectBuilderInterface
 {
     /**
      * Configurable Attribute Resource Model.
-     * 
+     *
      * @var Attribute
      */
     private $attributeResource;
 
     /**
      * Option Provider.
-     * 
+     *
      * @var OptionProvider
      */
     private $attributeOptionProvider;
diff --git a/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilder.php b/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilder.php
index 48d019869de90..0afde6144bf88 100644
--- a/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilder.php
+++ b/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilder.php
@@ -35,7 +35,7 @@ public function __construct(Status $stockStatusResource)
      * @param OptionSelectBuilderInterface $subject
      * @param Select $select
      * @return Select
-     * 
+     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterGetSelect(OptionSelectBuilderInterface $subject, Select $select)
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
index bdb63ca563156..0e03dfe3cde51 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
@@ -160,7 +160,8 @@ public function modifyMeta(array $meta)
                                         'component' => 'Magento_Ui/js/form/components/html',
                                         'additionalClasses' => 'message message-notice',
                                         'content' => __(
-                                            'Choose a new product to delete and replace the current product configuration.'
+                                            'Choose a new product to delete and replace'
+                                            . ' the current product configuration.'
                                         ),
                                         'imports' => [
                                             'visible' => '!ns = ${ $.ns }, index = '
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePrice.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePrice.php
index e3e1ef2ff87bb..d3129a09d0056 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePrice.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePrice.php
@@ -72,9 +72,9 @@ public function modifyMeta(array $meta)
                     ]
                 );
             }
-            if (
-                !empty($meta[$groupCode]['children'][self::CODE_GROUP_PRICE]['children'][self::$advancedPricingButton])
-            ) {
+            if (!empty(
+                $meta[$groupCode]['children'][self::CODE_GROUP_PRICE]['children'][self::$advancedPricingButton]
+            )) {
                 $productTypeId = $this->locator->getProduct()->getTypeId();
                 $visibilityConfig = ($productTypeId === ConfigurableType::TYPE_CODE)
                     ? ['visible' => 0, 'disabled' => 1]
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/UnlockButtonTest.php b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/UnlockButtonTest.php
index ffcbdb8c41733..23b3a49a19ed3 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/UnlockButtonTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Adminhtml/Edit/UnlockButtonTest.php
@@ -116,13 +116,12 @@ public function getButtonDataProvider()
     {
         return [
             [
-                'result' =>
-                    [
-                        'label' => new \Magento\Framework\Phrase('Unlock'),
-                        'class' => 'unlock unlock-customer',
-                        'on_click' => "location.href = 'http://website.com/';",
-                        'sort_order' => 50,
-                    ],
+                'result' => [
+                    'label' => new \Magento\Framework\Phrase('Unlock'),
+                    'class' => 'unlock unlock-customer',
+                    'on_click' => "location.href = 'http://website.com/';",
+                    'sort_order' => 50,
+                ],
                 'expectedValue' => 'true'
             ],
             ['result' => [], 'expectedValue' => false]
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/Column/InlineEditUpdater.php b/app/code/Magento/Customer/Ui/Component/Listing/Column/InlineEditUpdater.php
index 6da0fa8c6d86a..c8aca1f28e30d 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/Column/InlineEditUpdater.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/Column/InlineEditUpdater.php
@@ -51,7 +51,6 @@ public function applyEditing(
         if (in_array($frontendInput, $this->editableFields)) {
             $config = $column->getConfiguration();
             if (!(isset($config['editor']) && isset($config['editor']['editorType']))) {
-
                 if (isset($config['editor']) && is_string($config['editor'])) {
                     $editorType = $config['editor'];
                 } elseif (isset($config['dataType'])) {
diff --git a/app/code/Magento/Deploy/Package/PackagePool.php b/app/code/Magento/Deploy/Package/PackagePool.php
index c3dbe0dafba92..b9c0418df860a 100644
--- a/app/code/Magento/Deploy/Package/PackagePool.php
+++ b/app/code/Magento/Deploy/Package/PackagePool.php
@@ -185,8 +185,7 @@ private function ensurePackagesForRequiredLocales(array $options)
                     continue;
                 }
                 foreach ($inheritedThemes as $inheritedTheme) {
-                    if (
-                        $package->getTheme() === $inheritedTheme->getThemePath()
+                    if ($package->getTheme() === $inheritedTheme->getThemePath()
                         && $package->getArea() === $inheritedTheme->getArea()
                     ) {
                         $this->ensurePackage([
diff --git a/app/code/Magento/Deploy/Process/Queue.php b/app/code/Magento/Deploy/Process/Queue.php
index 671e47fe2d7d6..e5e10c8f54a19 100644
--- a/app/code/Magento/Deploy/Process/Queue.php
+++ b/app/code/Magento/Deploy/Process/Queue.php
@@ -300,7 +300,6 @@ private function isDeployed(Package $package)
                 }
                 return false;
             }
-
         }
         return $package->getState();
     }
diff --git a/app/code/Magento/Deploy/Strategy/QuickDeploy.php b/app/code/Magento/Deploy/Strategy/QuickDeploy.php
index a211d8d9709b0..02badd7272936 100644
--- a/app/code/Magento/Deploy/Strategy/QuickDeploy.php
+++ b/app/code/Magento/Deploy/Strategy/QuickDeploy.php
@@ -90,9 +90,8 @@ private function preparePackages($level, array $levelPackages)
             if ($level > 1) {
                 $parentPackage = null;
                 $packageId = $package->getArea() . '/' . $package->getTheme();
-                if (
-                    // use base package if it is not the same as current
-                    isset($this->baseLocalePackages[$packageId])
+                // use base package if it is not the same as current
+                if (isset($this->baseLocalePackages[$packageId])
                     && $package !== $this->baseLocalePackages[$packageId]
                 ) {
                     $parentPackage = $this->baseLocalePackages[$packageId];
diff --git a/app/code/Magento/Developer/Console/Command/DiInfoCommand.php b/app/code/Magento/Developer/Console/Command/DiInfoCommand.php
index 79fcae74cf2c1..2235aa5e5d9df 100644
--- a/app/code/Magento/Developer/Console/Command/DiInfoCommand.php
+++ b/app/code/Magento/Developer/Console/Command/DiInfoCommand.php
@@ -51,7 +51,7 @@ protected function configure()
              ->setDescription('Provides information on Dependency Injection configuration for the Command.')
              ->setDefinition([
                 new InputArgument(self::CLASS_NAME, InputArgument::REQUIRED, 'Class name')
-            ]);
+             ]);
 
         parent::configure();
     }
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
index 604b84a6a723d..f56b219f72db2 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Downloadable.php
@@ -40,7 +40,7 @@ class Downloadable
 
     /**
      * Constructor
-     * 
+     *
      * @param RequestInterface $request
      * @param LinkBuilder $linkBuilder
      * @param SampleBuilder $sampleBuilder
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 efc121a8becf0..ad097724705be 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
@@ -821,14 +821,10 @@ public function testPrepareAttributesWithDefaultValueForSave()
                         'is_unique' => '0',
                         'frontend_label' => 'Name',
                         'is_static' => false,
-                        'apply_to' =>
-                            [
-                            ],
+                        'apply_to' => [],
                         'type' => 'varchar',
                         'default_value' => null,
-                        'options' =>
-                            [
-                            ],
+                        'options' => [],
                     ],
                     'sku' => [
                         'id' => '70',
@@ -838,14 +834,10 @@ public function testPrepareAttributesWithDefaultValueForSave()
                         'is_unique' => '1',
                         'frontend_label' => 'SKU',
                         'is_static' => true,
-                        'apply_to' =>
-                            [
-                            ],
+                        'apply_to' => [],
                         'type' => 'varchar',
                         'default_value' => null,
-                        'options' =>
-                            [
-                            ],
+                        'options' => [],
                     ]
                 ]
             ]
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
index 4a3b65fb13c7c..e1f4add630d7c 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
@@ -102,7 +102,7 @@ public function __construct(
     }
 
     /**
-     *{@inheritdoc}
+     * {@inheritdoc}
      */
     public function updateButton($buttonId, $key, $data)
     {
@@ -111,7 +111,7 @@ public function updateButton($buttonId, $key, $data)
     }
 
     /**
-     *{@inheritdoc}
+     * {@inheritdoc}
      */
     public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)
     {
@@ -119,7 +119,7 @@ public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)
     }
 
     /**
-     *{@inheritdoc}
+     * {@inheritdoc}
      */
     public function removeButton($buttonId)
     {
@@ -222,7 +222,7 @@ protected function _prepareLayout()
     }
 
     /**
-     *{@inheritdoc}
+     * {@inheritdoc}
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {
diff --git a/app/code/Magento/ImportExport/Model/Source/Import/AbstractBehavior.php b/app/code/Magento/ImportExport/Model/Source/Import/AbstractBehavior.php
index 9ee5f2df2be53..55533044b33f1 100644
--- a/app/code/Magento/ImportExport/Model/Source/Import/AbstractBehavior.php
+++ b/app/code/Magento/ImportExport/Model/Source/Import/AbstractBehavior.php
@@ -39,7 +39,7 @@ public function toOptionArray()
 
     /**
      * Get current behaviour group code
-     *;
+     *
      * @abstract
      * @return string
      */
diff --git a/app/code/Magento/Msrp/Ui/DataProvider/Product/Listing/Collector/MsrpPrice.php b/app/code/Magento/Msrp/Ui/DataProvider/Product/Listing/Collector/MsrpPrice.php
index a02a2e6fd666f..01ee93bad6073 100644
--- a/app/code/Magento/Msrp/Ui/DataProvider/Product/Listing/Collector/MsrpPrice.php
+++ b/app/code/Magento/Msrp/Ui/DataProvider/Product/Listing/Collector/MsrpPrice.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/AdapterTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/AdapterTest.php
index a1a48d136b01e..264436a2a97b6 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/AdapterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Method/AdapterTest.php
@@ -141,7 +141,6 @@ public function testFetchTransactionInfo()
             $transactionInfo,
             $this->adapter->fetchTransactionInfo($paymentInfo, $transactionId)
         );
-
     }
 
     /**
diff --git a/app/code/Magento/Paypal/Block/Logo.php b/app/code/Magento/Paypal/Block/Logo.php
index cea9b7a3a6262..6b3900afb485e 100644
--- a/app/code/Magento/Paypal/Block/Logo.php
+++ b/app/code/Magento/Paypal/Block/Logo.php
@@ -63,7 +63,7 @@ protected function _getConfig()
 
     /**
      * Disable block output if logo turned off
-     *M
+     *
      * @return string
      */
     protected function _toHtml()
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/InfoTest.php b/app/code/Magento/Paypal/Test/Unit/Model/InfoTest.php
index 3fb20edfea9a8..1b6c36c2e4a29 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/InfoTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/InfoTest.php
@@ -158,7 +158,7 @@ public function additionalInfoDataProvider()
     }
 
     /**
-     *List of public labels
+     * List of public labels
      *
      * @return array
      */
diff --git a/app/code/Magento/Paypal/view/frontend/templates/bml.phtml b/app/code/Magento/Paypal/view/frontend/templates/bml.phtml
index d1a9939258315..86dddf52e3646 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/bml.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/bml.phtml
@@ -3,10 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-
-
- ?>
+?>
 <?php
 /**
  * @see \Magento\Paypal\Block\Bml\Banners
diff --git a/app/code/Magento/Quote/Model/Quote/Item.php b/app/code/Magento/Quote/Model/Quote/Item.php
index 5363054d66f66..b62d633ae96c2 100644
--- a/app/code/Magento/Quote/Model/Quote/Item.php
+++ b/app/code/Magento/Quote/Model/Quote/Item.php
@@ -671,7 +671,7 @@ public function updateQtyOption(\Magento\Framework\DataObject $option, $value)
     }
 
     /**
-     *Remove option from item options
+     * Remove option from item options
      *
      * @param string $code
      * @return $this
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
index 996de8228c597..da1da7bc3c92b 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Lowstock/Collection.php
@@ -11,6 +11,8 @@
  */
 namespace Magento\Reports\Model\ResourceModel\Product\Lowstock;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
@@ -245,13 +247,13 @@ public function joinInventoryItem($fields = [])
      * Add filter by product type(s)
      *
      * @param array|string $typeFilter
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @return $this
      */
     public function filterByProductType($typeFilter)
     {
         if (!is_string($typeFilter) && !is_array($typeFilter)) {
-            throw new \Magento\Framework\Exception\LocalizedException(__('The product type filter specified is incorrect.'));
+            throw new LocalizedException(__('The product type filter specified is incorrect.'));
         }
         $this->addAttributeToFilter('type_id', $typeFilter);
         return $this;
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/CollectionFactory.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/CollectionFactory.php
index 1a836e8fc4889..dfdd66455d02e 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Quote/CollectionFactory.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/CollectionFactory.php
@@ -41,7 +41,7 @@ public function __construct(
     }
 
     /**
-     *{ @inheritdoc)
+     * {@inheritdoc)
      */
     public function create(array $data = [])
     {
diff --git a/app/code/Magento/Rule/Model/Condition/Context.php b/app/code/Magento/Rule/Model/Condition/Context.php
index 4cac8f8601b60..b09218c2c64d9 100644
--- a/app/code/Magento/Rule/Model/Condition/Context.php
+++ b/app/code/Magento/Rule/Model/Condition/Context.php
@@ -17,7 +17,7 @@
  * the classes they were introduced for.
  *
  * @api
- * @deprecated 
+ * @deprecated
  */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
diff --git a/app/code/Magento/Sales/Model/Increment.php b/app/code/Magento/Sales/Model/Increment.php
index c435e69c8ca9d..c1f3218fbae5f 100644
--- a/app/code/Magento/Sales/Model/Increment.php
+++ b/app/code/Magento/Sales/Model/Increment.php
@@ -9,7 +9,7 @@
 
 /**
  * Class Increment
- * @deprecated 
+ * @deprecated
  */
 class Increment
 {
diff --git a/app/code/Magento/Sales/Model/Order/Total/AbstractTotal.php b/app/code/Magento/Sales/Model/Order/Total/AbstractTotal.php
index 1113f739fee2b..ee84ba2db912f 100644
--- a/app/code/Magento/Sales/Model/Order/Total/AbstractTotal.php
+++ b/app/code/Magento/Sales/Model/Order/Total/AbstractTotal.php
@@ -8,7 +8,7 @@
 /**
  * Base class for configure totals order
  * @api
- * 
+ *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 abstract class AbstractTotal extends \Magento\Framework\DataObject
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
index 5954edfbf77b7..0d2ee1f24d5b3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
- ?>
+?>
 
 <div class="admin__page-section-title <?= /* @escapeNotVerified */ $block->getHeaderCssClass() ?>">
     <span class="title"><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Metadata/_files/MetaData.php b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Metadata/_files/MetaData.php
index 4dbf4b8926790..f288792d36ddb 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Metadata/_files/MetaData.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Metadata/_files/MetaData.php
@@ -5,171 +5,162 @@
  */
 
 return [
-    'rule_information' =>
-        [
-            'children' =>
-                [
-                    'website_ids' => ['arguments' => ['data' => ['config' => ['options' => []]]]],
-                    'is_active' =>
+    'rule_information' => [
+        'children' =>
+            [
+                'website_ids' => ['arguments' => ['data' => ['config' => ['options' => []]]]],
+                'is_active' => [
+                    'arguments' =>
                         [
-                            'arguments' =>
+                            'data' =>
                                 [
-                                    'data' =>
+                                    'config' =>
                                         [
-                                            'config' =>
+                                            'options' =>
                                                 [
-                                                    'options' =>
-                                                        [
-                                                            [
-                                                                'label' => __('Active'),
-                                                                'value' => '1',
-                                                            ],
-                                                            [
-                                                                'label' => __('Inactive'),
-                                                                'value' => '0',
-                                                            ],
-                                                        ],
+                                                    [
+                                                        'label' => __('Active'),
+                                                        'value' => '1',
+                                                    ],
+                                                    [
+                                                        'label' => __('Inactive'),
+                                                        'value' => '0',
+                                                    ],
                                                 ],
                                         ],
                                 ],
                         ],
-                    'customer_group_ids' => ['arguments' => ['data' => ['config' => ['options' => []]]]],
-                    'coupon_type' =>
-                        [
-                            'arguments' =>
-                                [
-                                    'data' =>
-                                        [
-                                            'config' =>
+                ],
+                'customer_group_ids' => ['arguments' => ['data' => ['config' => ['options' => []]]]],
+                'coupon_type' => [
+                    'arguments' => [
+                        'data' =>
+                            [
+                                'config' =>
+                                    [
+                                        'options' =>
+                                            [
                                                 [
-                                                    'options' =>
-                                                        [
-                                                            [
-                                                                'label' => 'couponType1',
-                                                                'value' => 'key1',
-                                                            ],
-                                                            [
-                                                                'label' => 'couponType2',
-                                                                'value' => 'key2',
-                                                            ],
-                                                        ],
+                                                    'label' => 'couponType1',
+                                                    'value' => 'key1',
                                                 ],
-                                        ],
-                                ],
-                        ],
-                    'is_rss' =>
+                                                [
+                                                    'label' => 'couponType2',
+                                                    'value' => 'key2',
+                                                ],
+                                            ],
+                                    ],
+                            ],
+                    ],
+                ],
+                'is_rss' => [
+                    'arguments' =>
                         [
-                            'arguments' =>
+                            'data' =>
                                 [
-                                    'data' =>
+                                    'config' =>
                                         [
-                                            'config' =>
+                                            'options' =>
                                                 [
-                                                    'options' =>
-                                                        [
-                                                            [
-                                                                'label' => __('Yes'),
-                                                                'value' => '1',
-                                                            ],
-                                                            [
-                                                                'label' => __('No'),
-                                                                'value' => '0',
-                                                            ],
-                                                        ],
+                                                    [
+                                                        'label' => __('Yes'),
+                                                        'value' => '1',
+                                                    ],
+                                                    [
+                                                        'label' => __('No'),
+                                                        'value' => '0',
+                                                    ],
                                                 ],
                                         ],
                                 ],
                         ],
                 ],
-        ],
-    'actions' =>
-        [
-            'children' =>
-                [
-                    'simple_action' =>
+            ],
+    ],
+    'actions' => [
+        'children' =>
+            [
+                'simple_action' => [
+                    'arguments' =>
                         [
-                            'arguments' =>
+                            'data' =>
                                 [
-                                    'data' =>
+                                    'config' =>
                                         [
-                                            'config' =>
+                                            'options' =>
                                                 [
-                                                    'options' =>
-                                                        [
-                                                            [
-                                                                'label' => __('Percent of product price discount'),
-                                                                'value' => 'by_percent',
-                                                            ],
-                                                            [
-                                                                'label' => __('Fixed amount discount'),
-                                                                'value' => 'by_fixed',
-                                                            ],
-                                                            [
-                                                                'label' => __('Fixed amount discount for whole cart'),
-                                                                'value' => 'cart_fixed',
-                                                            ],
-                                                            [
-                                                                'label' => __(
-                                                                    'Buy X get Y free (discount amount is Y)'
-                                                                ),
-                                                                'value' => 'buy_x_get_y',
-                                                            ],
-                                                        ],
+                                                    [
+                                                        'label' => __('Percent of product price discount'),
+                                                        'value' => 'by_percent',
+                                                    ],
+                                                    [
+                                                        'label' => __('Fixed amount discount'),
+                                                        'value' => 'by_fixed',
+                                                    ],
+                                                    [
+                                                        'label' => __('Fixed amount discount for whole cart'),
+                                                        'value' => 'cart_fixed',
+                                                    ],
+                                                    [
+                                                        'label' => __(
+                                                            'Buy X get Y free (discount amount is Y)'
+                                                        ),
+                                                        'value' => 'buy_x_get_y',
+                                                    ],
                                                 ],
                                         ],
                                 ],
                         ],
-                    'discount_amount' => ['arguments' => ['data' => ['config' => ['value' => '0']]]],
-                    'discount_qty' => ['arguments' => ['data' => ['config' => ['value' => '0']]]],
-                    'apply_to_shipping' =>
+                ],
+                'discount_amount' => ['arguments' => ['data' => ['config' => ['value' => '0']]]],
+                'discount_qty' => ['arguments' => ['data' => ['config' => ['value' => '0']]]],
+                'apply_to_shipping' => [
+                    'arguments' =>
                         [
-                            'arguments' =>
+                            'data' =>
                                 [
-                                    'data' =>
+                                    'config' =>
                                         [
-                                            'config' =>
+                                            'options' =>
                                                 [
-                                                    'options' =>
-                                                        [
-                                                            [
-                                                                'label' => __('Yes'),
-                                                                'value' => '1'
-                                                            ],
-                                                            [
-                                                                'label' => __('No'),
-                                                                'value' => '0'
-                                                            ],
-                                                        ],
+                                                    [
+                                                        'label' => __('Yes'),
+                                                        'value' => '1'
+                                                    ],
+                                                    [
+                                                        'label' => __('No'),
+                                                        'value' => '0'
+                                                    ],
                                                 ],
                                         ],
                                 ],
                         ],
-                    'stop_rules_processing' =>
+                ],
+                'stop_rules_processing' => [
+                    'arguments' =>
                         [
-                            'arguments' =>
+                            'data' =>
                                 [
-                                    'data' =>
+                                    'config' =>
                                         [
-                                            'config' =>
-                                                [
 
-                                                    'options' =>
-                                                        [
-                                                            [
-                                                                'label' => __('Yes'),
-                                                                'value' => '1'
-                                                            ],
+                                            'options' =>
+                                                [
+                                                    [
+                                                        'label' => __('Yes'),
+                                                        'value' => '1'
+                                                    ],
 
-                                                            [
-                                                                'label' => __('No'),
-                                                                'value' => '0'
-                                                            ],
-                                                        ],
+                                                    [
+                                                        'label' => __('No'),
+                                                        'value' => '0'
+                                                    ],
                                                 ],
                                         ],
                                 ],
                         ],
                 ],
-        ],
+            ],
+    ],
     'labels' => ['children' => ['store_labels[0]' => ['arguments' => ['data' => ['config' => ['value' => 'label0']]]]]],
 ];
diff --git a/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml b/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml
index f1f34f1caee39..88a3ff433a033 100644
--- a/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml
+++ b/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml
@@ -7,6 +7,7 @@
 /**
  * Account activity template
  *
+ * @codingStandardsIgnoreFile
  * @var $block \Magento\Security\Block\Adminhtml\Session\Activity
  */
 
@@ -38,7 +39,7 @@ $sessionInfoCollection = $block->getSessionInfoCollection();
             </thead>
             <tbody>
             <?php
-            foreach ($sessionInfoCollection as $item):?>
+            foreach ($sessionInfoCollection as $item): ?>
                 <tr>
                     <td><?= $block->escapeHtml($item->getFormattedIp()) ?></td>
                     <td><?= $block->escapeHtml($block->formatDateTime($item->getCreatedAt())) ?></td>
diff --git a/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php b/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php
index 9bb2b3e7cb1d0..cfa13e65ea42a 100644
--- a/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php
+++ b/app/code/Magento/Store/Model/Argument/Interpreter/ServiceUrl.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Store\Model\Argument\Interpreter;
diff --git a/app/code/Magento/Store/Model/Config/Importer/DataDifferenceCalculator.php b/app/code/Magento/Store/Model/Config/Importer/DataDifferenceCalculator.php
index 23256e8ca9c05..75fbe23d78f8b 100644
--- a/app/code/Magento/Store/Model/Config/Importer/DataDifferenceCalculator.php
+++ b/app/code/Magento/Store/Model/Config/Importer/DataDifferenceCalculator.php
@@ -79,9 +79,7 @@ public function getItemsToUpdate($scope, array $data)
         );
 
         foreach ($runtimeScopeData as $entityCode => $entityData) {
-            if (
-                isset($data[$entityCode]) && array_diff_assoc($entityData, $data[$entityCode])
-            ) {
+            if (isset($data[$entityCode]) && array_diff_assoc($entityData, $data[$entityCode])) {
                 $itemsToUpdate[$entityCode] = array_replace($entityData, $data[$entityCode]);
             }
         }
diff --git a/app/code/Magento/Store/Model/Plugin/StoreCookie.php b/app/code/Magento/Store/Model/Plugin/StoreCookie.php
index b637377000460..612d35e136d7e 100644
--- a/app/code/Magento/Store/Model/Plugin/StoreCookie.php
+++ b/app/code/Magento/Store/Model/Plugin/StoreCookie.php
@@ -82,8 +82,7 @@ public function beforeDispatch(
                 $this->storeCookieManager->deleteStoreCookie($this->storeManager->getDefaultStoreView());
             }
         }
-        if (
-            $this->storeCookieManager->getStoreCodeFromCookie() === null
+        if ($this->storeCookieManager->getStoreCodeFromCookie() === null
             || $request->getParam(StoreResolverInterface::PARAM_NAME) !== null
         ) {
             $storeId = $this->storeResolver->getCurrentStoreId();
diff --git a/app/code/Magento/Tax/Model/System/Message/Notification/ApplyDiscountOnPrices.php b/app/code/Magento/Tax/Model/System/Message/Notification/ApplyDiscountOnPrices.php
index cafd4cb561af9..ab1a6d40115b4 100644
--- a/app/code/Magento/Tax/Model/System/Message/Notification/ApplyDiscountOnPrices.php
+++ b/app/code/Magento/Tax/Model/System/Message/Notification/ApplyDiscountOnPrices.php
@@ -82,7 +82,8 @@ public function getText()
 
         if ($this->isDisplayed()) {
             $messageDetails .= '<strong>';
-            $messageDetails .= __('To apply the discount on prices including tax and apply the tax after discount, set Catalog Prices to “Including Tax”. ');
+            $messageDetails .= __('To apply the discount on prices including tax and apply the tax after discount,'
+                . ' set Catalog Prices to “Including Tax”. ');
             $messageDetails .= '</strong><p>';
             $messageDetails .= __('Store(s) affected: ');
             $messageDetails .= implode(', ', $this->getStoresWithWrongSettings());
diff --git a/app/code/Magento/Tax/Model/System/Message/Notification/DiscountErrors.php b/app/code/Magento/Tax/Model/System/Message/Notification/DiscountErrors.php
index 1ee37150015ff..ff16e350580a0 100644
--- a/app/code/Magento/Tax/Model/System/Message/Notification/DiscountErrors.php
+++ b/app/code/Magento/Tax/Model/System/Message/Notification/DiscountErrors.php
@@ -80,7 +80,8 @@ public function getText()
 
         if (!empty($this->getStoresWithWrongSettings()) && !$this->taxConfig->isWrongDiscountSettingsIgnored()) {
             $messageDetails .= '<strong>';
-            $messageDetails .= __('With customer tax applied “Before Discount”, the final discount calculation may not match customers’ expectations. ');
+            $messageDetails .= __('With customer tax applied “Before Discount”,'
+                . ' the final discount calculation may not match customers’ expectations. ');
             $messageDetails .= '</strong><p>';
             $messageDetails .= __('Store(s) affected: ');
             $messageDetails .= implode(', ', $this->getStoresWithWrongSettings());
diff --git a/app/code/Magento/Tax/Plugin/Ui/DataProvider/TaxSettings.php b/app/code/Magento/Tax/Plugin/Ui/DataProvider/TaxSettings.php
index a785eb7329d7a..3bd55bdbb8a25 100644
--- a/app/code/Magento/Tax/Plugin/Ui/DataProvider/TaxSettings.php
+++ b/app/code/Magento/Tax/Plugin/Ui/DataProvider/TaxSettings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
index 7ed0129de1c28..408866a916d4a 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RateRepositoryTest.php
@@ -363,11 +363,13 @@ public function saveThrowsExceptionIfCannotSaveTitlesDataProvider()
     {
         return [
             'entity_already_exists' => [
-                new AlreadyExistsException(__('Entity already exists')), \Magento\Framework\Exception\AlreadyExistsException::class,
+                new AlreadyExistsException(__('Entity already exists')),
+                AlreadyExistsException::class,
                 'Entity already exists'
             ],
             'cannot_save_title' => [
-                new LocalizedException(__('Cannot save titles')), \Magento\Framework\Exception\LocalizedException::class,
+                new LocalizedException(__('Cannot save titles')),
+                LocalizedException::class,
                 'Cannot save titles'
             ]
         ];
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
index 233253b328196..d879aba5d8474 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxRuleRepositoryTest.php
@@ -6,6 +6,10 @@
 namespace Magento\Tax\Test\Unit\Model;
 
 use Magento\Framework\Api\SortOrder;
+use Magento\Framework\Exception\AlreadyExistsException;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use \Magento\Tax\Model\TaxRuleRepository;
 
 /**
@@ -170,9 +174,9 @@ public function testSave()
      * @param $exceptionName
      * @param $exceptionMessage
      * @throws \Exception
-     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws CouldNotSaveException
      * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     public function testSaveWithExceptions($exceptionObject, $exceptionName, $exceptionMessage)
     {
@@ -192,13 +196,13 @@ public function saveExceptionsDataProvider()
     {
         return [
             [
-                new \Magento\Framework\Exception\LocalizedException(__('Could not save')), \Magento\Framework\Exception\CouldNotSaveException::class,
+                new LocalizedException(__('Could not save')), CouldNotSaveException::class,
                 'Could not save'
             ], [
-                new \Magento\Framework\Exception\AlreadyExistsException(__('Entity already exists')), \Magento\Framework\Exception\AlreadyExistsException::class,
+                new AlreadyExistsException(__('Entity already exists')), AlreadyExistsException::class,
                 'Entity already exists'
             ], [
-                new \Magento\Framework\Exception\NoSuchEntityException(__('No such entity')), \Magento\Framework\Exception\NoSuchEntityException::class,
+                new NoSuchEntityException(__('No such entity')), NoSuchEntityException::class,
                 'No such entity'
             ]
         ];
diff --git a/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php b/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php
index fb899c6bff22f..bdd9de8425e6b 100644
--- a/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Ui/DataProvider/Product/Listing/Collector/TaxTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Tax\Test\Unit\Ui\DataProvider\Product\Listing\Collector;
diff --git a/app/code/Magento/Tax/Ui/DataProvider/Product/Listing/Collector/Tax.php b/app/code/Magento/Tax/Ui/DataProvider/Product/Listing/Collector/Tax.php
index 52c50a3776d68..d84ffa27c6878 100644
--- a/app/code/Magento/Tax/Ui/DataProvider/Product/Listing/Collector/Tax.php
+++ b/app/code/Magento/Tax/Ui/DataProvider/Product/Listing/Collector/Tax.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/Theme/CustomerData/Messages.php b/app/code/Magento/Theme/CustomerData/Messages.php
index a205cb445efd7..adb3f7df27395 100644
--- a/app/code/Magento/Theme/CustomerData/Messages.php
+++ b/app/code/Magento/Theme/CustomerData/Messages.php
@@ -30,7 +30,7 @@ class Messages implements SectionSourceInterface
 
     /**
      * Constructor
-     * 
+     *
      * @param MessageManager $messageManager
      * @param InterpretationStrategyInterface $interpretationStrategy
      */
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
index 808da5d0363a5..0e6964bfa32cf 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
@@ -78,21 +78,20 @@ protected function setUp()
             [
                 'fieldsets' => ['test_fieldset' =>
                     [
-                        'fields' =>
-                            [
-                                'first_field' => [
-                                    'name' => 'firstField',
-                                    'origin' => null,
-                                    'type' => 'filterable',
-                                    'handler' => null,
-                                ],
-                                'second_field' => [
-                                    'name' => 'secondField',
-                                    'origin' => null,
-                                    'type' => 'searchable',
-                                    'handler' => null,
-                                ],
+                        'fields' => [
+                            'first_field' => [
+                                'name' => 'firstField',
+                                'origin' => null,
+                                'type' => 'filterable',
+                                'handler' => null,
                             ],
+                            'second_field' => [
+                                'name' => 'secondField',
+                                'origin' => null,
+                                'type' => 'searchable',
+                                'handler' => null,
+                            ],
+                        ],
                         'provider' => $indexerFieldset,
                     ]
                 ],
diff --git a/app/code/Magento/Ui/Config/Converter.php b/app/code/Magento/Ui/Config/Converter.php
index 72de0f70863e9..463bd0c3afa0c 100644
--- a/app/code/Magento/Ui/Config/Converter.php
+++ b/app/code/Magento/Ui/Config/Converter.php
@@ -257,8 +257,7 @@ private function convertChildNodes(\DOMNode $node)
             }
             if ($itemNode->localName === static::ARGUMENT_KEY) {
                 $arguments += $this->toArray($itemNode);
-            } elseif (
-                $this->converterUtils->isUiComponent($itemNode)
+            } elseif ($this->converterUtils->isUiComponent($itemNode)
                 && isset($this->schemaMap[$itemNode->localName])
             ) {
                 $itemNodeName = $this->converterUtils->getComponentName($itemNode);
diff --git a/app/code/Magento/Ui/Config/Converter/HtmlContent.php b/app/code/Magento/Ui/Config/Converter/HtmlContent.php
index 5c12358ef9c3f..f77b4a5285d5a 100644
--- a/app/code/Magento/Ui/Config/Converter/HtmlContent.php
+++ b/app/code/Magento/Ui/Config/Converter/HtmlContent.php
@@ -32,7 +32,6 @@ public function convert(\DOMNode $node, array $data)
             $items['name']['xsi:type'] = 'string';
             $items['name']['name'] = 'block';
             $items['name']['value'] = $node->getAttribute('name');
-
         }
         return [
             'xsi:type' => 'array',
diff --git a/app/code/Magento/Ui/Config/Reader/DefinitionMap/Converter.php b/app/code/Magento/Ui/Config/Reader/DefinitionMap/Converter.php
index 9c0514b88dd70..77220c8ac145a 100644
--- a/app/code/Magento/Ui/Config/Reader/DefinitionMap/Converter.php
+++ b/app/code/Magento/Ui/Config/Reader/DefinitionMap/Converter.php
@@ -83,7 +83,6 @@ private function toArray(\DOMNode $node)
                         );
                     }
                     $result[ $attributes[static::NAME_ATTRIBUTE_KEY] ] = $this->argumentParser->parse($node);
-
                 } else {
                     list($arguments, $childResult) = $this->convertChildNodes($node);
 
@@ -156,7 +155,6 @@ private function processMap($componentData, $sourceMap)
                     $result
                 );
             }
-
         }
 
         if (isset($componentData[static::CURRENT_SCHEMA_KEY])) {
diff --git a/app/code/Magento/Ui/Model/UiComponentGenerator.php b/app/code/Magento/Ui/Model/UiComponentGenerator.php
index bd9bb0649fb09..5e8db243d3c42 100644
--- a/app/code/Magento/Ui/Model/UiComponentGenerator.php
+++ b/app/code/Magento/Ui/Model/UiComponentGenerator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Ui\Model;
diff --git a/app/code/Magento/Ui/Test/Unit/Component/MassAction/FilterTest.php b/app/code/Magento/Ui/Test/Unit/Component/MassAction/FilterTest.php
index 7be75c1072582..efd9b0b05c85d 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/MassAction/FilterTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/MassAction/FilterTest.php
@@ -25,7 +25,7 @@
 class FilterTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     *\PHPUnit_Framework_MockObject_MockObject
+     * \PHPUnit_Framework_MockObject_MockObject
      */
     private $requestMock;
 
@@ -48,12 +48,12 @@ class FilterTest extends \PHPUnit_Framework_TestCase
     private $objectManager;
 
     /**
-     *\PHPUnit_Framework_MockObject_MockObject
+     * \PHPUnit_Framework_MockObject_MockObject
      */
     private $dataProviderMock;
 
     /**
-     *\PHPUnit_Framework_MockObject_MockObject
+     * \PHPUnit_Framework_MockObject_MockObject
      */
     private $abstractDbMock;
 
diff --git a/app/code/Magento/Ui/Test/Unit/Model/UiComponentGeneratorTest.php b/app/code/Magento/Ui/Test/Unit/Model/UiComponentGeneratorTest.php
index 00e44bed31343..2dd659c67fdc9 100644
--- a/app/code/Magento/Ui/Test/Unit/Model/UiComponentGeneratorTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Model/UiComponentGeneratorTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Ui\Test\Unit\Model;
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/info.phtml b/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
index 689b8c82ceeba..69f2627cd563f 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
@@ -9,8 +9,8 @@
 </form>
 <script>
 require([
-	"jquery",
-	"mage/mage"
+    "jquery",
+    "mage/mage"
 ], function(jQuery){
 
     jQuery(document).ready(function() {
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index 317d52c25f611..4fab92e1f3e6a 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -426,8 +426,7 @@ protected function _getXmlQuotes()
                 $service = $r->getService();
             }
 
-            if (
-                strpos($r->getContainer(), 'FLAT RATE ENVELOPE') !== false ||
+            if (strpos($r->getContainer(), 'FLAT RATE ENVELOPE') !== false ||
                 strpos($r->getContainer(), 'FLAT RATE BOX') !== false
             ) {
                 $service = 'Priority';
@@ -1072,13 +1071,10 @@ protected function _parseXmlTrackingResponse($trackingvalue, $response)
                 if (is_object($xml)) {
                     if (isset($xml->Number) && isset($xml->Description) && (string)$xml->Description != '') {
                         $errorTitle = (string)$xml->Description;
-                    } elseif (isset(
-                            $xml->TrackInfo
-                        ) && isset(
-                            $xml->TrackInfo->Error
-                        ) && isset(
-                            $xml->TrackInfo->Error->Description
-                        ) && (string)$xml->TrackInfo->Error->Description != ''
+                    } elseif (isset($xml->TrackInfo)
+                        && isset($xml->TrackInfo->Error)
+                        && isset($xml->TrackInfo->Error->Description)
+                        && (string)$xml->TrackInfo->Error->Description != ''
                     ) {
                         $errorTitle = (string)$xml->TrackInfo->Error->Description;
                     } else {
diff --git a/app/code/Magento/Weee/Plugin/Ui/DataProvider/WeeeSettings.php b/app/code/Magento/Weee/Plugin/Ui/DataProvider/WeeeSettings.php
index 642b52d6ff950..809b9b079ab62 100644
--- a/app/code/Magento/Weee/Plugin/Ui/DataProvider/WeeeSettings.php
+++ b/app/code/Magento/Weee/Plugin/Ui/DataProvider/WeeeSettings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/Weee/Test/Unit/Observer/GetPriceConfigurationObserverTest.php b/app/code/Magento/Weee/Test/Unit/Observer/GetPriceConfigurationObserverTest.php
index 3b835d06570dc..9ea67030f60ae 100644
--- a/app/code/Magento/Weee/Test/Unit/Observer/GetPriceConfigurationObserverTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Observer/GetPriceConfigurationObserverTest.php
@@ -166,10 +166,9 @@ public function getPriceConfigurationProvider()
                 'testArray' => [
                     [
                         [
-                            'prices' =>
-                                [
-                                    'finalPrice' => ['amount' => 31.50],
-                                ],
+                            'prices' => [
+                                'finalPrice' => ['amount' => 31.50],
+                            ],
                             'somekey' => 0,
                         ],
                         [
@@ -188,11 +187,10 @@ public function getPriceConfigurationProvider()
                 'expectedArray' => [
                     [
                         [
-                            'prices' =>
-                                [
-                                    'finalPrice' => ['amount' => 31.50],
-                                    'weeePrice' => ['amount' => 31.50],
-                                ],
+                            'prices' => [
+                                'finalPrice' => ['amount' => 31.50],
+                                'weeePrice' => ['amount' => 31.50],
+                            ],
                             'somekey' => 0,
                         ],
                         [
diff --git a/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php b/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php
index 286814368c365..c92c364332a56 100644
--- a/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Ui/DataProvider/Product/Listing/Collector/WeeeTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Weee\Test\Unit\Ui\DataProvider\Product\Listing\Collector;
@@ -32,7 +32,7 @@ class WeeeTest extends \PHPUnit_Framework_TestCase
     /** @var PriceInfoExtensionInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $extensionAttributes;
 
-    /** * @var WeeeAdjustmentAttributeInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var WeeeAdjustmentAttributeInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject */
     private $weeeAdjustmentAttributeFactory;
 
     /** @var PriceInfoExtensionInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject */
diff --git a/app/code/Magento/Weee/Ui/DataProvider/Product/Listing/Collector/Weee.php b/app/code/Magento/Weee/Ui/DataProvider/Product/Listing/Collector/Weee.php
index 80d30361093ef..cdfe26730011f 100644
--- a/app/code/Magento/Weee/Ui/DataProvider/Product/Listing/Collector/Weee.php
+++ b/app/code/Magento/Weee/Ui/DataProvider/Product/Listing/Collector/Weee.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/Wishlist/Plugin/Ui/DataProvider/WishlistSettings.php b/app/code/Magento/Wishlist/Plugin/Ui/DataProvider/WishlistSettings.php
index 4c4515f0e9dde..7f37486c7936c 100644
--- a/app/code/Magento/Wishlist/Plugin/Ui/DataProvider/WishlistSettings.php
+++ b/app/code/Magento/Wishlist/Plugin/Ui/DataProvider/WishlistSettings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php
index fd4ac660921ea..921d621e518f0 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/ItemTest.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Wishlist\Test\Unit\Model;
 
+use Magento\Framework\Exception\LocalizedException;
 use \Magento\Wishlist\Model\Item;
 
 /**
@@ -298,7 +299,7 @@ public function testSetAndSaveItemOptions()
 
     public function testGetProductWithException()
     {
-        $this->setExpectedException(\Magento\Framework\Exception\LocalizedException::class, __('Cannot specify product.'));
+        $this->setExpectedException(LocalizedException::class, __('Cannot specify product.'));
         $this->model->getProduct();
     }
 
diff --git a/app/code/Magento/Wishlist/Ui/DataProvider/Product/Collector/Button.php b/app/code/Magento/Wishlist/Ui/DataProvider/Product/Collector/Button.php
index 5945794b089d4..2404c6ecc5b1e 100644
--- a/app/code/Magento/Wishlist/Ui/DataProvider/Product/Collector/Button.php
+++ b/app/code/Magento/Wishlist/Ui/DataProvider/Product/Collector/Button.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml b/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml
index 5abb0dd8e0144..342af0a474492 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
+// @codingStandardsIgnoreFile
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
 
diff --git a/composer.json b/composer.json
index e7c306315a5c5..b48276c312a05 100644
--- a/composer.json
+++ b/composer.json
@@ -74,7 +74,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "4.1.0",
-        "squizlabs/php_codesniffer": "1.5.3",
+        "squizlabs/php_codesniffer": "3.0.1",
         "phpmd/phpmd": "@stable",
         "pdepend/pdepend": "2.5.0",
         "friendsofphp/php-cs-fixer": "~2.1.1",
diff --git a/composer.lock b/composer.lock
index 88e39d69744ca..34842231739e4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "36aef861e85e9529c55d9b2d2910bd44",
+    "hash": "25e812e582aa5c2221b8325a2da1b257",
+    "content-hash": "2bf5212716a5cc67bed5d30ee819bca2",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -51,7 +52,7 @@
                 }
             ],
             "description": "Braintree PHP Client Library",
-            "time": "2017-02-16T19:59:04+00:00"
+            "time": "2017-02-16 19:59:04"
         },
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -87,7 +88,7 @@
             ],
             "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
-            "time": "2016-05-02T16:24:47+00:00"
+            "time": "2016-05-02 16:24:47"
         },
         {
             "name": "colinmollenhour/cache-backend-redis",
@@ -123,7 +124,7 @@
             ],
             "description": "Zend_Cache backend using Redis with full support for tags.",
             "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
-            "time": "2017-03-25T04:54:24+00:00"
+            "time": "2017-03-25 04:54:24"
         },
         {
             "name": "colinmollenhour/credis",
@@ -162,7 +163,7 @@
             ],
             "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
             "homepage": "https://github.com/colinmollenhour/credis",
-            "time": "2015-11-28T01:20:04+00:00"
+            "time": "2015-11-28 01:20:04"
         },
         {
             "name": "colinmollenhour/php-redis-session-abstract",
@@ -199,7 +200,7 @@
             ],
             "description": "A Redis-based session handler with optimistic locking",
             "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
-            "time": "2017-04-19T14:21:43+00:00"
+            "time": "2017-04-19 14:21:43"
         },
         {
             "name": "composer/ca-bundle",
@@ -258,7 +259,7 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2017-03-06T11:59:08+00:00"
+            "time": "2017-03-06 11:59:08"
         },
         {
             "name": "composer/composer",
@@ -335,7 +336,7 @@
                 "dependency",
                 "package"
             ],
-            "time": "2017-03-10T08:29:45+00:00"
+            "time": "2017-03-10 08:29:45"
         },
         {
             "name": "composer/semver",
@@ -397,7 +398,7 @@
                 "validation",
                 "versioning"
             ],
-            "time": "2016-08-30T16:08:34+00:00"
+            "time": "2016-08-30 16:08:34"
         },
         {
             "name": "composer/spdx-licenses",
@@ -458,7 +459,7 @@
                 "spdx",
                 "validator"
             ],
-            "time": "2017-04-03T19:08:52+00:00"
+            "time": "2017-04-03 19:08:52"
         },
         {
             "name": "container-interop/container-interop",
@@ -489,7 +490,7 @@
             ],
             "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
             "homepage": "https://github.com/container-interop/container-interop",
-            "time": "2017-02-14T19:40:03+00:00"
+            "time": "2017-02-14 19:40:03"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -556,7 +557,7 @@
                 "json",
                 "schema"
             ],
-            "time": "2017-05-16T21:06:09+00:00"
+            "time": "2017-05-16 21:06:09"
         },
         {
             "name": "league/climate",
@@ -605,7 +606,7 @@
                 "php",
                 "terminal"
             ],
-            "time": "2015-01-18T14:31:58+00:00"
+            "time": "2015-01-18 14:31:58"
         },
         {
             "name": "magento/composer",
@@ -641,7 +642,7 @@
                 "AFL-3.0"
             ],
             "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-            "time": "2017-04-24T09:57:02+00:00"
+            "time": "2017-04-24 09:57:02"
         },
         {
             "name": "magento/magento-composer-installer",
@@ -720,7 +721,7 @@
                 "composer-installer",
                 "magento"
             ],
-            "time": "2016-10-06T16:05:07+00:00"
+            "time": "2016-10-06 16:05:07"
         },
         {
             "name": "magento/zendframework1",
@@ -767,7 +768,7 @@
                 "ZF1",
                 "framework"
             ],
-            "time": "2017-06-21T14:56:23+00:00"
+            "time": "2017-06-21 14:56:23"
         },
         {
             "name": "monolog/monolog",
@@ -845,7 +846,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2017-06-19T01:22:40+00:00"
+            "time": "2017-06-19 01:22:40"
         },
         {
             "name": "oyejorge/less.php",
@@ -907,7 +908,7 @@
                 "php",
                 "stylesheet"
             ],
-            "time": "2017-03-28T22:19:25+00:00"
+            "time": "2017-03-28 22:19:25"
         },
         {
             "name": "paragonie/random_compat",
@@ -955,7 +956,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2017-03-13T16:27:32+00:00"
+            "time": "2017-03-13 16:27:32"
         },
         {
             "name": "pelago/emogrifier",
@@ -1011,7 +1012,7 @@
             ],
             "description": "Converts CSS styles into inline style attributes in your HTML code",
             "homepage": "http://www.pelagodesign.com/sidecar/emogrifier/",
-            "time": "2015-05-15T11:37:51+00:00"
+            "time": "2015-05-15 11:37:51"
         },
         {
             "name": "phpseclib/phpseclib",
@@ -1103,7 +1104,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2017-06-05T06:31:10+00:00"
+            "time": "2017-06-05 06:31:10"
         },
         {
             "name": "psr/container",
@@ -1152,7 +1153,7 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2017-02-14T16:28:37+00:00"
+            "time": "2017-02-14 16:28:37"
         },
         {
             "name": "psr/log",
@@ -1199,7 +1200,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10T12:19:37+00:00"
+            "time": "2016-10-10 12:19:37"
         },
         {
             "name": "ramsey/uuid",
@@ -1281,7 +1282,7 @@
                 "identifier",
                 "uuid"
             ],
-            "time": "2017-03-26T20:37:53+00:00"
+            "time": "2017-03-26 20:37:53"
         },
         {
             "name": "seld/cli-prompt",
@@ -1329,7 +1330,7 @@
                 "input",
                 "prompt"
             ],
-            "time": "2017-03-18T11:32:45+00:00"
+            "time": "2017-03-18 11:32:45"
         },
         {
             "name": "seld/jsonlint",
@@ -1378,7 +1379,7 @@
                 "parser",
                 "validator"
             ],
-            "time": "2017-06-18T15:11:04+00:00"
+            "time": "2017-06-18 15:11:04"
         },
         {
             "name": "seld/phar-utils",
@@ -1422,7 +1423,7 @@
             "keywords": [
                 "phra"
             ],
-            "time": "2015-10-13T18:44:15+00:00"
+            "time": "2015-10-13 18:44:15"
         },
         {
             "name": "sjparkinson/static-review",
@@ -1475,20 +1476,20 @@
                 }
             ],
             "description": "An extendable framework for version control hooks.",
-            "time": "2014-09-22T08:40:36+00:00"
+            "time": "2014-09-22 08:40:36"
         },
         {
             "name": "symfony/console",
-            "version": "v2.8.22",
+            "version": "v2.8.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "3ef6ef64abecd566d551d9e7f6393ac6e93b2462"
+                "reference": "46e65f8d98c9ab629bbfcc16a4ff023f61c37fb2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/3ef6ef64abecd566d551d9e7f6393ac6e93b2462",
-                "reference": "3ef6ef64abecd566d551d9e7f6393ac6e93b2462",
+                "url": "https://api.github.com/repos/symfony/console/zipball/46e65f8d98c9ab629bbfcc16a4ff023f61c37fb2",
+                "reference": "46e65f8d98c9ab629bbfcc16a4ff023f61c37fb2",
                 "shasum": ""
             },
             "require": {
@@ -1536,7 +1537,7 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-02T14:36:56+00:00"
+            "time": "2017-07-03 08:04:30"
         },
         {
             "name": "symfony/debug",
@@ -1593,11 +1594,11 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2016-07-30T07:22:48+00:00"
+            "time": "2016-07-30 07:22:48"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.8.22",
+            "version": "v2.8.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
@@ -1653,20 +1654,20 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-02T07:47:27+00:00"
+            "time": "2017-06-02 07:47:27"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.3.2",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "c709670bf64721202ddbe4162846f250735842c0"
+                "reference": "311fa718389efbd8b627c272b9324a62437018cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/c709670bf64721202ddbe4162846f250735842c0",
-                "reference": "c709670bf64721202ddbe4162846f250735842c0",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/311fa718389efbd8b627c272b9324a62437018cc",
+                "reference": "311fa718389efbd8b627c272b9324a62437018cc",
                 "shasum": ""
             },
             "require": {
@@ -1702,11 +1703,11 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2017-05-28T14:08:56+00:00"
+            "time": "2017-06-24 09:29:48"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.3.2",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
@@ -1751,7 +1752,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-01T21:01:25+00:00"
+            "time": "2017-06-01 21:01:25"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -1810,20 +1811,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T14:24:12+00:00"
+            "time": "2017-06-09 14:24:12"
         },
         {
             "name": "symfony/process",
-            "version": "v2.8.22",
+            "version": "v2.8.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "d54232f5682fda2f8bbebff7c81b864646867ab9"
+                "reference": "57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d54232f5682fda2f8bbebff7c81b864646867ab9",
-                "reference": "d54232f5682fda2f8bbebff7c81b864646867ab9",
+                "url": "https://api.github.com/repos/symfony/process/zipball/57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8",
+                "reference": "57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8",
                 "shasum": ""
             },
             "require": {
@@ -1859,7 +1860,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-05-08T01:19:21+00:00"
+            "time": "2017-07-03 08:04:30"
         },
         {
             "name": "tedivm/jshrink",
@@ -1905,7 +1906,7 @@
                 "javascript",
                 "minifier"
             ],
-            "time": "2015-07-04T07:35:09+00:00"
+            "time": "2015-07-04 07:35:09"
         },
         {
             "name": "tubalmartin/cssmin",
@@ -1958,7 +1959,7 @@
                 "minify",
                 "yui"
             ],
-            "time": "2017-05-16T13:45:26+00:00"
+            "time": "2017-05-16 13:45:26"
         },
         {
             "name": "zendframework/zend-captcha",
@@ -2015,7 +2016,7 @@
                 "captcha",
                 "zf2"
             ],
-            "time": "2017-02-23T08:09:44+00:00"
+            "time": "2017-02-23 08:09:44"
         },
         {
             "name": "zendframework/zend-code",
@@ -2068,7 +2069,7 @@
                 "code",
                 "zf2"
             ],
-            "time": "2016-10-24T13:23:32+00:00"
+            "time": "2016-10-24 13:23:32"
         },
         {
             "name": "zendframework/zend-config",
@@ -2124,7 +2125,7 @@
                 "config",
                 "zf2"
             ],
-            "time": "2016-02-04T23:01:10+00:00"
+            "time": "2016-02-04 23:01:10"
         },
         {
             "name": "zendframework/zend-console",
@@ -2176,7 +2177,7 @@
                 "console",
                 "zf2"
             ],
-            "time": "2016-02-09T17:15:12+00:00"
+            "time": "2016-02-09 17:15:12"
         },
         {
             "name": "zendframework/zend-crypt",
@@ -2226,7 +2227,7 @@
                 "crypt",
                 "zf2"
             ],
-            "time": "2016-02-03T23:46:30+00:00"
+            "time": "2016-02-03 23:46:30"
         },
         {
             "name": "zendframework/zend-db",
@@ -2283,7 +2284,7 @@
                 "db",
                 "zf2"
             ],
-            "time": "2016-08-09T19:28:55+00:00"
+            "time": "2016-08-09 19:28:55"
         },
         {
             "name": "zendframework/zend-di",
@@ -2330,7 +2331,7 @@
                 "di",
                 "zf2"
             ],
-            "time": "2016-04-25T20:58:11+00:00"
+            "time": "2016-04-25 20:58:11"
         },
         {
             "name": "zendframework/zend-escaper",
@@ -2374,7 +2375,7 @@
                 "escaper",
                 "zf2"
             ],
-            "time": "2016-06-30T19:48:38+00:00"
+            "time": "2016-06-30 19:48:38"
         },
         {
             "name": "zendframework/zend-eventmanager",
@@ -2421,7 +2422,7 @@
                 "eventmanager",
                 "zf2"
             ],
-            "time": "2016-02-18T20:49:05+00:00"
+            "time": "2016-02-18 20:49:05"
         },
         {
             "name": "zendframework/zend-filter",
@@ -2481,7 +2482,7 @@
                 "filter",
                 "zf2"
             ],
-            "time": "2017-05-17T20:56:17+00:00"
+            "time": "2017-05-17 20:56:17"
         },
         {
             "name": "zendframework/zend-form",
@@ -2558,7 +2559,7 @@
                 "form",
                 "zf2"
             ],
-            "time": "2017-05-18T14:59:53+00:00"
+            "time": "2017-05-18 14:59:53"
         },
         {
             "name": "zendframework/zend-http",
@@ -2608,7 +2609,7 @@
                 "http",
                 "zf2"
             ],
-            "time": "2017-01-31T14:41:02+00:00"
+            "time": "2017-01-31 14:41:02"
         },
         {
             "name": "zendframework/zend-hydrator",
@@ -2666,7 +2667,7 @@
                 "hydrator",
                 "zf2"
             ],
-            "time": "2016-02-18T22:38:26+00:00"
+            "time": "2016-02-18 22:38:26"
         },
         {
             "name": "zendframework/zend-i18n",
@@ -2733,7 +2734,7 @@
                 "i18n",
                 "zf2"
             ],
-            "time": "2017-05-17T17:00:12+00:00"
+            "time": "2017-05-17 17:00:12"
         },
         {
             "name": "zendframework/zend-inputfilter",
@@ -2788,7 +2789,7 @@
                 "inputfilter",
                 "zf2"
             ],
-            "time": "2017-05-18T14:20:56+00:00"
+            "time": "2017-05-18 14:20:56"
         },
         {
             "name": "zendframework/zend-json",
@@ -2843,7 +2844,7 @@
                 "json",
                 "zf2"
             ],
-            "time": "2016-02-04T21:20:26+00:00"
+            "time": "2016-02-04 21:20:26"
         },
         {
             "name": "zendframework/zend-loader",
@@ -2887,7 +2888,7 @@
                 "loader",
                 "zf2"
             ],
-            "time": "2015-06-03T14:05:47+00:00"
+            "time": "2015-06-03 14:05:47"
         },
         {
             "name": "zendframework/zend-log",
@@ -2958,7 +2959,7 @@
                 "logging",
                 "zf2"
             ],
-            "time": "2017-05-17T16:03:26+00:00"
+            "time": "2017-05-17 16:03:26"
         },
         {
             "name": "zendframework/zend-math",
@@ -3008,7 +3009,7 @@
                 "math",
                 "zf2"
             ],
-            "time": "2016-04-07T16:29:53+00:00"
+            "time": "2016-04-07 16:29:53"
         },
         {
             "name": "zendframework/zend-modulemanager",
@@ -3067,7 +3068,7 @@
                 "modulemanager",
                 "zf2"
             ],
-            "time": "2016-05-16T21:21:11+00:00"
+            "time": "2016-05-16 21:21:11"
         },
         {
             "name": "zendframework/zend-mvc",
@@ -3154,7 +3155,7 @@
                 "mvc",
                 "zf2"
             ],
-            "time": "2016-02-23T15:24:59+00:00"
+            "time": "2016-02-23 15:24:59"
         },
         {
             "name": "zendframework/zend-serializer",
@@ -3211,7 +3212,7 @@
                 "serializer",
                 "zf2"
             ],
-            "time": "2016-06-21T17:01:55+00:00"
+            "time": "2016-06-21 17:01:55"
         },
         {
             "name": "zendframework/zend-server",
@@ -3257,7 +3258,7 @@
                 "server",
                 "zf2"
             ],
-            "time": "2016-06-20T22:27:55+00:00"
+            "time": "2016-06-20 22:27:55"
         },
         {
             "name": "zendframework/zend-servicemanager",
@@ -3309,7 +3310,7 @@
                 "servicemanager",
                 "zf2"
             ],
-            "time": "2016-12-19T19:14:29+00:00"
+            "time": "2016-12-19 19:14:29"
         },
         {
             "name": "zendframework/zend-session",
@@ -3375,7 +3376,7 @@
                 "session",
                 "zf2"
             ],
-            "time": "2017-06-19T21:31:39+00:00"
+            "time": "2017-06-19 21:31:39"
         },
         {
             "name": "zendframework/zend-soap",
@@ -3427,7 +3428,7 @@
                 "soap",
                 "zf2"
             ],
-            "time": "2016-04-21T16:06:27+00:00"
+            "time": "2016-04-21 16:06:27"
         },
         {
             "name": "zendframework/zend-stdlib",
@@ -3486,7 +3487,7 @@
                 "stdlib",
                 "zf2"
             ],
-            "time": "2016-04-12T21:17:31+00:00"
+            "time": "2016-04-12 21:17:31"
         },
         {
             "name": "zendframework/zend-text",
@@ -3533,7 +3534,7 @@
                 "text",
                 "zf2"
             ],
-            "time": "2016-02-08T19:03:52+00:00"
+            "time": "2016-02-08 19:03:52"
         },
         {
             "name": "zendframework/zend-uri",
@@ -3580,7 +3581,7 @@
                 "uri",
                 "zf2"
             ],
-            "time": "2016-02-17T22:38:51+00:00"
+            "time": "2016-02-17 22:38:51"
         },
         {
             "name": "zendframework/zend-validator",
@@ -3651,7 +3652,7 @@
                 "validator",
                 "zf2"
             ],
-            "time": "2017-05-17T22:06:13+00:00"
+            "time": "2017-05-17 22:06:13"
         },
         {
             "name": "zendframework/zend-view",
@@ -3738,7 +3739,7 @@
                 "view",
                 "zf2"
             ],
-            "time": "2017-03-21T15:05:56+00:00"
+            "time": "2017-03-21 15:05:56"
         }
     ],
     "packages-dev": [
@@ -3794,7 +3795,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14T21:17:01+00:00"
+            "time": "2015-06-14 21:17:01"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
@@ -3864,7 +3865,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2017-03-31T12:59:38+00:00"
+            "time": "2017-03-31 12:59:38"
         },
         {
             "name": "ircmaxell/password-compat",
@@ -3906,7 +3907,7 @@
                 "hashing",
                 "password"
             ],
-            "time": "2014-11-20T16:49:30+00:00"
+            "time": "2014-11-20 16:49:30"
         },
         {
             "name": "lusitanian/oauth",
@@ -3973,7 +3974,7 @@
                 "oauth",
                 "security"
             ],
-            "time": "2016-07-12T22:15:40+00:00"
+            "time": "2016-07-12 22:15:40"
         },
         {
             "name": "pdepend/pdepend",
@@ -4013,7 +4014,7 @@
                 "BSD-3-Clause"
             ],
             "description": "Official version of pdepend to be handled with Composer",
-            "time": "2017-01-19T14:23:36+00:00"
+            "time": "2017-01-19 14:23:36"
         },
         {
             "name": "phpmd/phpmd",
@@ -4079,7 +4080,7 @@
                 "phpmd",
                 "pmd"
             ],
-            "time": "2017-01-20T14:41:10+00:00"
+            "time": "2017-01-20 14:41:10"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -4141,7 +4142,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-10-06T15:47:00+00:00"
+            "time": "2015-10-06 15:47:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -4186,7 +4187,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2013-10-10T15:34:57+00:00"
+            "time": "2013-10-10 15:34:57"
         },
         {
             "name": "phpunit/php-text-template",
@@ -4227,7 +4228,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2015-06-21T13:50:34+00:00"
+            "time": "2015-06-21 13:50:34"
         },
         {
             "name": "phpunit/php-timer",
@@ -4276,7 +4277,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2017-02-26T11:10:40+00:00"
+            "time": "2017-02-26 11:10:40"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -4325,7 +4326,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2017-02-27T10:12:30+00:00"
+            "time": "2017-02-27 10:12:30"
         },
         {
             "name": "phpunit/phpunit",
@@ -4399,7 +4400,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2014-05-02T07:13:40+00:00"
+            "time": "2014-05-02 07:13:40"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -4455,7 +4456,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2015-10-02T06:51:40+00:00"
+            "time": "2015-10-02 06:51:40"
         },
         {
             "name": "sebastian/comparator",
@@ -4519,7 +4520,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2017-01-29T09:50:25+00:00"
+            "time": "2017-01-29 09:50:25"
         },
         {
             "name": "sebastian/diff",
@@ -4571,7 +4572,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2017-05-22T07:24:03+00:00"
+            "time": "2017-05-22 07:24:03"
         },
         {
             "name": "sebastian/environment",
@@ -4621,7 +4622,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2016-08-18T05:49:44+00:00"
+            "time": "2016-08-18 05:49:44"
         },
         {
             "name": "sebastian/exporter",
@@ -4688,7 +4689,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2016-06-17T09:04:28+00:00"
+            "time": "2016-06-17 09:04:28"
         },
         {
             "name": "sebastian/finder-facade",
@@ -4727,7 +4728,7 @@
             ],
             "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
             "homepage": "https://github.com/sebastianbergmann/finder-facade",
-            "time": "2016-02-17T07:02:23+00:00"
+            "time": "2016-02-17 07:02:23"
         },
         {
             "name": "sebastian/phpcpd",
@@ -4778,7 +4779,7 @@
             ],
             "description": "Copy/Paste Detector (CPD) for PHP code.",
             "homepage": "https://github.com/sebastianbergmann/phpcpd",
-            "time": "2016-04-17T19:32:49+00:00"
+            "time": "2016-04-17 19:32:49"
         },
         {
             "name": "sebastian/recursion-context",
@@ -4831,7 +4832,7 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2016-10-03T07:41:43+00:00"
+            "time": "2016-10-03 07:41:43"
         },
         {
             "name": "sebastian/version",
@@ -4866,65 +4867,41 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21T13:59:46+00:00"
+            "time": "2015-06-21 13:59:46"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "1.5.3",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "396178ada8499ec492363587f037125bf7b07fcc"
+                "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/396178ada8499ec492363587f037125bf7b07fcc",
-                "reference": "396178ada8499ec492363587f037125bf7b07fcc",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f9eaf037edf22fdfccf04cb0ab57ebcb1e166219",
+                "reference": "f9eaf037edf22fdfccf04cb0ab57ebcb1e166219",
                 "shasum": ""
             },
             "require": {
+                "ext-simplexml": "*",
                 "ext-tokenizer": "*",
-                "php": ">=5.1.2"
+                "ext-xmlwriter": "*",
+                "php": ">=5.4.0"
             },
-            "suggest": {
-                "phpunit/php-timer": "dev-master"
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
             },
             "bin": [
-                "scripts/phpcs"
+                "bin/phpcs",
+                "bin/phpcbf"
             ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-phpcs-fixer": "2.0.x-dev"
+                    "dev-master": "3.x-dev"
                 }
             },
-            "autoload": {
-                "classmap": [
-                    "CodeSniffer.php",
-                    "CodeSniffer/CLI.php",
-                    "CodeSniffer/Exception.php",
-                    "CodeSniffer/File.php",
-                    "CodeSniffer/Report.php",
-                    "CodeSniffer/Reporting.php",
-                    "CodeSniffer/Sniff.php",
-                    "CodeSniffer/Tokens.php",
-                    "CodeSniffer/Reports/",
-                    "CodeSniffer/CommentParser/",
-                    "CodeSniffer/Tokenizers/",
-                    "CodeSniffer/DocGenerators/",
-                    "CodeSniffer/Standards/AbstractPatternSniff.php",
-                    "CodeSniffer/Standards/AbstractScopeSniff.php",
-                    "CodeSniffer/Standards/AbstractVariableSniff.php",
-                    "CodeSniffer/Standards/IncorrectPatternException.php",
-                    "CodeSniffer/Standards/Generic/Sniffs/",
-                    "CodeSniffer/Standards/MySource/Sniffs/",
-                    "CodeSniffer/Standards/PEAR/Sniffs/",
-                    "CodeSniffer/Standards/PSR1/Sniffs/",
-                    "CodeSniffer/Standards/PSR2/Sniffs/",
-                    "CodeSniffer/Standards/Squiz/Sniffs/",
-                    "CodeSniffer/Standards/Zend/Sniffs/"
-                ]
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
@@ -4935,17 +4912,17 @@
                     "role": "lead"
                 }
             ],
-            "description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
             "homepage": "http://www.squizlabs.com/php-codesniffer",
             "keywords": [
                 "phpcs",
                 "standards"
             ],
-            "time": "2014-05-01T03:07:07+00:00"
+            "time": "2017-06-14 01:23:49"
         },
         {
             "name": "symfony/config",
-            "version": "v3.2.9",
+            "version": "v3.2.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
@@ -4997,7 +4974,7 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2017-04-12T14:13:17+00:00"
+            "time": "2017-04-12 14:13:17"
         },
         {
             "name": "symfony/dependency-injection",
@@ -5057,7 +5034,7 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-28T00:04:57+00:00"
+            "time": "2017-01-28 00:04:57"
         },
         {
             "name": "symfony/polyfill-php54",
@@ -5115,7 +5092,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T08:25:21+00:00"
+            "time": "2017-06-09 08:25:21"
         },
         {
             "name": "symfony/polyfill-php55",
@@ -5171,7 +5148,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T08:25:21+00:00"
+            "time": "2017-06-09 08:25:21"
         },
         {
             "name": "symfony/polyfill-php70",
@@ -5230,7 +5207,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T14:24:12+00:00"
+            "time": "2017-06-09 14:24:12"
         },
         {
             "name": "symfony/polyfill-php72",
@@ -5285,7 +5262,7 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T08:25:21+00:00"
+            "time": "2017-06-09 08:25:21"
         },
         {
             "name": "symfony/polyfill-xml",
@@ -5333,11 +5310,11 @@
                 "portable",
                 "shim"
             ],
-            "time": "2017-06-09T08:25:21+00:00"
+            "time": "2017-06-09 08:25:21"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v3.3.2",
+            "version": "v3.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
@@ -5382,11 +5359,11 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2017-04-12T14:14:56+00:00"
+            "time": "2017-04-12 14:14:56"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.8.22",
+            "version": "v2.8.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
@@ -5431,20 +5408,20 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-01T20:52:29+00:00"
+            "time": "2017-06-01 20:52:29"
         },
         {
             "name": "theseer/fdomdocument",
-            "version": "1.6.5",
+            "version": "1.6.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/fDOMDocument.git",
-                "reference": "8dcfd392135a5bd938c3c83ea71419501ad9855d"
+                "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/8dcfd392135a5bd938c3c83ea71419501ad9855d",
-                "reference": "8dcfd392135a5bd938c3c83ea71419501ad9855d",
+                "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/6e8203e40a32a9c770bcb62fe37e68b948da6dca",
+                "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca",
                 "shasum": ""
             },
             "require": {
@@ -5471,7 +5448,7 @@
             ],
             "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
             "homepage": "https://github.com/theseer/fDOMDocument",
-            "time": "2017-04-21T14:50:31+00:00"
+            "time": "2017-06-30 11:53:12"
         }
     ],
     "aliases": [],
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRenderListInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRenderListInterfaceTest.php
index 415683be668cb..9b16e0c0a06d3 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRenderListInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRenderListInterfaceTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Catalog\Api;
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
index 8437ad7de34d1..16931f3662c75 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
@@ -363,8 +363,7 @@ protected function prepareIsVirtual()
      */
     protected function prepareAttributeSet()
     {
-        if (
-            $this->fixture->hasData('attribute_set_id')
+        if ($this->fixture->hasData('attribute_set_id')
             && !empty($this->fixture->getDataFieldConfig('attribute_set_id')['source'])
             && $this->fixture->getDataFieldConfig('attribute_set_id')['source']->getAttributeSet()
         ) {
@@ -372,8 +371,7 @@ protected function prepareAttributeSet()
                 ->getDataFieldConfig('attribute_set_id')['source']
                 ->getAttributeSet()
                 ->getAttributeSetId();
-        } else if (
-            $this->fixture->hasData('attribute_set_id')
+        } else if ($this->fixture->hasData('attribute_set_id')
             && !empty($this->fixture->getDataFieldConfig('attribute_set_id')['source'])
             && $this->fixture->getDataFieldConfig('attribute_set_id')['source']->getAttributeSet()
         ) {
diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/_files/template/products_variation_1.php b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/_files/template/products_variation_1.php
index 2c1ac7f221030..371ee68b68052 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/_files/template/products_variation_1.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/_files/template/products_variation_1.php
@@ -5,40 +5,34 @@
  */
 
 return [
-    'entity_0' =>
-        [
-            'data_0' =>
-                [
-                    'sku' => '%sku%',
-                    'product_type' => "simple",
-                    'name' => '%name%',
-                    'price' => '999.00',
-                    'url_key' => '%url_key%',
-                    'qty' => '999',
-                ],
+    'entity_0' => [
+        'data_0' => [
+            'sku' => '%sku%',
+            'product_type' => "simple",
+            'name' => '%name%',
+            'price' => '999.00',
+            'url_key' => '%url_key%',
+            'qty' => '999',
         ],
-    'entity_1' =>
-        [
-            'data_0' =>
-                [
-                    'sku' => '%sku%',
-                    'product_type' => "simple",
-                    'name' => '%name%',
-                    'price' => '999.00',
-                    'url_key' => '%url_key%',
-                    'qty' => '999',
-                ],
+    ],
+    'entity_1' => [
+        'data_0' => [
+            'sku' => '%sku%',
+            'product_type' => "simple",
+            'name' => '%name%',
+            'price' => '999.00',
+            'url_key' => '%url_key%',
+            'qty' => '999',
         ],
-    'entity_2' =>
-        [
-            'data_0' =>
-                [
-                    'sku' => '%sku%',
-                    'product_type' => "simple",
-                    'name' => '%name%',
-                    'price' => '%price%.00',
-                    'url_key' => '%url_key%',
-                    'qty' => '%qty%',
-                ],
+    ],
+    'entity_2' => [
+        'data_0' => [
+            'sku' => '%sku%',
+            'product_type' => "simple",
+            'name' => '%name%',
+            'price' => '%price%.00',
+            'url_key' => '%url_key%',
+            'qty' => '%qty%',
         ],
+    ],
 ];
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 132b5376ad393..c4005f0b17fb3 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
@@ -5,70 +5,63 @@
  */
 
 return [
-    'entity_0' =>
-        [
-            'data_0' =>
-                [
-                    'sku' => '%sku%',
-                    'attribute_set_code' => 'Default',
-                    'product_type' => "simple",
-                    'name' => '%name%',
-                    'product_websites' => 'base,%code%',
-                    'price' => '999.00',
-                    'url_key' => '%url_key%',
-                    'additional_attributes' => '',
-                    'weight' => '',
-                    'qty' => '999',
-                    'configurable_variations' => ''
-                ],
+    'entity_0' => [
+        'data_0' => [
+            'sku' => '%sku%',
+            'attribute_set_code' => 'Default',
+            'product_type' => "simple",
+            'name' => '%name%',
+            'product_websites' => 'base,%code%',
+            'price' => '999.00',
+            'url_key' => '%url_key%',
+            'additional_attributes' => '',
+            'weight' => '',
+            'qty' => '999',
+            'configurable_variations' => ''
         ],
-    'entity_1' =>
-        [
-            'data_0' =>
-                [
-                    'sku' => '%sku%',
-                    'attribute_set_code' => 'Default',
-                    'product_type' => "simple",
-                    'name' => '%name%',
-                    'product_websites' => 'base',
-                    'price' => '999.00',
-                    'url_key' => '%url_key%',
-                    'additional_attributes' => '',
-                    'weight' => '',
-                    'qty' => '999',
-                    'configurable_variations' => ''
-                ],
+    ],
+    'entity_1' => [
+        'data_0' => [
+            'sku' => '%sku%',
+            'attribute_set_code' => 'Default',
+            'product_type' => "simple",
+            'name' => '%name%',
+            'product_websites' => 'base',
+            'price' => '999.00',
+            'url_key' => '%url_key%',
+            'additional_attributes' => '',
+            'weight' => '',
+            'qty' => '999',
+            'configurable_variations' => ''
         ],
-    'entity_2' =>
-        [
-            'data_0' =>
-                [
-                    'sku' => '%configurable_attribute_sku%',
-                    'attribute_set_code' => 'Default',
-                    'product_type' => "simple",
-                    'name' => '%configurable_attribute_name%',
-                    'product_websites' => 'base',
-                    'price' => '50.00',
-                    'url_key' => '%configurable_attribute_url_key%',
-                    'additional_attributes' => '%configurable_additional_attributes%=black',
-                    'weight' => '1',
-                    'qty' => '50',
-                    'configurable_variations' => ''
-                ],
-            'data_1' =>
-                [
-                    'sku' => '%sku%',
-                    'attribute_set_code' => 'Default',
-                    'product_type' => "configurable",
-                    'name' => '%name%',
-                    'product_websites' => 'base',
-                    'price' => '50.00',
-                    'url_key' => '%url_key%',
-                    'additional_attributes' => '%configurable_additional_attributes%=black',
-                    'weight' => '30',
-                    'qty' => '50',
-                    'configurable_variations' =>
-                        "sku=%configurable_attribute_sku%,%configurable_additional_attributes%=black"
-                ],
+    ],
+    'entity_2' => [
+        'data_0' => [
+            'sku' => '%configurable_attribute_sku%',
+            'attribute_set_code' => 'Default',
+            'product_type' => "simple",
+            'name' => '%configurable_attribute_name%',
+            'product_websites' => 'base',
+            'price' => '50.00',
+            'url_key' => '%configurable_attribute_url_key%',
+            'additional_attributes' => '%configurable_additional_attributes%=black',
+            'weight' => '1',
+            'qty' => '50',
+            'configurable_variations' => ''
         ],
+        'data_1' => [
+            'sku' => '%sku%',
+            'attribute_set_code' => 'Default',
+            'product_type' => "configurable",
+            'name' => '%name%',
+            'product_websites' => 'base',
+            'price' => '50.00',
+            'url_key' => '%url_key%',
+            'additional_attributes' => '%configurable_additional_attributes%=black',
+            'weight' => '30',
+            'qty' => '50',
+            '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 d3674ff9e756c..d33c93f487a2d 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
@@ -5,165 +5,154 @@
  */
 
 return [
-    'entity_0' =>
-        [
-            'data_0' =>
-                [
-                    'sku' => '%sku%',
-                    'attribute_set_code' => 'Default',
-                    'product_type' => "simple",
-                    'name' => '%name%',
-                    'product_websites' => 'base,%code%',
-                    'price' => '999.00',
-                    'url_key' => '%url_key%',
-                    'additional_attributes' => '',
-                    'weight' => '',
-                    'qty' => '999',
-                    'configurable_variations' => '',
-                    'associated_skus' => '',
-                    'bundle_shipment_type' => '',
-                    'bundle_values' => '',
-                    'bundle_price_type' => '',
-                    'bundle_price_view' => '',
-                    'bundle_sku_type' => '',
-                    'bundle_weight_type' => ''
-                ],
+    'entity_0' => [
+        'data_0' => [
+            'sku' => '%sku%',
+            'attribute_set_code' => 'Default',
+            'product_type' => "simple",
+            'name' => '%name%',
+            'product_websites' => 'base,%code%',
+            'price' => '999.00',
+            'url_key' => '%url_key%',
+            'additional_attributes' => '',
+            'weight' => '',
+            'qty' => '999',
+            'configurable_variations' => '',
+            'associated_skus' => '',
+            'bundle_shipment_type' => '',
+            'bundle_values' => '',
+            'bundle_price_type' => '',
+            'bundle_price_view' => '',
+            'bundle_sku_type' => '',
+            'bundle_weight_type' => ''
         ],
-    'entity_1' =>
-        [
-            'data_0' =>
-                [
-                    'sku' => '%configurable_attribute_sku%',
-                    'attribute_set_code' => 'Default',
-                    'product_type' => "simple",
-                    'name' => '%configurable_attribute_name%',
-                    'product_websites' => 'base',
-                    'price' => '50.00',
-                    'url_key' => '%configurable_attribute_url_key%',
-                    'additional_attributes' => '%configurable_additional_attributes%=black',
-                    'weight' => '1',
-                    'qty' => '50',
-                    'configurable_variations' => '',
-                    'associated_skus' => '',
-                    'bundle_shipment_type' => '',
-                    'bundle_values' => '',
-                    'bundle_price_type' => '',
-                    'bundle_price_view' => '',
-                    'bundle_sku_type' => '',
-                    'bundle_weight_type' => ''
-                ],
-            'data_1' =>
-                [
-                    'sku' => '%sku%',
-                    'attribute_set_code' => 'Default',
-                    'product_type' => "configurable",
-                    'name' => '%name%',
-                    'product_websites' => 'base',
-                    'price' => '50.00',
-                    'url_key' => '%url_key%',
-                    'additional_attributes' => '%configurable_additional_attributes%=black',
-                    'weight' => '30',
-                    'qty' => '50',
-                    'configurable_variations' =>
-                        "sku=%configurable_attribute_sku%,%configurable_additional_attributes%=black",
-                    'associated_skus' => '',
-                    'bundle_shipment_type' => '',
-                    'bundle_values' => '',
-                    'bundle_price_type' => '',
-                    'bundle_price_view' => '',
-                    'bundle_sku_type' => '',
-                    'bundle_weight_type' => ''
-                ],
+    ],
+    'entity_1' => [
+        'data_0' => [
+            'sku' => '%configurable_attribute_sku%',
+            'attribute_set_code' => 'Default',
+            'product_type' => "simple",
+            'name' => '%configurable_attribute_name%',
+            'product_websites' => 'base',
+            'price' => '50.00',
+            'url_key' => '%configurable_attribute_url_key%',
+            'additional_attributes' => '%configurable_additional_attributes%=black',
+            'weight' => '1',
+            'qty' => '50',
+            'configurable_variations' => '',
+            'associated_skus' => '',
+            'bundle_shipment_type' => '',
+            'bundle_values' => '',
+            'bundle_price_type' => '',
+            'bundle_price_view' => '',
+            'bundle_sku_type' => '',
+            'bundle_weight_type' => ''
         ],
-    'entity_2' =>
-        [
-            'data_0' =>
-                [
-                    'sku' => '%grouped_attribute_sku%',
-                    'attribute_set_code' => 'Default',
-                    'product_type' => "simple",
-                    'name' => '%grouped_attribute_name%',
-                    'product_websites' => 'base',
-                    'price' => '50.00',
-                    'url_key' => '%grouped_attribute_url_key%',
-                    'additional_attributes' => '',
-                    'weight' => '1',
-                    'qty' => '50',
-                    'configurable_variations' => '',
-                    'associated_skus' => '',
-                    'bundle_shipment_type' => '',
-                    'bundle_values' => '',
-                    'bundle_price_type' => '',
-                    'bundle_price_view' => '',
-                    'bundle_sku_type' => '',
-                    'bundle_weight_type' => ''
-                ],
-            'data_1' =>
-                [
-                    'sku' => '%sku%',
-                    'attribute_set_code' => 'Default',
-                    'product_type' => "grouped",
-                    'name' => '%name%',
-                    'product_websites' => 'base',
-                    'price' => '50.00',
-                    'url_key' => '%url_key%',
-                    'additional_attributes' => '',
-                    'weight' => '30',
-                    'qty' => '50',
-                    'configurable_variations' => "",
-                    'associated_skus' => '%grouped_attribute_sku%=1.0000',
-                    'bundle_shipment_type' => '',
-                    'bundle_values' => '',
-                    'bundle_price_type' => '',
-                    'bundle_price_view' => '',
-                    'bundle_sku_type' => '',
-                    'bundle_weight_type' => ''
-                ],
+        'data_1' => [
+            'sku' => '%sku%',
+            'attribute_set_code' => 'Default',
+            'product_type' => "configurable",
+            'name' => '%name%',
+            'product_websites' => 'base',
+            'price' => '50.00',
+            'url_key' => '%url_key%',
+            'additional_attributes' => '%configurable_additional_attributes%=black',
+            'weight' => '30',
+            'qty' => '50',
+            'configurable_variations' =>
+                "sku=%configurable_attribute_sku%,%configurable_additional_attributes%=black",
+            'associated_skus' => '',
+            'bundle_shipment_type' => '',
+            'bundle_values' => '',
+            'bundle_price_type' => '',
+            'bundle_price_view' => '',
+            'bundle_sku_type' => '',
+            'bundle_weight_type' => ''
         ],
-    'entity_3' =>
-        [
-            'data_0' =>
-                [
-                    'sku' => '%bundle_attribute_sku%',
-                    'attribute_set_code' => 'Default',
-                    'product_type' => "simple",
-                    'name' => '%bundle_attribute_name%',
-                    'product_websites' => 'base',
-                    'price' => '50.00',
-                    'url_key' => '%bundle_attribute_url_key%',
-                    'additional_attributes' => '',
-                    'weight' => '1',
-                    'qty' => '50',
-                    'configurable_variations' => '',
-                    'associated_skus' => '',
-                    'bundle_shipment_type' => '',
-                    'bundle_values' => '',
-                    'bundle_price_type' => '',
-                    'bundle_price_view' => '',
-                    'bundle_sku_type' => '',
-                    'bundle_weight_type' => ''
-                ],
-            'data_1' =>
-                [
-                    'sku' => '%sku%',
-                    'attribute_set_code' => 'Default',
-                    'product_type' => "bundle",
-                    'name' => '%name%',
-                    'product_websites' => 'base',
-                    'price' => '50.00',
-                    'url_key' => '%url_key%',
-                    'additional_attributes' => '',
-                    'weight' => '30',
-                    'qty' => '50',
-                    'configurable_variations' => "",
-                    'associated_skus' => '%bundle_attribute_sku%',
-                    'bundle_shipment_type' => 'together',
-                    'bundle_values' => "name=Drop-down Option,type=select,required=1,sku=%bundle_attribute_sku%,"
-                        . "price=0.0000,default=0,default_qty=1.0000,price_type=dynamic",
-                    'bundle_price_type' => 'dynamic',
-                    'bundle_price_view' => 'Price range',
-                    'bundle_sku_type' => 'dynamic',
-                    'bundle_weight_type' => 'fixed'
-                ],
+    ],
+    'entity_2' => [
+        'data_0' => [
+            'sku' => '%grouped_attribute_sku%',
+            'attribute_set_code' => 'Default',
+            'product_type' => "simple",
+            'name' => '%grouped_attribute_name%',
+            'product_websites' => 'base',
+            'price' => '50.00',
+            'url_key' => '%grouped_attribute_url_key%',
+            'additional_attributes' => '',
+            'weight' => '1',
+            'qty' => '50',
+            'configurable_variations' => '',
+            'associated_skus' => '',
+            'bundle_shipment_type' => '',
+            'bundle_values' => '',
+            'bundle_price_type' => '',
+            'bundle_price_view' => '',
+            'bundle_sku_type' => '',
+            'bundle_weight_type' => ''
         ],
+        'data_1' => [
+            'sku' => '%sku%',
+            'attribute_set_code' => 'Default',
+            'product_type' => "grouped",
+            'name' => '%name%',
+            'product_websites' => 'base',
+            'price' => '50.00',
+            'url_key' => '%url_key%',
+            'additional_attributes' => '',
+            'weight' => '30',
+            'qty' => '50',
+            'configurable_variations' => "",
+            'associated_skus' => '%grouped_attribute_sku%=1.0000',
+            'bundle_shipment_type' => '',
+            'bundle_values' => '',
+            'bundle_price_type' => '',
+            'bundle_price_view' => '',
+            'bundle_sku_type' => '',
+            'bundle_weight_type' => ''
+        ],
+    ],
+    'entity_3' => [
+        'data_0' => [
+            'sku' => '%bundle_attribute_sku%',
+            'attribute_set_code' => 'Default',
+            'product_type' => "simple",
+            'name' => '%bundle_attribute_name%',
+            'product_websites' => 'base',
+            'price' => '50.00',
+            'url_key' => '%bundle_attribute_url_key%',
+            'additional_attributes' => '',
+            'weight' => '1',
+            'qty' => '50',
+            'configurable_variations' => '',
+            'associated_skus' => '',
+            'bundle_shipment_type' => '',
+            'bundle_values' => '',
+            'bundle_price_type' => '',
+            'bundle_price_view' => '',
+            'bundle_sku_type' => '',
+            'bundle_weight_type' => ''
+        ],
+        'data_1' => [
+            'sku' => '%sku%',
+            'attribute_set_code' => 'Default',
+            'product_type' => "bundle",
+            'name' => '%name%',
+            'product_websites' => 'base',
+            'price' => '50.00',
+            'url_key' => '%url_key%',
+            'additional_attributes' => '',
+            'weight' => '30',
+            'qty' => '50',
+            'configurable_variations' => "",
+            'associated_skus' => '%bundle_attribute_sku%',
+            'bundle_shipment_type' => 'together',
+            'bundle_values' => "name=Drop-down Option,type=select,required=1,sku=%bundle_attribute_sku%,"
+                . "price=0.0000,default=0,default_qty=1.0000,price_type=dynamic",
+            'bundle_price_type' => 'dynamic',
+            'bundle_price_view' => 'Price range',
+            'bundle_sku_type' => 'dynamic',
+            'bundle_weight_type' => 'fixed'
+        ],
+    ],
 ];
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodAvailableInCart.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodAvailableInCart.php
index 750022d078e99..3dfb3bc195dd0 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodAvailableInCart.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertShippingMethodAvailableInCart.php
@@ -28,7 +28,6 @@ class AssertShippingMethodAvailableInCart extends AbstractConstraint
      */
     public function processAssert(CheckoutCart $checkoutCart, array $shippingExists, $requireReload = true)
     {
-
         if ($requireReload) {
             $checkoutCart->open();
         }
@@ -40,7 +39,6 @@ public function processAssert(CheckoutCart $checkoutCart, array $shippingExists,
             ),
             $shippingExists['exists']
         );
-
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
index e30c049d3bcac..5572c06816a39 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
@@ -69,7 +69,6 @@ public function fillProductData(array $data, $products = null)
         $data = $this->prepareData($data);
         if (isset($data['items_data']) && $products !== null) {
             foreach ($data['items_data'] as $key => $item) {
-
                 $productSku = is_array($products[$key]) ?  $products[$key]['sku'] : $products[$key]->getData()['sku'];
                 $this->getItemsBlock()->getItemProductBlock($productSku)->fillProduct($item);
             }
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithSpecialPriceCalculatorTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithSpecialPriceCalculatorTest.php
index 5979967029afb..0e21bcf8369f7 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithSpecialPriceCalculatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/DynamicBundleWithSpecialPriceCalculatorTest.php
@@ -65,7 +65,6 @@ public function testPriceForDynamicBundle(array $strategyModifiers, array $expec
         $this->assertEquals($expectedResults['indexerMinimalPrice'], $priceInfoFromIndexer->getMinimalPrice());
 
         $this->assertEquals($expectedResults['indexerMaximumPrice'], $priceInfoFromIndexer->getMaxPrice());
-
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/OptionsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/OptionsTest.php
index 8f37cf47f463e..b27cbf9d092d4 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/OptionsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/OptionsTest.php
@@ -112,8 +112,8 @@ public function testGetJsonConfig()
     private function getExpectedJsonConfig()
     {
         return [
-            0 =>
-                ['prices' =>
+            0 => [
+                'prices' =>
                     ['oldPrice' =>
                         ['amount' => 10, 'adjustments' => []],
                         'basePrice' => ['amount' => 10],
@@ -121,9 +121,9 @@ private function getExpectedJsonConfig()
                     ],
                     'type' => 'fixed',
                     'name' => 'drop_down option 1',
-                ],
-            1 =>
-                ['prices' =>
+            ],
+            1 => [
+                'prices' =>
                     ['oldPrice' =>
                         ['amount' => 40, 'adjustments' => []],
                         'basePrice' => ['amount' => 40],
@@ -131,7 +131,7 @@ private function getExpectedJsonConfig()
                     ],
                     'type' => 'percent',
                     'name' => 'drop_down option 2',
-                ],
+            ],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/_files/expected_categories.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/_files/expected_categories.php
index d00f63a44bbd2..744d368a467d5 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/_files/expected_categories.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/_files/expected_categories.php
@@ -12,78 +12,67 @@
             'label' => 'Default Category',
             'optgroup' =>
                 [
-                    0 =>
-                        [
-                            'value' => '3',
-                            'is_active' => '1',
-                            'label' => 'Category 1',
-                            'optgroup' =>
-                                [
-                                    0 =>
-                                        [
-                                            'value' => '4',
-                                            'is_active' => '1',
-                                            'label' => 'Category 1.1',
-                                            'optgroup' =>
-                                                [
-                                                    0 =>
-                                                        [
-                                                            'value' => '5',
-                                                            'is_active' => '1',
-                                                            'label' => 'Category 1.1.1',
-                                                        ],
-                                                ],
-                                        ],
-                                    1 =>
-                                        [
-                                            'value' => '13',
-                                            'is_active' => '1',
-                                            'label' => 'Category 1.2',
-                                        ],
-                                ],
-                        ],
-                    1 =>
-                        [
-                            'value' => '6',
-                            'is_active' => '1',
-                            'label' => 'Category 2',
-                        ],
-                    2 =>
-                        [
-                            'value' => '7',
-                            'is_active' => '1',
-                            'label' => 'Movable',
-                        ],
-                    3 =>
-                        [
-                            'value' => '8',
-                            'is_active' => '0',
-                            'label' => 'Inactive',
-                        ],
-                    4 =>
-                        [
-                            'value' => '9',
-                            'is_active' => '1',
-                            'label' => 'Movable Position 1',
-                        ],
-                    5 =>
-                        [
-                            'value' => '10',
-                            'is_active' => '1',
-                            'label' => 'Movable Position 2',
-                        ],
-                    6 =>
-                        [
-                            'value' => '11',
-                            'is_active' => '1',
-                            'label' => 'Movable Position 3',
-                        ],
-                    7 =>
-                        [
-                            'value' => '12',
-                            'is_active' => '1',
-                            'label' => 'Category 12',
+                    0 => [
+                        'value' => '3',
+                        'is_active' => '1',
+                        'label' => 'Category 1',
+                        'optgroup' => [
+                            0 => [
+                                'value' => '4',
+                                'is_active' => '1',
+                                'label' => 'Category 1.1',
+                                'optgroup' =>
+                                    [
+                                        0 =>
+                                            [
+                                                'value' => '5',
+                                                'is_active' => '1',
+                                                'label' => 'Category 1.1.1',
+                                            ],
+                                    ],
+                            ],
+                            1 => [
+                                'value' => '13',
+                                'is_active' => '1',
+                                'label' => 'Category 1.2',
+                            ],
                         ],
+                    ],
+                    1 => [
+                        'value' => '6',
+                        'is_active' => '1',
+                        'label' => 'Category 2',
+                    ],
+                    2 => [
+                        'value' => '7',
+                        'is_active' => '1',
+                        'label' => 'Movable',
+                    ],
+                    3 => [
+                        'value' => '8',
+                        'is_active' => '0',
+                        'label' => 'Inactive',
+                    ],
+                    4 => [
+                        'value' => '9',
+                        'is_active' => '1',
+                        'label' => 'Movable Position 1',
+                    ],
+                    5 => [
+                        'value' => '10',
+                        'is_active' => '1',
+                        'label' => 'Movable Position 2',
+                    ],
+                    6 => [
+                        'value' => '11',
+                        'is_active' => '1',
+                        'label' => 'Movable Position 3',
+                    ],
+                    7 => [
+                        'value' => '12',
+                        'is_active' => '1',
+                        'label' => 'Category 12',
+                    ],
                 ],
         ],
 ];
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/_files/input_meta_for_categories.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/_files/input_meta_for_categories.php
index 11286b0a2f8f2..e39aae556d1eb 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/_files/input_meta_for_categories.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/_files/input_meta_for_categories.php
@@ -10,47 +10,45 @@
             'children' =>
                 ['container_category_ids' =>
                     [
-                        'arguments' =>
-                            [
-                                'data' =>
-                                    [
-                                        'config' =>
-                                            [
-                                                'formElement' => 'container',
-                                                'componentType' => 'container',
-                                                'breakLine' => false,
-                                                'label' => 'Categories',
-                                                'required' => '0',
-                                                'sortOrder' => 70,
-                                            ],
-                                    ],
-                            ],
-                        'children' =>
-                            [
-                                'category_ids' =>
-                                    [
-                                        'arguments' =>
-                                            [
-                                                'data' =>
-                                                    [
-                                                        'config' =>
-                                                            [
-                                                                'dataType' => 'text',
-                                                                'formElement' => 'input',
-                                                                'visible' => '1',
-                                                                'required' => '0',
-                                                                'notice' => null,
-                                                                'default' => null,
-                                                                'label' => 'Categories',
-                                                                'code' => 'category_ids',
-                                                                'source' => 'product-details',
-                                                                'scopeLabel' => '[GLOBAL]',
-                                                                'globalScope' => true,
-                                                                'sortOrder' => 70,
-                                                                'componentType' => 'field',
-                                                            ],
-                                                    ],
-                                            ],
-                                    ],
-                            ],
+                        'arguments' => [
+                            'data' =>
+                                [
+                                    'config' =>
+                                        [
+                                            'formElement' => 'container',
+                                            'componentType' => 'container',
+                                            'breakLine' => false,
+                                            'label' => 'Categories',
+                                            'required' => '0',
+                                            'sortOrder' => 70,
+                                        ],
+                                ],
+                        ],
+                        'children' => [
+                            'category_ids' =>
+                                [
+                                    'arguments' =>
+                                        [
+                                            'data' =>
+                                                [
+                                                    'config' =>
+                                                        [
+                                                            'dataType' => 'text',
+                                                            'formElement' => 'input',
+                                                            'visible' => '1',
+                                                            'required' => '0',
+                                                            'notice' => null,
+                                                            'default' => null,
+                                                            'label' => 'Categories',
+                                                            'code' => 'category_ids',
+                                                            'source' => 'product-details',
+                                                            'scopeLabel' => '[GLOBAL]',
+                                                            'globalScope' => true,
+                                                            'sortOrder' => 70,
+                                                            'componentType' => 'field',
+                                                        ],
+                                                ],
+                                        ],
+                                ],
+                        ],
                     ]]]];
diff --git a/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/Checkout/Plugin/GuestValidationTest.php b/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/Checkout/Plugin/GuestValidationTest.php
index c43c247d415d0..8b9241fb463f4 100644
--- a/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/Checkout/Plugin/GuestValidationTest.php
+++ b/dev/tests/integration/testsuite/Magento/CheckoutAgreements/Model/Checkout/Plugin/GuestValidationTest.php
@@ -146,7 +146,6 @@ public function testBeforeSavePaymentInformationAndPlaceOrder($agreementNames)
                 $e->getMessage()
             );
         }
-
     }
 
     public function dataProvider()
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
index d74191c52b14f..a14a4a683d6c8 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
@@ -10,6 +10,7 @@
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\Phrase;
 use Magento\Setup\Module\I18n\Locale;
+use Magento\Theme\Block\Html\Footer;
 
 /**
  * @magentoAppIsolation enabled
@@ -56,12 +57,12 @@ public function testViewDirective()
      */
     public function testBlockDirective()
     {
-        $class = 'Magento\\\\Theme\\\\Block\\\\Html\\\\Footer';
-        $data = ["{{block class='$class' name='test.block' template='Magento_Theme::html/footer.phtml'}}",
-                'block',
-                " class='$class' name='test.block' template='Magento_Theme::html/footer.phtml'",
-
-            ];
+        $class = Footer::class;
+        $data = [
+            "{{block class='$class' name='test.block' template='Magento_Theme::html/footer.phtml'}}",
+            'block',
+            " class='$class' name='test.block' template='Magento_Theme::html/footer.phtml'",
+        ];
         $html = $this->model->blockDirective($data);
         $this->assertContains('<div class="footer-container">', $html);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
index ae9d6b07491b1..8586f47a0f7fa 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/search_request_merged.php
@@ -4,307 +4,246 @@
  * See COPYING.txt for license details.
  */
 return [
-    'bool_query' =>
-        [
-            'dimensions' =>
+    'bool_query' => [
+        'dimensions' => [
+            'scope' =>
                 [
-                    'scope' =>
-                        [
-                            'name' => 'scope',
-                            'value' => 'default_override',
-                        ],
+                    'name' => 'scope',
+                    'value' => 'default_override',
                 ],
-            'queries' =>
-                [
-                    'bool_query' =>
-                        [
-                            'name' => 'bool_query',
-                            'boost' => '10',
-                            'queryReference' =>
-                                [
-                                    0 =>
-                                        [
-                                            'clause' => 'must',
-                                            'ref' => 'must_query',
-                                        ],
-                                    1 =>
-                                        [
-                                            'clause' => 'should',
-                                            'ref' => 'should_query',
-                                        ],
-                                    2 =>
-                                        [
-                                            'clause' => 'not',
-                                            'ref' => 'not_query',
-                                        ],
-                                ],
-                            'type' => 'boolQuery',
-                        ],
-                    'match_query' =>
-                        [
-                            'value' => '$match_term_override$',
-                            'name' => 'match_query',
-                            'match' =>
-                                [
-                                    0 =>
-                                        [
-                                            'field' => 'match_field',
-                                        ],
-                                    1 =>
-                                        [
-                                            'field' => '*',
-                                        ],
-                                    2 =>
-                                        [
-                                            'field' => 'match_field_3',
-                                        ],
-                                ],
-                            'type' => 'matchQuery',
-                        ],
-                    'must_query' =>
-                        [
-                            'name' => 'must_query',
-                            'filterReference' =>
-                                [
-                                    0 =>
-                                        [
-                                            'clause' => 'must',
-                                            'ref' => 'must_filter',
-                                        ],
-                                ],
-                            'type' => 'filteredQuery',
-                        ],
-                    'should_query' =>
-                        [
-                            'name' => 'should_query',
-                            'filterReference' =>
-                                [
-                                    0 =>
-                                        [
-                                            'clause' => 'should',
-                                            'ref' => 'should_filter',
-                                        ],
-                                ],
-                            'type' => 'filteredQuery',
-                        ],
-                    'not_query' =>
-                        [
-                            'name' => 'not_query',
-                            'filterReference' =>
-                                [
-                                    0 =>
-                                        [
-                                            'clause' => 'not',
-                                            'ref' => 'not_filter',
-                                        ],
-                                ],
-                            'type' => 'filteredQuery',
-                        ],
-                    'match_query_2' =>
-                        [
-                            'value' => '$match_term_override$',
-                            'name' => 'match_query_2',
-                            'match' =>
-                                [
-                                    0 =>
-                                        [
-                                            'field' => 'match_field_4',
-                                        ],
-                                ],
-                            'type' => 'matchQuery',
-                        ],
+        ],
+        'queries' => [
+            'bool_query' => [
+                'name' => 'bool_query',
+                'boost' => '10',
+                'queryReference' => [
+                    0 => [
+                        'clause' => 'must',
+                        'ref' => 'must_query',
+                    ],
+                    1 => [
+                        'clause' => 'should',
+                        'ref' => 'should_query',
+                    ],
+                    2 => [
+                        'clause' => 'not',
+                        'ref' => 'not_query',
+                    ],
                 ],
-            'filters' =>
-                [
-                    'must_filter' =>
-                        [
-                            'name' => 'must_filter',
-                            'field' => 'field_1_override',
-                            'value' => '$value_1_override$',
-                            'type' => 'termFilter',
-                        ],
-                    'should_filter' =>
-                        [
-                            'name' => 'should_filter',
-                            'field' => 'field_2_override',
-                            'from' => '$value_2_override.from$',
-                            'to' => '$value_2_override.to$',
-                            'type' => 'rangeFilter',
-                        ],
-                    'not_filter' =>
-                        [
-                            'name' => 'not_filter',
-                            'field' => 'field_3_override',
-                            'value' => '$field_3_override$',
-                            'type' => 'wildcardFilter',
-                        ],
+                'type' => 'boolQuery',
+            ],
+            'match_query' => [
+                'value' => '$match_term_override$',
+                'name' => 'match_query',
+                'match' => [
+                    0 => [
+                        'field' => 'match_field',
+                    ],
+                    1 => [
+                        'field' => '*',
+                    ],
+                    2 => [
+                        'field' => 'match_field_3',
+                    ],
                 ],
-            'aggregations' =>
-                [
-                    'bucket_1' =>
-                        [
-                            'name' => 'bucket_1',
-                            'field' => 'field_1_override',
-                            'method' => '$field_1_dynamic_algorithm_override$',
-                            'metric' =>
-                                [
-                                    0 =>
-                                        [
-                                            'type' => 'count',
-                                        ],
-                                ],
-                            'type' => 'dynamicBucket',
-                        ],
-                    'bucket_2' =>
-                        [
-                            'name' => 'bucket_2',
-                            'field' => 'field_2_override',
-                            'metric' =>
-                                [
-                                    0 =>
-                                        [
-                                            'type' => 'count',
-                                        ],
-                                ],
-                            'type' => 'termBucket',
-                        ],
-                    'bucket_3' =>
-                        [
-                            'name' => 'bucket_3',
-                            'field' => 'field_2_override',
-                            'range' =>
-                                [
-                                    0 =>
-                                        [
-                                            'from' => '$value_2_override.from$',
-                                            'to' => 'value_2_override.to$',
-                                        ],
-                                ],
-                            'type' => 'rangeBucket',
-                        ],
+                'type' => 'matchQuery',
+            ],
+            'must_query' => [
+                'name' => 'must_query',
+                'filterReference' =>  [
+                    0 => [
+                        'clause' => 'must',
+                        'ref' => 'must_filter',
+                    ],
+                ],
+                'type' => 'filteredQuery',
+            ],
+            'should_query' => [
+                'name' => 'should_query',
+                'filterReference' => [
+                    0 => [
+                        'clause' => 'should',
+                        'ref' => 'should_filter',
+                    ],
                 ],
-            'from' => '0',
-            'size' => '10000',
-            'query' => 'bool_query',
-            'index' => 'bool_query_index_override',
+                'type' => 'filteredQuery',
+            ],
+            'not_query' => [
+                'name' => 'not_query',
+                'filterReference' => [
+                    0 => [
+                        'clause' => 'not',
+                        'ref' => 'not_filter',
+                    ],
+                ],
+                'type' => 'filteredQuery',
+            ],
+            'match_query_2' => [
+                'value' => '$match_term_override$',
+                'name' => 'match_query_2',
+                'match' => [
+                    0 => [
+                        'field' => 'match_field_4',
+                    ],
+                ],
+                'type' => 'matchQuery',
+            ],
         ],
-    'filter_query' =>
-        [
-            'dimensions' =>
-                [
-                    'scope' =>
+        'filters' => [
+            'must_filter' => [
+                'name' => 'must_filter',
+                'field' => 'field_1_override',
+                'value' => '$value_1_override$',
+                'type' => 'termFilter',
+            ],
+            'should_filter' => [
+                'name' => 'should_filter',
+                'field' => 'field_2_override',
+                'from' => '$value_2_override.from$',
+                'to' => '$value_2_override.to$',
+                'type' => 'rangeFilter',
+            ],
+            'not_filter' => [
+                'name' => 'not_filter',
+                'field' => 'field_3_override',
+                'value' => '$field_3_override$',
+                'type' => 'wildcardFilter',
+            ],
+        ],
+        'aggregations' => [
+            'bucket_1' => [
+                'name' => 'bucket_1',
+                'field' => 'field_1_override',
+                'method' => '$field_1_dynamic_algorithm_override$',
+                'metric' => [
+                    0 =>
                         [
-                            'name' => 'scope',
-                            'value' => 'default_override',
+                            'type' => 'count',
                         ],
                 ],
-            'queries' =>
-                [
-                    'filter_query' =>
+                'type' => 'dynamicBucket',
+            ],
+            'bucket_2' => [
+                'name' => 'bucket_2',
+                'field' => 'field_2_override',
+                'metric' => [
+                    0 =>
                         [
-                            'name' => 'filter_query',
-                            'filterReference' =>
-                                [
-                                    0 =>
-                                        [
-                                            'clause' => 'must',
-                                            'ref' => 'bool_filter',
-                                        ],
-                                ],
-                            'type' => 'filteredQuery',
+                            'type' => 'count',
                         ],
                 ],
-            'filters' =>
-                [
-                    'bool_filter' =>
-                        [
-                            'name' => 'bool_filter',
-                            'filterReference' =>
-                                [
-                                    0 =>
-                                        [
-                                            'clause' => 'must',
-                                            'ref' => 'must_filter',
-                                        ],
-                                    1 =>
-                                        [
-                                            'clause' => 'should',
-                                            'ref' => 'should_filter',
-                                        ],
-                                    2 =>
-                                        [
-                                            'clause' => 'not',
-                                            'ref' => 'not_filter',
-                                        ],
-                                ],
-                            'type' => 'boolFilter',
-                        ],
-                    'must_filter' =>
-                        [
-                            'name' => 'must_filter',
-                            'field' => 'field_1',
-                            'value' => '$value_1$',
-                            'type' => 'termFilter',
-                        ],
-                    'should_filter' =>
+                'type' => 'termBucket',
+            ],
+            'bucket_3' => [
+                'name' => 'bucket_3',
+                'field' => 'field_2_override',
+                'range' => [
+                    0 =>
                         [
-                            'name' => 'should_filter',
-                            'field' => 'field_2',
-                            'from' => '$value_2.from$',
-                            'to' => '$value_2.to$',
-                            'type' => 'rangeFilter',
-                        ],
-                    'not_filter' =>
-                        [
-                            'name' => 'not_filter',
-                            'field' => 'field_3',
-                            'value' => '$field_3$',
-                            'type' => 'wildcardFilter',
+                            'from' => '$value_2_override.from$',
+                            'to' => 'value_2_override.to$',
                         ],
                 ],
-            'from' => '0',
-            'size' => '10000',
-            'query' => 'filter_query',
-            'index' => 'filter_query_index_override',
-            'aggregations' =>
+                'type' => 'rangeBucket',
+            ],
+        ],
+        'from' => '0',
+        'size' => '10000',
+        'query' => 'bool_query',
+        'index' => 'bool_query_index_override',
+    ],
+    'filter_query' => [
+        'dimensions' => [
+            'scope' =>
                 [
+                    'name' => 'scope',
+                    'value' => 'default_override',
                 ],
         ],
-    'new_match_query' =>
-        [
-            'dimensions' =>
-                [
-                    'scope' =>
+        'queries' => [
+            'filter_query' => [
+                'name' => 'filter_query',
+                'filterReference' => [
+                    0 =>
                         [
-                            'name' => 'scope',
-                            'value' => 'new',
+                            'clause' => 'must',
+                            'ref' => 'bool_filter',
                         ],
                 ],
-            'queries' =>
-                [
-                    'new_match_query' =>
-                        [
-                            'value' => '$match_term$',
-                            'name' => 'new_match_query',
-                            'match' =>
-                                [
-                                    0 =>
-                                        [
-                                            'field' => 'new_match_field',
-                                        ],
-                                ],
-                            'type' => 'matchQuery',
-                        ],
+                'type' => 'filteredQuery',
+            ],
+        ],
+        'filters' => [
+            'bool_filter' => [
+                'name' => 'bool_filter',
+                'filterReference' => [
+                    0 => [
+                        'clause' => 'must',
+                        'ref' => 'must_filter',
+                    ],
+                    1 => [
+                        'clause' => 'should',
+                        'ref' => 'should_filter',
+                    ],
+                    2 => [
+                        'clause' => 'not',
+                        'ref' => 'not_filter',
+                    ],
                 ],
-            'filters' =>
+                'type' => 'boolFilter',
+            ],
+            'must_filter' => [
+                'name' => 'must_filter',
+                'field' => 'field_1',
+                'value' => '$value_1$',
+                'type' => 'termFilter',
+            ],
+            'should_filter' => [
+                'name' => 'should_filter',
+                'field' => 'field_2',
+                'from' => '$value_2.from$',
+                'to' => '$value_2.to$',
+                'type' => 'rangeFilter',
+            ],
+            'not_filter' => [
+                'name' => 'not_filter',
+                'field' => 'field_3',
+                'value' => '$field_3$',
+                'type' => 'wildcardFilter',
+            ],
+        ],
+        'from' => '0',
+        'size' => '10000',
+        'query' => 'filter_query',
+        'index' => 'filter_query_index_override',
+        'aggregations' => [],
+    ],
+    'new_match_query' => [
+        'dimensions' => [
+            'scope' =>
                 [
+                    'name' => 'scope',
+                    'value' => 'new',
                 ],
-            'from' => '0',
-            'size' => '10000',
-            'query' => 'new_match_query',
-            'index' => 'new_query_index',
-            'aggregations' =>
-                [
+        ],
+        'queries' => [
+            'new_match_query' => [
+                'value' => '$match_term$',
+                'name' => 'new_match_query',
+                'match' => [
+                    0 =>
+                        [
+                            'field' => 'new_match_field',
+                        ],
                 ],
+                'type' => 'matchQuery',
+            ],
         ],
+        'filters' => [],
+        'from' => '0',
+        'size' => '10000',
+        'query' => 'new_match_query',
+        'index' => 'new_query_index',
+        'aggregations' => [],
+    ],
 ];
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/DateTime/Filter/DataTest.php b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/DateTime/Filter/DataTest.php
index 8efe8f18f2f35..03b63f75922bb 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/DateTime/Filter/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/DateTime/Filter/DataTest.php
@@ -3,10 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Framework\Stdlib\DateTime\Filter;
 
-
 class DataTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Indexer/Model/Config/_files/result.php b/dev/tests/integration/testsuite/Magento/Indexer/Model/Config/_files/result.php
index 4c89de7de495f..bb4869cf2bd5c 100644
--- a/dev/tests/integration/testsuite/Magento/Indexer/Model/Config/_files/result.php
+++ b/dev/tests/integration/testsuite/Magento/Indexer/Model/Config/_files/result.php
@@ -5,76 +5,69 @@
  */
 
 return [
-    'catalogsearch_fulltext' =>
-        [
-            'indexer_id' => 'catalogsearch_fulltext',
-            'shared_index' => null,
-            'primary' => 'first',
-            'view_id' => 'catalogsearch_fulltext',
-            'action_class' => \Magento\CatalogSearch\Model\Indexer\Fulltext::class,
-            'title' => __('Catalog Search'),
-            'description' => __('Rebuild Catalog product fulltext search index'),
-            'fieldsets' =>
-                [
-                    [
-                        'source' => 'MagentoModule\\ServiceClassOrRepositoryClass',
-                        'name' => 'first',
-                        'provider' => \Magento\Indexer\Model\Fieldset\ProductFieldset::class,
-                        'fields' =>
+    'catalogsearch_fulltext' =>  [
+        'indexer_id' => 'catalogsearch_fulltext',
+        'shared_index' => null,
+        'primary' => 'first',
+        'view_id' => 'catalogsearch_fulltext',
+        'action_class' => \Magento\CatalogSearch\Model\Indexer\Fulltext::class,
+        'title' => __('Catalog Search'),
+        'description' => __('Rebuild Catalog product fulltext search index'),
+        'fieldsets' => [
+            [
+                'source' => 'MagentoModule\\ServiceClassOrRepositoryClass',
+                'name' => 'first',
+                'provider' => \Magento\Indexer\Model\Fieldset\ProductFieldset::class,
+                'fields' => [
+                    'title_alias' => [
+                        'name' => 'title_alias',
+                        'handler' => null,
+                        'origin' => 'title',
+                        'dataType' => 'text',
+                        'type' => 'searchable',
+                        'filters' =>
                             [
-                                'title_alias' =>
-                                    [
-                                        'name' => 'title_alias',
-                                        'handler' => null,
-                                        'origin' => 'title',
-                                        'dataType' => 'text',
-                                        'type' => 'searchable',
-                                        'filters' =>
-                                            [
-                                                0 => \Magento\Framework\Search\Index\Filter\LowercaseFilter::class,
-                                            ],
-                                    ],
-                                'identifier' =>
-                                    [
-                                        'name' => 'identifier',
-                                        'handler' => \Magento\Framework\Search\Index\Handler::class,
-                                        'origin' => 'identifier',
-                                        'dataType' => null,
-                                        'type' => 'filterable',
-                                        'filters' =>
-                                            [],
-                                    ],
+                                0 => \Magento\Framework\Search\Index\Filter\LowercaseFilter::class,
                             ],
                     ],
-                    [
-                        'source' => 'MagentoModule\\ServiceClassOrRepositoryClass',
-                        'name' => 'second',
-                        'provider' => null,
-                        'fields' =>
-                            [
-                                'title' =>
-                                    [
-                                        'name' => 'title',
-                                        'handler' => null,
-                                        'origin' => 'title',
-                                        'dataType' => null,
-                                        'type' => 'searchable',
-                                        'filters' =>
-                                            [],
-                                    ],
-                            ],
-                        'references' =>
-                            [
-                                'first' =>
-                                    [
-                                        'fieldset' => 'first',
-                                        'from' => 'id_field',
-                                        'to' => 'second_entity_id',
-                                    ]
-                            ],
+                    'identifier' => [
+                        'name' => 'identifier',
+                        'handler' => \Magento\Framework\Search\Index\Handler::class,
+                        'origin' => 'identifier',
+                        'dataType' => null,
+                        'type' => 'filterable',
+                        'filters' =>
+                            [],
                     ],
                 ],
-            'saveHandler' => \Magento\Cms\Model\Indexer\StoreResource::class,
-            'structure' => \Magento\Cms\Model\Indexer\IndexStructure::class,
+            ],
+            [
+                'source' => 'MagentoModule\\ServiceClassOrRepositoryClass',
+                'name' => 'second',
+                'provider' => null,
+                'fields' => [
+                    'title' =>
+                        [
+                            'name' => 'title',
+                            'handler' => null,
+                            'origin' => 'title',
+                            'dataType' => null,
+                            'type' => 'searchable',
+                            'filters' =>
+                                [],
+                        ],
+                ],
+                'references' => [
+                    'first' =>
+                        [
+                            'fieldset' => 'first',
+                            'from' => 'id_field',
+                            'to' => 'second_entity_id',
+                        ]
+                ],
+            ],
         ],
+        'saveHandler' => \Magento\Cms\Model\Indexer\StoreResource::class,
+        'structure' => \Magento\Cms\Model\Indexer\IndexStructure::class,
+    ],
 ];
diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotations/Helper.php b/dev/tests/static/framework/Magento/Sniffs/Annotations/Helper.php
deleted file mode 100644
index 90d6f10db76f1..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/Annotations/Helper.php
+++ /dev/null
@@ -1,576 +0,0 @@
-<?php
-namespace Magento\Sniffs\Annotations;
-
-use PHP_CodeSniffer;
-use PHP_CodeSniffer_File;
-
-/**
- * Base of the annotations sniffs
- *
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- *
- * @SuppressWarnings(PHPMD)
- */
-class Helper
-{
-    const ERROR_PARSING = 'ErrorParsing';
-
-    const AMBIGUOUS_TYPE = 'AmbiguousType';
-
-    const MISSING = 'Missing';
-
-    const WRONG_STYLE = 'WrongStyle';
-
-    const WRONG_END = 'WrongEnd';
-
-    const FAILED_PARSE = 'FailedParse';
-
-    const CONTENT_AFTER_OPEN = 'ContentAfterOpen';
-
-    const MISSING_SHORT = 'MissingShort';
-
-    const EMPTY_DOC = 'Empty';
-
-    const SPACING_BETWEEN = 'SpacingBetween';
-
-    const SPACING_BEFORE_SHORT = 'SpacingBeforeShort';
-
-    const SPACING_BEFORE_TAGS = 'SpacingBeforeTags';
-
-    const SHORT_SINGLE_LINE = 'ShortSingleLine';
-
-    const SHORT_NOT_CAPITAL = 'ShortNotCapital';
-
-    const SHORT_FULL_STOP = 'ShortFullStop';
-
-    const SPACING_AFTER = 'SpacingAfter';
-
-    const SEE_ORDER = 'SeeOrder';
-
-    const EMPTY_SEE = 'EmptySee';
-
-    const SEE_INDENT = 'SeeIndent';
-
-    const DUPLICATE_RETURN = 'DuplicateReturn';
-
-    const MISSING_PARAM_TAG = 'MissingParamTag';
-
-    const SPACING_AFTER_LONG_NAME = 'SpacingAfterLongName';
-
-    const SPACING_AFTER_LONG_TYPE = 'SpacingAfterLongType';
-
-    const MISSING_PARAM_TYPE = 'MissingParamType';
-
-    const MISSING_PARAM_NAME = 'MissingParamName';
-
-    const EXTRA_PARAM_COMMENT = 'ExtraParamComment';
-
-    const PARAM_NAME_NO_MATCH = 'ParamNameNoMatch';
-
-    const PARAM_NAME_NO_CASE_MATCH = 'ParamNameNoCaseMatch';
-
-    const INVALID_TYPE_HINT = 'InvalidTypeHint';
-
-    const INCORRECT_TYPE_HINT = 'IncorrectTypeHint';
-
-    const TYPE_HINT_MISSING = 'TypeHintMissing';
-
-    const INCORRECT_PARAM_VAR_NAME = 'IncorrectParamVarName';
-
-    const RETURN_ORDER = 'ReturnOrder';
-
-    const MISSING_RETURN_TYPE = 'MissingReturnType';
-
-    const INVALID_RETURN = 'InvalidReturn';
-
-    const INVALID_RETURN_VOID = 'InvalidReturnVoid';
-
-    const INVALID_NO_RETURN = 'InvalidNoReturn';
-
-    const INVALID_RETURN_NOT_VOID = 'InvalidReturnNotVoid';
-
-    const INCORRECT_INHERIT_DOC = 'IncorrectInheritDoc';
-
-    const RETURN_INDENT = 'ReturnIndent';
-
-    const MISSING_RETURN = 'MissingReturn';
-
-    const RETURN_NOT_REQUIRED = 'ReturnNotRequired';
-
-    const INVALID_THROWS = 'InvalidThrows';
-
-    const THROWS_NOT_CAPITAL = 'ThrowsNotCapital';
-
-    const THROWS_ORDER = 'ThrowsOrder';
-
-    const EMPTY_THROWS = 'EmptyThrows';
-
-    const THROWS_NO_FULL_STOP = 'ThrowsNoFullStop';
-
-    const SPACING_AFTER_PARAMS = 'SpacingAfterParams';
-
-    const SPACING_BEFORE_PARAMS = 'SpacingBeforeParams';
-
-    const SPACING_BEFORE_PARAM_TYPE = 'SpacingBeforeParamType';
-
-    const LONG_NOT_CAPITAL = 'LongNotCapital';
-
-    const TAG_NOT_ALLOWED = 'TagNotAllowed';
-
-    const DUPLICATE_VAR = 'DuplicateVar';
-
-    const VAR_ORDER = 'VarOrder';
-
-    const MISSING_VAR_TYPE = 'MissingVarType';
-
-    const INCORRECT_VAR_TYPE = 'IncorrectVarType';
-
-    const VAR_INDENT = 'VarIndent';
-
-    const MISSING_VAR = 'MissingVar';
-
-    const MISSING_PARAM_COMMENT = 'MissingParamComment';
-
-    const PARAM_COMMENT_NOT_CAPITAL = 'ParamCommentNotCapital';
-
-    const PARAM_COMMENT_FULL_STOP = 'ParamCommentFullStop';
-
-    // tells phpcs to use the default level
-    const ERROR = 0;
-
-    // default level of warnings is 5
-    const WARNING = 6;
-
-    const INFO = 2;
-
-    // Lowest possible level.
-    const OFF = 1;
-
-    const LEVEL = 'level';
-
-    const MESSAGE = 'message';
-
-    /**
-     * Map of Error Type to Error Severity
-     *
-     * @var array
-     */
-    protected static $reportingLevel = [
-        self::ERROR_PARSING => [self::LEVEL => self::ERROR, self::MESSAGE => '%s'],
-        self::FAILED_PARSE => [self::LEVEL => self::ERROR, self::MESSAGE => '%s'],
-        self::AMBIGUOUS_TYPE => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Ambiguous type "%s" for %s is NOT recommended',
-        ],
-        self::MISSING => [self::LEVEL => self::ERROR, self::MESSAGE => 'Missing %s doc comment'],
-        self::WRONG_STYLE => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'You must use "/**" style comments for a %s comment',
-        ],
-        self::WRONG_END => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'You must use "*/" to end a function comment; found "%s"',
-        ],
-        self::EMPTY_DOC => [self::LEVEL => self::WARNING, self::MESSAGE => '%s doc comment is empty'],
-        self::CONTENT_AFTER_OPEN => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'The open comment tag must be the only content on the line',
-        ],
-        self::MISSING_SHORT => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Missing short description in %s doc comment',
-        ],
-        self::SPACING_BETWEEN => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => 'There must be exactly one blank line between descriptions in %s comment',
-        ],
-        self::SPACING_BEFORE_SHORT => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Extra newline(s) found before %s comment short description',
-        ],
-        self::SPACING_BEFORE_TAGS => [
-            self::LEVEL => self::INFO,
-            self::MESSAGE => 'There must be exactly one blank line before the tags in %s comment',
-        ],
-        self::SHORT_SINGLE_LINE => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => '%s comment short description must be on a single line',
-        ],
-        self::SHORT_NOT_CAPITAL => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => '%s comment short description must start with a capital letter',
-        ],
-        self::SHORT_FULL_STOP => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => '%s comment short description must end with a full stop',
-        ],
-        self::SPACING_AFTER => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Additional blank lines found at end of %s comment',
-        ],
-        self::SEE_ORDER => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'The @see tag is in the wrong order; the tag precedes @return',
-        ],
-        self::EMPTY_SEE => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Content missing for @see tag in %s comment',
-        ],
-        self::SEE_INDENT => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => '@see tag indented incorrectly; expected 1 spaces but found %s',
-        ],
-        self::DUPLICATE_RETURN => [
-            self::LEVEL => self::ERROR,
-            self::MESSAGE => 'Only 1 @return tag is allowed in function comment',
-        ],
-        self::MISSING_PARAM_TAG => [self::LEVEL => self::ERROR, self::MESSAGE => 'Doc comment for "%s" missing'],
-        self::SPACING_AFTER_LONG_NAME => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => 'Expected 1 space after the longest variable name',
-        ],
-        self::SPACING_AFTER_LONG_TYPE => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => 'Expected 1 space after the longest type',
-        ],
-        self::MISSING_PARAM_TYPE => [self::LEVEL => self::ERROR, self::MESSAGE => 'Missing type at position %s'],
-        self::MISSING_PARAM_NAME => [
-            self::LEVEL => self::ERROR,
-            self::MESSAGE => 'Missing parameter name at position %s',
-        ],
-        self::EXTRA_PARAM_COMMENT => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Superfluous doc comment at position %s',
-        ],
-        self::PARAM_NAME_NO_MATCH => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Doc comment for var %s does not match actual variable name %s at position %s',
-        ],
-        self::PARAM_NAME_NO_CASE_MATCH => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Doc comment for var %s does not match case of actual variable name %s at position %s',
-        ],
-        self::INVALID_TYPE_HINT => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Unknown type hint "%s" found for %s at position %s',
-        ],
-        self::INCORRECT_TYPE_HINT => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Expected type hint "%s"; found "%s" for %s at position %s',
-        ],
-        self::TYPE_HINT_MISSING => [
-            self::LEVEL => self::INFO,
-            self::MESSAGE => 'Type hint "%s" missing for %s at position %s',
-        ],
-        self::INCORRECT_PARAM_VAR_NAME => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Expected "%s"; found "%s" for %s at position %s',
-        ],
-        self::RETURN_ORDER => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'The @return tag is in the wrong order; the tag follows @see (if used)',
-        ],
-        self::MISSING_RETURN_TYPE => [
-            self::LEVEL => self::ERROR,
-            self::MESSAGE => 'Return type missing for @return tag in function comment',
-        ],
-        self::INVALID_RETURN => [
-            self::LEVEL => self::ERROR,
-            self::MESSAGE => 'Function return type "%s" is invalid',
-        ],
-        self::INVALID_RETURN_VOID => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Function return type is void, but function contains return statement',
-        ],
-        self::INVALID_NO_RETURN => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Function return type is not void, but function has no return statement',
-        ],
-        self::INVALID_RETURN_NOT_VOID => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Function return type is not void, but function is returning void here',
-        ],
-        self::INCORRECT_INHERIT_DOC => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'The incorrect inherit doc tag usage. Should be {@inheritdoc}',
-        ],
-        self::RETURN_INDENT => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => '@return tag indented incorrectly; expected 1 space but found %s',
-        ],
-        self::MISSING_RETURN => [
-            self::LEVEL => self::ERROR,
-            self::MESSAGE => 'Missing @return tag in function comment',
-        ],
-        self::RETURN_NOT_REQUIRED => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => '@return tag is not required for constructor and destructor',
-        ],
-        self::INVALID_THROWS => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Exception type and comment missing for @throws tag in function comment',
-        ],
-        self::THROWS_NOT_CAPITAL => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => '@throws tag comment must start with a capital letter',
-        ],
-        self::THROWS_ORDER => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'The @throws tag is in the wrong order; the tag follows @return',
-        ],
-        self::EMPTY_THROWS => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => 'Comment missing for @throws tag in function comment',
-        ],
-        self::THROWS_NO_FULL_STOP => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => '@throws tag comment must end with a full stop',
-        ],
-        self::SPACING_AFTER_PARAMS => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => 'Last parameter comment requires a blank newline after it',
-        ],
-        self::SPACING_BEFORE_PARAMS => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Parameters must appear immediately after the comment',
-        ],
-        self::SPACING_BEFORE_PARAM_TYPE => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => 'Expected 1 space before variable type',
-        ],
-        self::LONG_NOT_CAPITAL => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => '%s comment long description must start with a capital letter',
-        ],
-        self::TAG_NOT_ALLOWED => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => '@%s tag is not allowed in variable comment',
-        ],
-        self::DUPLICATE_VAR => [
-            self::LEVEL => self::ERROR,
-            self::MESSAGE => 'Only 1 @var tag is allowed in variable comment',
-        ],
-        self::VAR_ORDER => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'The @var tag must be the first tag in a variable comment',
-        ],
-        self::MISSING_VAR_TYPE => [
-            self::LEVEL => self::ERROR,
-            self::MESSAGE => 'Var type missing for @var tag in variable comment',
-        ],
-        self::INCORRECT_VAR_TYPE => [
-            self::LEVEL => self::ERROR,
-            self::MESSAGE => 'Expected "%s"; found "%s" for @var tag in variable comment',
-        ],
-        self::VAR_INDENT => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => '@var tag indented incorrectly; expected 1 space but found %s',
-        ],
-        self::MISSING_VAR => [
-            self::LEVEL => self::WARNING,
-            self::MESSAGE => 'Missing @var tag in variable comment',
-        ],
-        self::MISSING_PARAM_COMMENT => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => 'Missing comment for param "%s" at position %s',
-        ],
-        self::PARAM_COMMENT_NOT_CAPITAL => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => 'Param comment must start with a capital letter',
-        ],
-        self::PARAM_COMMENT_FULL_STOP => [
-            self::LEVEL => self::OFF,
-            self::MESSAGE => 'Param comment must end with a full stop',
-        ],
-    ];
-
-    /**
-     * List of allowed types
-     *
-     * @var string[]
-     */
-    protected static $allowedTypes = [
-        'array',
-        'boolean',
-        'bool',
-        'float',
-        'integer',
-        'int',
-        'object',
-        'string',
-        'resource',
-        'callable',
-        'true',
-        'false',
-    ];
-
-    /**
-     * The current PHP_CodeSniffer_File object we are processing.
-     *
-     * @var PHP_CodeSniffer_File
-     */
-    protected $currentFile = null;
-
-    /**
-     * Constructor for class.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile
-     */
-    public function __construct(PHP_CodeSniffer_File $phpcsFile)
-    {
-        $this->currentFile = $phpcsFile;
-    }
-
-    /**
-     * Returns the current file object
-     *
-     * @return PHP_CodeSniffer_File
-     */
-    public function getCurrentFile()
-    {
-        return $this->currentFile;
-    }
-
-    /**
-     * Returns the eol character used in the file
-     *
-     * @return string
-     */
-    public function getEolChar()
-    {
-        return $this->currentFile->eolChar;
-    }
-
-    /**
-     * Returns the array of allowed types for magento standard
-     *
-     * @return string[]
-     */
-    public function getAllowedTypes()
-    {
-        return self::$allowedTypes;
-    }
-
-    /**
-     * This method will add the message as an error or warning depending on the configuration
-     *
-     * @param int    $stackPtr The stack position where the error occurred.
-     * @param string $code     A violation code unique to the sniff message.
-     * @param string[] $data     Replacements for the error message.
-     * @param int    $severity The severity level for this error. A value of 0
-     * @return void
-     */
-    public function addMessage($stackPtr, $code, $data = [], $severity = 0)
-    {
-        // Does the $code key exist in the report level
-        if (array_key_exists($code, self::$reportingLevel)) {
-            $message = self::$reportingLevel[$code][self::MESSAGE];
-            $level = self::$reportingLevel[$code][self::LEVEL];
-            if ($level === self::WARNING || $level === self::INFO || $level === self::OFF) {
-                $s = $level;
-                if ($severity !== 0) {
-                    $s = $severity;
-                }
-                $this->currentFile->addWarning($message, $stackPtr, $code, $data, $s);
-            } else {
-                $this->currentFile->addError($message, $stackPtr, $code, $data, $severity);
-            }
-        }
-    }
-
-    /**
-     * Returns if we should filter a particular file
-     *
-     * @return bool
-     */
-    public function shouldFilter()
-    {
-        $shouldFilter = false;
-        $filename = $this->getCurrentFile()->getFilename();
-        if (preg_match('#(?:/|\\\\)dev(?:/|\\\\)tests(?:/|\\\\)#', $filename)) {
-            // TODO: Temporarily blacklist anything in dev/tests until a sweep of dev/tests can be made.
-            //       This block of the if should be removed leaving only the phtml condition when dev/tests is swept.
-            // Skip all dev tests files
-            $shouldFilter = true;
-        } elseif (preg_match('#(?:/|\\\\)Test(?:/|\\\\)Unit(?:/|\\\\)#', $filename)) {
-            $shouldFilter = true;
-        } elseif (preg_match('/\\.phtml$/', $filename)) {
-            // Skip all phtml files
-            $shouldFilter = true;
-        }
-
-        return $shouldFilter;
-    }
-
-    /**
-     * Determine if text is a class name
-     *
-     * @param string $class
-     * @return bool
-     */
-    protected function isClassName($class)
-    {
-        $return = false;
-        if (preg_match('/^\\\\?[A-Z]\\w+(?:\\\\\\w+)*?$/', $class)) {
-            $return = true;
-        }
-        return $return;
-    }
-
-    /**
-     * Determine if the text has an ambiguous type
-     *
-     * @param string $text
-     * @param array &$matches Type that was detected as ambiguous is in result.
-     * @return bool
-     */
-    public function isAmbiguous($text, &$matches = [])
-    {
-        return preg_match('/(array|mixed)/', $text, $matches);
-    }
-
-    /**
-     * Take the type and suggest the correct one.
-     *
-     * @param string $type
-     * @return string
-     */
-    public function suggestType($type)
-    {
-        $suggestedName = null;
-        // First check to see if this type is a list of types. If so we break it up and check each
-        if (preg_match('/^.*?(?:\|.*)+$/', $type)) {
-            // Return list of all types in this string.
-            $types = explode('|', $type);
-            if (is_array($types)) {
-                // Loop over all types and call this method on each.
-                $suggestions = [];
-                foreach ($types as $t) {
-                    $suggestions[] = $this->suggestType($t);
-                }
-                // Now that we have suggestions put them back together.
-                $suggestedName = implode('|', $suggestions);
-            } else {
-                $suggestedName = 'Unknown';
-            }
-        } elseif ($this->isClassName($type)) {
-            // If this looks like a class name.
-            $suggestedName = $type;
-        } else {
-            // Only one type First check if that type is a base one.
-            $lowerVarType = strtolower($type);
-            if (in_array($lowerVarType, self::$allowedTypes)) {
-                $suggestedName = $lowerVarType;
-            }
-            // If no name suggested yet then call the phpcs version of this method.
-            if (empty($suggestedName)) {
-                $suggestedName = PHP_CodeSniffer::suggestType($type);
-            }
-        }
-        return $suggestedName;
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotations/RequireAnnotatedAttributesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Annotations/RequireAnnotatedAttributesSniff.php
deleted file mode 100644
index 98fc99a0e9b88..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/Annotations/RequireAnnotatedAttributesSniff.php
+++ /dev/null
@@ -1,357 +0,0 @@
-<?php
-namespace Magento\Sniffs\Annotations;
-
-use PHP_CodeSniffer_CommentParser_ClassCommentParser;
-use PHP_CodeSniffer_CommentParser_CommentElement;
-use PHP_CodeSniffer_CommentParser_MemberCommentParser;
-use PHP_CodeSniffer_CommentParser_ParserException;
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Standards_AbstractVariableSniff;
-
-include_once 'Helper.php';
-/**
- * Parses and verifies the variable doc comment.
- *
- * Verifies that :
- * <ul>
- *  <li>A variable doc comment exists.</li>
- *  <li>Short description ends with a full stop.</li>
- *  <li>There is a blank line after the short description.</li>
- *  <li>There is a blank line between the description and the tags.</li>
- *  <li>Check the order, indentation and content of each tag.</li>
- * </ul>
- *
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @version   Release: @package_version@
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- *
- * @SuppressWarnings(PHPMD)
- */
-class RequireAnnotatedAttributesSniff extends PHP_CodeSniffer_Standards_AbstractVariableSniff
-{
-    /**
-     * The header comment parser for the current file.
-     *
-     * @var PHP_CodeSniffer_CommentParser_ClassCommentParser
-     */
-    protected $commentParser = null;
-
-    /**
-     * The sniff helper for stuff shared between the annotations sniffs
-     *
-     * @var Helper
-     */
-    protected $helper = null;
-
-    /**
-     * Extract the var comment docblock
-     *
-     * @param array $tokens
-     * @param string $commentToken
-     * @param int $stackPtr  The position of the current token in the stack passed in $tokens.
-     * @return int|false
-     */
-    protected function extractVarDocBlock($tokens, $commentToken, $stackPtr)
-    {
-        $commentEnd = $this->helper->getCurrentFile()->findPrevious($commentToken, $stackPtr - 3);
-        $break = false;
-        if ($commentEnd !== false && $tokens[$commentEnd]['code'] === T_COMMENT) {
-            $this->helper->addMessage($stackPtr, Helper::WRONG_STYLE, ['variable']);
-            $break = true;
-        } elseif ($commentEnd === false || $tokens[$commentEnd]['code'] !== T_DOC_COMMENT) {
-            $this->helper->addMessage($stackPtr, Helper::MISSING, ['variable']);
-            $break = true;
-        } else {
-            // Make sure the comment we have found belongs to us.
-            $commentFor = $this->helper->getCurrentFile()->findNext(
-                [T_VARIABLE, T_CLASS, T_INTERFACE],
-                $commentEnd + 1
-            );
-            if ($commentFor !== $stackPtr) {
-                $this->helper->addMessage($stackPtr, Helper::MISSING, ['variable']);
-                $break = true;
-            }
-        }
-        return $break ? false : $commentEnd;
-    }
-
-    /**
-     * Checks for short and long descriptions on variable definitions
-     *
-     * @param PHP_CodeSniffer_CommentParser_CommentElement $comment
-     * @param int $commentStart
-     * @return void
-     */
-    protected function checkForDescription($comment, $commentStart)
-    {
-        $short = $comment->getShortComment();
-        $long = '';
-        $newlineCount = 0;
-        if (trim($short) === '') {
-            $this->helper->addMessage($commentStart, Helper::MISSING_SHORT, ['variable']);
-            $newlineCount = 1;
-        } else {
-            // No extra newline before short description.
-            $newlineSpan = strspn($short, $this->helper->getEolChar());
-            if ($short !== '' && $newlineSpan > 0) {
-                $this->helper->addMessage($commentStart + 1, Helper::SPACING_BEFORE_SHORT, ['variable']);
-            }
-
-            $newlineCount = substr_count($short, $this->helper->getEolChar()) + 1;
-
-            // Exactly one blank line between short and long description.
-            $long = $comment->getLongComment();
-            if (empty($long) === false) {
-                $between = $comment->getWhiteSpaceBetween();
-                $newlineBetween = substr_count($between, $this->helper->getEolChar());
-                if ($newlineBetween !== 2) {
-                    $this->helper->addMessage(
-                        $commentStart + $newlineCount + 1,
-                        Helper::SPACING_BETWEEN,
-                        ['variable']
-                    );
-                }
-
-                $newlineCount += $newlineBetween;
-
-                $testLong = trim($long);
-                if (preg_match('|\p{Lu}|u', $testLong[0]) === 0) {
-                    $this->helper->addMessage(
-                        $commentStart + $newlineCount,
-                        Helper::LONG_NOT_CAPITAL,
-                        ['Variable']
-                    );
-                }
-            }
-
-            // Short description must be single line and end with a full stop.
-            $testShort = trim($short);
-            $lastChar = $testShort[strlen($testShort) - 1];
-            if (substr_count($testShort, $this->helper->getEolChar()) !== 0) {
-                $this->helper->addMessage($commentStart + 1, Helper::SHORT_SINGLE_LINE, ['Variable']);
-            }
-
-            if (preg_match('|\p{Lu}|u', $testShort[0]) === 0) {
-                $this->helper->addMessage($commentStart + 1, Helper::SHORT_NOT_CAPITAL, ['Variable']);
-            }
-
-            if ($lastChar !== '.') {
-                $this->helper->addMessage($commentStart + 1, Helper::SHORT_FULL_STOP, ['Variable']);
-            }
-        }
-        // Exactly one blank line before tags.
-        $tags = $this->commentParser->getTagOrders();
-        if (count($tags) > 1) {
-            $newlineSpan = $comment->getNewlineAfter();
-            if ($newlineSpan !== 2) {
-                if ($long !== '') {
-                    $newlineCount += substr_count($long, $this->helper->getEolChar()) - $newlineSpan + 1;
-                }
-
-                $this->helper->addMessage(
-                    $commentStart + $newlineCount,
-                    Helper::SPACING_BEFORE_TAGS,
-                    ['variable']
-                );
-                $short = rtrim($short, $this->helper->getEolChar() . ' ');
-            }
-        }
-    }
-
-    /**
-     * Called to process class member vars.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function processMemberVar(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $this->helper = new Helper($phpcsFile);
-        // if we should skip this type we should do that
-        if ($this->helper->shouldFilter()) {
-            return;
-        }
-        $tokens = $phpcsFile->getTokens();
-        $commentToken = [T_COMMENT, T_DOC_COMMENT];
-
-        // Extract the var comment docblock.
-        $commentEnd = $this->extractVarDocBlock($tokens, $commentToken, $stackPtr);
-        if ($commentEnd === false) {
-            return;
-        }
-
-        $commentStart = $phpcsFile->findPrevious(T_DOC_COMMENT, $commentEnd - 1, null, true) + 1;
-        $commentString = $phpcsFile->getTokensAsString($commentStart, $commentEnd - $commentStart + 1);
-
-        // Parse the header comment docblock.
-        try {
-            $this->commentParser = new PHP_CodeSniffer_CommentParser_MemberCommentParser($commentString, $phpcsFile);
-            $this->commentParser->parse();
-        } catch (PHP_CodeSniffer_CommentParser_ParserException $e) {
-            $line = $e->getLineWithinComment() + $commentStart;
-            $data = [$e->getMessage()];
-            $this->helper->addMessage($line, Helper::ERROR_PARSING, $data);
-            return;
-        }
-
-        $comment = $this->commentParser->getComment();
-        if (($comment === null) === true) {
-            $this->helper->addMessage($commentStart, Helper::EMPTY_DOC, ['Variable']);
-            return;
-        }
-
-        // The first line of the comment should just be the /** code.
-        $eolPos = strpos($commentString, $phpcsFile->eolChar);
-        $firstLine = substr($commentString, 0, $eolPos);
-        if ($firstLine !== '/**') {
-            $this->helper->addMessage($commentStart, Helper::CONTENT_AFTER_OPEN);
-        }
-
-        // Check for a comment description.
-        $this->checkForDescription($comment, $commentStart);
-
-        // Check for unknown/deprecated tags.
-        $unknownTags = $this->commentParser->getUnknown();
-        foreach ($unknownTags as $errorTag) {
-            // Unknown tags are not parsed, do not process further.
-            $data = [$errorTag['tag']];
-            $this->helper->addMessage($commentStart + $errorTag['line'], Helper::TAG_NOT_ALLOWED, $data);
-        }
-
-        // Check each tag.
-        $this->processVar($commentStart, $commentEnd);
-        $this->processSees($commentStart);
-
-        // The last content should be a newline and the content before
-        // that should not be blank. If there is more blank space
-        // then they have additional blank lines at the end of the comment.
-        $words = $this->commentParser->getWords();
-        $lastPos = count($words) - 1;
-        if (trim(
-            $words[$lastPos - 1]
-        ) !== '' || strpos(
-            $words[$lastPos - 1],
-            $this->currentFile->eolChar
-        ) === false || trim(
-            $words[$lastPos - 2]
-        ) === ''
-        ) {
-            $this->helper->addMessage($commentEnd, Helper::SPACING_AFTER, ['variable']);
-        }
-    }
-
-    /**
-     * Process the var tag.
-     *
-     * @param int $commentStart The position in the stack where the comment started.
-     * @param int $commentEnd   The position in the stack where the comment ended.
-     *
-     * @return void
-     */
-    protected function processVar($commentStart, $commentEnd)
-    {
-        $var = $this->commentParser->getVar();
-
-        if ($var !== null) {
-            $errorPos = $commentStart + $var->getLine();
-            $index = array_keys($this->commentParser->getTagOrders(), 'var');
-
-            if (count($index) > 1) {
-                $this->helper->addMessage($errorPos, Helper::DUPLICATE_VAR);
-                return;
-            }
-
-            if ($index[0] !== 1) {
-                $this->helper->addMessage($errorPos, Helper::VAR_ORDER);
-            }
-
-            $content = $var->getContent();
-            if (empty($content) === true) {
-                $this->helper->addMessage($errorPos, Helper::MISSING_VAR_TYPE);
-                return;
-            } else {
-                $suggestedType = $this->helper->suggestType($content);
-                if ($content !== $suggestedType) {
-                    $data = [$suggestedType, $content];
-                    $this->helper->addMessage($errorPos, Helper::INCORRECT_VAR_TYPE, $data);
-                } elseif ($this->helper->isAmbiguous($content, $matches)) {
-                    // Warn about ambiguous types ie array or mixed
-                    $data = [$matches[1], '@var'];
-                    $this->helper->addMessage($errorPos, Helper::AMBIGUOUS_TYPE, $data);
-                }
-            }
-
-            $spacing = substr_count($var->getWhitespaceBeforeContent(), ' ');
-            if ($spacing !== 1) {
-                $data = [$spacing];
-                $this->helper->addMessage($errorPos, Helper::VAR_INDENT, $data);
-            }
-        } else {
-            $this->helper->addMessage($commentEnd, Helper::MISSING_VAR);
-        }
-    }
-
-    /**
-     * Process the see tags.
-     *
-     * @param int $commentStart The position in the stack where the comment started.
-     *
-     * @return void
-     */
-    protected function processSees($commentStart)
-    {
-        $sees = $this->commentParser->getSees();
-        if (empty($sees) === false) {
-            foreach ($sees as $see) {
-                $errorPos = $commentStart + $see->getLine();
-                $content = $see->getContent();
-                if (empty($content) === true) {
-                    $this->helper->addMessage($errorPos, Helper::EMPTY_SEE, ['variable']);
-                    continue;
-                }
-
-                $spacing = substr_count($see->getWhitespaceBeforeContent(), ' ');
-                if ($spacing !== 1) {
-                    $data = [$spacing];
-                    $this->helper->addMessage($errorPos, Helper::SEE_INDENT, $data);
-                }
-            }
-        }
-    }
-
-    /**
-     * Called to process a normal variable.
-     *
-     * Not required for this sniff.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The PHP_CodeSniffer file where this token was found.
-     * @param int                  $stackPtr  The position where the double quoted
-     *                                        string was found.
-     *
-     * @return void
-     */
-    protected function processVariable(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-    }
-
-    /**
-     * Called to process variables found in double quoted strings.
-     *
-     * Not required for this sniff.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The PHP_CodeSniffer file where this token was found.
-     * @param int                  $stackPtr  The position where the double quoted
-     *                                        string was found.
-     *
-     * @return void
-     */
-    protected function processVariableInString(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Annotations/RequireAnnotatedMethodsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Annotations/RequireAnnotatedMethodsSniff.php
deleted file mode 100644
index 63dc220b6224f..0000000000000
--- a/dev/tests/static/framework/Magento/Sniffs/Annotations/RequireAnnotatedMethodsSniff.php
+++ /dev/null
@@ -1,694 +0,0 @@
-<?php
-namespace Magento\Sniffs\Annotations;
-
-use PHP_CodeSniffer_CommentParser_FunctionCommentParser;
-use PHP_CodeSniffer_CommentParser_ParserException;
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
-use PHP_CodeSniffer_Tokens;
-
-include_once 'Helper.php';
-/**
- * Parses and verifies the doc comments for functions.
- *
- * PHP version 5
- *
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @author    Marc McIntyre <mmcintyre@squiz.net>
- * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- * @link      http://pear.php.net/package/PHP_CodeSniffer
- *
- * @SuppressWarnings(PHPMD)
- */
-class RequireAnnotatedMethodsSniff implements PHP_CodeSniffer_Sniff
-{
-    /**
-     * The name of the method that we are currently processing.
-     *
-     * @var string
-     */
-    private $_methodName = '';
-
-    /**
-     * The position in the stack where the function token was found.
-     *
-     * @var int
-     */
-    private $_functionToken = null;
-
-    /**
-     * The position in the stack where the class token was found.
-     *
-     * @var int
-     */
-    private $_classToken = null;
-
-    /**
-     * The index of the current tag we are processing.
-     *
-     * @var int
-     */
-    private $_tagIndex = 0;
-
-    /**
-     * The function comment parser for the current method.
-     *
-     * @var PHP_CodeSniffer_CommentParser_FunctionCommentParser
-     */
-    protected $commentParser = null;
-
-    /**
-     * The sniff helper for stuff shared between the annotations sniffs
-     *
-     * @var Helper
-     */
-    protected $helper = null;
-
-    /**
-     * Returns an array of tokens this test wants to listen for.
-     *
-     * @return array
-     */
-    public function register()
-    {
-        return [T_FUNCTION];
-    }
-
-    /**
-     * Processes this test, when one of its tokens is encountered.
-     *
-     * @param PHP_CodeSniffer_File $phpcsFile The file being scanned.
-     * @param int                  $stackPtr  The position of the current token
-     *                                        in the stack passed in $tokens.
-     *
-     * @return void
-     */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $this->helper = new Helper($phpcsFile);
-        // if we should skip this type we should do that
-        if ($this->helper->shouldFilter()) {
-            return;
-        }
-
-        $tokens = $phpcsFile->getTokens();
-
-        $find = [T_COMMENT, T_DOC_COMMENT, T_CLASS, T_FUNCTION, T_OPEN_TAG];
-
-        $commentEnd = $phpcsFile->findPrevious($find, $stackPtr - 1);
-
-        if ($commentEnd === false) {
-            return;
-        }
-
-        // If the token that we found was a class or a function, then this
-        // function has no doc comment.
-        $code = $tokens[$commentEnd]['code'];
-
-        if ($code === T_COMMENT) {
-            // The function might actually be missing a comment, and this last comment
-            // found is just commenting a bit of code on a line. So if it is not the
-            // only thing on the line, assume we found nothing.
-            $prevContent = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, $commentEnd);
-            if ($tokens[$commentEnd]['line'] === $tokens[$commentEnd]['line']) {
-                $this->helper->addMessage($stackPtr, Helper::MISSING, ['function']);
-            } else {
-                $this->helper->addMessage($stackPtr, Helper::WRONG_STYLE, ['function']);
-            }
-            return;
-        } elseif ($code !== T_DOC_COMMENT) {
-            $this->helper->addMessage($stackPtr, Helper::MISSING, ['function']);
-            return;
-        } elseif (trim($tokens[$commentEnd]['content']) !== '*/') {
-            $this->helper->addMessage($commentEnd, Helper::WRONG_END, [trim($tokens[$commentEnd]['content'])]);
-            return;
-        }
-
-        // If there is any code between the function keyword and the doc block
-        // then the doc block is not for us.
-        $ignore = PHP_CodeSniffer_Tokens::$scopeModifiers;
-        $ignore[] = T_STATIC;
-        $ignore[] = T_WHITESPACE;
-        $ignore[] = T_ABSTRACT;
-        $ignore[] = T_FINAL;
-        $prevToken = $phpcsFile->findPrevious($ignore, $stackPtr - 1, null, true);
-        if ($prevToken !== $commentEnd) {
-            $this->helper->addMessage($stackPtr, Helper::MISSING, ['function']);
-            return;
-        }
-
-        $this->_functionToken = $stackPtr;
-
-        $this->_classToken = null;
-        foreach ($tokens[$stackPtr]['conditions'] as $condPtr => $condition) {
-            if ($condition === T_CLASS || $condition === T_INTERFACE) {
-                $this->_classToken = $condPtr;
-                break;
-            }
-        }
-
-        // Find the first doc comment.
-        $commentStart = $phpcsFile->findPrevious(T_DOC_COMMENT, $commentEnd - 1, null, true) + 1;
-        $commentString = $phpcsFile->getTokensAsString($commentStart, $commentEnd - $commentStart + 1);
-        $this->_methodName = $phpcsFile->getDeclarationName($stackPtr);
-
-        try {
-            $this->commentParser = new PHP_CodeSniffer_CommentParser_FunctionCommentParser($commentString, $phpcsFile);
-            $this->commentParser->parse();
-        } catch (PHP_CodeSniffer_CommentParser_ParserException $e) {
-            $line = $e->getLineWithinComment() + $commentStart;
-            $this->helper->addMessage($line, Helper::FAILED_PARSE, [$e->getMessage()]);
-            return;
-        }
-
-        $comment = $this->commentParser->getComment();
-        if (($comment === null) === true) {
-            $this->helper->addMessage($commentStart, Helper::EMPTY_DOC, ['Function']);
-            return;
-        }
-
-        // The first line of the comment should just be the /** code.
-        $eolPos = strpos($commentString, $phpcsFile->eolChar);
-        $firstLine = substr($commentString, 0, $eolPos);
-        if ($firstLine !== '/**') {
-            $this->helper->addMessage($commentStart, Helper::CONTENT_AFTER_OPEN);
-        }
-
-        // If the comment has an inherit doc note just move on
-        if (preg_match('/\{\@inheritdoc\}/', $commentString)) {
-            return;
-        } elseif (preg_match('/\{?\@?inherit[dD]oc\}?/', $commentString)) {
-            $this->helper->addMessage($commentStart, Helper::INCORRECT_INHERIT_DOC);
-            return;
-        }
-
-        $this->processParams($commentStart, $commentEnd);
-        $this->processSees($commentStart);
-        $this->processReturn($commentStart, $commentEnd);
-        $this->processThrows($commentStart);
-
-        // Check for a comment description.
-        $short = $comment->getShortComment();
-        if (trim($short) === '') {
-            $this->helper->addMessage($commentStart, Helper::MISSING_SHORT, ['function']);
-            return;
-        }
-
-        // No extra newline before short description.
-        $newlineCount = 0;
-        $newlineSpan = strspn($short, $phpcsFile->eolChar);
-        if ($short !== '' && $newlineSpan > 0) {
-            $this->helper->addMessage($commentStart + 1, Helper::SPACING_BEFORE_SHORT, ['function']);
-        }
-
-        $newlineCount = substr_count($short, $phpcsFile->eolChar) + 1;
-
-        // Exactly one blank line between short and long description.
-        $long = $comment->getLongComment();
-        if (empty($long) === false) {
-            $between = $comment->getWhiteSpaceBetween();
-            $newlineBetween = substr_count($between, $phpcsFile->eolChar);
-            if ($newlineBetween !== 2) {
-                $this->helper->addMessage(
-                    $commentStart + $newlineCount + 1,
-                    Helper::SPACING_BETWEEN,
-                    ['function']
-                );
-            }
-            $newlineCount += $newlineBetween;
-            $testLong = trim($long);
-            if (preg_match('|\p{Lu}|u', $testLong[0]) === 0) {
-                $this->helper->addMessage($commentStart + $newlineCount, Helper::LONG_NOT_CAPITAL, ['Function']);
-            }
-        }
-
-        // Exactly one blank line before tags.
-        $params = $this->commentParser->getTagOrders();
-        if (count($params) > 1) {
-            $newlineSpan = $comment->getNewlineAfter();
-            if ($newlineSpan !== 2) {
-                if ($long !== '') {
-                    $newlineCount += substr_count($long, $phpcsFile->eolChar) - $newlineSpan + 1;
-                }
-
-                $this->helper->addMessage(
-                    $commentStart + $newlineCount,
-                    Helper::SPACING_BEFORE_TAGS,
-                    ['function']
-                );
-                $short = rtrim($short, $phpcsFile->eolChar . ' ');
-            }
-        }
-
-        // Short description must be single line and end with a full stop.
-        $testShort = trim($short);
-        $lastChar = $testShort[strlen($testShort) - 1];
-        if (substr_count($testShort, $phpcsFile->eolChar) !== 0) {
-            $this->helper->addMessage($commentStart + 1, Helper::SHORT_SINGLE_LINE, ['Function']);
-        }
-
-        if (preg_match('|\p{Lu}|u', $testShort[0]) === 0) {
-            $this->helper->addMessage($commentStart + 1, Helper::SHORT_NOT_CAPITAL, ['Function']);
-        }
-
-        if ($lastChar !== '.') {
-            $this->helper->addMessage($commentStart + 1, Helper::SHORT_FULL_STOP, ['Function']);
-        }
-
-        // Check for unknown/deprecated tags.
-        // For example call: $this->processUnknownTags($commentStart, $commentEnd);
-
-        // The last content should be a newline and the content before
-        // that should not be blank. If there is more blank space
-        // then they have additional blank lines at the end of the comment.
-        $words = $this->commentParser->getWords();
-        $lastPos = count($words) - 1;
-        if (trim(
-            $words[$lastPos - 1]
-        ) !== '' || strpos(
-            $words[$lastPos - 1],
-            $this->helper->getCurrentFile()->eolChar
-        ) === false || trim(
-            $words[$lastPos - 2]
-        ) === ''
-        ) {
-            $this->helper->addMessage($commentEnd, Helper::SPACING_AFTER, ['function']);
-        }
-    }
-
-    /**
-     * Process the see tags.
-     *
-     * @param int $commentStart The position in the stack where the comment started.
-     *
-     * @return void
-     */
-    protected function processSees($commentStart)
-    {
-        $sees = $this->commentParser->getSees();
-        if (empty($sees) === false) {
-            $tagOrder = $this->commentParser->getTagOrders();
-            $index = array_keys($this->commentParser->getTagOrders(), 'see');
-            foreach ($sees as $i => $see) {
-                $errorPos = $commentStart + $see->getLine();
-                $since = array_keys($tagOrder, 'since');
-                if (count($since) === 1 && $this->_tagIndex !== 0) {
-                    $this->_tagIndex++;
-                    if ($index[$i] !== $this->_tagIndex) {
-                        $this->helper->addMessage($errorPos, Helper::SEE_ORDER);
-                    }
-                }
-
-                $content = $see->getContent();
-                if (empty($content) === true) {
-                    $this->helper->addMessage($errorPos, Helper::EMPTY_SEE, ['function']);
-                    continue;
-                }
-            }
-        }
-    }
-
-    /**
-     * Process the return comment of this function comment.
-     *
-     * @param int $commentStart The position in the stack where the comment started.
-     * @param int $commentEnd   The position in the stack where the comment ended.
-     *
-     * @return void
-     */
-    protected function processReturn($commentStart, $commentEnd)
-    {
-        // Skip constructor and destructor.
-        $className = '';
-        if ($this->_classToken !== null) {
-            $className = $this->helper->getCurrentFile()->getDeclarationName($this->_classToken);
-            $className = strtolower(ltrim($className, '_'));
-        }
-
-        $methodName = strtolower(ltrim($this->_methodName, '_'));
-        $return = $this->commentParser->getReturn();
-
-        if ($this->_methodName !== '__construct' && $this->_methodName !== '__destruct') {
-            if ($return !== null) {
-                $tagOrder = $this->commentParser->getTagOrders();
-                $index = array_keys($tagOrder, 'return');
-                $errorPos = $commentStart + $return->getLine();
-                $content = trim($return->getRawContent());
-
-                if (count($index) > 1) {
-                    $this->helper->addMessage($errorPos, Helper::DUPLICATE_RETURN);
-                    return;
-                }
-
-                $since = array_keys($tagOrder, 'since');
-                if (count($since) === 1 && $this->_tagIndex !== 0) {
-                    $this->_tagIndex++;
-                    if ($index[0] !== $this->_tagIndex) {
-                        $this->helper->addMessage($errorPos, Helper::RETURN_ORDER);
-                    }
-                }
-
-                if (empty($content) === true) {
-                    $this->helper->addMessage($errorPos, Helper::MISSING_RETURN_TYPE);
-                } else {
-                    // Strip off any comments attached to our content
-                    $parts = explode(' ', $content);
-                    $content = $parts[0];
-                    // Check return type (can be multiple, separated by '|').
-                    $typeNames = explode('|', $content);
-                    $suggestedNames = [];
-                    foreach ($typeNames as $i => $typeName) {
-                        $suggestedName = $this->helper->suggestType($typeName);
-                        if (in_array($suggestedName, $suggestedNames) === false) {
-                            $suggestedNames[] = $suggestedName;
-                        }
-                    }
-
-                    $suggestedType = implode('|', $suggestedNames);
-                    if ($content !== $suggestedType) {
-                        $data = [$content];
-                        $this->helper->addMessage($errorPos, Helper::INVALID_RETURN, $data);
-                    } elseif ($this->helper->isAmbiguous($typeName, $matches)) {
-                        // Warn about ambiguous types ie array or mixed
-                        $data = [$matches[1], '@return'];
-                        $this->helper->addMessage($errorPos, Helper::AMBIGUOUS_TYPE, $data);
-                    }
-
-                    $tokens = $this->helper->getCurrentFile()->getTokens();
-
-                    // If the return type is void, make sure there is
-                    // no return statement in the function.
-                    if ($content === 'void') {
-                        if (isset($tokens[$this->_functionToken]['scope_closer']) === true) {
-                            $endToken = $tokens[$this->_functionToken]['scope_closer'];
-
-                            $tokens = $this->helper->getCurrentFile()->getTokens();
-                            for ($returnToken = $this->_functionToken; $returnToken < $endToken; $returnToken++) {
-                                if ($tokens[$returnToken]['code'] === T_CLOSURE) {
-                                    $returnToken = $tokens[$returnToken]['scope_closer'];
-                                    continue;
-                                }
-
-                                if ($tokens[$returnToken]['code'] === T_RETURN) {
-                                    break;
-                                }
-                            }
-
-                            if ($returnToken !== $endToken) {
-                                // If the function is not returning anything, just
-                                // exiting, then there is no problem.
-                                $semicolon = $this->helper->getCurrentFile()->findNext(
-                                    T_WHITESPACE,
-                                    $returnToken + 1,
-                                    null,
-                                    true
-                                );
-                                if ($tokens[$semicolon]['code'] !== T_SEMICOLON) {
-                                    $this->helper->addMessage($errorPos, Helper::INVALID_RETURN_VOID);
-                                }
-                            }
-                        }
-                    } elseif ($content !== 'mixed') {
-                        // If return type is not void, there needs to be a
-                        // returns statement somewhere in the function that
-                        // returns something.
-                        if (isset($tokens[$this->_functionToken]['scope_closer']) === true) {
-                            $endToken = $tokens[$this->_functionToken]['scope_closer'];
-                            $returnToken = $this->helper->getCurrentFile()->findNext(
-                                T_RETURN,
-                                $this->_functionToken,
-                                $endToken
-                            );
-                            if ($returnToken === false) {
-                                $this->helper->addMessage($errorPos, Helper::INVALID_NO_RETURN);
-                            } else {
-                                $semicolon = $this->helper->getCurrentFile()->findNext(
-                                    T_WHITESPACE,
-                                    $returnToken + 1,
-                                    null,
-                                    true
-                                );
-                                if ($tokens[$semicolon]['code'] === T_SEMICOLON) {
-                                    $this->helper->addMessage($returnToken, Helper::INVALID_RETURN_NOT_VOID);
-                                }
-                            }
-                        }
-                    }
-
-                    $spacing = substr_count($return->getWhitespaceBeforeValue(), ' ');
-                    if ($spacing !== 1) {
-                        $data = [$spacing];
-                        $this->helper->addMessage($errorPos, Helper::RETURN_INDENT, $data);
-                    }
-                }
-            } else {
-                $this->helper->addMessage($commentEnd, Helper::MISSING_RETURN);
-            }
-        } elseif ($return !== null) {
-            // No return tag for constructor and destructor.
-            $errorPos = $commentStart + $return->getLine();
-            $this->helper->addMessage($errorPos, Helper::RETURN_NOT_REQUIRED);
-        }
-    }
-
-    /**
-     * Process any throw tags that this function comment has.
-     *
-     * @param int $commentStart The position in the stack where the comment started.
-     *
-     * @return void
-     */
-    protected function processThrows($commentStart)
-    {
-        if (count($this->commentParser->getThrows()) === 0) {
-            return;
-        }
-
-        $tagOrder = $this->commentParser->getTagOrders();
-        $index = array_keys($this->commentParser->getTagOrders(), 'throws');
-
-        foreach ($this->commentParser->getThrows() as $i => $throw) {
-            $exception = $throw->getValue();
-            $content = trim($throw->getComment());
-            $errorPos = $commentStart + $throw->getLine();
-            if (empty($exception) === true) {
-                $this->helper->addMessage($errorPos, Helper::INVALID_THROWS);
-            } elseif (empty($content) === true) {
-                $this->helper->addMessage($errorPos, Helper::EMPTY_THROWS);
-            } else {
-                // Assumes that $content is not empty.
-                // Starts with a capital letter and ends with a fullstop.
-                $firstChar = $content[0];
-                if (strtoupper($firstChar) !== $firstChar) {
-                    $this->helper->addMessage($errorPos, Helper::THROWS_NOT_CAPITAL);
-                }
-
-                $lastChar = $content[strlen($content) - 1];
-                if ($lastChar !== '.') {
-                    $this->helper->addMessage($errorPos, Helper::THROWS_NO_FULL_STOP);
-                }
-            }
-
-            $since = array_keys($tagOrder, 'since');
-            if (count($since) === 1 && $this->_tagIndex !== 0) {
-                $this->_tagIndex++;
-                if ($index[$i] !== $this->_tagIndex) {
-                    $this->helper->addMessage($errorPos, Helper::THROWS_ORDER);
-                }
-            }
-        }
-    }
-
-    /**
-     * Process the function parameter comments.
-     *
-     * @param int $commentStart The position in the stack where
-     *                          the comment started.
-     * @param int $commentEnd   The position in the stack where
-     *                          the comment ended.
-     *
-     * @return void
-     */
-    protected function processParams($commentStart, $commentEnd)
-    {
-        $realParams = $this->helper->getCurrentFile()->getMethodParameters($this->_functionToken);
-        $params = $this->commentParser->getParams();
-        $foundParams = [];
-
-        if (empty($params) === false) {
-            $subStrCount = substr_count(
-                $params[count($params) - 1]->getWhitespaceAfter(),
-                $this->helper->getCurrentFile()->eolChar
-            );
-            if ($subStrCount !== 2) {
-                $errorPos = $params[count($params) - 1]->getLine() + $commentStart;
-                $this->helper->addMessage($errorPos, Helper::SPACING_AFTER_PARAMS);
-            }
-
-            // Parameters must appear immediately after the comment.
-            if ($params[0]->getOrder() !== 2) {
-                $errorPos = $params[0]->getLine() + $commentStart;
-                $this->helper->addMessage($errorPos, Helper::SPACING_BEFORE_PARAMS);
-            }
-
-            $previousParam = null;
-            $spaceBeforeVar = 10000;
-            $spaceBeforeComment = 10000;
-            $longestType = 0;
-            $longestVar = 0;
-
-            foreach ($params as $param) {
-                $paramComment = trim($param->getComment());
-                $errorPos = $param->getLine() + $commentStart;
-
-                // Make sure that there is only one space before the var type.
-                if ($param->getWhitespaceBeforeType() !== ' ') {
-                    $this->helper->addMessage($errorPos, Helper::SPACING_BEFORE_PARAM_TYPE);
-                }
-
-                $spaceCount = substr_count($param->getWhitespaceBeforeVarName(), ' ');
-                if ($spaceCount < $spaceBeforeVar) {
-                    $spaceBeforeVar = $spaceCount;
-                    $longestType = $errorPos;
-                }
-
-                $spaceCount = substr_count($param->getWhitespaceBeforeComment(), ' ');
-
-                if ($spaceCount < $spaceBeforeComment && $paramComment !== '') {
-                    $spaceBeforeComment = $spaceCount;
-                    $longestVar = $errorPos;
-                }
-
-                // Make sure they are in the correct order, and have the correct name.
-                $pos = $param->getPosition();
-                $paramName = $param->getVarName() !== '' ? $param->getVarName() : '[ UNKNOWN ]';
-
-                if ($previousParam !== null) {
-                    $previousName = $previousParam->getVarName() !== '' ? $previousParam->getVarName() : 'UNKNOWN';
-                }
-
-                // Variable must be one of the supported standard type.
-                $typeNames = explode('|', $param->getType());
-                foreach ($typeNames as $typeName) {
-                    $suggestedName = $this->helper->suggestType($typeName);
-                    if ($typeName !== $suggestedName) {
-                        $data = [$suggestedName, $typeName, $paramName, $pos];
-                        $this->helper->addMessage($errorPos, Helper::INCORRECT_PARAM_VAR_NAME, $data);
-                    } elseif ($this->helper->isAmbiguous($typeName, $matches)) {
-                        // Warn about ambiguous types ie array or mixed
-                        $data = [$matches[1], $paramName, ' at position ' . $pos . ' is NOT recommended'];
-                        $this->helper->addMessage($commentEnd + 2, Helper::AMBIGUOUS_TYPE, $data);
-                    } elseif (count($typeNames) === 1) {
-                        // Check type hint for array and custom type.
-                        $suggestedTypeHint = '';
-                        if (strpos($suggestedName, 'array') !== false) {
-                            $suggestedTypeHint = 'array';
-                        } elseif (strpos($suggestedName, 'callable') !== false) {
-                            $suggestedTypeHint = 'callable';
-                        } elseif (in_array($typeName, $this->helper->getAllowedTypes()) === false) {
-                            $suggestedTypeHint = $suggestedName;
-                        } else {
-                            $suggestedTypeHint = $this->helper->suggestType($typeName);
-                        }
-
-                        if ($suggestedTypeHint !== '' && isset($realParams[$pos - 1]) === true) {
-                            $typeHint = $realParams[$pos - 1]['type_hint'];
-                            if ($typeHint === '') {
-                                $data = [$suggestedTypeHint, $paramName, $pos];
-                                $this->helper->addMessage($commentEnd + 2, Helper::TYPE_HINT_MISSING, $data);
-                            } elseif ($typeHint !== $suggestedTypeHint) {
-                                $data = [$suggestedTypeHint, $typeHint, $paramName, $pos];
-                                $this->helper->addMessage($commentEnd + 2, Helper::INCORRECT_TYPE_HINT, $data);
-                            }
-                        } elseif ($suggestedTypeHint === '' && isset($realParams[$pos - 1]) === true) {
-                            $typeHint = $realParams[$pos - 1]['type_hint'];
-                            if ($typeHint !== '') {
-                                $data = [$typeHint, $paramName, $pos];
-                                $this->helper->addMessage($commentEnd + 2, Helper::INVALID_TYPE_HINT, $data);
-                            }
-                        }
-                    }
-                }
-
-                // Make sure the names of the parameter comment matches the
-                // actual parameter.
-                if (isset($realParams[$pos - 1]) === true) {
-                    $realName = $realParams[$pos - 1]['name'];
-                    $foundParams[] = $realName;
-
-                    // Append ampersand to name if passing by reference.
-                    if ($realParams[$pos - 1]['pass_by_reference'] === true) {
-                        $realName = '&' . $realName;
-                    }
-
-                    if ($realName !== $paramName) {
-                        $code = Helper::PARAM_NAME_NO_MATCH;
-                        $data = [$paramName, $realName, $pos];
-
-                        if (strtolower($paramName) === strtolower($realName)) {
-                            $code = Helper::PARAM_NAME_NO_CASE_MATCH;
-                        }
-
-                        $this->helper->addMessage($errorPos, $code, $data);
-                    }
-                } elseif (substr($paramName, -4) !== ',...') {
-                    // We must have an extra parameter comment.
-                    $this->helper->addMessage($errorPos, Helper::EXTRA_PARAM_COMMENT, [$pos]);
-                }
-
-                if ($param->getVarName() === '') {
-                    $this->helper->addMessage($errorPos, Helper::MISSING_PARAM_NAME, [$pos]);
-                }
-
-                if ($param->getType() === '') {
-                    $this->helper->addMessage($errorPos, Helper::MISSING_PARAM_TYPE, [$pos]);
-                }
-
-                if ($paramComment === '') {
-                    $data = [$paramName, $pos];
-                    $this->helper->addMessage($errorPos, Helper::MISSING_PARAM_COMMENT, $data);
-                } else {
-                    // Param comments must start with a capital letter and
-                    // end with the full stop.
-                    $firstChar = $paramComment[0];
-                    if (preg_match('|\p{Lu}|u', $firstChar) === 0) {
-                        $this->helper->addMessage($errorPos, Helper::PARAM_COMMENT_NOT_CAPITAL);
-                    }
-                    $lastChar = $paramComment[strlen($paramComment) - 1];
-                    if ($lastChar !== '.') {
-                        $this->helper->addMessage($errorPos, Helper::PARAM_COMMENT_FULL_STOP);
-                    }
-                }
-
-                $previousParam = $param;
-            }
-
-            if ($spaceBeforeVar !== 1 && $spaceBeforeVar !== 10000 && $spaceBeforeComment !== 10000) {
-                $this->helper->addMessage($longestType, Helper::SPACING_AFTER_LONG_TYPE);
-            }
-
-            if ($spaceBeforeComment !== 1 && $spaceBeforeComment !== 10000) {
-                $this->helper->addMessage($longestVar, Helper::SPACING_AFTER_LONG_NAME);
-            }
-        }
-
-        $realNames = [];
-        foreach ($realParams as $realParam) {
-            $realNames[] = $realParam['name'];
-        }
-
-        // Report missing comments.
-        $diff = array_diff($realNames, $foundParams);
-        foreach ($diff as $neededParam) {
-            if (count($params) !== 0) {
-                $errorPos = $params[count($params) - 1]->getLine() + $commentStart;
-            } else {
-                $errorPos = $commentStart;
-            }
-
-            $data = [$neededParam];
-            $this->helper->addMessage($errorPos, Helper::MISSING_PARAM_TAG, $data);
-        }
-    }
-}
diff --git a/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php b/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php
index e8e8507064b62..9013f12b6b46b 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Arrays/ShortArraySyntaxSniff.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sniffs\Arrays;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
-class ShortArraySyntaxSniff implements PHP_CodeSniffer_Sniff
+class ShortArraySyntaxSniff implements Sniff
 {
     /**
      * {@inheritdoc}
@@ -21,8 +21,12 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $sourceFile, $stackPtr)
+    public function process(File $sourceFile, $stackPtr)
     {
-        $sourceFile->addError('Short array syntax must be used; expected "[]" but found "array()"', $stackPtr);
+        $sourceFile->addError(
+            'Short array syntax must be used; expected "[]" but found "array()"',
+            $stackPtr,
+            'ShortArraySyntax'
+        );
     }
 }
diff --git a/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php b/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php
index de869982d54cf..694905cb37add 100644
--- a/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php
@@ -5,11 +5,11 @@
  */
 namespace Magento\Sniffs\EchoTags;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
-use PHP_CodeSniffer_Tokens;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
 
-class ShortEchoSyntaxSniff implements PHP_CodeSniffer_Sniff
+class ShortEchoSyntaxSniff implements Sniff
 {
     /**
      * {@inheritdoc}
@@ -22,7 +22,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens  = $phpcsFile->getTokens();
         $openTag = $tokens[$stackPtr];
@@ -32,11 +32,12 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
             return;
         }
 
-        $nextToken = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+        $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
         if ($tokens[$nextToken]['code'] == T_ECHO) {
             $phpcsFile->addError(
                 'Short echo tag syntax must be used; expected "<?=" but found "<?php echo"',
-                $stackPtr
+                $stackPtr,
+                'ShortEchoTag'
             );
         }
     }
diff --git a/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php b/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php
index 50020cb297304..2abcf0531b009 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Files/LineLengthSniff.php
@@ -5,10 +5,12 @@
  */
 namespace Magento\Sniffs\Files;
 
+use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff as FilesLineLengthSniff;
+
 /**
  * Line length sniff which ignores long lines in case they contain strings intended for translation.
  */
-class LineLengthSniff extends \Generic_Sniffs_Files_LineLengthSniff
+class LineLengthSniff extends FilesLineLengthSniff
 {
     /**
      * Having previous line content allows to ignore long lines in case of multi-line declaration.
@@ -20,7 +22,7 @@ class LineLengthSniff extends \Generic_Sniffs_Files_LineLengthSniff
     /**
      * {@inheritdoc}
      */
-    protected function checkLineLength(\PHP_CodeSniffer_File $phpcsFile, $stackPtr, $lineContent)
+    protected function checkLineLength($phpcsFile, $stackPtr, $lineContent)
     {
         $previousLineRegexp = '~__\($|\bPhrase\($~';
         $currentLineRegexp = '~__\(.+\)|\bPhrase\(.+\)~';
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php
index 4b28ab7827235..f9cec6404dc69 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/AvoidIdSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class AvoidIdSniff
@@ -16,7 +16,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#types
  *
  */
-class AvoidIdSniff implements PHP_CodeSniffer_Sniff
+class AvoidIdSniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -44,14 +44,14 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
         if (T_WHITESPACE === $tokens[$stackPtr - 1]['code']
             && in_array($tokens[$stackPtr - 1]['content'], $this->symbolsBeforeId)
         ) {
-            $phpcsFile->addError('Id selector is used', $stackPtr);
+            $phpcsFile->addError('Id selector is used', $stackPtr, 'IdSelectorUsage');
         }
     }
 }
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php
index 508a20256add0..435eea118af63 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/BracesFormattingSniff.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
-use PHP_CodeSniffer_Tokens;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
 
 /**
  * Class BracesFormattingSniff
@@ -17,7 +17,7 @@
  * @see Squiz_Sniffs_CSS_ClassDefinitionClosingBraceSpaceSniff
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#braces
  */
-class BracesFormattingSniff implements PHP_CodeSniffer_Sniff
+class BracesFormattingSniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -37,7 +37,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -77,7 +77,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
             return;
         }
 
-        $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
         if ($prev !== false && $tokens[$prev]['line'] !== ($tokens[$stackPtr]['line'] - 1)) {
             $num = ($tokens[$stackPtr]['line'] - $tokens[$prev]['line'] - 1);
             $error = 'Expected 0 blank lines before closing brace of class definition; %s found';
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
index 4bfe35a7fa84c..cde667bc53843 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class ClassNamingSniff
@@ -20,7 +20,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#standard-classes
  *
  */
-class ClassNamingSniff implements PHP_CodeSniffer_Sniff
+class ClassNamingSniff implements Sniff
 {
 
     const STRING_HELPER_CLASSES_PREFIX = '_';
@@ -45,7 +45,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php
index b11d3f335ec78..39753544cf248 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ColonSpacingSniff.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
-use PHP_CodeSniffer_Tokens;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
 
 /**
  * Class ColonSpacingSniff
@@ -17,7 +17,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#properties-colon-indents
  *
  */
-class ColonSpacingSniff implements PHP_CodeSniffer_Sniff
+class ColonSpacingSniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -37,7 +37,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -49,13 +49,13 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     /**
      * Check is it need to check spaces
      *
-     * @param PHP_CodeSniffer_File $phpcsFile
+     * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
      *
      * @return bool
      */
-    private function needValidateSpaces(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $tokens)
+    private function needValidateSpaces(File $phpcsFile, $stackPtr, $tokens)
     {
         $nextSemicolon = $phpcsFile->findNext(T_SEMICOLON, $stackPtr);
 
@@ -66,7 +66,7 @@ private function needValidateSpaces(PHP_CodeSniffer_File $phpcsFile, $stackPtr,
             return false;
         }
 
-        $prev = $phpcsFile->findPrevious(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr - 1), null, true);
+        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
         if ($tokens[$prev]['code'] !== T_STYLE) {
             // The colon is not part of a style definition.
             return false;
@@ -83,13 +83,13 @@ private function needValidateSpaces(PHP_CodeSniffer_File $phpcsFile, $stackPtr,
     /**
      * Validate Colon Spacing according to requirements
      *
-     * @param PHP_CodeSniffer_File $phpcsFile
+     * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
      *
      * @return void
      */
-    private function validateSpaces(PHP_CodeSniffer_File $phpcsFile, $stackPtr, array $tokens)
+    private function validateSpaces(File $phpcsFile, $stackPtr, array $tokens)
     {
         if (T_WHITESPACE === $tokens[($stackPtr - 1)]['code']) {
             $phpcsFile->addError('There must be no space before a colon in a style definition', $stackPtr, 'Before');
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php
index 669f6bca712c9..83f2e8f5d94de 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ColourDefinitionSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class ColourDefinitionSniff
@@ -16,7 +16,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#hexadecimal-notation
  *
  */
-class ColourDefinitionSniff implements PHP_CodeSniffer_Sniff
+class ColourDefinitionSniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -36,7 +36,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         $colour = $tokens[$stackPtr]['content'];
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php
index a05ebe1c9b80d..d27c853ab7808 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/CombinatorIndentationSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class CombinatorIndentationSniff
@@ -16,7 +16,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#combinator-indents
  *
  */
-class CombinatorIndentationSniff implements PHP_CodeSniffer_Sniff
+class CombinatorIndentationSniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -36,7 +36,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
index d39ad0a2ed179..abf15dd3748d5 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class CommentLevelsSniff
@@ -18,7 +18,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#comments
  *
  */
-class CommentLevelsSniff implements PHP_CodeSniffer_Sniff
+class CommentLevelsSniff implements Sniff
 {
     const COMMENT_STRING = '//';
 
@@ -52,7 +52,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -98,12 +98,12 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     /**
      * Validate that inline comment responds to given requirements
      *
-     * @param PHP_CodeSniffer_File $phpcsFile
+     * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
      * @return bool
      */
-    private function validateInlineComment(PHP_CodeSniffer_File $phpcsFile, $stackPtr, array $tokens)
+    private function validateInlineComment(File $phpcsFile, $stackPtr, array $tokens)
     {
         if ($tokens[$stackPtr + 1]['content'] !== TokenizerSymbolsInterface::WHITESPACE) {
             $phpcsFile->addError('Inline comment should have 1 space after "//"', $stackPtr, 'SpaceMissedAfter');
@@ -116,12 +116,12 @@ private function validateInlineComment(PHP_CodeSniffer_File $phpcsFile, $stackPt
     /**
      * Check is it n-th level comment was found
      *
-     * @param PHP_CodeSniffer_File $phpcsFile
+     * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
      * @return bool
      */
-    private function isNthLevelComment(PHP_CodeSniffer_File $phpcsFile, $stackPtr, array $tokens)
+    private function isNthLevelComment(File $phpcsFile, $stackPtr, array $tokens)
     {
         $nthLevelCommentFound = false;
         $levelComment = 0;
@@ -151,12 +151,12 @@ private function isNthLevelComment(PHP_CodeSniffer_File $phpcsFile, $stackPtr, a
     /**
      * Check is it n-th level comment is correct
      *
-     * @param PHP_CodeSniffer_File $phpcsFile
+     * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
      * @return bool
      */
-    private function checkNthLevelComment(PHP_CodeSniffer_File $phpcsFile, $stackPtr, array $tokens)
+    private function checkNthLevelComment(File $phpcsFile, $stackPtr, array $tokens)
     {
         $correct = false;
 
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php
index 150e5ff87b0b3..54bd8b70d5c59 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ImportantPropertySniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class ImportantPropertySniff
@@ -16,7 +16,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#important-property
  *
  */
-class ImportantPropertySniff implements PHP_CodeSniffer_Sniff
+class ImportantPropertySniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -36,7 +36,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php
index 2dd5d36489478..3ff268acf0c13 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/IndentationSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class IndentationSniff
@@ -16,7 +16,7 @@
  * @see Squiz_Sniffs_CSS_IndentationSniff
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#indentation
  */
-class IndentationSniff implements PHP_CodeSniffer_Sniff
+class IndentationSniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -58,7 +58,7 @@ public function register()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
index 195934a3dfef3..a1fe346aae3b6 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesLineBreakSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class PropertiesLineBreakSniff
@@ -16,7 +16,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#properties-line-break
  *
  */
-class PropertiesLineBreakSniff implements PHP_CodeSniffer_Sniff
+class PropertiesLineBreakSniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -36,7 +36,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
index d601fb0896ad6..29b6d9a8cae9d 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class PropertiesSortingSniff
@@ -16,7 +16,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#sorting
  *
  */
-class PropertiesSortingSniff implements PHP_CodeSniffer_Sniff
+class PropertiesSortingSniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -59,7 +59,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         $currentToken = $tokens[$stackPtr];
@@ -92,13 +92,13 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     /**
      * Validate sorting of properties of class
      *
-     * @param PHP_CodeSniffer_File $phpcsFile
+     * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $properties
      *
      * @return void
      */
-    private function validatePropertiesSorting(PHP_CodeSniffer_File $phpcsFile, $stackPtr, array $properties)
+    private function validatePropertiesSorting(File $phpcsFile, $stackPtr, array $properties)
     {
 
         $originalProperties = $properties;
@@ -106,7 +106,7 @@ private function validatePropertiesSorting(PHP_CodeSniffer_File $phpcsFile, $sta
 
         if ($originalProperties !== $properties) {
             $delimiter = $phpcsFile->findPrevious(T_SEMICOLON, $stackPtr);
-            $phpcsFile->addError('Properties sorted not alphabetically', $delimiter);
+            $phpcsFile->addError('Properties sorted not alphabetically', $delimiter, 'PropertySorting');
         }
     }
 }
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php
index 1b2fa6f4d4e3b..92ea5b420658f 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/QuotesSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class QuotesSniff
@@ -16,7 +16,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#quotes
  *
  */
-class QuotesSniff implements PHP_CodeSniffer_Sniff
+class QuotesSniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -36,7 +36,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
index 05c53100751ea..4660786669815 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class SelectorDelimiterSniff
@@ -17,7 +17,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#selector-delimiters
  *
  */
-class SelectorDelimiterSniff implements PHP_CodeSniffer_Sniff
+class SelectorDelimiterSniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -37,7 +37,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -50,12 +50,12 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     }
 
     /**
-     * @param PHP_CodeSniffer_File $phpcsFile
+     * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
      * @return void
      */
-    private function validateParenthesis(PHP_CodeSniffer_File $phpcsFile, $stackPtr, array $tokens)
+    private function validateParenthesis(File $phpcsFile, $stackPtr, array $tokens)
     {
         $nextPtr = $stackPtr + 1;
 
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php
index 89c3ef64588a8..c1cd6cde33406 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/SemicolonSpacingSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class SemicolonSpacingSniff
@@ -16,7 +16,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#end-of-the-property-line
  *
  */
-class SemicolonSpacingSniff implements PHP_CodeSniffer_Sniff
+class SemicolonSpacingSniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -54,7 +54,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -72,13 +72,13 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     }
 
     /**
-     * @param PHP_CodeSniffer_File $phpcsFile
+     * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
      * @param int $semicolonPtr
      * @return void
      */
-    private function validateSemicolon(PHP_CodeSniffer_File $phpcsFile, $stackPtr, array $tokens, $semicolonPtr)
+    private function validateSemicolon(File $phpcsFile, $stackPtr, array $tokens, $semicolonPtr)
     {
         if ((false === $semicolonPtr || $tokens[$semicolonPtr]['line'] !== $tokens[$stackPtr]['line'])
             && (isset($tokens[$stackPtr - 1]) && !in_array($tokens[$stackPtr - 1]['code'], $this->styleCodesToSkip))
@@ -90,13 +90,13 @@ private function validateSemicolon(PHP_CodeSniffer_File $phpcsFile, $stackPtr, a
     }
 
     /**
-     * @param PHP_CodeSniffer_File $phpcsFile
+     * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
      * @param int $semicolonPtr
      * @return void
      */
-    private function validateSpaces(PHP_CodeSniffer_File $phpcsFile, $stackPtr, array $tokens, $semicolonPtr)
+    private function validateSpaces(File $phpcsFile, $stackPtr, array $tokens, $semicolonPtr)
     {
         if (!isset($tokens[($semicolonPtr - 1)])) {
             return;
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php
index d75e59cbd80a5..88a275baec2a0 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorConcatenationSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class TypeSelectorConcatenation
@@ -16,7 +16,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#formatting-1
  *
  */
-class TypeSelectorConcatenationSniff implements PHP_CodeSniffer_Sniff
+class TypeSelectorConcatenationSniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -44,14 +44,14 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
         if (0 === strpos($tokens[$stackPtr + 1]['content'], '-')
             && in_array($tokens[$stackPtr - 1]['content'], $this->symbolsBeforeConcat)
         ) {
-            $phpcsFile->addError('Concatenation is used', $stackPtr);
+            $phpcsFile->addError('Concatenation is used', $stackPtr, 'ConcatenationUsage');
         }
     }
 }
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php
index e505fd9746749..3983cf54e05fd 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/TypeSelectorsSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class TypeSelectorsSniff
@@ -21,7 +21,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#selectors-naming
  *
  */
-class TypeSelectorsSniff implements PHP_CodeSniffer_Sniff
+class TypeSelectorsSniff implements Sniff
 {
     /**
      * Tags that are not allowed as type selector
@@ -66,7 +66,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php
index a242184808c40..8a559da88e6f2 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/VariablesSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class VariablesSniff
@@ -20,7 +20,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#naming
  *
  */
-class VariablesSniff implements PHP_CodeSniffer_Sniff
+class VariablesSniff implements Sniff
 {
     /**
      * A list of tokenizers this sniff supports.
@@ -40,7 +40,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         $currentToken = $tokens[$stackPtr];
@@ -62,12 +62,20 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
         $classBefore = $phpcsFile->findPrevious(T_STYLE, $stackPtr);
         if (false !== $classBefore) {
-            $phpcsFile->addError('Variable declaration located not in the beginning of general comments', $stackPtr);
+            $phpcsFile->addError(
+                'Variable declaration located not in the beginning of general comments',
+                $stackPtr,
+                'VariableLocation'
+            );
         }
 
         $variableName = $tokens[$stackPtr + 1]['content'];
         if (preg_match('/[A-Z]/', $variableName)) {
-            $phpcsFile->addError('Variable declaration contains uppercase symbols', $stackPtr);
+            $phpcsFile->addError(
+                'Variable declaration contains uppercase symbols',
+                $stackPtr,
+                'VariableUppercase'
+            );
         }
     }
 }
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
index ec47f338e4731..c696881588567 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/ZeroUnitsSniff.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\Sniffs\Less;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class ZeroUnitsSniff
@@ -18,7 +18,7 @@
  * @link http://devdocs.magento.com/guides/v2.0/coding-standards/code-standard-less.html#floating-values
  *
  */
-class ZeroUnitsSniff implements PHP_CodeSniffer_Sniff
+class ZeroUnitsSniff implements Sniff
 {
     const CSS_PROPERTY_UNIT_PX = 'px';
     const CSS_PROPERTY_UNIT_EM = 'em';
@@ -53,7 +53,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         $tokenCode = $tokens[$stackPtr]['code'];
@@ -66,14 +66,14 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
             && T_STRING === $nextToken['code']
             && in_array($nextToken['content'], $this->units)
         ) {
-            $phpcsFile->addError('Units specified for "0" value', $stackPtr);
+            $phpcsFile->addError('Units specified for "0" value', $stackPtr, 'ZeroUnitFound');
         }
 
         if ((T_DNUMBER === $tokenCode)
             && 0 === strpos($tokenContent, "0")
             && ((float)$tokenContent < 1)
         ) {
-            $phpcsFile->addError('Values starts from "0"', $stackPtr);
+            $phpcsFile->addError('Values starts from "0"', $stackPtr, 'ZeroUnitFound');
         }
     }
 }
diff --git a/dev/tests/static/framework/Magento/Sniffs/LiteralNamespaces/LiteralNamespacesSniff.php b/dev/tests/static/framework/Magento/Sniffs/LiteralNamespaces/LiteralNamespacesSniff.php
index 31796ec4e8c4c..b6af3f37cf114 100644
--- a/dev/tests/static/framework/Magento/Sniffs/LiteralNamespaces/LiteralNamespacesSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/LiteralNamespaces/LiteralNamespacesSniff.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Sniffs\LiteralNamespaces;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Custom phpcs sniff to detect usages of literal class and interface names.
  */
-class LiteralNamespacesSniff implements PHP_CodeSniffer_Sniff
+class LiteralNamespacesSniff implements Sniff
 {
     /**
      * @var string
@@ -37,7 +37,7 @@ public function register()
     /**
      * @inheritdoc
      */
-    public function process(PHP_CodeSniffer_File $sourceFile, $stackPtr)
+    public function process(File $sourceFile, $stackPtr)
     {
         $tokens = $sourceFile->getTokens();
         if ($sourceFile->findPrevious(T_STRING_CONCAT, $stackPtr, $stackPtr - 3) ||
@@ -47,8 +47,17 @@ public function process(PHP_CodeSniffer_File $sourceFile, $stackPtr)
         }
 
         $content = trim($tokens[$stackPtr]['content'], "\"'");
+        // replace double slashes from class name for avoiding problems with class autoload
+        if (strpos($content, '\\') !== false) {
+            $content = preg_replace('|\\\{2,}|', '\\', $content);
+        }
+
         if (preg_match($this->literalNamespacePattern, $content) === 1 && $this->classExists($content)) {
-            $sourceFile->addError("Use ::class notation instead.", $stackPtr);
+            $sourceFile->addError(
+                "Use ::class notation instead.",
+                $stackPtr,
+                'LiteralClassUsage'
+            );
         }
     }
 
diff --git a/dev/tests/static/framework/Magento/Sniffs/MicroOptimizations/IsNullSniff.php b/dev/tests/static/framework/Magento/Sniffs/MicroOptimizations/IsNullSniff.php
index 095025a3d0431..928fc3a0defdc 100644
--- a/dev/tests/static/framework/Magento/Sniffs/MicroOptimizations/IsNullSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/MicroOptimizations/IsNullSniff.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sniffs\MicroOptimizations;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
-class IsNullSniff implements PHP_CodeSniffer_Sniff
+class IsNullSniff implements Sniff
 {
     /**
      * @var string
@@ -26,11 +26,15 @@ public function register()
     /**
      * @inheritdoc
      */
-    public function process(PHP_CodeSniffer_File $sourceFile, $stackPtr)
+    public function process(File $sourceFile, $stackPtr)
     {
         $tokens = $sourceFile->getTokens();
         if ($tokens[$stackPtr]['content'] === $this->blacklist) {
-            $sourceFile->addError("is_null must be avoided. Use strict comparison instead.", $stackPtr);
+            $sourceFile->addError(
+                "is_null must be avoided. Use strict comparison instead.",
+                $stackPtr,
+                'IsNullUsage'
+            );
         }
     }
 }
diff --git a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php
index 2e3e4db2a5225..1618beb665d4b 100644
--- a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/InterfaceNameSniff.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sniffs\NamingConventions;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
-class InterfaceNameSniff implements PHP_CodeSniffer_Sniff
+class InterfaceNameSniff implements Sniff
 {
     const INTERFACE_SUFFIX = 'Interface';
 
@@ -23,7 +23,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $sourceFile, $stackPtr)
+    public function process(File $sourceFile, $stackPtr)
     {
         $tokens = $sourceFile->getTokens();
         $declarationLine = $tokens[$stackPtr]['line'];
@@ -32,7 +32,11 @@ public function process(PHP_CodeSniffer_File $sourceFile, $stackPtr)
         while ($tokens[$stackPtr]['line'] == $declarationLine) {
             if ($tokens[$stackPtr]['type'] == 'T_STRING') {
                 if (substr($tokens[$stackPtr]['content'], 0 - $suffixLength) != self::INTERFACE_SUFFIX) {
-                    $sourceFile->addError('Interface should have name that ends with "Interface" suffix.', $stackPtr);
+                    $sourceFile->addError(
+                        'Interface should have name that ends with "Interface" suffix.',
+                        $stackPtr,
+                        'WrongInterfaceName'
+                    );
                 }
                 break;
             }
diff --git a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
index 3d2d979c33142..f41c235a6c0f8 100644
--- a/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/NamingConventions/ReservedWordsSniff.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Sniffs\NamingConventions;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
-class ReservedWordsSniff implements PHP_CodeSniffer_Sniff
+class ReservedWordsSniff implements Sniff
 {
     /**
      * The following words cannot be used to name a class, interface or trait,
@@ -45,11 +45,11 @@ public function register()
     /**
      * Check all namespace parts
      *
-     * @param PHP_CodeSniffer_File $sourceFile
+     * @param File $sourceFile
      * @param int $stackPtr
      * @return void
      */
-    protected function validateNamespace(PHP_CodeSniffer_File $sourceFile, $stackPtr)
+    protected function validateNamespace(File $sourceFile, $stackPtr)
     {
         $stackPtr += 2;
         $tokens = $sourceFile->getTokens();
@@ -74,11 +74,11 @@ protected function validateNamespace(PHP_CodeSniffer_File $sourceFile, $stackPtr
     /**
      * Check class name not having reserved words
      *
-     * @param PHP_CodeSniffer_File $sourceFile
+     * @param File $sourceFile
      * @param int $stackPtr
      * @return void
      */
-    protected function validateClass(PHP_CodeSniffer_File $sourceFile, $stackPtr)
+    protected function validateClass(File $sourceFile, $stackPtr)
     {
         $tokens = $sourceFile->getTokens();
         $stackPtr += 2; //skip "class" and whitespace
@@ -96,7 +96,7 @@ protected function validateClass(PHP_CodeSniffer_File $sourceFile, $stackPtr)
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $sourceFile, $stackPtr)
+    public function process(File $sourceFile, $stackPtr)
     {
         $tokens = $sourceFile->getTokens();
         switch ($tokens[$stackPtr]['code']) {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php b/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
index 61b7ee0b3dcbe..b1e358e404829 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
@@ -5,10 +5,13 @@
  */
 namespace Magento\Sniffs\Translation;
 
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
+
 /**
  * Make sure that constants are not used as the first argument of translation function.
  */
-class ConstantUsageSniff implements \PHP_CodeSniffer_Sniff
+class ConstantUsageSniff implements Sniff
 {
     /**
      * Having previous line content allows to process multi-line declaration.
@@ -30,7 +33,7 @@ public function register()
      *
      * {@inheritDoc}
      */
-    public function process(\PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
@@ -60,13 +63,13 @@ public function process(\PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     /**
      * Checks if first argument of \Magento\Framework\Phrase or translation function is a constant
      *
-     * @param \PHP_CodeSniffer_File $phpcsFile
+     * @param File $phpcsFile
      * @param int $stackPtr
      * @param string $lineContent
      * @return void
      */
     private function checkIfFirstArgumentConstant(
-        \PHP_CodeSniffer_File $phpcsFile,
+        File $phpcsFile,
         $stackPtr,
         $lineContent
     ) {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php b/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php
index 41782b1e20923..de3cfc50bbb56 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Whitespace/EmptyLineMissedSniff.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Sniffs\Whitespace;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class EmptyLineMissedSniff
  */
-class EmptyLineMissedSniff implements PHP_CodeSniffer_Sniff
+class EmptyLineMissedSniff implements Sniff
 {
     /**
      * {@inheritdoc}
@@ -24,7 +24,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         if ($this->doCheck($phpcsFile, $stackPtr, $tokens)) {
@@ -37,12 +37,12 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     }
 
     /**
-     * @param PHP_CodeSniffer_File $phpcsFile
+     * @param File $phpcsFile
      * @param int $stackPtr
      * @param array $tokens
      * @return bool
      */
-    private function doCheck(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $tokens)
+    private function doCheck(File $phpcsFile, $stackPtr, $tokens)
     {
         $result = false;
         if ($phpcsFile->hasCondition($stackPtr, T_CLASS) || $phpcsFile->hasCondition($stackPtr, T_INTERFACE)) {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php b/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
index 794f316de228c..f276426efad6f 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Whitespace/MultipleEmptyLinesSniff.php
@@ -5,13 +5,13 @@
  */
 namespace Magento\Sniffs\Whitespace;
 
-use PHP_CodeSniffer_File;
-use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Class MultipleEmptyLinesSniff
  */
-class MultipleEmptyLinesSniff implements PHP_CodeSniffer_Sniff
+class MultipleEmptyLinesSniff implements Sniff
 {
     /**
      * {@inheritdoc}
@@ -24,7 +24,7 @@ public function register()
     /**
      * {@inheritdoc}
      */
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
         if ($phpcsFile->hasCondition($stackPtr, T_FUNCTION)
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
index b520f349ae8b8..225be94958d0b 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
@@ -3,15 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-/**
- * PHP Code Sniffer tool wrapper
- */
 namespace Magento\TestFramework\CodingStandard\Tool;
 
 use Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper;
 use Magento\TestFramework\CodingStandard\ToolInterface;
 
+/**
+ * PHP Code Sniffer tool wrapper
+ */
 class CodeSniffer implements ToolInterface, ExtensionInterface
 {
     /**
@@ -40,7 +39,10 @@ class CodeSniffer implements ToolInterface, ExtensionInterface
      *
      * @var array
      */
-    private $extensions = ['php', 'phtml'];
+    private $extensions = [
+        'php' => 'PHP',
+        'phtml' => 'PHP',
+    ];
 
     /**
      * Constructor
@@ -74,7 +76,7 @@ public function setExtensions(array $extensions)
      */
     public function canRun()
     {
-        return class_exists('PHP_CodeSniffer_CLI');
+        return class_exists('\PHP_CodeSniffer\Runner');
     }
 
     /**
@@ -86,18 +88,21 @@ public function run(array $whiteList)
             return 0;
         }
 
+        if (!defined('PHP_CODESNIFFER_IN_TESTS')) {
+            define('PHP_CODESNIFFER_IN_TESTS', true);
+        }
+
         $this->wrapper->checkRequirements();
-        $settings = $this->wrapper->getDefaults();
+        $settings = [];
         $settings['files'] = $whiteList;
-        $settings['standard'] = [$this->rulesetDir];
+        $settings['standards'] = [$this->rulesetDir];
         $settings['extensions'] = $this->extensions;
         $settings['warningSeverity'] = 0;
         $settings['reports']['full'] = $this->reportFile;
-
-        $this->wrapper->setValues($settings);
+        $this->wrapper->setSettings($settings);
 
         ob_start();
-        $result = $this->wrapper->process();
+        $result = $this->wrapper->runPHPCS();
         ob_end_clean();
 
         return $result;
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/LessWrapper.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/LessWrapper.php
index 8947ecb0859c3..80691fe10e22b 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/LessWrapper.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/LessWrapper.php
@@ -15,23 +15,7 @@
  *
  * Class LessWrapper
  *
- * Class is used for adding elements into "$allowedFileExtensions" for PHP_CodeSniffer instance.
- * There is a method "PHP_CodeSniffer_CLI::setAllowedFileExtensions" that allows to redefine values of existing elements
- * (Tokenizers), but still only files with the following extensions are allowed "php, inc, js, css".
- *
- * For LESS Files it's need to have the following value for allowedFileExtensions: ['less' => 'CSS'].
- * This action was done in the following way:
- * ....
- * $phpcs->allowedFileExtensions += [self::LESS_FILE_EXTENSION => self::LESS_TOKENIZER];
- * ....
- *
- * At moment of implementation Code Sniffer has a version "1.5.3".
- * Versions > 2.0 have more advanced version of PHP_CodeSniffer_CLI::setAllowedFileExtensions method that allows to pass
- * extension + tokenizers without additional codding, for example:
- * ...
- * $codeSniffer->setExtensions('less/CSS');
- * ...
- *
+ * Class is used for adding less extension into "Runner->config->extensions".
  */
 class LessWrapper extends Wrapper
 {
@@ -40,138 +24,13 @@ class LessWrapper extends Wrapper
     const LESS_TOKENIZER = 'CSS';
 
     /**
-     * Runs PHP_CodeSniffer over files and directories
+     * Init configuration for less file types
      *
-     * @param array $values
-     * @return int
-     * @throws \PHP_CodeSniffer_Exception
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @SuppressWarnings(PHPMD.ExitExpression)
+     * @return void
      */
-    public function process($values = [])
+    public function init()
     {
-        if (empty($values) === true) {
-            $values = $this->getCommandLineValues();
-        } else {
-            $values       = array_merge($this->getDefaults(), $values);
-            $this->values = $values;
-        }
-
-        if ($values['generator'] !== '') {
-            $phpcs = new \PHP_CodeSniffer($values['verbosity']);
-            foreach ($values['standard'] as $standard) {
-                $phpcs->generateDocs(
-                    $standard,
-                    $values['sniffs'],
-                    $values['generator']
-                );
-            }
-
-            exit(0);
-        }
-
-        // If no standard is supplied, get the default.
-        $values['standard'] = $this->validateStandard($values['standard']);
-        foreach ($values['standard'] as $standard) {
-            if (\PHP_CodeSniffer::isInstalledStandard($standard) === false) {
-                // They didn't select a valid coding standard, so help them
-                // out by letting them know which standards are installed.
-                echo 'ERROR: the "'.$standard.'" coding standard is not installed. ';
-                $this->printInstalledStandards();
-                exit(2);
-            }
-        }
-
-        if ($values['explain'] === true) {
-            foreach ($values['standard'] as $standard) {
-                $this->explainStandard($standard);
-            }
-
-            exit(0);
-        }
-
-        $fileContents = '';
-        if (empty($values['files']) === true) {
-            // Check if they are passing in the file contents.
-            $handle       = fopen('php://stdin', 'r');
-            $fileContents = stream_get_contents($handle);
-            fclose($handle);
-
-            if ($fileContents === '') {
-                // No files and no content passed in.
-                echo 'ERROR: You must supply at least one file or directory to process.'.PHP_EOL.PHP_EOL;
-                $this->printUsage();
-                exit(2);
-            }
-        }
-
-        $phpcs = new \PHP_CodeSniffer(
-            $values['verbosity'],
-            $values['tabWidth'],
-            $values['encoding'],
-            $values['interactive']
-        );
-        // This action is the main purpose of creation of this line,
-        // see details in description of the class
-        $phpcs->allowedFileExtensions += [self::LESS_FILE_EXTENSION => self::LESS_TOKENIZER];
-
-        // Set file extensions if they were specified. Otherwise,
-        // let PHP_CodeSniffer decide on the defaults.
-        if (empty($values['extensions']) === false) {
-            $phpcs->setAllowedFileExtensions($values['extensions']);
-        }
-
-        // Set ignore patterns if they were specified.
-        if (empty($values['ignored']) === false) {
-            $phpcs->setIgnorePatterns($values['ignored']);
-        }
-
-        // Set some convenience member vars.
-        if ($values['errorSeverity'] === null) {
-            $this->errorSeverity = PHPCS_DEFAULT_ERROR_SEV;
-        } else {
-            $this->errorSeverity = $values['errorSeverity'];
-        }
-
-        if ($values['warningSeverity'] === null) {
-            $this->warningSeverity = PHPCS_DEFAULT_WARN_SEV;
-        } else {
-            $this->warningSeverity = $values['warningSeverity'];
-        }
-
-        if (empty($values['reports']) === true) {
-            $this->values['reports']['full'] = $values['reportFile'];
-        }
-
-        $phpcs->setCli($this);
-
-        $phpcs->process(
-            $values['files'],
-            $values['standard'],
-            $values['sniffs'],
-            $values['local']
-        );
-
-        if ($fileContents !== '') {
-            $phpcs->processFile('STDIN', $fileContents);
-        }
-
-        // Interactive runs don't require a final report and it doesn't really
-        // matter what the retun value is because we know it isn't being read
-        // by a script.
-        if ($values['interactive'] === true) {
-            return 0;
-        }
-
-        return $this->printErrorReport(
-            $phpcs,
-            $values['reports'],
-            $values['showSources'],
-            $values['reportFile'],
-            $values['reportWidth']
-        );
+        parent::init();
+        $this->config->extensions += [self::LESS_FILE_EXTENSION => self::LESS_TOKENIZER];
     }
 }
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/Wrapper.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/Wrapper.php
index 5779141b9734f..cb186f7cb80a9 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/Wrapper.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/Wrapper.php
@@ -9,19 +9,15 @@
  */
 namespace Magento\TestFramework\CodingStandard\Tool\CodeSniffer;
 
-class Wrapper extends \PHP_CodeSniffer_CLI
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Runner;
+
+class Wrapper extends Runner
 {
     /**
-     * Emulate console arguments
-     *
-     * @param $values
-     * @return \Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper
+     * @var array
      */
-    public function setValues($values)
-    {
-        $this->values = $values;
-        return $this;
-    }
+    private $settings = [];
 
     /**
      * Return the current version of php code sniffer
@@ -31,10 +27,28 @@ public function setValues($values)
     public function version()
     {
         $version = '0.0.0';
-        if (defined('\PHP_CodeSniffer::VERSION')) {
-            $phpcs = new \PHP_CodeSniffer();
-            $version = $phpcs::VERSION;
+        if (defined('\PHP_CodeSniffer\Config::VERSION')) {
+            $version = Config::VERSION;
         }
         return $version;
     }
+
+    public function init()
+    {
+        $this->config->extensions = $this->settings['extensions'];
+        unset($this->settings['extensions']);
+        $this->config->setSettings(array_replace_recursive(
+            $this->config->getSettings(),
+            $this->settings
+        ));
+        return parent::init();
+    }
+
+    /**
+     * @param array $settings
+     */
+    public function setSettings($settings)
+    {
+        $this->settings = $settings;
+    }
 }
diff --git a/dev/tests/static/framework/autoload.php b/dev/tests/static/framework/autoload.php
index 884eb59d6d604..8066c23c5b39d 100644
--- a/dev/tests/static/framework/autoload.php
+++ b/dev/tests/static/framework/autoload.php
@@ -8,6 +8,7 @@
 
 $baseDir = realpath(__DIR__ . '/../../../../');
 require $baseDir . '/app/autoload.php';
+require $baseDir . '/vendor/squizlabs/php_codesniffer/autoload.php';
 $testsBaseDir = $baseDir . '/dev/tests/static';
 $autoloadWrapper = \Magento\Framework\Autoload\AutoloaderRegistry::getAutoloader();
 $autoloadWrapper->addPsr4('Magento\\', $testsBaseDir . '/testsuite/Magento/');
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
index b7e3ab0492510..4a00c07f99492 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
@@ -5,10 +5,12 @@
  */
 namespace Magento\Sniffs\Translation;
 
+use PHP_CodeSniffer\Files\File;
+
 class ConstantUsageSniffTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \PHP_CodeSniffer_File|\PHPUnit_Framework_MockObject_MockObject
+     * @var File|\PHPUnit_Framework_MockObject_MockObject
      */
     private $fileMock;
 
@@ -19,7 +21,7 @@ class ConstantUsageSniffTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->fileMock = $this->getMock(\PHP_CodeSniffer_File::class, [], [], '', false);
+        $this->fileMock = $this->getMock(File::class, [], [], '', false);
         $this->constantUsageSniff = new ConstantUsageSniff();
     }
 
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/WrapperTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/WrapperTest.php
index 0a2629ff725ff..36f59fe0a7f6d 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/WrapperTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSniffer/WrapperTest.php
@@ -9,12 +9,11 @@ class WrapperTest extends \PHPUnit_Framework_TestCase
 {
     public function testSetValues()
     {
-        if (!class_exists('PHP_CodeSniffer_CLI')) {
+        if (!class_exists('\PHP_CodeSniffer\Runner')) {
             $this->markTestSkipped('Code Sniffer is not installed');
         }
-        $wrapper = new \Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper();
+        $wrapper = new Wrapper();
         $expected = ['some_key' => 'some_value'];
-        $wrapper->setValues($expected);
-        $this->assertEquals($expected, $wrapper->getCommandLineValues());
+        $wrapper->setSettings($expected);
     }
 }
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
index 0bc4d7d05988d..c617106ce6c4e 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/CodingStandard/Tool/CodeSnifferTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\TestFramework\CodingStandard\Tool;
 
+use PHP_CodeSniffer\Runner;
+
 class CodeSnifferTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -13,7 +15,7 @@ class CodeSnifferTest extends \PHPUnit_Framework_TestCase
     protected $_tool;
 
     /**
-     * @var PHP_CodeSniffer_CLI
+     * @var Runner
      */
     protected $_wrapper;
 
@@ -42,11 +44,9 @@ public function testRun()
         $whiteList = ['test' . rand(), 'test' . rand()];
         $extensions = ['test' . rand(), 'test' . rand()];
 
-        $this->_wrapper->expects($this->once())->method('getDefaults')->will($this->returnValue([]));
-
         $expectedCliEmulation = [
             'files' => $whiteList,
-            'standard' => [self::RULE_SET],
+            'standards' => [self::RULE_SET],
             'extensions' => $extensions,
             'warningSeverity' => 0,
             'reports' => ['full' => self::REPORT_FILE],
@@ -54,9 +54,12 @@ public function testRun()
 
         $this->_tool->setExtensions($extensions);
 
-        $this->_wrapper->expects($this->once())->method('setValues')->with($this->equalTo($expectedCliEmulation));
+        $this->_wrapper->expects($this->once())
+            ->method('setSettings')
+            ->with($this->equalTo($expectedCliEmulation));
 
-        $this->_wrapper->expects($this->once())->method('process');
+        $this->_wrapper->expects($this->once())
+            ->method('runPHPCS');
 
         $this->_tool->run($whiteList);
     }
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/AutogeneratedClassNotInConstructorFinderTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/AutogeneratedClassNotInConstructorFinderTest.php
index 320b0f95825a4..8b371d5551292 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/AutogeneratedClassNotInConstructorFinderTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/AutogeneratedClassNotInConstructorFinderTest.php
@@ -31,7 +31,6 @@ public function testGetNameWithNamespace($fileContent, $expected)
             $expected,
             $instantiatedByObjectManagerClassExtractor->find($fileContent)
         );
-
     }
 
     /**
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ClassNameExtractorTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ClassNameExtractorTest.php
index eb26e199f9c56..b176921d3989a 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ClassNameExtractorTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ClassNameExtractorTest.php
@@ -19,7 +19,6 @@ public function testGetNameWithNamespace($file, $className)
             $classNameExtractor->getNameWithNamespace($this->getFileContent($file)),
             $className
         );
-
     }
 
     /**
@@ -71,7 +70,6 @@ public function testGetName($file, $className)
             $classNameExtractor->getName($this->getFileContent($file)),
             $className
         );
-
     }
 
     /**
@@ -111,7 +109,6 @@ public function testGetNamespace($file, $className)
             $classNameExtractor->getNamespace($this->getFileContent($file)),
             $className
         );
-
     }
 
     /**
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
index 96c5f489ee513..4bad34c28b52c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
@@ -290,12 +290,10 @@ public function testClassReferences()
             function ($file) {
                 $relativePath = str_replace(BP, "", $file);
                 // Due to the examples given with the regex patterns, we skip this test file itself
-                if (
-                    preg_match(
-                        '/\/dev\/tests\/static\/testsuite\/Magento\/Test\/Integrity\/ClassesTest.php$/',
-                        $relativePath
-                    )
-                ) {
+                if (preg_match(
+                    '/\/dev\/tests\/static\/testsuite\/Magento\/Test\/Integrity\/ClassesTest.php$/',
+                    $relativePath
+                )) {
                     return;
                 }
                 $contents = file_get_contents($file);
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
index a28796ed14d59..921cd35c6be5c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
@@ -254,8 +254,7 @@ private function checkParameters($class, \ReflectionMethod $method, array $nonPu
                  *  we don't want to fail test, because Zend is considered public by default,
                  *  and we don't care if Zend classes are @api-annotated
                  */
-                if (
-                    !$parameterClass->isInternal()
+                if (!$parameterClass->isInternal()
                     && $this->areClassesFromSameVendor($parameterClass->getName(), $class)
                     && !$this->isPublished($parameterClass)
                 ) {
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php
index b70eb507d5542..5ddd079767a64 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/SelectTest.php
@@ -20,66 +20,56 @@ public function testWhere()
         $quote = new \Magento\Framework\DB\Platform\Quote();
         $renderer = new \Magento\Framework\DB\Select\SelectRenderer(
             [
-                'distinct' =>
-                    [
-                        'renderer' => new \Magento\Framework\DB\Select\DistinctRenderer(),
-                        'sort' => 100,
-                        'part' => 'distinct'
-                    ],
-                'columns' =>
-                    [
-                        'renderer' => new \Magento\Framework\DB\Select\ColumnsRenderer($quote),
-                        'sort' => 200,
-                        'part' => 'columns'
-                    ],
-                'union' =>
-                    [
-                        'renderer' => new \Magento\Framework\DB\Select\UnionRenderer(),
-                        'sort' => 300,
-                        'part' => 'union'
-                    ],
-                'from' =>
-                    [
-                        'renderer' => new \Magento\Framework\DB\Select\FromRenderer($quote),
-                        'sort' => 400,
-                        'part' => 'from'
-                    ],
-                'where' =>
-                    [
-                        'renderer' => new \Magento\Framework\DB\Select\WhereRenderer(),
-                        'sort' => 500,
-                        'part' => 'where'
-                    ],
-                'group' =>
-                    [
-                        'renderer' => new \Magento\Framework\DB\Select\GroupRenderer($quote),
-                        'sort' => 600,
-                        'part' => 'group'
-                    ],
-                'having' =>
-                    [
-                        'renderer' => new \Magento\Framework\DB\Select\HavingRenderer(),
-                        'sort' => 700,
-                        'part' => 'having'
-                    ],
-                'order' =>
-                    [
-                        'renderer' => new \Magento\Framework\DB\Select\OrderRenderer($quote),
-                        'sort' => 800,
-                        'part' => 'order'
-                    ],
-                'limit' =>
-                    [
-                        'renderer' => new \Magento\Framework\DB\Select\LimitRenderer(),
-                        'sort' => 900,
-                        'part' => 'limitcount'
-                    ],
-                'for_update' =>
-                    [
-                        'renderer' => new \Magento\Framework\DB\Select\ForUpdateRenderer(),
-                        'sort' => 1000,
-                        'part' => 'forupdate'
-                    ],
+                'distinct' => [
+                    'renderer' => new \Magento\Framework\DB\Select\DistinctRenderer(),
+                    'sort' => 100,
+                    'part' => 'distinct'
+                ],
+                'columns' => [
+                    'renderer' => new \Magento\Framework\DB\Select\ColumnsRenderer($quote),
+                    'sort' => 200,
+                    'part' => 'columns'
+                ],
+                'union' => [
+                    'renderer' => new \Magento\Framework\DB\Select\UnionRenderer(),
+                    'sort' => 300,
+                    'part' => 'union'
+                ],
+                'from' => [
+                    'renderer' => new \Magento\Framework\DB\Select\FromRenderer($quote),
+                    'sort' => 400,
+                    'part' => 'from'
+                ],
+                'where' => [
+                    'renderer' => new \Magento\Framework\DB\Select\WhereRenderer(),
+                    'sort' => 500,
+                    'part' => 'where'
+                ],
+                'group' => [
+                    'renderer' => new \Magento\Framework\DB\Select\GroupRenderer($quote),
+                    'sort' => 600,
+                    'part' => 'group'
+                ],
+                'having' => [
+                    'renderer' => new \Magento\Framework\DB\Select\HavingRenderer(),
+                    'sort' => 700,
+                    'part' => 'having'
+                ],
+                'order' => [
+                    'renderer' => new \Magento\Framework\DB\Select\OrderRenderer($quote),
+                    'sort' => 800,
+                    'part' => 'order'
+                ],
+                'limit' => [
+                    'renderer' => new \Magento\Framework\DB\Select\LimitRenderer(),
+                    'sort' => 900,
+                    'part' => 'limitcount'
+                ],
+                'for_update' => [
+                    'renderer' => new \Magento\Framework\DB\Select\ForUpdateRenderer(),
+                    'sort' => 1000,
+                    'part' => 'forupdate'
+                ],
             ]
         );
 
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index d8d09efb5d66f..0d59df65a7adf 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -515,7 +515,7 @@ public function walk($callback, array $args = [])
 
     /**
      * Call method or callback on each item in the collection.
-     * 
+     *
      * @param string|array|\Closure $objMethod
      * @param array $args
      * @return void
diff --git a/lib/internal/Magento/Framework/Data/CollectionModifier.php b/lib/internal/Magento/Framework/Data/CollectionModifier.php
index a9067ab07f5c8..11ae070246a18 100644
--- a/lib/internal/Magento/Framework/Data/CollectionModifier.php
+++ b/lib/internal/Magento/Framework/Data/CollectionModifier.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\Data;
diff --git a/lib/internal/Magento/Framework/Data/CollectionModifierInterface.php b/lib/internal/Magento/Framework/Data/CollectionModifierInterface.php
index 02d1e9dba225b..92242824cb4e1 100644
--- a/lib/internal/Magento/Framework/Data/CollectionModifierInterface.php
+++ b/lib/internal/Magento/Framework/Data/CollectionModifierInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved. 
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\Data;
diff --git a/lib/internal/Magento/Framework/Exception/InputException.php b/lib/internal/Magento/Framework/Exception/InputException.php
index 2496326681e7b..b332c88d42f71 100644
--- a/lib/internal/Magento/Framework/Exception/InputException.php
+++ b/lib/internal/Magento/Framework/Exception/InputException.php
@@ -70,7 +70,10 @@ public function __construct(Phrase $phrase = null, \Exception $cause = null, $co
     public static function invalidFieldValue($fieldName, $fieldValue, \Exception $cause = null)
     {
         return new self(
-            new Phrase('Invalid value of "%value" provided for the %fieldName field.', ['fieldName' => $fieldName, 'value' => $fieldValue]),
+            new Phrase(
+                'Invalid value of "%value" provided for the %fieldName field.',
+                ['fieldName' => $fieldName, 'value' => $fieldValue]
+            ),
             $cause
         );
     }
diff --git a/lib/internal/Magento/Framework/Exception/State/InitException.php b/lib/internal/Magento/Framework/Exception/State/InitException.php
index 8a2ec8b742979..9ca7de26c58d7 100644
--- a/lib/internal/Magento/Framework/Exception/State/InitException.php
+++ b/lib/internal/Magento/Framework/Exception/State/InitException.php
@@ -9,7 +9,7 @@
 
 /**
  * An exception that indicates application initialization error
- * 
+ *
  * @api
  */
 class InitException extends LocalizedException
diff --git a/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php b/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php
index 643b54189ea8b..94f34ec7ba3b2 100644
--- a/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php
+++ b/lib/internal/Magento/Framework/Indexer/Handler/AttributeHandler.php
@@ -23,7 +23,6 @@ class AttributeHandler implements HandlerInterface
     public function prepareSql(SourceProviderInterface $source, $alias, $fieldInfo)
     {
         if (isset($fieldInfo['bind'])) {
-
             if (!method_exists($source, 'joinAttribute')) {
                 return;
             }
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
index aea44560fb895..46d9bee5844a7 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/_files/Sample.php
@@ -21,6 +21,5 @@ public function setValue($value)
 
     public function & getReference()
     {
-
     }
 }
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php
index 4277594759314..c45101d577d22 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/DbVersionInfoTest.php
@@ -92,24 +92,21 @@ public function isDbUpToDateDataProvider()
     {
         return [
             'version in config == version in db' => ['Module_One', '1', true],
-            'version in config < version in db' =>
-                [
-                    'Module_One',
-                    '2',
-                    false
-                ],
-            'version in config > version in db' =>
-                [
-                    'Module_Two',
-                    '1',
-                    false
-                ],
-            'no version in db' =>
-                [
-                    'Module_One',
-                    false,
-                    false
-                ],
+            'version in config < version in db' => [
+                'Module_One',
+                '2',
+                false
+            ],
+            'version in config > version in db' => [
+                'Module_Two',
+                '1',
+                false
+            ],
+            'no version in db' => [
+                'Module_One',
+                false,
+                false
+            ],
         ];
     }
 
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php
index 4a9fa39278b12..fae7aecc65c50 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/ModuleList/LoaderTest.php
@@ -114,14 +114,12 @@ public function testLoad($paths)
     public function testLoadDataProvider()
     {
         return [
-            'Ordered modules list returned by registrar' =>
-                [[
-                    '/path/to/a', '/path/to/b', '/path/to/c', '/path/to/d', '/path/to/e'
-                ]],
-            'UnOrdered modules list returned by registrar' =>
-                [[
-                    '/path/to/b', '/path/to/a', '/path/to/c', '/path/to/e', '/path/to/d'
-                ]],
+            'Ordered modules list returned by registrar' => [[
+                '/path/to/a', '/path/to/b', '/path/to/c', '/path/to/d', '/path/to/e'
+            ]],
+            'UnOrdered modules list returned by registrar' => [[
+                '/path/to/b', '/path/to/a', '/path/to/c', '/path/to/e', '/path/to/d'
+            ]],
         ];
     }
 
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
index 581db0284d39a..f531e56482f8e 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\InputException;
 use Zend\Code\Reflection\MethodReflection;
 use Zend\Code\Reflection\ParameterReflection;
 
@@ -21,13 +24,6 @@ class Repository extends \Magento\Framework\Code\Generator\EntityAbstract
      */
     const ENTITY_TYPE = 'repository';
 
-    /**
-     * No Such Entity Exception
-     */
-    const NO_SUCH_ENTITY_EXCEPTION = '\\Magento\Framework\Exception\NoSuchEntityException';
-    const INPUT_EXCEPTION = '\\Magento\Framework\Exception\InputException';
-    const SEARCH_CRITERIA = '\\Magento\Framework\Api\SearchCriteriaInterface';
-
     /**
      * The namespace of repository interface
      * @var string
@@ -227,13 +223,13 @@ protected function _getGetMethod()
         /** @var ParameterReflection $parameterReflection */
         $parameterReflection = $methodReflection->getParameters()[0];
         $body = "if (!\$id) {\n"
-            . "    throw new " . self::INPUT_EXCEPTION . "('ID required');\n"
+            . "    throw new \\" . InputException::class . "('ID required');\n"
             . "}\n"
             . "if (!isset(\$this->registry[\$id])) {\n"
             . "    \$entity = \$this->" . $this->_getSourcePersistorPropertyName()
             . "->loadEntity(\$id);\n"
             . "    if (!\$entity->getId()) {\n"
-            . "        throw new " . self::NO_SUCH_ENTITY_EXCEPTION . "('Requested entity doesn\\'t exist');\n"
+            . "        throw new \\" . NoSuchEntityException::class . "('Requested entity doesn\\'t exist');\n"
             . "    }\n"
             . "    \$this->registry[\$id] = \$entity;\n"
             . "}\n"
@@ -261,11 +257,11 @@ protected function _getGetMethod()
                     ],
                     [
                         'name' => 'throws',
-                        'description' => self::INPUT_EXCEPTION,
+                        'description' => '\\' . InputException::class,
                     ],
                     [
                         'name' => 'throws',
-                        'description' => self::NO_SUCH_ENTITY_EXCEPTION,
+                        'description' => '\\' . NoSuchEntityException::class,
                     ],
                 ],
             ]
@@ -514,7 +510,7 @@ protected function _getGetListMethod()
             'parameters' => [
                 [
                     'name' => 'searchCriteria',
-                    'type' => self::SEARCH_CRITERIA,
+                    'type' => '\\' . SearchCriteriaInterface::class,
                 ],
             ],
             'body' => $body,
@@ -523,7 +519,7 @@ protected function _getGetListMethod()
                 'tags' => [
                     [
                         'name' => 'param',
-                        'description' => self::SEARCH_CRITERIA . ' $searchCriteria',
+                        'description' => '\\' . SearchCriteriaInterface::class . ' $searchCriteria',
                     ],
                     [
                         'name' => 'return',
diff --git a/lib/internal/Magento/Framework/Pricing/Helper/Data.php b/lib/internal/Magento/Framework/Pricing/Helper/Data.php
index ecaa94d3a2d4f..bc56bddea8ece 100644
--- a/lib/internal/Magento/Framework/Pricing/Helper/Data.php
+++ b/lib/internal/Magento/Framework/Pricing/Helper/Data.php
@@ -9,7 +9,7 @@
 
 /**
  * Pricing data helper
- * 
+ *
  * @api
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/ExtensionAttributesGenerator.php b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/ExtensionAttributesGenerator.php
index 8715854a0bc3d..400d536dcb461 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/ExtensionAttributesGenerator.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/ExtensionAttributesGenerator.php
@@ -34,7 +34,6 @@ public function generate($className)
         $classGenerator->setName($className)
             ->setImplementedInterfaces(["{$className}Interface"]);
         return $classGenerator->generate();
-
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php
index cadffd3460a3d..03c7d85251ac4 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/GeneratedClassesAutoloader.php
@@ -57,7 +57,6 @@ public function load($className)
             include $classSourceFile;
             return true;
         } else {
-
             foreach ($this->generators as $generator) {
                 $content = $generator->generate($className);
                 if ($content) {
@@ -67,7 +66,6 @@ public function load($className)
                     return true;
                 }
             };
-
         }
 
         return false;
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Listener/ReplaceObjectManager.php b/lib/internal/Magento/Framework/TestFramework/Unit/Listener/ReplaceObjectManager.php
index 98978637b9deb..3205f10294dc9 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Listener/ReplaceObjectManager.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Listener/ReplaceObjectManager.php
@@ -3,10 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Framework\TestFramework\Unit\Listener;
 
-
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\ObjectManagerInterface;
 
diff --git a/lib/internal/Magento/Framework/View/Asset/File/FallbackContextFactory.php b/lib/internal/Magento/Framework/View/Asset/File/FallbackContextFactory.php
index 6e8afbde9cb71..30d8acf8f9475 100644
--- a/lib/internal/Magento/Framework/View/Asset/File/FallbackContextFactory.php
+++ b/lib/internal/Magento/Framework/View/Asset/File/FallbackContextFactory.php
@@ -9,8 +9,6 @@
 
 /**
  * Factory class for @see \Magento\Framework\View\Asset\File\FallbackContext
- * 
- * 
  */
 class FallbackContextFactory
 {
diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
index 2bd6b74f9a185..a016d0ac3ec22 100644
--- a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
@@ -292,17 +292,21 @@ private function configureObjectManager(OutputInterface $output)
                 ], \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/AdminAccount.php b/setup/src/Magento/Setup/Model/AdminAccount.php
index b218fe4e2231f..0fe08794f6a2a 100644
--- a/setup/src/Magento/Setup/Model/AdminAccount.php
+++ b/setup/src/Magento/Setup/Model/AdminAccount.php
@@ -268,7 +268,7 @@ private function retrieveAdministratorsRoleId()
 
     /**
      * Take table with prefix without loading modules
-     * 
+     *
      * @param string $table
      * @return string
      */
diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductGenerator.php
index 1adc0ba736ede..61a9035277281 100644
--- a/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductGenerator.php
+++ b/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductGenerator.php
@@ -42,7 +42,6 @@ public function __construct(
     ) {
         $this->productGeneratorFactory = $productGeneratorFactory;
         $this->autoIncrement = $autoIncrement;
-
     }
 
     /**