diff --git a/.travis.yml b/.travis.yml
index 74e374412fff4..6c147707b3342 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,12 +26,11 @@ cache:
   directories: $HOME/.composer/cache
 matrix:
   exclude:
-    - php: 7.0
+    - php: 5.6.29
       env: TEST_SUITE=static
 before_install: ./dev/travis/before_install.sh
 install: composer install --no-interaction --prefer-dist
 before_script: ./dev/travis/before_script.sh
 script:
-  - cd dev/tests/$TEST_SUITE
   - test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
-  - phpunit $TEST_FILTER
+  - phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
index 312394787ef82..fce3f6b105dc5 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
@@ -9,7 +9,7 @@
 use Magento\Store\Model\Store;
 
 /**
- * @deprecated 
+ * @deprecated
  */
 class Baseurl implements \Magento\Framework\Notification\MessageInterface
 {
diff --git a/app/code/Magento/AdminNotification/Setup/InstallSchema.php b/app/code/Magento/AdminNotification/Setup/InstallSchema.php
index 01c447b9cc2db..d3f9dd2e0c7be 100644
--- a/app/code/Magento/AdminNotification/Setup/InstallSchema.php
+++ b/app/code/Magento/AdminNotification/Setup/InstallSchema.php
@@ -120,6 +120,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
index 6a0fd28ac7466..edec01a8af4ac 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
@@ -13,7 +13,7 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Store\Model\WebSite|\PHPUnit_Framework_MockObject_MockObject
      */
-     protected $webSiteModel;
+    protected $webSiteModel;
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver|\PHPUnit_Framework_MockObject_MockObject
diff --git a/app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Postpone.php b/app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Postpone.php
index b87730132e3d4..8c4183150d0f5 100644
--- a/app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Postpone.php
+++ b/app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Postpone.php
@@ -55,7 +55,6 @@ public function __construct(
         $this->notificationTime = $notificationTime;
         $this->logger = $logger;
         parent::__construct($context);
-
     }
 
     /**
diff --git a/app/code/Magento/Analytics/Model/FileRecorder.php b/app/code/Magento/Analytics/Model/FileRecorder.php
index c1ef8da247147..c087fb1d208b3 100644
--- a/app/code/Magento/Analytics/Model/FileRecorder.php
+++ b/app/code/Magento/Analytics/Model/FileRecorder.php
@@ -78,7 +78,6 @@ public function recordNewFile(EncodedContext $encodedContext)
         $this->removeOldFile($fileInfo, $directory);
 
         return true;
-        
     }
 
     /**
diff --git a/app/code/Magento/Analytics/Model/ReportWriter.php b/app/code/Magento/Analytics/Model/ReportWriter.php
index 80b1210f9677a..39c5fec752585 100644
--- a/app/code/Magento/Analytics/Model/ReportWriter.php
+++ b/app/code/Magento/Analytics/Model/ReportWriter.php
@@ -80,7 +80,6 @@ public function write(WriteInterface $directory, $path)
                 if (!$headers) {
                     $headers = array_keys($row);
                     $stream->writeCsv($headers);
-
                 }
                 $stream->writeCsv($row);
             }
diff --git a/app/code/Magento/Analytics/ReportXml/Config/Mapper.php b/app/code/Magento/Analytics/ReportXml/Config/Mapper.php
index cd64867984530..190e84c434182 100644
--- a/app/code/Magento/Analytics/ReportXml/Config/Mapper.php
+++ b/app/code/Magento/Analytics/ReportXml/Config/Mapper.php
@@ -31,7 +31,6 @@ public function execute($configData)
             $entityData = array_shift($queryData['source']);
             $queries[$queryData['name']] = $queryData;
             $queries[$queryData['name']]['source'] = $entityData;
-
         }
         return $queries;
     }
diff --git a/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php b/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php
index b3d4c42a62df7..66d31737ba4cb 100644
--- a/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php
+++ b/app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php
@@ -63,7 +63,6 @@ public function getColumns(SelectBuilder $selectBuilder, $entityConfig)
             if (isset($attributeData['group'])) {
                 $group[$columnAlias] = $expression;
             }
-
         }
         $selectBuilder->setGroup(array_merge($selectBuilder->getGroup(), $group));
         return $columns;
diff --git a/app/code/Magento/Analytics/ReportXml/Query.php b/app/code/Magento/Analytics/ReportXml/Query.php
index 2bdf2432600dd..5e62235f329e4 100644
--- a/app/code/Magento/Analytics/ReportXml/Query.php
+++ b/app/code/Magento/Analytics/ReportXml/Query.php
@@ -25,7 +25,7 @@ class Query implements \JsonSerializable
     private $selectHydrator;
 
     /**
-     * @var string 
+     * @var string
      */
     private $connectionName;
 
diff --git a/app/code/Magento/Analytics/ReportXml/ReportProvider.php b/app/code/Magento/Analytics/ReportXml/ReportProvider.php
index 9a8a8ffab0861..7c92db6964865 100644
--- a/app/code/Magento/Analytics/ReportXml/ReportProvider.php
+++ b/app/code/Magento/Analytics/ReportXml/ReportProvider.php
@@ -74,6 +74,5 @@ public function getReport($name, SearchCriteria $criteria = null)
         $connection = $this->connectionFactory->getConnection($query->getConnectionName());
         $statement = $connection->query($query->getSelect());
         return $this->iteratorFactory->create($statement, $this->getIteratorName($query));
-
     }
 }
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/CollectionTimeTest.php b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/CollectionTimeTest.php
index 132aa4aac9529..bcdd5f8ce47b3 100644
--- a/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/CollectionTimeTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/CollectionTimeTest.php
@@ -76,7 +76,6 @@ public function testAfterSave()
             Value::class,
             $this->collectionTime->afterSave()
         );
-
     }
 
     /**
diff --git a/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml b/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml
index 45d1d8b77547f..188d9a00b6fb4 100644
--- a/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml
+++ b/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml
@@ -3,6 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// @codingStandardsIgnoreFile
 ?>
 
 <section class="dashboard-advanced-reports" data-index="dashboard-advanced-reports">
diff --git a/app/code/Magento/Authorizenet/Model/Directpost.php b/app/code/Magento/Authorizenet/Model/Directpost.php
index 1dc4e79c0bdad..5782cdd041445 100644
--- a/app/code/Magento/Authorizenet/Model/Directpost.php
+++ b/app/code/Magento/Authorizenet/Model/Directpost.php
@@ -281,15 +281,14 @@ protected function processCapture($result, $payment)
         switch ($result->getXResponseCode()) {
             case self::RESPONSE_CODE_APPROVED:
             case self::RESPONSE_CODE_HELD:
-                if (
-                    in_array(
-                        $result->getXResponseReasonCode(),
-                        [
+                if (in_array(
+                    $result->getXResponseReasonCode(),
+                    [
                             self::RESPONSE_REASON_CODE_APPROVED,
                             self::RESPONSE_REASON_CODE_PENDING_REVIEW,
                             self::RESPONSE_REASON_CODE_PENDING_REVIEW_AUTHORIZED
                         ]
-                    )
+                )
                 ) {
                     if (!$payment->getParentTransactionId()
                         || $result->getXTransId() != $payment->getParentTransactionId()
@@ -534,8 +533,7 @@ public function validateResponse()
     {
         $response = $this->getResponse();
         //md5 check
-        if (
-            !$this->getConfigData('trans_md5')
+        if (!$this->getConfigData('trans_md5')
             || !$this->getConfigData('login')
             || !$response->isValidHash($this->getConfigData('trans_md5'), $this->getConfigData('login'))
         ) {
@@ -802,8 +800,7 @@ protected function declineOrder(\Magento\Sales\Model\Order $order, $message = ''
     {
         try {
             $response = $this->getResponse();
-            if (
-                $voidPayment && $response->getXTransId() && strtoupper($response->getXType())
+            if ($voidPayment && $response->getXTransId() && strtoupper($response->getXType())
                 == self::REQUEST_TYPE_AUTH_ONLY
             ) {
                 $order->getPayment()->setTransactionId(null)->setParentTransactionId($response->getXTransId())->void();
diff --git a/app/code/Magento/Backend/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php
index e48d49d5112e3..ed121d4d7be6c 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Sales.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Sales.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Backend\Block\Dashboard;
 
-
 /**
  * Adminhtml dashboard sales statistics bar
  *
diff --git a/app/code/Magento/Backend/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php
index 0e44a793c3422..d733d1d7d1f89 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Totals.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Totals.php
@@ -11,7 +11,6 @@
  */
 namespace Magento\Backend\Block\Dashboard;
 
-
 class Totals extends \Magento\Backend\Block\Dashboard\Bar
 {
     /**
diff --git a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
index 02f7c5ad58e29..2c8b6922d2b97 100644
--- a/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
+++ b/app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php
@@ -65,7 +65,7 @@ protected function _prepareForm()
                     'required' => true
                 ]
             );
-            $renderer = $this->getLayout()->createBlock(
+            $renderer = $this->getLayout()->createBlock(
                  \Magento\Backend\Block\Store\Switcher\Form\Renderer\Fieldset\Element::class
             );
             $field->setRenderer($renderer);
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php
index f2663290dbeaa..d18a655ba88c2 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php
@@ -12,6 +12,7 @@
 class Store extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilter
 {
     const ALL_STORE_VIEWS = '0';
+
     /**
      * @var \Magento\Store\Model\System\Store
      */
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php
index 0871d82bf5e68..08152342ffce0 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php
@@ -9,7 +9,6 @@
  */
 namespace Magento\Backend\Block\Widget\Grid\Column\Renderer;
 
-
 class Country extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
diff --git a/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php b/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php
index 2fc8eeac8c994..a4e828dafcc0e 100644
--- a/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php
+++ b/app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php
@@ -26,7 +26,7 @@ public function beforeSave()
             throw new LocalizedException(
                 __('Admin session lifetime must be less than or equal to 31536000 seconds (one year)')
             );
-        } else if ($value < self::MIN_LIFETIME) {
+        } elseif ($value < self::MIN_LIFETIME) {
             throw new LocalizedException(
                 __('Admin session lifetime must be greater than or equal to 60 seconds')
             );
diff --git a/app/code/Magento/Backend/Model/Locale/Manager.php b/app/code/Magento/Backend/Model/Locale/Manager.php
index 7f2fa2d5e5a4c..52a5eeb401ec3 100644
--- a/app/code/Magento/Backend/Model/Locale/Manager.php
+++ b/app/code/Magento/Backend/Model/Locale/Manager.php
@@ -70,7 +70,7 @@ public function switchBackendInterfaceLocale($localeCode)
     }
 
     /**
-     * Get general interface locale 
+     * Get general interface locale
      *
      * @return string
      */
diff --git a/app/code/Magento/Backend/Model/Menu/Item/Validator.php b/app/code/Magento/Backend/Model/Menu/Item/Validator.php
index 720ef840986f3..33e14b4cbc346 100644
--- a/app/code/Magento/Backend/Model/Menu/Item/Validator.php
+++ b/app/code/Magento/Backend/Model/Menu/Item/Validator.php
@@ -82,8 +82,7 @@ public function validate($data)
         }
 
         foreach ($data as $param => $value) {
-            if (
-                $data[$param] !== null
+            if ($data[$param] !== null
             && isset(
                 $this->_validators[$param]
             ) && !$this->_validators[$param]->isValid(
diff --git a/app/code/Magento/Backend/Model/View/Layout/ConditionInterface.php b/app/code/Magento/Backend/Model/View/Layout/ConditionInterface.php
index 033ce511d8ec7..a1d59b151d802 100644
--- a/app/code/Magento/Backend/Model/View/Layout/ConditionInterface.php
+++ b/app/code/Magento/Backend/Model/View/Layout/ConditionInterface.php
@@ -19,7 +19,7 @@
  *         </argument>
  *     </arguments>
  * </type>
- * 
+ *
  * Registered condition can be used by ui component declaration in layout
  *
  * <uiComponent name="form" condition="condition::identifier" />
diff --git a/app/code/Magento/Backend/Model/View/Layout/ConditionPool.php b/app/code/Magento/Backend/Model/View/Layout/ConditionPool.php
index ff73b8c519824..8daff46271744 100644
--- a/app/code/Magento/Backend/Model/View/Layout/ConditionPool.php
+++ b/app/code/Magento/Backend/Model/View/Layout/ConditionPool.php
@@ -10,7 +10,7 @@
 
 /**
  * Class ConditionPool
- * 
+ *
  * Registry for \Magento\Backend\Model\View\Layout\ConditionInterface
  * @see usage details in \Magento\Backend\Model\View\Layout\ConditionInterface description
  *
diff --git a/app/code/Magento/Backend/Model/View/Layout/FilterInterface.php b/app/code/Magento/Backend/Model/View/Layout/FilterInterface.php
index a1b0a302c0f66..2312cff829264 100644
--- a/app/code/Magento/Backend/Model/View/Layout/FilterInterface.php
+++ b/app/code/Magento/Backend/Model/View/Layout/FilterInterface.php
@@ -23,7 +23,7 @@
  *         </argument>
  *     </arguments>
  * </type>
- * 
+ *
  */
 interface FilterInterface
 {
diff --git a/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php b/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php
index 150a0c7a82191..2abdb35f93bb0 100644
--- a/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php
+++ b/app/code/Magento/Backend/Model/View/Layout/Reader/Block.php
@@ -13,6 +13,13 @@
  */
 class Block extends Layout\Reader\Block
 {
+    /**
+     * @param Layout\ScheduledStructure\Helper $helper
+     * @param Layout\Argument\Parser $argumentParser
+     * @param Layout\ReaderPool $readerPool
+     * @param InterpreterInterface $argumentInterpreter
+     * @param null $scopeType
+     */
     public function __construct(
         Layout\ScheduledStructure\Helper $helper,
         Layout\Argument\Parser $argumentParser,
diff --git a/app/code/Magento/Backend/Service/V1/ModuleService.php b/app/code/Magento/Backend/Service/V1/ModuleService.php
index 9abd44752772a..0bd0e76c7907e 100644
--- a/app/code/Magento/Backend/Service/V1/ModuleService.php
+++ b/app/code/Magento/Backend/Service/V1/ModuleService.php
@@ -15,6 +15,7 @@ class ModuleService implements ModuleServiceInterface
      * @var \Magento\Framework\Module\ModuleListInterface
      */
     protected $moduleList;
+
     /**
      * @param \Magento\Framework\Module\ModuleListInterface $moduleList
      */
diff --git a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php
index 8f626dba2d024..6010cc78d8b8b 100644
--- a/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php
+++ b/app/code/Magento/Backend/Test/Unit/App/Action/Plugin/AuthenticationTest.php
@@ -120,7 +120,7 @@ public function testProcessNotLoggedInUser($isIFrameParam, $isAjaxParam, $isForw
             if ($isIFrameParam) {
                 $getParamCalls = 1;
                 $actionName = 'deniedIframe';
-            } else if ($isAjaxParam) {
+            } elseif ($isAjaxParam) {
                 $getParamCalls = 2;
                 $actionName = 'deniedJson';
             } else {
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php b/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php
index 2eba4779d91e6..59a6b3463f582 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Page/System/Config/Robots/ResetTest.php
@@ -11,7 +11,7 @@
 
 /**
  * Class ResetTest
- * @deprecated 
+ * @deprecated
  * @package Magento\Backend\Test\Unit\Block\Page\System\Config\Robots
  */
 class ResetTest extends \PHPUnit_Framework_TestCase
diff --git a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php
index d9ea144372445..175ea2664ded3 100644
--- a/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/Cache/CleanStaticFilesTest.php
@@ -48,7 +48,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $context = $objectHelper->getObject(
+        $context = $objectHelper->getObject(
             \Magento\Backend\App\Action\Context::class,
             [
                 'objectManager' => $this->objectManagerMock,
@@ -58,7 +58,7 @@ protected function setUp()
             ]
         );
 
-        $this->controller = $objectHelper->getObject(
+        $this->controller = $objectHelper->getObject(
             \Magento\Backend\Controller\Adminhtml\Cache\CleanStaticFiles::class,
             ['context' => $context,]
         );
diff --git a/app/code/Magento/Backup/Model/Config/Backend/Cron.php b/app/code/Magento/Backup/Model/Config/Backend/Cron.php
index 564f07b36be6f..5de9cf5627107 100644
--- a/app/code/Magento/Backup/Model/Config/Backend/Cron.php
+++ b/app/code/Magento/Backup/Model/Config/Backend/Cron.php
@@ -23,11 +23,9 @@ class Cron extends \Magento\Framework\App\Config\Value
     /** @var \Magento\Framework\App\Config\ValueFactory */
     protected $_configValueFactory;
 
-
     /** @var string */
     protected $_runModelPath = '';
 
-
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
diff --git a/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Countries.php b/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Countries.php
index 3483e081cf0c9..3be50ef2f8702 100644
--- a/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Countries.php
+++ b/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/Countries.php
@@ -47,7 +47,7 @@ protected function _toHtml()
 
     /**
      * Sets name for input element
-     * 
+     *
      * @param string $value
      * @return $this
      */
diff --git a/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/CountryCreditCard.php b/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/CountryCreditCard.php
index c5f2ae5c73da5..8974e2d050f1a 100644
--- a/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/CountryCreditCard.php
+++ b/app/code/Magento/Braintree/Block/Adminhtml/Form/Field/CountryCreditCard.php
@@ -25,7 +25,7 @@ class CountryCreditCard extends AbstractFieldArray
     
     /**
      * Returns renderer for country element
-     * 
+     *
      * @return Countries
      */
     protected function getCountryRenderer()
@@ -42,7 +42,7 @@ protected function getCountryRenderer()
 
     /**
      * Returns renderer for country element
-     * 
+     *
      * @return CcTypes
      */
     protected function getCcTypesRenderer()
diff --git a/app/code/Magento/Braintree/Block/Customer/PayPal/VaultTokenRenderer.php b/app/code/Magento/Braintree/Block/Customer/PayPal/VaultTokenRenderer.php
index 33458b399e795..28629251f2fcc 100644
--- a/app/code/Magento/Braintree/Block/Customer/PayPal/VaultTokenRenderer.php
+++ b/app/code/Magento/Braintree/Block/Customer/PayPal/VaultTokenRenderer.php
@@ -21,6 +21,11 @@ class VaultTokenRenderer extends AbstractTokenRenderer
      */
     private $config;
 
+    /**
+     * @param Template\Context $context
+     * @param Config $config
+     * @param array $data
+     */
     public function __construct(
         Template\Context $context,
         Config $config,
diff --git a/app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetNonce.php b/app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetNonce.php
index 8117d5c31f12a..4b69944797b03 100644
--- a/app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetNonce.php
+++ b/app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetNonce.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Braintree\Controller\Adminhtml\Payment;
 
-
 /**
  * Class GetNonce
  */
diff --git a/app/code/Magento/Braintree/Controller/Payment/GetNonce.php b/app/code/Magento/Braintree/Controller/Payment/GetNonce.php
index 5d771c3189a5e..cd767123c67c9 100644
--- a/app/code/Magento/Braintree/Controller/Payment/GetNonce.php
+++ b/app/code/Magento/Braintree/Controller/Payment/GetNonce.php
@@ -65,7 +65,6 @@ public function execute()
             $customerId = $this->session->getCustomerId();
             $result = $this->command->execute(['public_hash' => $publicHash, 'customer_id' => $customerId])->get();
             $response->setData(['paymentMethodNonce' => $result['paymentMethodNonce']]);
-
         } catch (\Exception $e) {
             $this->logger->critical($e);
             return $this->processBadRequest($response);
diff --git a/app/code/Magento/Braintree/Gateway/Config/PayPal/Config.php b/app/code/Magento/Braintree/Gateway/Config/PayPal/Config.php
index 3f34afd0717db..ad6d8361b8b40 100644
--- a/app/code/Magento/Braintree/Gateway/Config/PayPal/Config.php
+++ b/app/code/Magento/Braintree/Gateway/Config/PayPal/Config.php
@@ -35,6 +35,12 @@ class Config extends \Magento\Payment\Gateway\Config\Config
      */
     private $icon = [];
 
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param CcConfig $ccConfig
+     * @param null $methodCode
+     * @param string $pathPattern
+     */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         CcConfig $ccConfig,
diff --git a/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php b/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php
index 7d35b00e5715d..d4b38807537a3 100644
--- a/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php
+++ b/app/code/Magento/Braintree/Model/Adminhtml/Source/PaymentAction.php
@@ -15,7 +15,7 @@ class PaymentAction implements ArrayInterface
 {
     /**
      * Possible actions on order place
-     * 
+     *
      * @return array
      */
     public function toOptionArray()
diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdater.php b/app/code/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdater.php
index 55f48c95de271..171cb3565044b 100644
--- a/app/code/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdater.php
+++ b/app/code/Magento/Braintree/Model/Paypal/Helper/ShippingMethodUpdater.php
@@ -53,10 +53,8 @@ public function execute($shippingMethod, Quote $quote)
         }
 
         if (!$quote->getIsVirtual()) {
-
             $shippingAddress = $quote->getShippingAddress();
             if ($shippingMethod !== $shippingAddress->getShippingMethod()) {
-
                 $this->disabledQuoteAddressValidation($quote);
 
                 $shippingAddress->setShippingMethod($shippingMethod);
diff --git a/app/code/Magento/Braintree/Model/Report/ConditionAppliers/MultipleValue.php b/app/code/Magento/Braintree/Model/Report/ConditionAppliers/MultipleValue.php
index df4700d4c25aa..17fb8e0190f3b 100644
--- a/app/code/Magento/Braintree/Model/Report/ConditionAppliers/MultipleValue.php
+++ b/app/code/Magento/Braintree/Model/Report/ConditionAppliers/MultipleValue.php
@@ -24,7 +24,7 @@ public function apply($field, $condition, $value)
     {
         $result = false;
 
-        switch($condition) {
+        switch ($condition) {
             case ApplierInterface::IN:
                 $field->in($value);
                 $result = true;
diff --git a/app/code/Magento/Braintree/Model/Report/ConditionAppliers/Range.php b/app/code/Magento/Braintree/Model/Report/ConditionAppliers/Range.php
index 5937425ee7a7f..bfe1120642003 100644
--- a/app/code/Magento/Braintree/Model/Report/ConditionAppliers/Range.php
+++ b/app/code/Magento/Braintree/Model/Report/ConditionAppliers/Range.php
@@ -24,7 +24,7 @@ public function apply($field, $condition, $value)
     {
         $result = false;
 
-        switch($condition) {
+        switch ($condition) {
             case ApplierInterface::QTEQ:
                 $field->greaterThanOrEqualTo($value);
                 $result = true;
diff --git a/app/code/Magento/Braintree/Model/Report/ConditionAppliers/Text.php b/app/code/Magento/Braintree/Model/Report/ConditionAppliers/Text.php
index fa7272be7f15e..ab27f117d89f1 100644
--- a/app/code/Magento/Braintree/Model/Report/ConditionAppliers/Text.php
+++ b/app/code/Magento/Braintree/Model/Report/ConditionAppliers/Text.php
@@ -25,7 +25,7 @@ public function apply($field, $condition, $value)
         $result = false;
 
         $value = trim($value, "% \r\n\t");
-        switch($condition) {
+        switch ($condition) {
             case ApplierInterface::EQ:
                 $field->is($value);
                 $result = true;
diff --git a/app/code/Magento/Braintree/Model/Report/Row/TransactionMap.php b/app/code/Magento/Braintree/Model/Report/Row/TransactionMap.php
index bb9c807c530ea..de1c4afc74434 100644
--- a/app/code/Magento/Braintree/Model/Report/Row/TransactionMap.php
+++ b/app/code/Magento/Braintree/Model/Report/Row/TransactionMap.php
@@ -119,7 +119,7 @@ public function getCustomAttributes()
         $output = [];
         foreach ($this->getMappedValues() as $key => $value) {
             $attribute = $this->attributeValueFactory->create();
-            if(in_array($key, $shouldBeLocalized)) {
+            if (in_array($key, $shouldBeLocalized)) {
                 $value = __($value);
             }
             $output[] = $attribute->setAttributeCode($key)->setValue($value);
diff --git a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
index 270e0ed6e83c0..061766d6c2ac5 100644
--- a/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/PayPal/ConfigProvider.php
@@ -28,12 +28,19 @@ class ConfigProvider implements ConfigProviderInterface
      */
     private $resolver;
 
+    /**
+     * @param Config $config
+     * @param ResolverInterface $resolver
+     */
     public function __construct(Config $config, ResolverInterface $resolver)
     {
         $this->config = $config;
         $this->resolver = $resolver;
     }
 
+    /**
+     * @return array
+     */
     public function getConfig()
     {
         return [
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
index 40d62a64790e7..21fbea73a3fb7 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
@@ -15,7 +15,7 @@
 
 /**
  * Class PaymentDataBuilderTest
- * 
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PaymentDataBuilderTest extends \PHPUnit_Framework_TestCase
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php
index 7ceaadf40e644..c18b75d8a4986 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php
@@ -187,7 +187,7 @@ public function testGetItemsWithNullLimit()
 
     /**
      * Add fields to filter
-     * 
+     *
      * @dataProvider addToFilterDataProvider
      */
     public function testAddToFilter($field, $condition, $filterMapperCall, $expectedCondition)
@@ -211,7 +211,7 @@ public function testAddToFilter($field, $condition, $filterMapperCall, $expected
 
     /**
      * addToFilter DataProvider
-     * 
+     *
      * @return array
      */
     public function addToFilterDataProvider()
diff --git a/app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php b/app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php
index 479651b90de69..8be689f7db24e 100644
--- a/app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php
@@ -39,7 +39,6 @@ class DateRangeTest extends \PHPUnit_Framework_TestCase
      */
     private $filterModifierMock;
 
-
     /**
      * @var DataProviderInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -81,6 +80,7 @@ protected function setUp()
      * @param array|null $expectedCondition
      * @dataProvider getPrepareDataProvider
      * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function testPrepare($name, $filterData, $expectedCondition)
     {
@@ -181,12 +181,12 @@ public function testPrepare($name, $filterData, $expectedCondition)
 
     /**
      * Gets Filter mock
-     * 
+     *
      * @param string $name
      * @param string $expectedType
      * @param string $expectedDate
      * @param int $i
-     * 
+     *
      * @return Filter|\PHPUnit_Framework_MockObject_MockObject
      */
     private function getFilterMock($name, $expectedType, $expectedDate, &$i)
diff --git a/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/PaymentType.php b/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/PaymentType.php
index fe62fe2340757..9e2867f43b9f2 100644
--- a/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/PaymentType.php
+++ b/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/PaymentType.php
@@ -43,6 +43,7 @@ public function toOptionArray()
      */
     private function getAvailablePaymentTypes()
     {
+        // @codingStandardsIgnoreStart
         return [
             PaymentInstrumentType::PAYPAL_ACCOUNT => __(PaymentInstrumentType::PAYPAL_ACCOUNT),
             PaymentInstrumentType::COINBASE_ACCOUNT => __(PaymentInstrumentType::COINBASE_ACCOUNT),
@@ -51,5 +52,6 @@ private function getAvailablePaymentTypes()
             PaymentInstrumentType::APPLE_PAY_CARD => __(PaymentInstrumentType::APPLE_PAY_CARD),
             PaymentInstrumentType::ANDROID_PAY_CARD => __(PaymentInstrumentType::ANDROID_PAY_CARD)
         ];
+        // @codingStandardsIgnoreEnd
     }
 }
diff --git a/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/Status.php b/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/Status.php
index b58bda418874f..20a427ff86058 100644
--- a/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/Status.php
+++ b/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/Status.php
@@ -43,6 +43,7 @@ public function toOptionArray()
      */
     private function getAvailableStatuses()
     {
+        // @codingStandardsIgnoreStart
         return [
             Transaction::AUTHORIZATION_EXPIRED => __(Transaction::AUTHORIZATION_EXPIRED),
             Transaction::AUTHORIZING => __(Transaction::AUTHORIZING),
@@ -59,5 +60,6 @@ private function getAvailableStatuses()
             Transaction::SETTLEMENT_PENDING => __(Transaction::SETTLEMENT_PENDING),
             Transaction::SETTLEMENT_CONFIRMED => __(Transaction::SETTLEMENT_CONFIRMED)
         ];
+        // @codingStandardsIgnoreEnd
     }
 }
diff --git a/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/TransactionType.php b/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/TransactionType.php
index 46c497c8eca4a..64432c079491f 100644
--- a/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/TransactionType.php
+++ b/app/code/Magento/Braintree/Ui/Component/Report/Listing/Column/TransactionType.php
@@ -43,9 +43,11 @@ public function toOptionArray()
      */
     private function getAvailableTransactionTypes()
     {
+        // @codingStandardsIgnoreStart
         return [
             Transaction::SALE => __(Transaction::SALE),
             Transaction::CREDIT => __(Transaction::CREDIT)
         ];
+        // @codingStandardsIgnoreEnd
     }
 }
diff --git a/app/code/Magento/Braintree/view/frontend/templates/paypal/vault_token.phtml b/app/code/Magento/Braintree/view/frontend/templates/paypal/vault_token.phtml
index 80844768e2212..85c127361f727 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/paypal/vault_token.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/paypal/vault_token.phtml
@@ -39,7 +39,8 @@ $payerEmail = $block->escapeHtml($block->getPayerEmail());
                                         "modalClass": "my-credit-cards-popup",
                                         "toggleEvent": "click",
                                         "title": "<?php echo $block->escapeHtml(__('Delete')); ?>",
-                                        "content": "Are you sure you want to delete this PayPal account: <?php /* @noEscape */ echo $payerEmail; ?>?"
+                                        "content": "Are you sure you want to delete this PayPal account:
+                                            <?php /* @noEscape */ echo $payerEmail; ?>?"
                                     }
                                 }'>
                 <span><?php echo $block->escapeHtml(__('Delete')); ?></span>
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
index 8253d84f07363..aae15b9ded321 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes/Extend.php
@@ -115,7 +115,6 @@ public function isDisabledField()
                 && $this->getAttribute()->getAttributeCode() === 'price'
             )
             || $this->getElement()->getReadonly();
-
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Model/Link.php b/app/code/Magento/Bundle/Model/Link.php
index 49ab21aadeca0..6bc966e64ef5a 100644
--- a/app/code/Magento/Bundle/Model/Link.php
+++ b/app/code/Magento/Bundle/Model/Link.php
@@ -43,7 +43,6 @@ public function setId($id)
         return $this->setData(self::KEY_ID, $id);
     }
 
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/code/Magento/Bundle/Model/Option.php b/app/code/Magento/Bundle/Model/Option.php
index 84c5a3433e259..6db77c6515b9d 100644
--- a/app/code/Magento/Bundle/Model/Option.php
+++ b/app/code/Magento/Bundle/Model/Option.php
@@ -294,5 +294,6 @@ public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionExtensionI
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Bundle/Model/OptionRepository.php b/app/code/Magento/Bundle/Model/OptionRepository.php
index fa4a363f168c9..b86e41f1a43b0 100644
--- a/app/code/Magento/Bundle/Model/OptionRepository.php
+++ b/app/code/Magento/Bundle/Model/OptionRepository.php
@@ -276,8 +276,7 @@ private function compareLinks(
         }
         foreach ($firstArray as $obj) {
             foreach ($secondArray as $objToCompare) {
-                if (
-                    $obj->getId() != $objToCompare->getId()
+                if ($obj->getId() != $objToCompare->getId()
                     && $obj instanceof \Magento\Bundle\Api\Data\LinkInterface
                     && $objToCompare instanceof \Magento\Bundle\Api\Data\LinkInterface
                 ) {
diff --git a/app/code/Magento/Bundle/Model/Source/Option/Type.php b/app/code/Magento/Bundle/Model/Source/Option/Type.php
index 2f5e6fe85e47b..d087b3c7c3861 100644
--- a/app/code/Magento/Bundle/Model/Source/Option/Type.php
+++ b/app/code/Magento/Bundle/Model/Source/Option/Type.php
@@ -78,6 +78,7 @@ public function toOptionArray()
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * {@inheritdoc}
      */
@@ -136,5 +137,6 @@ public function setExtensionAttributes(\Magento\Bundle\Api\Data\OptionTypeExtens
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Bundle/Setup/UpgradeSchema.php b/app/code/Magento/Bundle/Setup/UpgradeSchema.php
index d80a7d5837a62..f0310c37431d5 100755
--- a/app/code/Magento/Bundle/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Bundle/Setup/UpgradeSchema.php
@@ -23,7 +23,6 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
         $setup->startSetup();
         $connection = $setup->getConnection();
         if (version_compare($context->getVersion(), '2.0.1', '<')) {
-
             $fields = [
                 ['table' => 'catalog_product_index_price_bundle_opt_idx', 'column' => 'alt_group_price'],
                 ['table' => 'catalog_product_index_price_bundle_opt_tmp', 'column' => 'alt_group_price'],
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/Bundle/OptionTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/Bundle/OptionTest.php
index 39eb1d9188436..647ed885422bd 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/Bundle/OptionTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/Bundle/OptionTest.php
@@ -51,7 +51,7 @@ protected function setUp()
             ->will($this->returnValue($this->layout));
 
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->block = $objectManagerHelper->getObject(
+        $this->block = $objectManagerHelper->getObject(
             \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option::class,
             ['registry' => $registry, 'context' => $context]
         );
@@ -74,7 +74,7 @@ public function testSetOption()
         $otherOption = $this->getMock(\Magento\Bundle\Model\Option::class, [], [], '', false);
         $otherOption->expects($this->any())->method('getId')->will($this->returnValue(16));
 
-        $selection = $this->getMock(
+        $selection = $this->getMock(
             \Magento\Catalog\Model\Product::class,
             ['getSelectionId', '__wakeup'],
             [],
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
index ad0d6ee87a07c..efc12e42cc0c8 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
@@ -135,7 +135,7 @@ protected function setUp()
             ->setMethods(['appendSelections'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->selectionCollection = $this->getMockBuilder(
+        $this->selectionCollection = $this->getMockBuilder(
             \Magento\Bundle\Model\ResourceModel\Selection\Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -150,13 +150,13 @@ protected function setUp()
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->bundleSelectionMock = $this->getMock(
+        $this->bundleSelectionMock = $this->getMock(
             \Magento\Bundle\Model\SelectionFactory::class, ['create'], [], '', false
         );
-        $this->bundleFactoryMock = $this->getMock(
+        $this->bundleFactoryMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\BundleFactory::class, ['create'], [], '', false
         );
-        $this->optionCollectionFactoryMock = $this->getMock(
+        $this->optionCollectionFactoryMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\Option\CollectionFactory::class, ['create'], [], '', false
         );
         $this->storeManagerMock = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class, [], [], '', false);
@@ -173,7 +173,7 @@ protected function setUp()
         $this->dataObjectHelperMock = $this->getMockBuilder(\Magento\Framework\Api\DataObjectHelper::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->model = $helper->getObject(
+        $this->model = $helper->getObject(
             
             LinkManagement::class,
             [
@@ -322,7 +322,7 @@ public function testAddChildNonExistingOption()
             ->method('getId')
             ->will($this->returnValue(null));
 
-        $optionsCollectionMock = $this->getMock(
+        $optionsCollectionMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\Option\Collection::class, [], [], '', false
         );
         $optionsCollectionMock->expects($this->once())
@@ -377,7 +377,7 @@ public function testAddChildLinkedProductIsComposite()
             ->getMock();
         $option->expects($this->once())->method('getId')->will($this->returnValue(1));
 
-        $optionsCollectionMock = $this->getMock(
+        $optionsCollectionMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\Option\Collection::class,
             [],
             [],
@@ -439,7 +439,7 @@ public function testAddChildProductAlreadyExistsInOption()
             ->getMock();
         $option->expects($this->once())->method('getId')->will($this->returnValue(1));
 
-        $optionsCollectionMock = $this->getMock(
+        $optionsCollectionMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\Option\Collection::class,
             [],
             [],
@@ -488,7 +488,6 @@ public function testAddChildCouldNotSave()
             ->with($this->linkField)
             ->willReturn($this->linkField);
 
-
         $linkedProductMock = $this->getMock(\Magento\Catalog\Model\Product::class, [], [], '', false);
         $linkedProductMock->expects($this->any())->method('getId')->will($this->returnValue(13));
         $linkedProductMock->expects($this->once())->method('isComposite')->will($this->returnValue(false));
@@ -507,7 +506,7 @@ public function testAddChildCouldNotSave()
             ->getMock();
         $option->expects($this->once())->method('getId')->will($this->returnValue(1));
 
-        $optionsCollectionMock = $this->getMock(
+        $optionsCollectionMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\Option\Collection::class, [], [], '', false
         );
         $optionsCollectionMock->expects($this->once())
@@ -578,7 +577,7 @@ public function testAddChild()
             ->getMock();
         $option->expects($this->once())->method('getId')->will($this->returnValue(1));
 
-        $optionsCollectionMock = $this->getMock(
+        $optionsCollectionMock = $this->getMock(
             \Magento\Bundle\Model\ResourceModel\Option\Collection::class, [], [], '', false
         );
         $optionsCollectionMock->expects($this->once())
@@ -663,7 +662,7 @@ public function testSaveChild()
         $this->storeManagerMock->expects($this->any())->method('getStore')->will($this->returnValue($store));
         $store->expects($this->any())->method('getId')->will($this->returnValue(0));
 
-        $selection = $this->getMock(
+        $selection = $this->getMock(
             \Magento\Bundle\Model\Selection::class,
             [
                 'save',
@@ -737,7 +736,7 @@ public function testSaveChildFailedToSave()
         $this->storeManagerMock->expects($this->any())->method('getStore')->will($this->returnValue($store));
         $store->expects($this->any())->method('getId')->will($this->returnValue(0));
 
-        $selection = $this->getMock(
+        $selection = $this->getMock(
             \Magento\Bundle\Model\Selection::class,
             [
                 'save',
@@ -831,7 +830,7 @@ public function testSaveChildWithInvalidId()
             ->with($linkedProductSku)
             ->will($this->returnValue($linkedProductMock));
 
-        $selection = $this->getMock(
+        $selection = $this->getMock(
             \Magento\Bundle\Model\Selection::class,
             [
                 'getId',
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
index 7d1eee7ea132a..24ff1a14d9f7e 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
@@ -1834,7 +1834,6 @@ public function testIsVirtual()
      * @param int $getSelectionsIdsIndex
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
-
     protected function getSelectionsByIdsMock($selectionIds, $productMock, $getSelectionsIndex, $getSelectionsIdsIndex)
     {
         $usedSelectionsMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Selection\Collection::class)
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/DiscountCalculatorTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/DiscountCalculatorTest.php
index 0322f83d35b0f..b89edd5884f9d 100644
--- a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/DiscountCalculatorTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/DiscountCalculatorTest.php
@@ -43,29 +43,29 @@ class DiscountCalculatorTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->productMock = $this->getMock(
+        $this->productMock = $this->getMock(
             \Magento\Catalog\Model\Product::class,
             [],
             [],
             '',
             false
         );
-        $this->priceInfoMock = $this->getMock(
+        $this->priceInfoMock = $this->getMock(
             \Magento\Framework\Pricing\PriceInfo\Base::class,
             ['getPrice', 'getPrices'],
             [],
             '',
             false
         );
-        $this->finalPriceMock = $this->getMock(
+        $this->finalPriceMock = $this->getMock(
             \Magento\Catalog\Pricing\Price\FinalPrice::class,
             [],
             [],
             '',
             false
         );
-        $this->priceMock = $this->getMockForAbstractClass(
-            \Magento\Bundle\Pricing\Price\DiscountProviderInterface::class
+        $this->priceMock = $this->getMockForAbstractClass(
+            \Magento\Bundle\Pricing\Price\DiscountProviderInterface::class
         );
         $this->calculator = new \Magento\Bundle\Pricing\Price\DiscountCalculator();
     }
diff --git a/app/code/Magento/CacheInvalidate/Model/SocketFactory.php b/app/code/Magento/CacheInvalidate/Model/SocketFactory.php
index 94747a2f70571..993b645d6df77 100644
--- a/app/code/Magento/CacheInvalidate/Model/SocketFactory.php
+++ b/app/code/Magento/CacheInvalidate/Model/SocketFactory.php
@@ -7,7 +7,6 @@
 
 class SocketFactory
 {
-
     /**
      * @return \Zend\Http\Client\Adapter\Socket
      */
diff --git a/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php b/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
index d3b6f5451b197..47c54a5a2c893 100644
--- a/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
+++ b/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
@@ -65,7 +65,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             if (!empty($tags)) {
                 $this->purgeCache->sendPurgeRequest(implode('|', array_unique($tags)));
             }
-
         }
     }
 
diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Model/SocketFactoryTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Model/SocketFactoryTest.php
index 45729089f732f..4c3c4811fda77 100644
--- a/app/code/Magento/CacheInvalidate/Test/Unit/Model/SocketFactoryTest.php
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Model/SocketFactoryTest.php
@@ -7,7 +7,6 @@
 
 class SocketFactoryTest extends \PHPUnit_Framework_TestCase
 {
-
     public function testCreate()
     {
         $factory = new \Magento\CacheInvalidate\Model\SocketFactory();
diff --git a/app/code/Magento/Captcha/Model/DefaultModel.php b/app/code/Magento/Captcha/Model/DefaultModel.php
index a977ad6923611..da72abb862b6f 100644
--- a/app/code/Magento/Captcha/Model/DefaultModel.php
+++ b/app/code/Magento/Captcha/Model/DefaultModel.php
@@ -117,8 +117,7 @@ public function getBlockName()
      */
     public function isRequired($login = null)
     {
-        if (
-            $this->isUserAuth()
+        if ($this->isUserAuth()
             && !$this->isShownToLoggedInUser()
             || !$this->isEnabled()
             || !in_array(
@@ -425,8 +424,7 @@ private function isShowAlways()
             return true;
         }
 
-        if (
-            (string)$this->captchaData->getConfig('mode') == \Magento\Captcha\Helper\Data::MODE_AFTER_FAIL
+        if ((string)$this->captchaData->getConfig('mode') == \Magento\Captcha\Helper\Data::MODE_AFTER_FAIL
             && $this->getAllowedAttemptsForSameLogin() == 0
         ) {
             return true;
diff --git a/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php b/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
index 045397988a467..85ee15f7f61d8 100644
--- a/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
@@ -69,8 +69,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_GUEST) {
             if ($captchaModel->isRequired()) {
                 $controller = $observer->getControllerAction();
-                if (
-                    !$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
+                if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
                 ) {
                     $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
                     $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
diff --git a/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php b/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
index 2c9f698f835a9..fc0dc515a1806 100644
--- a/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
@@ -69,8 +69,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_REGISTER) {
             if ($captchaModel->isRequired()) {
                 $controller = $observer->getControllerAction();
-                if (
-                    !$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
+                if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
                 ) {
                     $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
                     $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
diff --git a/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php b/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
index f4e20045156d7..a262b0afa09c6 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
@@ -71,8 +71,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $params = $observer->getControllerAction()->getRequest()->getParams();
         if (!empty($email) && !empty($params)) {
             if ($captchaModel->isRequired()) {
-                if (
-                    !$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
+                if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
                 ) {
                     $this->_session->setEmail((string)$controller->getRequest()->getPost('email'));
                     $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
diff --git a/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php b/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php
index 9952180ef9316..1ef0c82f5d160 100644
--- a/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php
+++ b/app/code/Magento/Captcha/Observer/ResetAttemptForBackendObserver.php
@@ -23,7 +23,6 @@ public function __construct(
         $this->resLogFactory = $resLogFactory;
     }
 
-
     /**
      * Reset Attempts For Backend
      *
diff --git a/app/code/Magento/Captcha/Setup/InstallSchema.php b/app/code/Magento/Captcha/Setup/InstallSchema.php
index 9d2f843da686d..52c2cfc7b41d2 100644
--- a/app/code/Magento/Captcha/Setup/InstallSchema.php
+++ b/app/code/Magento/Captcha/Setup/InstallSchema.php
@@ -56,6 +56,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php b/app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php
index 5bd1ca06ea969..76cd5bbfd9e1a 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php
@@ -139,7 +139,7 @@ public function getContent();
      * Set media gallery content
      *
      * @param $content \Magento\Framework\Api\Data\ImageContentInterface
-     * @return $this 
+     * @return $this
      */
     public function setContent($content);
 
diff --git a/app/code/Magento/Catalog/Api/ProductCustomOptionRepositoryInterface.php b/app/code/Magento/Catalog/Api/ProductCustomOptionRepositoryInterface.php
index 8c8e3217bee1b..411fd053595ab 100644
--- a/app/code/Magento/Catalog/Api/ProductCustomOptionRepositoryInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductCustomOptionRepositoryInterface.php
@@ -29,7 +29,6 @@ public function getProductOptions(
         $requiredOnly = false
     );
 
-
     /**
      * Get custom option for a specific product
      *
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
index c76835456bf10..41ae63bc87d9e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -25,7 +25,7 @@ class Alerts extends \Magento\Backend\Block\Widget\Tab
      */
     protected function _prepareLayout()
     {
-        $accordion = $this->getLayout()->createBlock(
+        $accordion = $this->getLayout()->createBlock(
             \Magento\Backend\Block\Widget\Accordion::class)->setId('productAlerts');
         /* @var $accordion \Magento\Backend\Block\Widget\Accordion */
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
index 5c1571992db46..b320dbaa931df 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 /**
  * Sign up for an alert when the product price changes grid
  *
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
index 23492d6d16f93..3ce4cec41816c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Stock.php
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 /**
  * Sign up for an alert when the product price changes grid
  *
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
index cde6e6af44538..a842ec9083932 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
@@ -125,7 +125,7 @@ public function getAfterElementHtml()
         $selectorOptions = $this->_jsonEncoder->encode($this->_getSelectorOptions());
         $newCategoryCaption = __('New Category');
 
-        $button = $this->_layout->createBlock(
+        $button = $this->_layout->createBlock(
              \Magento\Backend\Block\Widget\Button::class
         )->setData(
                 [
diff --git a/app/code/Magento/Catalog/Block/Product/View.php b/app/code/Magento/Catalog/Block/Product/View.php
index 72f1009d115bc..0d87a6a141901 100644
--- a/app/code/Magento/Catalog/Block/Product/View.php
+++ b/app/code/Magento/Catalog/Block/Product/View.php
@@ -104,6 +104,7 @@ public function __construct(
             $data
         );
     }
+
     // @codingStandardsIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
index dc77ca29108b1..9cfc1251116f5 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Block\Product\View\Options\Type;
 
-
 /**
  * Product options text type block
  *
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
index f4f0154e0dedd..1c27a8a7f7d0f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
@@ -364,7 +364,6 @@ protected function getRedirectParams($isNewCategory, $hasError, $categoryId, $pa
         } else {
             $path = 'catalog/*/edit';
             $params['id'] = $categoryId;
-
         }
         return ['path' => $path, 'params' => $params];
     }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
index 35733ad629467..8a83601e9a7e9 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute.php
@@ -50,7 +50,7 @@ protected function _validateProducts()
         $productIds = $this->attributeHelper->getProductIds();
         if (!is_array($productIds)) {
             $error = __('Please select products for attributes update.');
-        } elseif (!$this->_objectManager->create(
+        } elseif (!$this->_objectManager->create(
             \Magento\Catalog\Model\Product::class)->isProductsHasSku($productIds)) {
             $error = __('Please make sure to define SKU values for all processed products.');
         }
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php
index 3b370edc27008..afc62e70db3a6 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/AlertsPriceGrid.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-
 class AlertsPriceGrid extends AbstractProductGrid
 {
     /**
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
index 0b1df5ec4d1a6..77c0c88678fa2 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
@@ -54,7 +54,7 @@ public function execute()
             $resultRedirect = $this->resultRedirectFactory->create();
             $this->messageManager->addError(__('This product doesn\'t exist.'));
             return $resultRedirect->setPath('catalog/*/');
-        } else if ($productId === 0) {
+        } elseif ($productId === 0) {
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultRedirectFactory->create();
             $this->messageManager->addError(__('Invalid product id. Should be numeric value greater than 0'));
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php
index 07bda43edd030..1706b23892170 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GridOnly.php
@@ -34,6 +34,7 @@ public function __construct(
         $this->resultRawFactory = $resultRawFactory;
         $this->layoutFactory = $layoutFactory;
     }
+
     /**
      * Get specified tab grid
      *
diff --git a/app/code/Magento/Catalog/Cron/RefreshSpecialPrices.php b/app/code/Magento/Catalog/Cron/RefreshSpecialPrices.php
index 5e04b026db3d4..dd1e7d38ec0fb 100644
--- a/app/code/Magento/Catalog/Cron/RefreshSpecialPrices.php
+++ b/app/code/Magento/Catalog/Cron/RefreshSpecialPrices.php
@@ -169,7 +169,6 @@ protected function _refreshSpecialPriceByStore($storeId, $attrCode, $attrConditi
         if (!empty($selectData)) {
             $this->_processor->getIndexer()->reindexList($selectData);
         }
-
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
index 15813eebb969f..ec8190c695263 100644
--- a/app/code/Magento/Catalog/Helper/Data.php
+++ b/app/code/Magento/Catalog/Helper/Data.php
@@ -272,7 +272,6 @@ public function setStoreId($store)
     public function getBreadcrumbPath()
     {
         if (!$this->_categoryPath) {
-
             $path = [];
             $category = $this->getCategory();
             if ($category) {
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index 6fa3ec2adb7cf..fcd6de3c11389 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -432,7 +432,7 @@ public function placeholder($fileName)
      *
      * @param null|string $placeholder
      * @return string
-     * 
+     *
      * @deprecated Returns only default placeholder.
      * Does not take into account custom placeholders set in Configuration.
      */
@@ -543,7 +543,7 @@ public function getResizedImageInfo()
     /**
      * @param null|string $placeholder
      * @return string
-     * 
+     *
      * @deprecated Returns only default placeholder.
      * Does not take into account custom placeholders set in Configuration.
      */
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index 0b02e075d432e..9b4ffe188c9e8 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -1219,6 +1219,7 @@ public function getChildrenData()
     {
         return $this->getData(self::KEY_CHILDREN_DATA);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
@@ -1411,5 +1412,6 @@ public function setExtensionAttributes(\Magento\Catalog\Api\Data\CategoryExtensi
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute.php b/app/code/Magento/Catalog/Model/Category/Attribute.php
index 94a108c063f51..9d0c8c256c655 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute.php
@@ -324,6 +324,7 @@ public function setIsVisible($isVisible)
     {
         return $this->setData(self::IS_VISIBLE, $isVisible);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
index 455a006098932..a061f34e54d85 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
@@ -97,7 +97,7 @@ public function beforeSave($object)
         if ($imageName = $this->getUploadedImageName($value)) {
             $object->setData($this->additionalData . $attributeName, $value);
             $object->setData($attributeName, $imageName);
-        } else if (!is_string($value)) {
+        } elseif (!is_string($value)) {
             $object->setData($attributeName, '');
         }
 
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
index d18146ebae85e..fcaaff7502504 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
@@ -121,7 +121,6 @@ public function afterLoad($object)
                 } else {
                     $object->setData($attributeCode, $data);
                 }
-
             }
         }
         return $this;
diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php
index 3718ce85e1681..ee0a3f65925e8 100644
--- a/app/code/Magento/Catalog/Model/Category/DataProvider.php
+++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php
@@ -209,8 +209,7 @@ private function addUseDefaultValueCheckbox(Category $category, array $meta)
                 && $category->getStoreId();
             $attributePath = $this->getArrayManager()->findPath($attributeCode, $meta);
 
-            if (
-                !$attributePath
+            if (!$attributePath
                 || !$canDisplayUseDefault
                 || in_array($attributeCode, $this->elementsWithUseConfigSetting)
             ) {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
index f622e7b6bb32b..25347d5dd7c46 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
@@ -47,7 +47,7 @@ public function execute(array $entityIds = [], $useTempTable = false)
 
     /**
      * Register affected products
-     * 
+     *
      * @param array $entityIds
      * @return void
      */
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
index 4f700c14270bc..a5ed757635c01 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
@@ -35,6 +35,7 @@ class Improved implements AlgorithmInterface
      * @var Render
      */
     private $render;
+
     /**
      * @var IntervalFactory
      */
diff --git a/app/code/Magento/Catalog/Model/Layer/FilterList.php b/app/code/Magento/Catalog/Model/Layer/FilterList.php
index 19d728b04a545..b79516f71705a 100644
--- a/app/code/Magento/Catalog/Model/Layer/FilterList.php
+++ b/app/code/Magento/Catalog/Model/Layer/FilterList.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Catalog\Model\Layer;
 
-
 class FilterList
 {
     const CATEGORY_FILTER   = 'category';
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index d88f9e0c44307..ab2f666d30f4c 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -541,6 +541,7 @@ public function getName()
     {
         return $this->_getData(self::NAME);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
@@ -619,6 +620,7 @@ public function getTypeId()
     {
         return $this->_getData(self::TYPE_ID);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
@@ -2520,6 +2522,7 @@ public function setExtensionAttributes(\Magento\Catalog\Api\Data\ProductExtensio
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
@@ -2568,7 +2571,6 @@ public function setMediaGalleryEntries(array $mediaGalleryEntries = null)
                     ->convertFrom($entry);
             }
             $this->setData('media_gallery', ['images' => $images]);
-
         }
         return $this;
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php
index 495c62b429365..6be70d3d0bcfd 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Weight.php
@@ -19,7 +19,6 @@ class Weight extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      */
     protected $localeFormat;
 
-
     /**
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
      */
@@ -27,7 +26,6 @@ public function __construct(
         \Magento\Framework\Locale\FormatInterface $localeFormat
     ) {
         $this->localeFormat = $localeFormat;
-
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/CatalogPrice.php b/app/code/Magento/Catalog/Model/Product/CatalogPrice.php
index d589116245d68..64def8ba0415b 100644
--- a/app/code/Magento/Catalog/Model/Product/CatalogPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/CatalogPrice.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Model\Product;
 
-
 /**
  * Price model for external catalogs
  */
diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
index 50f7a20ef789e..2b43f25f0a402 100644
--- a/app/code/Magento/Catalog/Model/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Product/Option.php
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 namespace Magento\Catalog\Model\Product;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
@@ -912,5 +911,6 @@ private function getMetadataPool()
         }
         return $this->metadataPool;
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Product/Option/Value.php
index eaa0e9b386483..512b6869830ae 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Value.php
@@ -172,6 +172,7 @@ public function setProduct($product)
         $this->_product = $product;
         return $this;
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
@@ -366,6 +367,7 @@ public function getOptionTypeId()
     {
         return $this->_getData(self::KEY_OPTION_TYPE_ID);
     }
+
     /**
      * Set option title
      *
@@ -431,5 +433,6 @@ public function setOptionTypeId($optionTypeId)
     {
         return $this->setData(self::KEY_OPTION_TYPE_ID, $optionTypeId);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Price/Validation/TierPriceValidator.php b/app/code/Magento/Catalog/Model/Product/Price/Validation/TierPriceValidator.php
index b39423c8894de..054129cd7d00f 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/Validation/TierPriceValidator.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/Validation/TierPriceValidator.php
@@ -214,8 +214,7 @@ private function checkSku(
      */
     private function checkPrice(\Magento\Catalog\Api\Data\TierPriceInterface $price, $key, Result $validationResult)
     {
-        if (
-            null === $price->getPrice()
+        if (null === $price->getPrice()
             || $price->getPrice() < 0
             || ($price->getPriceType() === \Magento\Catalog\Api\Data\TierPriceInterface::PRICE_TYPE_DISCOUNT
                 && $price->getPrice() > 100
@@ -260,14 +259,13 @@ private function checkPriceType(
         $key,
         Result $validationResult
     ) {
-        if (
-            !in_array(
-                $price->getPriceType(),
-                [
+        if (!in_array(
+            $price->getPriceType(),
+            [
                     \Magento\Catalog\Api\Data\TierPriceInterface::PRICE_TYPE_FIXED,
                     \Magento\Catalog\Api\Data\TierPriceInterface::PRICE_TYPE_DISCOUNT
                 ]
-            )
+        )
             || (array_search(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE, $ids)
                 && $price->getPriceType() !== \Magento\Catalog\Api\Data\TierPriceInterface::PRICE_TYPE_DISCOUNT)
         ) {
diff --git a/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php
index c3e7d41892e35..151ad97cf9cb6 100644
--- a/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Model/Product/ProductList/Toolbar.php
@@ -90,6 +90,7 @@ public function getLimit()
     {
         return $this->request->getParam(self::LIMIT_PARAM_NAME);
     }
+
     /**
      * Return current page from request
      *
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
index 8d61a8f46abc6..f6666474a7ac4 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
@@ -617,6 +617,7 @@ public function getIsVisible()
     {
         return $this->getData(self::IS_VISIBLE);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
index a8b7bf2960185..0c3d0a3937bfa 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
@@ -115,10 +115,10 @@ protected function _getSelect()
         // remove join with main table
         $fromPart = $select->getPart(\Magento\Framework\DB\Select::FROM);
         if (!isset(
-                $fromPart[\Magento\Catalog\Model\ResourceModel\Product\Collection::INDEX_TABLE_ALIAS]
-            ) || !isset(
-                $fromPart[\Magento\Catalog\Model\ResourceModel\Product\Collection::MAIN_TABLE_ALIAS]
-            )
+            $fromPart[\Magento\Catalog\Model\ResourceModel\Product\Collection::INDEX_TABLE_ALIAS]
+        ) || !isset(
+            $fromPart[\Magento\Catalog\Model\ResourceModel\Product\Collection::MAIN_TABLE_ALIAS]
+        )
         ) {
             return $select;
         }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php
index 6b481c95583f7..52ecfa064f4f9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/CategoryLink.php
@@ -30,8 +30,7 @@ class CategoryLink
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param ResourceConnection $resourceConnection
      */
-    public function __construct
-    (
+    public function __construct(
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
         ResourceConnection $resourceConnection
     ) {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
index da3227da75087..a9917df4c5c61 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php
@@ -260,7 +260,6 @@ protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $obje
                 if ($existInCurrentStore) {
                     if ($isDeleteStoreTitle && (int)$storeId != \Magento\Store\Model\Store::DEFAULT_STORE_ID) {
                         $connection->delete($titleTableName, ['option_title_id = ?' => $existInCurrentStore]);
-
                     } elseif ($object->getStoreId() == $storeId) {
                         $data = $this->_prepareDataForTable(
                             new \Magento\Framework\DataObject(['title' => $object->getTitle()]),
@@ -277,8 +276,7 @@ protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $obje
                     }
                 } else {
                     // we should insert record into not default store only of if it does not exist in default store
-                    if (
-                        ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID && !$existInDefaultStore) ||
+                    if (($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID && !$existInDefaultStore) ||
                         (
                             $storeId != \Magento\Store\Model\Store::DEFAULT_STORE_ID &&
                             !$existInCurrentStore &&
diff --git a/app/code/Magento/Catalog/Setup/InstallSchema.php b/app/code/Magento/Catalog/Setup/InstallSchema.php
index 31cb143396dd4..642970de44609 100644
--- a/app/code/Magento/Catalog/Setup/InstallSchema.php
+++ b/app/code/Magento/Catalog/Setup/InstallSchema.php
@@ -4273,6 +4273,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             ->createTable($table);
 
          $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Catalog/Setup/UpgradeData.php b/app/code/Magento/Catalog/Setup/UpgradeData.php
index 7ffb345202836..32543ec76b233 100644
--- a/app/code/Magento/Catalog/Setup/UpgradeData.php
+++ b/app/code/Magento/Catalog/Setup/UpgradeData.php
@@ -389,7 +389,6 @@ private function dissallowUsingHtmlForProductName(ModuleDataSetupInterface $setu
                 ['is_html_allowed_on_front' => 0],
                 $setup->getConnection()->quoteInto('attribute_id = ?', $attribute['attribute_id'])
             );
-
     }
 
     /**
@@ -407,7 +406,6 @@ private function changePriceAttributeDefaultScope($categorySetup)
                 'is_global',
                 \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL
             );
-
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Category/AbstractCategoryTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Category/AbstractCategoryTest.php
index f22f7f50859a2..e7034411548c4 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Category/AbstractCategoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Category/AbstractCategoryTest.php
@@ -106,7 +106,6 @@ public function testGetSaveUrl()
         $saveUrl = 'save URL';
         $params = ['_current' => false, '_query' => false, 'store' => $storeId];
 
-
         $this->requestMock->expects($this->once())->method('getParam')->with('store')->willReturn($storeId);
         $this->storeManagerMock->expects($this->once())
             ->method('getStore')
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php
index b96de53e2b23e..ea80848f7392a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Product/Compare/IndexTest.php
@@ -69,7 +69,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->contextMock = $this->getMock(
+        $this->contextMock = $this->getMock(
             \Magento\Framework\App\Action\Context::class,
             ['getRequest', 'getResponse', 'getResultRedirectFactory'],
             [],
@@ -78,7 +78,7 @@ protected function setUp()
         );
         $this->request = $this->getMock(\Magento\Framework\App\RequestInterface::class, [], [], '', false);
         $this->response = $this->getMock(\Magento\Framework\App\ResponseInterface::class, [], [], '', false);
-        $this->redirectFactoryMock = $this->getMock(
+        $this->redirectFactoryMock = $this->getMock(
             \Magento\Framework\Controller\Result\RedirectFactory::class,
             ['create'],
             [],
@@ -91,14 +91,14 @@ protected function setUp()
             ->method('getResultRedirectFactory')
             ->willReturn($this->redirectFactoryMock);
 
-        $this->itemFactoryMock = $this->getMock(
+        $this->itemFactoryMock = $this->getMock(
             \Magento\Catalog\Model\Product\Compare\ItemFactory::class,
             ['create'],
             [],
             '',
             false
         );
-        $this->collectionFactoryMock = $this->getMock(
+        $this->collectionFactoryMock = $this->getMock(
             \Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory::class,
             ['create'],
             [],
@@ -107,19 +107,19 @@ protected function setUp()
         );
         $this->sessionMock = $this->getMock(\Magento\Customer\Model\Session::class, [], [], '', false);
         $this->visitorMock = $this->getMock(\Magento\Customer\Model\Visitor::class, [], [], '', false);
-        $this->listCompareMock = $this->getMock(
-            \Magento\Catalog\Model\Product\Compare\ListCompare::class,
-            [],
-            [],
-            '',
-            false
+        $this->listCompareMock = $this->getMock(
+            \Magento\Catalog\Model\Product\Compare\ListCompare::class,
+            [],
+            [],
+            '',
+            false
         );
-        $this->catalogSession = $this->getMock(
-            \Magento\Catalog\Model\Session::class,
-            ['setBeforeCompareUrl'],
-            [],
-            '',
-            false
+        $this->catalogSession = $this->getMock(
+            \Magento\Catalog\Model\Session::class,
+            ['setBeforeCompareUrl'],
+            [],
+            '',
+            false
         );
         $this->storeManagerMock = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->formKeyValidatorMock = $this->getMockBuilder(\Magento\Framework\Data\Form\FormKey\Validator::class)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/CustomlayoutupdateTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/CustomlayoutupdateTest.php
index da29c3d8ca14e..99ccaded0df84 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/CustomlayoutupdateTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/CustomlayoutupdateTest.php
@@ -57,7 +57,7 @@ public function validateProvider()
     protected function setUp()
     {
         $helper = new ObjectManager($this);
-        $this->model = $helper->getObject(
+        $this->model = $helper->getObject(
             \Magento\Catalog\Model\Attribute\Backend\Customlayoutupdate::class,
             [
                 'layoutUpdateValidatorFactory' => $this->getMockedLayoutUpdateValidatorFactory()
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php
index 62c0fc6d9f535..ed000abef366f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/SortbyTest.php
@@ -37,11 +37,11 @@ protected function setUp()
         $this->markTestSkipped('Due to MAGETWO-48956');
         $this->_objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_scopeConfig = $this->getMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $this->_model = $this->_objectHelper->getObject(
+        $this->_model = $this->_objectHelper->getObject(
             \Magento\Catalog\Model\Category\Attribute\Backend\Sortby::class,
             ['scopeConfig' => $this->_scopeConfig]
         );
-        $this->_attribute = $this->getMock(
+        $this->_attribute = $this->getMock(
             \Magento\Eav\Model\Entity\Attribute\AbstractAttribute::class,
             [
                 'getName',
@@ -196,7 +196,7 @@ public function testValidateUnique()
         $this->_attribute->expects($this->at(1))->method('getIsRequired');
         $this->_attribute->expects($this->at(2))->method('getIsUnique')->will($this->returnValue(true));
 
-        $entityMock = $this->getMockForAbstractClass(
+        $entityMock = $this->getMockForAbstractClass(
             \Magento\Eav\Model\Entity\AbstractEntity::class,
             [],
             '',
@@ -219,7 +219,7 @@ public function testValidateUniqueException()
         $this->_attribute->expects($this->at(1))->method('getIsRequired');
         $this->_attribute->expects($this->at(2))->method('getIsUnique')->will($this->returnValue(true));
 
-        $entityMock = $this->getMockForAbstractClass(
+        $entityMock = $this->getMockForAbstractClass(
             \Magento\Eav\Model\Entity\AbstractEntity::class,
             [],
             '',
@@ -228,7 +228,7 @@ public function testValidateUniqueException()
             true,
             ['checkAttributeUniqueValue']
         );
-        $frontMock = $this->getMockForAbstractClass(
+        $frontMock = $this->getMockForAbstractClass(
             \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend::class,
             [],
             '',
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Category/TreeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Category/TreeTest.php
index 703c9f3bf5c23..195ad8997ead7 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Category/TreeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Category/TreeTest.php
@@ -49,17 +49,17 @@ protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->categoryTreeMock = $this->getMockBuilder(
+        $this->categoryTreeMock = $this->getMockBuilder(
             \Magento\Catalog\Model\ResourceModel\Category\Tree::class
             )->disableOriginalConstructor()
             ->getMock();
 
-        $this->categoryCollection = $this->getMockBuilder(
+        $this->categoryCollection = $this->getMockBuilder(
             \Magento\Catalog\Model\ResourceModel\Category\Collection::class
             )->disableOriginalConstructor()
             ->getMock();
 
-        $this->storeManagerMock = $this->getMockBuilder(
+        $this->storeManagerMock = $this->getMockBuilder(
             \Magento\Store\Model\StoreManagerInterface::class
             )->disableOriginalConstructor()
             ->getMock();
@@ -69,7 +69,7 @@ protected function setUp()
             $this->getMock(\Magento\Catalog\Api\Data\CategoryTreeInterfaceFactory::class, $methods, [], '', false);
 
         $this->tree = $this->objectManager
-            ->getObject(
+            ->getObject(
                 \Magento\Catalog\Model\Category\Tree::class,
                 [
                     'categoryCollection' => $this->categoryCollection,
@@ -82,13 +82,13 @@ protected function setUp()
 
     public function testGetNode()
     {
-        $category = $this->getMockBuilder(
+        $category = $this->getMockBuilder(
             \Magento\Catalog\Model\Category::class
             )->disableOriginalConstructor()
             ->getMock();
         $category->expects($this->exactly(2))->method('getId')->will($this->returnValue(1));
 
-        $node = $this->getMockBuilder(
+        $node = $this->getMockBuilder(
             \Magento\Framework\Data\Tree\Node::class
             )->disableOriginalConstructor()
             ->getMock();
@@ -123,7 +123,7 @@ public function testGetRootNode()
         $this->categoryCollection->expects($this->once())->method('setLoadProductCount')->will($this->returnSelf());
         $this->categoryCollection->expects($this->once())->method('setStoreId')->will($this->returnSelf());
 
-        $node = $this->getMockBuilder(
+        $node = $this->getMockBuilder(
             \Magento\Catalog\Model\ResourceModel\Category\Tree::class
         )->disableOriginalConstructor()
         ->getMock();
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkManagementTest.php
index 3b8b3645125c0..4b37c34d69891 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkManagementTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkManagementTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Catalog\Test\Unit\Model;
 
-
 class CategoryLinkManagementTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CustomOptions/CustomOptionProcessorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CustomOptions/CustomOptionProcessorTest.php
index 8977a332684e2..fac7bb72a653b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CustomOptions/CustomOptionProcessorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CustomOptions/CustomOptionProcessorTest.php
@@ -104,7 +104,6 @@ protected function setUp()
             $this->customOptionFactory,
             $this->serializer
         );
-
     }
 
     public function testConvertToBuyRequest()
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
index 7ad6e14993854..32b22f7ed168b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowTest.php
@@ -70,20 +70,20 @@ protected function setUp()
         $this->store = $this->getMock(\Magento\Store\Model\Store::class, [], [], '', false);
         $this->store->expects($this->any())->method('getId')->will($this->returnValue('store_id_1'));
         $this->storeManager->expects($this->any())->method('getStores')->will($this->returnValue([$this->store]));
-        $this->productIndexerHelper = $this->getMock(
+        $this->productIndexerHelper = $this->getMock(
             \Magento\Catalog\Helper\Product\Flat\Indexer::class, [], [], '', false
         );
-        $this->flatItemEraser = $this->getMock(
+        $this->flatItemEraser = $this->getMock(
             \Magento\Catalog\Model\Indexer\Product\Flat\Action\Eraser::class, [], [], '', false
         );
-        $this->flatItemWriter = $this->getMock(
+        $this->flatItemWriter = $this->getMock(
             \Magento\Catalog\Model\Indexer\Product\Flat\Action\Indexer::class, [], [], '', false
         );
-        $this->flatTableBuilder = $this->getMock(
+        $this->flatTableBuilder = $this->getMock(
             \Magento\Catalog\Model\Indexer\Product\Flat\FlatTableBuilder::class, [], [], '', false
         );
 
-        $this->model = $objectManager->getObject(
+        $this->model = $objectManager->getObject(
             \Magento\Catalog\Model\Indexer\Product\Flat\Action\Row::class, [
             'resource' => $this->resource,
             'storeManager' => $this->storeManager,
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowsTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowsTest.php
index 5fe871f77fd71..fdb844b1436a0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Action/RowsTest.php
@@ -72,20 +72,20 @@ protected function setUp()
         $this->_storeManager->expects($this->any())->method('getStores')->will(
             $this->returnValue([$this->_store])
         );
-        $this->_productIndexerHelper = $this->getMock(
+        $this->_productIndexerHelper = $this->getMock(
             \Magento\Catalog\Helper\Product\Flat\Indexer::class, [], [], '', false
         );
-        $this->_flatItemEraser = $this->getMock(
+        $this->_flatItemEraser = $this->getMock(
             \Magento\Catalog\Model\Indexer\Product\Flat\Action\Eraser::class, [], [], '', false
         );
-        $this->_flatItemWriter = $this->getMock(
+        $this->_flatItemWriter = $this->getMock(
             \Magento\Catalog\Model\Indexer\Product\Flat\Action\Indexer::class, [], [], '', false
         );
-        $this->_flatTableBuilder = $this->getMock(
+        $this->_flatTableBuilder = $this->getMock(
             \Magento\Catalog\Model\Indexer\Product\Flat\FlatTableBuilder::class, [], [], '', false
         );
 
-        $this->_model = $objectManager->getObject(
+        $this->_model = $objectManager->getObject(
             \Magento\Catalog\Model\Indexer\Product\Flat\Action\Rows::class, [
             'resource' => $this->_resource,
             'storeManager' => $this->_storeManager,
@@ -95,6 +95,7 @@ protected function setUp()
             'flatTableBuilder' => $this->_flatTableBuilder
         ]);
     }
+
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage Bad value was supplied.
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php
index ce9fd36b2c143..a31bedcbf9ee7 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Plugin/CustomerGroupTest.php
@@ -34,11 +34,11 @@ protected function setUp()
     {
         $this->_objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->_subjectMock = $this->getMock(
+        $this->_subjectMock = $this->getMock(
             \Magento\Customer\Api\GroupRepositoryInterface::class, [], [], '', false
         );
 
-        $indexerMock = $this->getMock(
+        $indexerMock = $this->getMock(
             \Magento\Indexer\Model\Indexer::class,
             ['getId', 'invalidate'],
             [],
@@ -46,19 +46,19 @@ protected function setUp()
             false
         );
         $indexerMock->expects($this->once())->method('invalidate');
-        $this->indexerRegistryMock = $this->getMock(
-            \Magento\Framework\Indexer\IndexerRegistry::class,
-            ['get'],
-            [],
-            '',
-            false
+        $this->indexerRegistryMock = $this->getMock(
+            \Magento\Framework\Indexer\IndexerRegistry::class,
+            ['get'],
+            [],
+            '',
+            false
         );
         $this->indexerRegistryMock->expects($this->once())
             ->method('get')
             ->with(\Magento\Catalog\Model\Indexer\Product\Price\Processor::INDEXER_ID)
             ->will($this->returnValue($indexerMock));
 
-        $this->_model = $this->_objectManager->getObject(
+        $this->_model = $this->_objectManager->getObject(
             \Magento\Catalog\Model\Indexer\Product\Price\Plugin\CustomerGroup::class,
             ['indexerRegistry' => $this->indexerRegistryMock]
         );
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/CollectionFilterTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/CollectionFilterTest.php
index bc60108094849..e8b4386c5ce25 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/CollectionFilterTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/CollectionFilterTest.php
@@ -29,7 +29,7 @@ class CollectionFilterTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->visibilityMock = $this->getMock(
+        $this->visibilityMock = $this->getMock(
             \Magento\Catalog\Model\Product\Visibility::class, [], [], '', false
         );
         $this->catalogConfigMock = $this->getMock(\Magento\Catalog\Model\Config::class, [], [], '', false);
@@ -42,7 +42,7 @@ protected function setUp()
      */
     public function testFilter()
     {
-        $collectionMock = $this->getMock(
+        $collectionMock = $this->getMock(
             \Magento\Catalog\Model\ResourceModel\Product\Collection::class, [], [], '', false
         );
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/FilterableAttributeListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/FilterableAttributeListTest.php
index 7a2471dd592a1..5689a3ecc8e75 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/FilterableAttributeListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Category/FilterableAttributeListTest.php
@@ -28,11 +28,11 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->collectionFactoryMock = $this->getMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory::class,
-            ['create'],
-            [],
-            '',
-            false
+            \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory::class,
+            ['create'],
+            [],
+            '',
+            false
         );
 
         $this->storeManagerMock = $this->getMock(
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/PriceTest.php
index bc0d48cb54180..4db388408e021 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/PriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/PriceTest.php
@@ -219,6 +219,7 @@ public function applyWithEmptyRequestDataProvider()
 
     /** @var  \Magento\Eav\Model\Entity\Attribute|MockObject */
     private $attribute;
+
     public function testApply()
     {
         $priceId = '15-50';
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php
index 5238dc20232ef..bf35da5d0676a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/FilterListTest.php
@@ -40,10 +40,10 @@ class FilterListTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->objectManagerMock = $this->getMock(\Magento\Framework\ObjectManagerInterface::class);
-        $this->attributeListMock = $this->getMock(
+        $this->attributeListMock = $this->getMock(
             \Magento\Catalog\Model\Layer\Category\FilterableAttributeList::class, [], [], '', false
         );
-        $this->attributeMock = $this->getMock(
+        $this->attributeMock = $this->getMock(
             \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class, [], [], '', false
         );
         $filters = [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/FilterableAttributeListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/FilterableAttributeListTest.php
index 736f3f7049548..b619fe308871b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/FilterableAttributeListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layer/Search/FilterableAttributeListTest.php
@@ -28,11 +28,11 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->collectionFactoryMock = $this->getMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory::class,
-            ['create'],
-            [],
-            '',
-            false
+            \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory::class,
+            ['create'],
+            [],
+            '',
+            false
         );
 
         $this->storeManagerMock = $this->getMock(
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Layout/DepersonalizePluginTest.php
index ab9131e210642..9c8d009d8df6d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Layout/DepersonalizePluginTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Layout/DepersonalizePluginTest.php
@@ -35,7 +35,7 @@ class DepersonalizePluginTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->layoutMock = $this->getMock(\Magento\Framework\View\Layout::class, [], [], '', false);
-        $this->catalogSessionMock = $this->getMock(
+        $this->catalogSessionMock = $this->getMock(
             \Magento\Catalog\Model\Session::class,
             ['clearStorage'],
             [],
@@ -43,7 +43,7 @@ protected function setUp()
             false
         );
         $this->resultLayout = $this->getMock(\Magento\Framework\View\Layout::class, [], [], '', false);
-        $this->depersonalizeCheckerMock = $this->getMock(
+        $this->depersonalizeCheckerMock = $this->getMock(
             \Magento\PageCache\Model\DepersonalizeChecker::class,
             [],
             [],
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/Media/ImageEntryConverterTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/Media/ImageEntryConverterTest.php
index fecb0f6b62035..41059022f786c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/Media/ImageEntryConverterTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/Backend/Media/ImageEntryConverterTest.php
@@ -207,7 +207,7 @@ public function testConvertFrom()
                     'name' => '/s/a/sample_3.jpg'
                 ]
             ],
-            'media_type' => null,
+                'media_type' => null,
         ];
 
         $this->assertEquals($expectedResult, $this->modelObject->convertFrom($this->mediaGalleryEntryMock));
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
index dbf83645f1a7f..7384d38bdaf0b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
@@ -305,7 +305,6 @@ public function testSaveSavesDefaultFrontendLabelIfItIsPresentInPayload()
         $attributeMock->expects($this->any())->method('getFrontendLabels')->willReturn([$labelMock]);
         $attributeMock->expects($this->any())->method('getOptions')->willReturn([]);
 
-
         $existingModelMock = $this->getMock(Attribute::class, [], [], '', false);
         $existingModelMock->expects($this->any())->method('getAttributeId')->willReturn($attributeId);
         $existingModelMock->expects($this->any())->method('getAttributeCode')->willReturn($attributeCode);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/TypesListTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/TypesListTest.php
index 603cac1dd6bde..1b8df0f22efae 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/TypesListTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/TypesListTest.php
@@ -35,14 +35,14 @@ class TypesListTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->inputTypeFactoryMock = $this->getMock(
+        $this->inputTypeFactoryMock = $this->getMock(
             \Magento\Catalog\Model\Product\Attribute\Source\InputtypeFactory::class,
             ['create', '__wakeup'],
             [],
             '',
             false);
         $this->attributeTypeFactoryMock =
-            $this->getMock(
+            $this->getMock(
                 \Magento\Catalog\Api\Data\ProductAttributeTypeInterfaceFactory::class,
                 [
                     'create',
@@ -63,12 +63,12 @@ protected function setUp()
 
     public function testGetItems()
     {
-        $inputTypeMock = $this->getMock(
-            \Magento\Catalog\Model\Product\Attribute\Source\Inputtype::class,
-            [],
-            [],
-            '',
-            false
+        $inputTypeMock = $this->getMock(
+            \Magento\Catalog\Model\Product\Attribute\Source\Inputtype::class,
+            [],
+            [],
+            '',
+            false
         );
         $this->inputTypeFactoryMock->expects($this->once())->method('create')->willReturn($inputTypeMock);
         $inputTypeMock->expects($this->once())->method('toOptionArray')->willReturn(['option' => ['value']]);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Link/ResolverTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Link/ResolverTest.php
index 9ce3ca804531c..b05424b9e5c44 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Link/ResolverTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Link/ResolverTest.php
@@ -35,7 +35,6 @@ public function testGetLinksEmpty()
             ->with('links', [])
             ->willReturn($someLinks);
         $this->assertEquals($someLinks, $this->resolver->getLinks());
-
     }
 
     public function testGetLinksOverridden()
@@ -46,6 +45,5 @@ public function testGetLinksOverridden()
 
         $this->resolver->override($overriddenLinks);
         $this->assertEquals($overriddenLinks, $this->resolver->getLinks());
-
     }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTypeProviderTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTypeProviderTest.php
index 6feadffc8f602..09c63dd566fdc 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTypeProviderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/LinkTypeProviderTest.php
@@ -37,18 +37,18 @@ class LinkTypeProviderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->linkTypeFactoryMock = $this->getMock(
+        $this->linkTypeFactoryMock = $this->getMock(
             \Magento\Catalog\Api\Data\ProductLinkTypeInterfaceFactory::class,
             ['create'],
             [],
             '',
             false
         );
-        $this->linkAttributeFactoryMock = $this->getMock(
+        $this->linkAttributeFactoryMock = $this->getMock(
             \Magento\Catalog\Api\Data\ProductLinkAttributeInterfaceFactory::class,
             ['create'], [], '', false, false
         );
-        $this->linkFactoryMock = $this->getMock(
+        $this->linkFactoryMock = $this->getMock(
             \Magento\Catalog\Model\Product\LinkFactory::class,
             ['create'], [], '', false, false
         );
@@ -58,7 +58,7 @@ protected function setUp()
             'test_product_link_3' => 'test_code_3',
         ];
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->model = $objectManager->getObject(
+        $this->model = $objectManager->getObject(
             \Magento\Catalog\Model\Product\LinkTypeProvider::class,
             [
                 'linkTypeFactory' => $this->linkTypeFactoryMock,
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php
index 5c3743b731c48..df09a21b00b24 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/PriceModifierTest.php
@@ -33,10 +33,10 @@ class PriceModifierTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->productMock =
-            $this->getMock(
+            $this->getMock(
                 \Magento\Catalog\Model\Product::class,
                 ['getData', 'setData', '__wakeup'], [], '', false);
-        $this->productRepositoryMock = $this->getMock(
+        $this->productRepositoryMock = $this->getMock(
             \Magento\Catalog\Model\ProductRepository::class,
             [],
             [],
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
index 8ed93f9d32c5a..423c0cb05bd64 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
@@ -424,7 +424,6 @@ public function testAddRethrowsTemporaryStateExceptionIfRecoverableErrorOccurred
      * @expectedException \Magento\Framework\Exception\InputException
      * @dataProvider addDataProvider
      */
-
     public function testAddWithInvalidData($price, $qty)
     {
         $this->service->add('product_sku', 1, $price, $qty);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/TypeTest.php
index 16605ea6043ea..face451f85a62 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/TypeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/TypeTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Catalog\Test\Unit\Model\Product;
 
-
 /**
  * ProductType Test
  *
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/TreeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/TreeTest.php
index d80090c05351b..849c9668139f7 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/TreeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/TreeTest.php
@@ -223,7 +223,6 @@ public function testAddCollectionData()
             ->with(CategoryInterface::class)
             ->willReturn($categoryMetadataMock);
 
-
         $model = $objectHelper->getObject(
             \Magento\Catalog\Model\ResourceModel\Category\Tree::class,
             [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Website/LinkTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Website/LinkTest.php
index a01fbc4d2e386..2363559096a9d 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Website/LinkTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Website/LinkTest.php
@@ -93,7 +93,7 @@ public function testSaveWebsiteIds()
             ->method('insertMultiple')
             ->with('catalog_product_website', [
                 ['product_id' => $productId, 'website_id' => 3]
-        ]);
+            ]);
 
         $this->connection->expects($this->once())
             ->method('delete')
diff --git a/app/code/Magento/Catalog/Test/Unit/Observer/MenuCategoryDataTest.php b/app/code/Magento/Catalog/Test/Unit/Observer/MenuCategoryDataTest.php
index a935861a263e1..af213a0b9a89f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Observer/MenuCategoryDataTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Observer/MenuCategoryDataTest.php
@@ -39,7 +39,7 @@ class MenuCategoryDataTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_catalogCategory = $this->getMock(
+        $this->_catalogCategory = $this->getMock(
             \Magento\Catalog\Helper\Category::class,
             ['getStoreCategories', 'getCategoryUrl'],
             [],
diff --git a/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php b/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
index 3a17233deb2e4..50d076490432a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Plugin/Block/TopmenuTest.php
@@ -10,7 +10,7 @@
 
 /**
  * Class TopmenuTest
- * 
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TopmenuTest extends \PHPUnit_Framework_TestCase
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/BasePriceTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/BasePriceTest.php
index 11ff04d0aa0fb..5b521b33144b1 100644
--- a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/BasePriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/BasePriceTest.php
@@ -64,12 +64,12 @@ protected function setUp()
         $this->regularPriceMock = $this->getMock(\Magento\Catalog\Pricing\Price\RegularPrice::class, [], [], '', false);
         $this->tearPriceMock = $this->getMock(\Magento\Catalog\Pricing\Price\TierPrice::class, [], [], '', false);
         $this->specialPriceMock = $this->getMock(\Magento\Catalog\Pricing\Price\SpecialPrice::class, [], [], '', false);
-        $this->calculatorMock = $this->getMock(
-            \Magento\Framework\Pricing\Adjustment\Calculator::class,
-            [],
-            [],
-            '',
-            false
+        $this->calculatorMock = $this->getMock(
+            \Magento\Framework\Pricing\Adjustment\Calculator::class,
+            [],
+            [],
+            '',
+            false
         );
 
         $this->saleableItemMock->expects($this->once())
@@ -82,7 +82,7 @@ protected function setUp()
         ];
 
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->basePrice = $helper->getObject(
+        $this->basePrice = $helper->getObject(
             \Magento\Catalog\Pricing\Price\BasePrice::class,
             [
                 'saleableItem' => $this->saleableItemMock,
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AbstractModifier.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AbstractModifier.php
index f568c0909b7dc..c882d76263658 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AbstractModifier.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AbstractModifier.php
@@ -106,8 +106,7 @@ private function _getNextAttributeSortOrder(array $meta, $attributeCodes, $defau
                         $defaultSortOrder,
                         $iteration
                     );
-                } elseif (
-                    in_array($attributeCode, $attributeCodes)
+                } elseif (in_array($attributeCode, $attributeCodes)
                     && isset($attributeMeta['arguments']['data']['config']['sortOrder'])
                 ) {
                     $defaultSortOrder = $attributeMeta['arguments']['data']['config']['sortOrder'] + $iteration;
@@ -161,8 +160,7 @@ protected function getFirstPanelCode(array $meta)
         $name = null;
 
         foreach ($meta as $fieldSetName => $fieldSetMeta) {
-            if (
-                isset($fieldSetMeta['arguments']['data']['config']['sortOrder'])
+            if (isset($fieldSetMeta['arguments']['data']['config']['sortOrder'])
                 && (null === $min || $fieldSetMeta['arguments']['data']['config']['sortOrder'] <= $min)
             ) {
                 $min = $fieldSetMeta['arguments']['data']['config']['sortOrder'];
@@ -183,8 +181,7 @@ protected function getFirstPanelCode(array $meta)
     protected function getGroupCodeByField(array $meta, $field)
     {
         foreach ($meta as $groupCode => $groupData) {
-            if (
-                isset($groupData['children'][$field])
+            if (isset($groupData['children'][$field])
                 || isset($groupData['children'][static::CONTAINER_PREFIX . $field])
             ) {
                 return $groupCode;
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
index 687f6349146c2..cf8112d83d843 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -798,8 +798,7 @@ private function getValue(ProductAttributeInterface $attribute)
      */
     private function getScopeLabel(ProductAttributeInterface $attribute)
     {
-        if (
-            $this->storeManager->isSingleStoreMode()
+        if ($this->storeManager->isSingleStoreMode()
             || $attribute->getFrontendInput() === AttributeInterface::FRONTEND_INPUT
         ) {
             return '';
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Images.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Images.php
index e7b3e86083a8e..e47a62868c2b5 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Images.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Images.php
@@ -54,8 +54,7 @@ public function modifyData(array $data)
         /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
         $product = $this->locator->getProduct();
         $modelId = $product->getId();
-        if (
-            isset($data[$modelId][self::DATA_SOURCE_DEFAULT]['media_gallery'])
+        if (isset($data[$modelId][self::DATA_SOURCE_DEFAULT]['media_gallery'])
             && !empty($data[$modelId][self::DATA_SOURCE_DEFAULT]['media_gallery'])
             && !empty($data[$modelId][self::DATA_SOURCE_DEFAULT]['media_gallery']['images'])
         ) {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdate.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdate.php
index f9421b5154bed..40bb0dfc9cd39 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdate.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdate.php
@@ -57,8 +57,7 @@ public function modifyData(array $data)
      */
     protected function customizeDateRangeField(array $meta)
     {
-        if (
-            $this->getGroupCodeByField($meta, self::CODE_CUSTOM_DESIGN_FROM)
+        if ($this->getGroupCodeByField($meta, self::CODE_CUSTOM_DESIGN_FROM)
             !== $this->getGroupCodeByField($meta, self::CODE_CUSTOM_DESIGN_TO)
         ) {
             return $meta;
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
index 42fde247a39fc..f327aca49b781 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php
@@ -114,7 +114,6 @@ protected function createCategory($name, $parentId)
         return $category->getId();
     }
 
-
     /**
      * Returns ID of category by string path creating nonexistent ones.
      *
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
index 108ab592dbc7c..a7c5699874819 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
@@ -27,6 +27,7 @@ class StoreResolver
      * @var array
      */
     protected $websiteCodeToStoreIds = [];
+
     /**
      * All stores code-ID pairs.
      *
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
index 0416a5640337b..621acac6cc5e7 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php
@@ -229,7 +229,6 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData)
         }
 
         return (bool)$valid;
-
     }
 
     /**
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/SuperProductsSku.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/SuperProductsSku.php
index 54275e861366e..249e52a5109ad 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/SuperProductsSku.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/SuperProductsSku.php
@@ -40,14 +40,13 @@ public function isValid($value)
         $this->_clearMessages();
         $oldSku = $this->skuProcessor->getOldSkus();
         if (!empty($value['_super_products_sku']) && (!isset(
-                $oldSku[$value['_super_products_sku']]
-            ) && $this->skuProcessor->getNewSku($value['_super_products_sku']) === null
+            $oldSku[$value['_super_products_sku']]
+        ) && $this->skuProcessor->getNewSku($value['_super_products_sku']) === null
             )
         ) {
             $this->_addMessages([self::ERROR_SUPER_PRODUCTS_SKU_NOT_FOUND]);
             return false;
         }
         return true;
-
     }
 }
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/TierPrice.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/TierPrice.php
index cd360f1f873f9..dac82838580c5 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/TierPrice.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Validator/TierPrice.php
@@ -44,40 +44,40 @@ public function isValid($value)
     {
         $this->_clearMessages();
         if (isset(
+            $value['_tier_price_website']
+        ) && strlen(
+            $value['_tier_price_website']
+        ) || isset(
+            $value['_tier_price_customer_group']
+        ) && strlen(
+            $value['_tier_price_customer_group']
+        ) || isset(
+            $value['_tier_price_qty']
+        ) && strlen(
+            $value['_tier_price_qty']
+        ) || isset(
+            $value['_tier_price_price']
+        ) && strlen(
+            $value['_tier_price_price']
+        )
+        ) {
+            if (!isset(
                 $value['_tier_price_website']
-            ) && strlen(
-                $value['_tier_price_website']
-            ) || isset(
+            ) || !isset(
                 $value['_tier_price_customer_group']
-            ) && strlen(
-                $value['_tier_price_customer_group']
-            ) || isset(
-                $value['_tier_price_qty']
-            ) && strlen(
+            ) || !isset(
                 $value['_tier_price_qty']
-            ) || isset(
+            ) || !isset(
                 $value['_tier_price_price']
-            ) && strlen(
+            ) || !strlen(
+                $value['_tier_price_website']
+            ) || !strlen(
+                $value['_tier_price_customer_group']
+            ) || !strlen(
+                $value['_tier_price_qty']
+            ) || !strlen(
                 $value['_tier_price_price']
             )
-        ) {
-            if (!isset(
-                    $value['_tier_price_website']
-                ) || !isset(
-                    $value['_tier_price_customer_group']
-                ) || !isset(
-                    $value['_tier_price_qty']
-                ) || !isset(
-                    $value['_tier_price_price']
-                ) || !strlen(
-                    $value['_tier_price_website']
-                ) || !strlen(
-                    $value['_tier_price_customer_group']
-                ) || !strlen(
-                    $value['_tier_price_qty']
-                ) || !strlen(
-                    $value['_tier_price_price']
-                )
             ) {
                 $this->_addMessages([self::ERROR_TIER_DATA_INCOMPLETE]);
                 return false;
@@ -87,8 +87,8 @@ public function isValid($value)
                 $this->_addMessages([self::ERROR_INVALID_TIER_PRICE_SITE]);
                 return false;
             } elseif ($value['_tier_price_customer_group'] != self::VALUE_ALL && !isset(
-                    $this->customerGroups[$value['_tier_price_customer_group']]
-                )
+                $this->customerGroups[$value['_tier_price_customer_group']]
+            )
             ) {
                 $this->_addMessages([self::ERROR_INVALID_TIER_PRICE_GROUP]);
                 return false;
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
index 3594013ff3c18..4017756830967 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
@@ -20,7 +20,6 @@ interface StockStatusCollectionInterface extends SearchResultsInterface
      */
     public function getItems();
 
-
     /**
      * Sets items
      *
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php b/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php
index 05240781211e1..880d62225bc0c 100644
--- a/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php
+++ b/app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php
@@ -30,7 +30,7 @@ public function __construct(array $blackList = [])
      * @param Repository $repository
      * @param array $attributes
      * @return \Magento\Eav\Model\AttributeRepository
-     * 
+     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterGetCustomAttributesMetadata(Repository $repository, array $attributes)
diff --git a/app/code/Magento/CatalogInventory/Model/Stock.php b/app/code/Magento/CatalogInventory/Model/Stock.php
index 5961c6681e99e..963e0be894e38 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock.php
@@ -145,5 +145,6 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
index 3203c8b681b49..249a88e5bb616 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
@@ -833,5 +833,6 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Stock/Status.php
index 0c5f571a05b89..758344eec6b0c 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Status.php
@@ -118,6 +118,7 @@ public function getStockStatus()
     {
         return $this->getData(self::KEY_STOCK_STATUS);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
@@ -196,5 +197,6 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/CatalogInventory/Model/StockIndex.php b/app/code/Magento/CatalogInventory/Model/StockIndex.php
index 610f67e16fb57..e053383fd1e07 100644
--- a/app/code/Magento/CatalogInventory/Model/StockIndex.php
+++ b/app/code/Magento/CatalogInventory/Model/StockIndex.php
@@ -268,7 +268,7 @@ protected function getProductTypeInstances()
     protected function getStockStatusResource()
     {
         if (empty($this->stockStatusResource)) {
-            $this->stockStatusResource = \Magento\Framework\App\ObjectManager::getInstance()->get(
+            $this->stockStatusResource = \Magento\Framework\App\ObjectManager::getInstance()->get(
                 \Magento\CatalogInventory\Model\ResourceModel\Stock\Status::class
             );
         }
diff --git a/app/code/Magento/CatalogInventory/Setup/InstallSchema.php b/app/code/Magento/CatalogInventory/Setup/InstallSchema.php
index 3a343e9029cb3..1af1980bf8985 100644
--- a/app/code/Magento/CatalogInventory/Setup/InstallSchema.php
+++ b/app/code/Magento/CatalogInventory/Setup/InstallSchema.php
@@ -457,6 +457,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             ->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AfterProductLoadTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AfterProductLoadTest.php
index cf6ca57487acf..4984903c1809c 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AfterProductLoadTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AfterProductLoadTest.php
@@ -34,7 +34,7 @@ class AfterProductLoadTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $stockRegistryMock = $this->getMock(\Magento\CatalogInventory\Api\StockRegistryInterface::class);
-        $this->productExtensionFactoryMock = $this->getMockBuilder(
+        $this->productExtensionFactoryMock = $this->getMockBuilder(
             \Magento\Catalog\Api\Data\ProductExtensionFactory::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/CatalogInventory/Ui/Component/Product/Form/Element/UseConfigSettings.php b/app/code/Magento/CatalogInventory/Ui/Component/Product/Form/Element/UseConfigSettings.php
index 9e510ff1e7bad..a662486211def 100644
--- a/app/code/Magento/CatalogInventory/Ui/Component/Product/Form/Element/UseConfigSettings.php
+++ b/app/code/Magento/CatalogInventory/Ui/Component/Product/Form/Element/UseConfigSettings.php
@@ -21,8 +21,7 @@ class UseConfigSettings extends Checkbox
     public function prepare()
     {
         $config = $this->getData('config');
-        if (
-            isset($config['keyInConfiguration'])
+        if (isset($config['keyInConfiguration'])
             && isset($config['valueFromConfig'])
             && $config['valueFromConfig'] instanceof ValueSourceInterface
         ) {
diff --git a/app/code/Magento/CatalogRule/Model/CatalogRuleRepository.php b/app/code/Magento/CatalogRule/Model/CatalogRuleRepository.php
index 70bab6f0dee7a..82c1c29c63ad0 100644
--- a/app/code/Magento/CatalogRule/Model/CatalogRuleRepository.php
+++ b/app/code/Magento/CatalogRule/Model/CatalogRuleRepository.php
@@ -54,8 +54,7 @@ public function save(Data\RuleInterface $rule)
             unset($this->rules[$rule->getId()]);
         } catch (ValidatorException $e) {
             throw new CouldNotSaveException(__($e->getMessage()));
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             throw new CouldNotSaveException(__('Unable to save rule %1', $rule->getRuleId()));
         }
         return $rule;
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
index 11fd946344ae4..a6a4fb0282dad 100644
--- a/app/code/Magento/CatalogRule/Model/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Rule.php
@@ -787,6 +787,7 @@ private function getRuleConditionConverter()
         }
         return $this->ruleConditionConverter;
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/CatalogRule/Setup/InstallData.php b/app/code/Magento/CatalogRule/Setup/InstallData.php
index e679d324de66f..86ebebcd8d51c 100644
--- a/app/code/Magento/CatalogRule/Setup/InstallData.php
+++ b/app/code/Magento/CatalogRule/Setup/InstallData.php
@@ -41,6 +41,5 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
         $installer->doUpdateClassAliases();
 
         $setup->endSetup();
-        
     }
 }
diff --git a/app/code/Magento/CatalogRule/Setup/InstallSchema.php b/app/code/Magento/CatalogRule/Setup/InstallSchema.php
index d8e3d8295ff3b..3a9d90f0a4b81 100644
--- a/app/code/Magento/CatalogRule/Setup/InstallSchema.php
+++ b/app/code/Magento/CatalogRule/Setup/InstallSchema.php
@@ -513,6 +513,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php
index 380a2966288f8..2293168ccc430 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Field/Resolver.php
@@ -16,6 +16,7 @@ class Resolver implements ResolverInterface
      * @var AttributeCollection
      */
     private $attributeCollection;
+
     /**
      * @var FieldFactory
      */
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php
index 8f5a231b1ddc6..433d47e0826ab 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/AliasResolver.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogSearch\Model\Adapter\Mysql\Filter;
 
-
 use Magento\CatalogSearch\Model\Search\RequestGenerator;
 
 /**
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
index 4873bf22e1b1e..4d9eeb6a221c8 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
@@ -146,13 +146,11 @@ private function processQueryWithField(FilterInterface $filter, $isNegation, $qu
                 $this->connection->quoteIdentifier($alias . '.' . $attribute->getAttributeCode()),
                 $query
             );
-        } elseif (
-            $filter->getType() === FilterInterface::TYPE_TERM &&
+        } elseif ($filter->getType() === FilterInterface::TYPE_TERM &&
             in_array($attribute->getFrontendInput(), ['select', 'multiselect'], true)
         ) {
             $resultQuery = $this->processTermSelect($filter, $isNegation);
-        } elseif (
-            $filter->getType() === FilterInterface::TYPE_RANGE &&
+        } elseif ($filter->getType() === FilterInterface::TYPE_RANGE &&
             in_array($attribute->getBackendType(), ['decimal', 'int'], true)
         ) {
             $resultQuery = $this->processRangeNumeric($filter, $query, $attribute);
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
index 7decbdf62cd0c..f4e0f94eda13a 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
@@ -422,7 +422,6 @@ public function prepareProductIndex($indexData, $productData, $storeId)
             $attributeCode = $attribute->getAttributeCode();
 
             if (isset($productData[$attributeCode])) {
-
                 if ('store_id' === $attributeCode) {
                     continue;
                 }
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php
index ef223a774cb97..532c0fce86ee9 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/IndexIterator.php
@@ -130,7 +130,6 @@ public function __construct(
         $this->statusIds = $statusIds;
     }
 
-
     /**
      * {@inheritDoc}
      */
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexTableNotExistException.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexTableNotExistException.php
index cf13dd28fdf84..864999380c213 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexTableNotExistException.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/IndexTableNotExistException.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogSearch\Model\Indexer\Scope;
 
-
 use Magento\Framework\Exception\LocalizedException;
 
 /**
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php
index fdc7284ecdf5d..85428023fc5eb 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/ScopeProxy.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogSearch\Model\Indexer\Scope;
 
-
 use Magento\Framework\Search\Request\Dimension;
 
 /**
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php
index 5d11fa18cba9c..0eba30dd0588f 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/State.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogSearch\Model\Indexer\Scope;
 
-
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/TemporaryResolver.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/TemporaryResolver.php
index 9cea4647a6eba..81c55183fe24d 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/TemporaryResolver.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/TemporaryResolver.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogSearch\Model\Indexer\Scope;
 
-
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Framework\Search\Request\Dimension;
 
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php
index 3b1316ade7994..a0b3ea325ae29 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogSearch\Model\Indexer\Scope;
 
-
 use Magento\Framework\Exception\LocalizedException;
 
 /**
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
index d4a35920b8230..557ccef621104 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -105,8 +105,7 @@ protected function _getItemsData()
                 ? (int)$optionsFacetedData[$value]['count']
                 : 0;
             // Check filter type
-            if (
-                $this->getAttributeIsFilterable($attribute) === static::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS
+            if ($this->getAttributeIsFilterable($attribute) === static::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS
                 && (!$this->isOptionReducesResults($count, $productSize) || $count === 0)
             ) {
                 continue;
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
index 5cff916672f99..86b34f7227672 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineInterface.php
@@ -39,7 +39,6 @@ public function allowAdvancedIndex();
      */
     public function processAttributeValue($attribute, $value);
 
-
     /**
      * Prepare index array as a string glued by separator
      *
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php
index d8d3efc65e782..e98b73f86246b 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogSearch\Model\Search\FilterMapper;
 
-
 use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
 use Magento\Eav\Model\Config as EavConfig;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
@@ -14,6 +13,7 @@
 /**
  * FilterContext represents a Context of the Strategy pattern
  * Its responsibility is to choose appropriate strategy to apply passed filter to the Select
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FilterContext implements FilterStrategyInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php
index b4a7be092e6fd..f8b6f2e509de7 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/Decimal.php
@@ -6,14 +6,12 @@
 
 namespace Magento\CatalogSearch\Model\Search\RequestGenerator;
 
-
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Framework\Search\Request\BucketInterface;
 use Magento\Framework\Search\Request\FilterInterface;
 
 class Decimal implements GeneratorInterface
 {
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php
index e35691cd52522..4edaca0960ca1 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/General.php
@@ -6,14 +6,12 @@
 
 namespace Magento\CatalogSearch\Model\Search\RequestGenerator;
 
-
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Framework\Search\Request\BucketInterface;
 use Magento\Framework\Search\Request\FilterInterface;
 
 class General implements GeneratorInterface
 {
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php
index 7f60554d41cfd..9e5444a612e3d 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorInterface.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogSearch\Model\Search\RequestGenerator;
 
-
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 
 interface GeneratorInterface
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/GroupTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/GroupTest.php
index 5af9fe078e4f7..210960c444aa8 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/GroupTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/GroupTest.php
@@ -115,7 +115,7 @@ public function testAfterDelete()
 
     /**
      * Prepare expectations for indexer
-     * 
+     *
      * @param int $invalidateCounter
      * @return void
      */
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php
index 190515f550e95..b1d079b770f07 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php
@@ -202,6 +202,7 @@ public function applyWithEmptyRequestDataProvider()
 
     /** @var  \Magento\Eav\Model\Entity\Attribute|MockObject */
     private $attribute;
+
     public function testApply()
     {
         $priceId = '15-50';
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGenerator/GeneratorResolverTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGenerator/GeneratorResolverTest.php
index 93c6e81aece4f..f87b4b81627d8 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGenerator/GeneratorResolverTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/RequestGenerator/GeneratorResolverTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Search\RequestGenerator;
 
-
 use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorResolver;
 use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorInterface;
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
index dd0250049a426..528f678cae848 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/CategoryProcessUrlRewriteSavingObserver.php
@@ -93,6 +93,5 @@ private function resetUrlRewritesDataMaps($category)
         foreach ($this->dataUrlRewriteClassNames as $className) {
             $this->databaseMapPool->resetMap($className, $category->getEntityId());
         }
-
     }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CanonicalUrlRewriteGeneratorTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CanonicalUrlRewriteGeneratorTest.php
index 483f0ecbd1104..06006c27f0868 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CanonicalUrlRewriteGeneratorTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/CanonicalUrlRewriteGeneratorTest.php
@@ -35,10 +35,10 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
         $this->category = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
             ->disableOriginalConstructor()->getMock();
-        $this->categoryUrlPathGenerator = $this->getMockBuilder(
+        $this->categoryUrlPathGenerator = $this->getMockBuilder(
             \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator::class
         )->disableOriginalConstructor()->getMock();
-        $this->canonicalUrlRewriteGenerator = (new ObjectManager($this))->getObject(
+        $this->canonicalUrlRewriteGenerator = (new ObjectManager($this))->getObject(
             \Magento\CatalogUrlRewrite\Model\Category\CanonicalUrlRewriteGenerator::class,
             [
                 'categoryUrlPathGenerator' => $this->categoryUrlPathGenerator,
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/HashMapPoolTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/HashMapPoolTest.php
index b9efdb01f2e1d..f7a99541a9025 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/HashMapPoolTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/HashMapPoolTest.php
@@ -63,7 +63,7 @@ public function testGetDataMap()
                         ['category' => 2],
                         $dataProductMapMockOtherCategory
                     ]
-               ]
+                ]
             );
         $this->assertSame($dataCategoryMapMock, $this->model->getDataMap(DataCategoryHashMap::class, 1));
         $this->assertSame($dataProductMapMock, $this->model->getDataMap(DataProductHashMap::class, 1));
diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index d9ea8196ab975..589a5d312d5a3 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -132,7 +132,7 @@ protected function _construct()
         $this->addData([
             'cache_lifetime' => 86400,
             'cache_tags' => [\Magento\Catalog\Model\Product::CACHE_TAG,
-        ], ]);
+            ], ]);
     }
 
     /**
@@ -369,6 +369,5 @@ private function getPriceCurrency()
                 ->get(PriceCurrencyInterface::class);
         }
         return $this->priceCurrency;
-
     }
 }
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
index 9386d85385c1f..6900da62056fd 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 /**
  * CatalogWidget Rule Product Condition data model
  */
diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
index 4d9aaa7f9177b..d257a5206ff93 100644
--- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -385,7 +385,6 @@ protected function orderCountryOptions(array $countryOptions)
             } else {
                 array_push($tailOptions, $countryOption);
             }
-
         }
         return array_merge($headOptions, $tailOptions);
     }
diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
index 19d35060b37a4..6ec3b1add408d 100644
--- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
+++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
@@ -151,8 +151,7 @@ public function process($jsLayout)
         $elements = $this->convertElementsToSelect($elements, $attributesToConvert);
         // The following code is a workaround for custom address attributes
         if (isset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
-            ['payment']['children']
-        )) {
+            ['payment']['children'])) {
             $jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
             ['payment']['children'] = $this->processPaymentChildrenComponents(
                 $jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
@@ -161,8 +160,7 @@ public function process($jsLayout)
             );
         }
         if (isset($jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
-            ['step-config']['children']['shipping-rates-validation']['children']
-        )) {
+            ['step-config']['children']['shipping-rates-validation']['children'])) {
             $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']
             ['step-config']['children']['shipping-rates-validation']['children'] =
                 $this->processShippingChildrenComponents(
@@ -172,8 +170,7 @@ public function process($jsLayout)
         }
 
         if (isset($jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']
-            ['children']['shippingAddress']['children']['shipping-address-fieldset']['children']
-        )) {
+            ['children']['shippingAddress']['children']['shipping-address-fieldset']['children'])) {
             $fields = $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']
             ['children']['shippingAddress']['children']['shipping-address-fieldset']['children'];
             $jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']
diff --git a/app/code/Magento/Checkout/Block/Registration.php b/app/code/Magento/Checkout/Block/Registration.php
index 0efd58dcc3273..1249932e368a7 100644
--- a/app/code/Magento/Checkout/Block/Registration.php
+++ b/app/code/Magento/Checkout/Block/Registration.php
@@ -96,8 +96,7 @@ public function getCreateAccountUrl()
      */
     public function toHtml()
     {
-        if (
-            $this->customerSession->isLoggedIn()
+        if ($this->customerSession->isLoggedIn()
             || !$this->registration->isAllowed()
             || !$this->accountManagement->isEmailAvailable($this->getEmailAddress())
             || !$this->validateAddresses()
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index a1ec6ca1b01f4..ecfa5d948fe0e 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -152,7 +152,6 @@ public function execute()
             }
 
             return $this->goBack($url);
-
         } catch (\Exception $e) {
             $this->messageManager->addException($e, __('We can\'t add this item to your shopping cart right now.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
diff --git a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
index f73412e04ed1f..d648d1af3c036 100644
--- a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
+++ b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Checkout\Controller\Sidebar;
 
-
 class RemoveItem extends \Magento\Framework\App\Action\Action
 {
     /**
diff --git a/app/code/Magento/Checkout/CustomerData/DirectoryData.php b/app/code/Magento/Checkout/CustomerData/DirectoryData.php
index 909fa0fee7437..f9cb731f080c1 100644
--- a/app/code/Magento/Checkout/CustomerData/DirectoryData.php
+++ b/app/code/Magento/Checkout/CustomerData/DirectoryData.php
@@ -46,7 +46,6 @@ public function getSectionData()
                     $output[$code]['regions'][$key]['name'] = $region['name'];
                 }
             }
-
         }
         return $output;
     }
diff --git a/app/code/Magento/Checkout/Model/Adminhtml/BillingAddressDisplayOptions.php b/app/code/Magento/Checkout/Model/Adminhtml/BillingAddressDisplayOptions.php
index afaff4013b49f..39e07a64b7418 100644
--- a/app/code/Magento/Checkout/Model/Adminhtml/BillingAddressDisplayOptions.php
+++ b/app/code/Magento/Checkout/Model/Adminhtml/BillingAddressDisplayOptions.php
@@ -13,7 +13,6 @@
  */
 class BillingAddressDisplayOptions implements ArrayInterface
 {
-
     /**
      * Return array of options for billing address displaying on checkout payment step
      *
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index 5d7cd9e51a862..06d6024a4b08d 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -14,7 +14,7 @@
 /**
  * Shopping cart model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @deprecated 
+ * @deprecated
  */
 class Cart extends DataObject implements CartInterface
 {
diff --git a/app/code/Magento/Checkout/Model/ConfigProviderInterface.php b/app/code/Magento/Checkout/Model/ConfigProviderInterface.php
index f49df5c827730..7e28c0a7d4e6b 100644
--- a/app/code/Magento/Checkout/Model/ConfigProviderInterface.php
+++ b/app/code/Magento/Checkout/Model/ConfigProviderInterface.php
@@ -11,7 +11,6 @@
  */
 interface ConfigProviderInterface
 {
-
     /**
      * Retrieve assoc array of checkout configuration
      *
diff --git a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
index b70348aa15225..5e16f093dd5c8 100644
--- a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
+++ b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
@@ -368,7 +368,6 @@ private function getQuoteData()
                     'quote_id'
                 )->getMaskedId();
             }
-
         }
         return $quoteData;
     }
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 235cc1b5893bc..e0b9d9443ec70 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Checkout/TotalsProcessorTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Checkout/TotalsProcessorTest.php
@@ -38,18 +38,18 @@ public function testProcess()
                 'sub-total' => [],
                 'grand-total' => [],
                 'non-existant-total' => null
-        ];
-        $expectedResult['components']['checkout']['children']['sidebar']['children']['summary']
+            ];
+            $expectedResult['components']['checkout']['children']['sidebar']['children']['summary']
             ['children']['totals']['children'] = [
                 'sub-total' => ['sortOrder' => 10],
                 'grand-total' => ['sortOrder' => 20],
                 'non-existant-total' => null
-        ];
-        $configData = ['sub_total' => 10, 'grand_total' => 20];
+            ];
+            $configData = ['sub_total' => 10, 'grand_total' => 20];
 
-        $this->scopeConfigMock->expects($this->once())->method('getValue')->with('sales/totals_sort')
+            $this->scopeConfigMock->expects($this->once())->method('getValue')->with('sales/totals_sort')
             ->willReturn($configData);
 
-        $this->assertEquals($expectedResult, $this->model->process($jsLayout));
+            $this->assertEquals($expectedResult, $this->model->process($jsLayout));
     }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Shipping/PriceTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Shipping/PriceTest.php
index bb2ca8a476875..782a11396c284 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Shipping/PriceTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Shipping/PriceTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Checkout\Test\Unit\Block\Shipping;
 
-
 class PriceTest extends \PHPUnit_Framework_TestCase
 {
     const SUBTOTAL = 10;
diff --git a/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php b/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php
index 354fdcd3458da..1532504ead973 100644
--- a/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/CustomerData/DefaultItemTest.php
@@ -90,4 +90,3 @@ public function testGetItemData()
         $this->assertArrayHasKey('canApplyMsrp', $itemData);
     }
 }
-
diff --git a/app/code/Magento/Checkout/Test/Unit/Helper/CartTest.php b/app/code/Magento/Checkout/Test/Unit/Helper/CartTest.php
index 72b5e0be3bd2c..90b08d80279c5 100644
--- a/app/code/Magento/Checkout/Test/Unit/Helper/CartTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Helper/CartTest.php
@@ -57,7 +57,7 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         /** @var \Magento\Framework\App\Helper\Context $context */
-        $context = $objectManagerHelper->getObject(
+        $context = $objectManagerHelper->getObject(
             \Magento\Framework\App\Helper\Context::class,
             [
                 'httpRequest' => $this->requestMock,
@@ -156,7 +156,7 @@ public function testGetAddUrl()
         $productEntityId = 1;
         $storeId = 1;
         $isRequestSecure = false;
-        $productMock = $this->getMock(
+        $productMock = $this->getMock(
             \Magento\Catalog\Model\Product::class,
             ['getEntityId', 'hasUrlDataObject', 'getUrlDataObject', '__wakeup'], [], '', false);
         $productMock->expects($this->any())->method('getEntityId')->will($this->returnValue($productEntityId));
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php
index 3b6d3922fd4ef..989f5774e83f9 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/Layout/DepersonalizePluginTest.php
@@ -39,14 +39,14 @@ class DepersonalizePluginTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->layoutMock = $this->getMock(\Magento\Framework\View\Layout::class, [], [], '', false);
-        $this->checkoutSessionMock = $this->getMock(
+        $this->checkoutSessionMock = $this->getMock(
             \Magento\Framework\Session\Generic::class,
             ['clearStorage', 'setData', 'getData'],
             [],
             '',
             false
         );
-        $this->checkoutSessionMock = $this->getMock(
+        $this->checkoutSessionMock = $this->getMock(
             \Magento\Checkout\Model\Session::class,
             ['clearStorage'],
             [],
@@ -56,7 +56,7 @@ protected function setUp()
         $this->requestMock = $this->getMock(\Magento\Framework\App\Request\Http::class, [], [], '', false);
         $this->moduleManagerMock = $this->getMock(\Magento\Framework\Module\Manager::class, [], [], '', false);
         $this->cacheConfigMock = $this->getMock(\Magento\PageCache\Model\Config::class, [], [], '', false);
-        $this->depersonalizeCheckerMock = $this->getMock(
+        $this->depersonalizeCheckerMock = $this->getMock(
             \Magento\PageCache\Model\DepersonalizeChecker::class,
             [],
             [],
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
index 26fb8a9bd71bd..e1b0b35cfcfb0 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
@@ -3,7 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
+// @codingStandardsIgnoreFile
 /**  @var $block \Magento\Checkout\Block\Cart */
 ?>
 <div class="cart-empty">
diff --git a/app/code/Magento/CheckoutAgreements/Model/Agreement.php b/app/code/Magento/CheckoutAgreements/Model/Agreement.php
index fd1de44e9879e..9e96d74cfc0e4 100644
--- a/app/code/Magento/CheckoutAgreements/Model/Agreement.php
+++ b/app/code/Magento/CheckoutAgreements/Model/Agreement.php
@@ -215,5 +215,6 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php b/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php
index a2e070a787e02..c555811e6fb08 100644
--- a/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php
+++ b/app/code/Magento/CheckoutAgreements/Setup/InstallSchema.php
@@ -110,6 +110,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php
index 005cbddfcd99f..b6f842f013aa0 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/DeleteButton.php
@@ -12,7 +12,6 @@
  */
 class DeleteButton extends GenericButton implements ButtonProviderInterface
 {
-
     /**
      * @return array
      */
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/SaveAndContinueButton.php b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/SaveAndContinueButton.php
index ef84753109026..7c47e06a37866 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/SaveAndContinueButton.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit/SaveAndContinueButton.php
@@ -12,7 +12,6 @@
  */
 class SaveAndContinueButton extends GenericButton implements ButtonProviderInterface
 {
-
     /**
      * @return array
      */
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php
index eea050666cb3e..9b29d663f1020 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/DeleteButton.php
@@ -12,7 +12,6 @@
  */
 class DeleteButton extends GenericButton implements ButtonProviderInterface
 {
-
     /**
      * @return array
      */
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/SaveAndContinueButton.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/SaveAndContinueButton.php
index 182255761afcf..2da7c0d357984 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/SaveAndContinueButton.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/SaveAndContinueButton.php
@@ -12,7 +12,6 @@
  */
 class SaveAndContinueButton extends GenericButton implements ButtonProviderInterface
 {
-
     /**
      * @return array
      */
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
index dbba38efb4f1d..3e324fab07cfa 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images;
 
-
 /**
  * Wysiwyg Images content block
  */
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index de209e88782e5..e83ca108bc8c5 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -245,7 +245,6 @@ protected function removeItemFromCollection($collection, $conditions)
 
             if (array_key_exists($rootChildParts[1], $conditions['plain'])
                 || ($regExp && preg_match($regExp, $value->getFilename()))) {
-
                 $collection->removeItemByKey($key);
             }
         }
diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
index d8cd17aa16092..78a64e154320b 100644
--- a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Cms\Test\Unit\Ui\Component\Listing;
 
-
 use Magento\Cms\Ui\Component\DataProvider;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Authorization;
@@ -130,6 +129,5 @@ public function testPrepareMetadata()
             $metadata,
             $this->dataProvider->prepareMetadata()
         );
-
     }
 }
diff --git a/app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php b/app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php
index 9e0d3be93fd34..6a4845632b0e1 100644
--- a/app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php
+++ b/app/code/Magento/CmsUrlRewrite/Test/Unit/Model/CmsPageUrlRewriteGeneratorTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\CmsUrlRewrite\Test\Unit\Model;
 
-
 class CmsPageUrlRewriteGeneratorTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/app/code/Magento/Config/App/Config/Source/DumpConfigSourceAggregated.php b/app/code/Magento/Config/App/Config/Source/DumpConfigSourceAggregated.php
index e19a832efc2de..b8e95f77b734f 100644
--- a/app/code/Magento/Config/App/Config/Source/DumpConfigSourceAggregated.php
+++ b/app/code/Magento/Config/App/Config/Source/DumpConfigSourceAggregated.php
@@ -86,8 +86,7 @@ private function filterChain($path, &$data)
             $newPath = $path ? $path . '/' . $subKey : $subKey;
             $filteredPath = $this->filterPath($newPath);
 
-            if (
-                $filteredPath
+            if ($filteredPath
                 && !is_array($data[$subKey])
                 && $this->excludeList->isPresent($filteredPath)
             ) {
diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index e677ce42278e0..ba06f941d0f2c 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -436,7 +436,6 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
                         ->afterLoad();
                     $data = $backendModel->getValue();
                 }
-
             } elseif ($field->getConfigPath() !== null) {
                 $data = $this->getConfigValue($field->getConfigPath());
             } else {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
index 2e867d49c7df4..ddb7d6f4a20d1 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
@@ -239,8 +239,7 @@ protected function _getExtraJs($element)
      */
     protected function _isCollapseState($element)
     {
-        if (
-            $element->getExpanded() ||
+        if ($element->getExpanded() ||
             ($element->getForm() && $element->getForm()->getElements()->count() === 1)
         ) {
             return true;
diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index bc4fefeab4167..8f0b5b1091e2d 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -203,7 +203,6 @@ protected function _processGroup(
         /** @var $group \Magento\Config\Model\Config\Structure\Element\Group */
         $group = $this->_configStructure->getElement($groupPath);
 
-
         // set value for group field entry by fieldname
         // use extra memory
         $fieldsetData = [];
@@ -397,7 +396,6 @@ private function initScope()
             $this->setStore('');
         }
 
-
         if ($this->getStore()) {
             $scope = 'stores';
             $store = $this->_storeManager->getStore($this->getStore());
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php
index bcbc0011ff1df..c0d43f46d87f0 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php
@@ -53,7 +53,6 @@ class Custom extends \Magento\Framework\App\Config\Value
     /* @var \Magento\Framework\App\Config\Storage\WriterInterface */
     protected $_configWriter;
 
-
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php b/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
index e95ed4d049908..1832657ed9d39 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/Cron.php
@@ -16,7 +16,6 @@ class Cron extends \Magento\Framework\App\Config\Value
     /** @var \Magento\Framework\App\Config\ValueFactory */
     protected $_configValueFactory;
 
-
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
diff --git a/app/code/Magento/Config/Model/Config/Backend/Encrypted.php b/app/code/Magento/Config/Model/Config/Backend/Encrypted.php
index 86039fd2834ab..72853c7917993 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Encrypted.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Encrypted.php
@@ -61,7 +61,7 @@ public function __sleep()
     public function __wakeup()
     {
         parent::__wakeup();
-        $this->_encryptor = \Magento\Framework\App\ObjectManager::getInstance()->get(
+        $this->_encryptor = \Magento\Framework\App\ObjectManager::getInstance()->get(
             \Magento\Framework\Encryption\EncryptorInterface::class
         );
     }
diff --git a/app/code/Magento/Config/Model/Config/Backend/File.php b/app/code/Magento/Config/Model/Config/Backend/File.php
index 7dcf1e1dd012c..404a3db902a3f 100644
--- a/app/code/Magento/Config/Model/Config/Backend/File.php
+++ b/app/code/Magento/Config/Model/Config/Backend/File.php
@@ -188,8 +188,7 @@ protected function _getUploadDir()
 
         if (is_array($fieldConfig['upload_dir'])) {
             $uploadDir = $fieldConfig['upload_dir']['value'];
-            if (
-                array_key_exists('scope_info', $fieldConfig['upload_dir'])
+            if (array_key_exists('scope_info', $fieldConfig['upload_dir'])
                 && $fieldConfig['upload_dir']['scope_info']
             ) {
                 $uploadDir = $this->_appendScopeInfo($uploadDir);
diff --git a/app/code/Magento/Config/Model/Config/Backend/Secure.php b/app/code/Magento/Config/Model/Config/Backend/Secure.php
index 163babae2648d..626796a8c4574 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Secure.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Secure.php
@@ -10,7 +10,6 @@ class Secure extends \Magento\Framework\App\Config\Value
     /** @var \Magento\Framework\View\Asset\MergeService */
     protected $_mergeService;
 
-
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
diff --git a/app/code/Magento/Config/Setup/InstallData.php b/app/code/Magento/Config/Setup/InstallData.php
index 0b11d3be66103..811826c82bd27 100644
--- a/app/code/Magento/Config/Setup/InstallData.php
+++ b/app/code/Magento/Config/Setup/InstallData.php
@@ -34,6 +34,5 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
         $installer->doUpdateClassAliases();
 
         $setup->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
index f68e5871af956..de68a2c8d9ab6 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
@@ -269,7 +269,6 @@ public function testInitForm($sectionIsVisible)
                 ->method('_initGroup');
         }
 
-
         $object->initForm();
         $this->assertEquals($this->_formMock, $object->getForm());
     }
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
index add77ba058412..e286a52deb2e1 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
@@ -34,7 +34,7 @@ protected function setUp()
     {
         $this->_coreRegistry = $this->getMock(\Magento\Framework\Registry::class, [], [], '', false, false);
         $this->_emailConfig = $this->getMock(\Magento\Email\Model\Template\Config::class, [], [], '', false);
-        $this->_templatesFactory = $this->getMock(
+        $this->_templatesFactory = $this->getMock(
             \Magento\Email\Model\ResourceModel\Template\CollectionFactory::class,
             [],
             [],
diff --git a/app/code/Magento/Config/Test/Unit/Model/_files/converted_config.php b/app/code/Magento/Config/Test/Unit/Model/_files/converted_config.php
index e94e5bd881240..c0c4e6015ede9 100644
--- a/app/code/Magento/Config/Test/Unit/Model/_files/converted_config.php
+++ b/app/code/Magento/Config/Test/Unit/Model/_files/converted_config.php
@@ -165,7 +165,7 @@
                                     'type' => 'text',
                                     'label' => '',
                                     '_elementType' => 'field',
-                                ],
+                                 ],
                             ],
                             '_elementType' => 'group',
                         ],
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Associated/Grid.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Associated/Grid.php
index 772e2ba3de976..c29ce90c64eb4 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Associated/Grid.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Associated/Grid.php
@@ -28,6 +28,7 @@ public function __construct(
         parent::__construct($context);
         $this->resultPageFactory = $resultPageFactory;
     }
+
     /**
      * Index action
      *
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
index e877d6e32f9e1..70cbc77df3324 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Attribute.php
@@ -266,6 +266,7 @@ public function setProductId($value)
     {
         return $this->setData(self::KEY_PRODUCT_ID, $value);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/OptionValue.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/OptionValue.php
index 036c912da8a5b..a010c9a443dc8 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/OptionValue.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/OptionValue.php
@@ -60,5 +60,6 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/ConfigurableItemOptionValue.php b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/ConfigurableItemOptionValue.php
index a8c7d8f23431e..57fbd930550b0 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/ConfigurableItemOptionValue.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/ConfigurableItemOptionValue.php
@@ -14,6 +14,7 @@
 class ConfigurableItemOptionValue extends AbstractExtensibleModel implements ConfigurableItemOptionValueInterface
 {
     //@codeCoverageIgnoreStart
+
     /**
      * {@inheritdoc}
      */
diff --git a/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php b/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php
index f902dd42259ad..b9632184a9035 100644
--- a/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php
+++ b/app/code/Magento/ConfigurableProduct/Model/SuggestedAttributeList.php
@@ -20,6 +20,7 @@ class SuggestedAttributeList
      * @var \Magento\Catalog\Model\ResourceModel\Helper
      */
     protected $_resourceHelper;
+
     /**
      * @param ConfigurableAttributeHandler $configurableAttributeHandler
      * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
@@ -31,6 +32,7 @@ public function __construct(
         $this->configurableAttributeHandler = $configurableAttributeHandler;
         $this->_resourceHelper = $resourceHelper;
     }
+
     /**
      * Retrieve list of attributes with admin store label containing $labelPart
      *
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php
index e593cfda9ce43..a7940bcc4f4b9 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableRegularPrice.php
@@ -100,7 +100,6 @@ public function getMaxRegularAmount()
             $this->maxRegularAmount = $this->doGetMaxRegularAmount() ?: false;
         }
         return $this->maxRegularAmount;
-
     }
 
     /**
diff --git a/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php b/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php
index fb2b3c80e8e09..f35d33c4c6a62 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/InstallSchema.php
@@ -221,6 +221,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/PluginTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/PluginTest.php
index 1b3db9b8e476e..4b814b85b8ced 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/PluginTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/PluginTest.php
@@ -20,7 +20,7 @@ class PluginTest extends \PHPUnit_Framework_TestCase
      */
     public function testAfterGetOptionArray(array $expected, array $data)
     {
-        $moduleManagerMock = $this->getMock(
+        $moduleManagerMock = $this->getMock(
             \Magento\Framework\Module\Manager::class, ['isOutputEnabled'], [], '', false
         );
         $moduleManagerMock->expects($this->once())
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ProductVariationsBuilderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ProductVariationsBuilderTest.php
index 346587f52454f..918c093bc2046 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ProductVariationsBuilderTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ProductVariationsBuilderTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\ConfigurableProduct\Test\Unit\Model;
 
-
 class ProductVariationsBuilderTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/SuggestedAttributeListTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/SuggestedAttributeListTest.php
index 3cd94bd3568d7..87e472c135f43 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/SuggestedAttributeListTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/SuggestedAttributeListTest.php
@@ -42,21 +42,21 @@ class SuggestedAttributeListTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->configurableAttributeHandler = $this->getMock(
+        $this->configurableAttributeHandler = $this->getMock(
             \Magento\ConfigurableProduct\Model\ConfigurableAttributeHandler::class,
             [],
             [],
             '',
             false
         );
-        $this->resourceHelperMock = $this->getMock(
+        $this->resourceHelperMock = $this->getMock(
             \Magento\Catalog\Model\ResourceModel\Helper::class,
             [],
             [],
             '',
             false
         );
-        $this->collectionMock = $this->getMock(
+        $this->collectionMock = $this->getMock(
             \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection::class,
             [],
             [],
@@ -91,7 +91,7 @@ protected function setUp()
             $this->returnValueMap($valueMap)
         );
         $methods = ['getId', 'getFrontendLabel', 'getAttributeCode', 'getSource'];
-        $this->attributeMock = $this->getMock(
+        $this->attributeMock = $this->getMock(
             \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
             $methods,
             [],
@@ -113,7 +113,7 @@ protected function setUp()
 
     public function testGetSuggestedAttributesIfTheyApplicable()
     {
-        $source = $this->getMock(
+        $source = $this->getMock(
             \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource::class,
             [],
             [],
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProducts.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProducts.php
index 9529172cbdcc2..bee100541f352 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProducts.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProducts.php
@@ -359,7 +359,6 @@ protected function getVariationKey(array $options = [])
         asort($result);
 
         return implode('-', $result);
-
     }
 
     /**
diff --git a/app/code/Magento/Cookie/Test/Unit/Model/Config/Backend/LifetimeTest.php b/app/code/Magento/Cookie/Test/Unit/Model/Config/Backend/LifetimeTest.php
index a6d51f7edf090..781a6dab99c34 100644
--- a/app/code/Magento/Cookie/Test/Unit/Model/Config/Backend/LifetimeTest.php
+++ b/app/code/Magento/Cookie/Test/Unit/Model/Config/Backend/LifetimeTest.php
@@ -26,7 +26,7 @@ class LifetimeTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->validatorMock = $this->getMockBuilder(
+        $this->validatorMock = $this->getMockBuilder(
             \Magento\Framework\Session\Config\Validator\CookieLifetimeValidator::class
         )->disableOriginalConstructor()
             ->getMock();
@@ -35,7 +35,7 @@ protected function setUp()
             ->getMock();
 
         $objectManager = new ObjectManager($this);
-        $this->model = $objectManager->getObject(
+        $this->model = $objectManager->getObject(
             \Magento\Cookie\Model\Config\Backend\Lifetime::class,
             [
                 'configValidator' => $this->validatorMock,
diff --git a/app/code/Magento/Cookie/Test/Unit/Model/Config/Backend/PathTest.php b/app/code/Magento/Cookie/Test/Unit/Model/Config/Backend/PathTest.php
index 4706a7cc0d45b..f879d6f0c6832 100644
--- a/app/code/Magento/Cookie/Test/Unit/Model/Config/Backend/PathTest.php
+++ b/app/code/Magento/Cookie/Test/Unit/Model/Config/Backend/PathTest.php
@@ -26,7 +26,7 @@ class PathTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->validatorMock = $this->getMockBuilder(
+        $this->validatorMock = $this->getMockBuilder(
             \Magento\Framework\Session\Config\Validator\CookiePathValidator::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -35,7 +35,7 @@ protected function setUp()
             ->getMock();
 
         $objectManager = new ObjectManager($this);
-        $this->model = $objectManager->getObject(
+        $this->model = $objectManager->getObject(
             \Magento\Cookie\Model\Config\Backend\Path::class,
             [
                 'configValidator' => $this->validatorMock,
diff --git a/app/code/Magento/Cron/Setup/InstallSchema.php b/app/code/Magento/Cron/Setup/InstallSchema.php
index 1001a4d487205..3e0502e8d70c8 100644
--- a/app/code/Magento/Cron/Setup/InstallSchema.php
+++ b/app/code/Magento/Cron/Setup/InstallSchema.php
@@ -89,6 +89,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
index da908d99fe945..2b39b1fa42ea8 100644
--- a/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
+++ b/app/code/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRates.php
@@ -23,7 +23,7 @@ public function execute()
             try {
                 foreach ($data as $currencyCode => $rate) {
                     foreach ($rate as $currencyTo => $value) {
-                        $value = abs($this->_objectManager->get(
+                        $value = abs($this->_objectManager->get(
                             \Magento\Framework\Locale\FormatInterface::class)->getNumber($value));
                         $data[$currencyCode][$currencyTo] = $value;
                         if ($value == 0) {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
index ba859462a0b0e..ccdc6331f5b6c 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 /**
  * Customer Widget Form Image File Element Block
  *
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php b/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
index 8f70dee5ad66f..cbf250f505492 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php
@@ -114,7 +114,7 @@ public function execute()
      */
     private function convertFilesArray()
     {
-        foreach($_FILES['address'] as $itemKey => $item) {
+        foreach ($_FILES['address'] as $itemKey => $item) {
             foreach ($item as $value) {
                 if (is_array($value)) {
                     $_FILES['address'][$itemKey] = [
diff --git a/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php b/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php
index 6ee04cea5f85b..ab93d432f13b6 100644
--- a/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php
+++ b/app/code/Magento/Customer/CustomerData/Plugin/SessionChecker.php
@@ -37,6 +37,7 @@ public function __construct(
      * Delete frontend session cookie if customer session is expired
      *
      * @param SessionManager $sessionManager
+     * @return void
      */
     public function beforeStart(SessionManager $sessionManager)
     {
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
index 475116fb94272..bae46345cde48 100644
--- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -584,21 +584,18 @@ public function validate()
         if ($this->isTelephoneRequired()) {
             if (!\Zend_Validate::is($this->getTelephone(), 'NotEmpty')) {
                 $errors[] = __('%fieldName is a required field.', ['fieldName' => 'telephone']);
-
             }
         }
 
         if ($this->isFaxRequired()) {
             if (!\Zend_Validate::is($this->getFax(), 'NotEmpty')) {
                 $errors[] = __('%fieldName is a required field.', ['fieldName' => 'fax']);
-
             }
         }
 
         if ($this->isCompanyRequired()) {
             if (!\Zend_Validate::is($this->getCompany(), 'NotEmpty')) {
                 $errors[] = __('%fieldName is a required field.', ['fieldName' => 'company']);
-
             }
         }
 
diff --git a/app/code/Magento/Customer/Model/Context.php b/app/code/Magento/Customer/Model/Context.php
index 8634993e8866b..526a3bfa092fd 100644
--- a/app/code/Magento/Customer/Model/Context.php
+++ b/app/code/Magento/Customer/Model/Context.php
@@ -11,6 +11,7 @@ class Context
      * Customer group cache context
      */
     const CONTEXT_GROUP = 'customer_group';
+
     /**
      * Customer authorization cache context
      */
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/File.php b/app/code/Magento/Customer/Model/Metadata/Form/File.php
index c0a3d195f971e..31a1d2593521d 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/File.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/File.php
@@ -127,7 +127,7 @@ public function extractValue(\Magento\Framework\App\RequestInterface $request)
                         $value[$fileKey] = $scopeData[$attrCode];
                     }
                 }
-            } else if (isset($extend[0]['file']) && !empty($extend[0]['file'])) {
+            } elseif (isset($extend[0]['file']) && !empty($extend[0]['file'])) {
                 /**
                  * This case is required by file uploader UI component
                  *
diff --git a/app/code/Magento/Customer/Model/Plugin/CustomerNotification.php b/app/code/Magento/Customer/Model/Plugin/CustomerNotification.php
index c064c07086db0..1e013b21cfe66 100644
--- a/app/code/Magento/Customer/Model/Plugin/CustomerNotification.php
+++ b/app/code/Magento/Customer/Model/Plugin/CustomerNotification.php
@@ -37,11 +37,10 @@ class CustomerNotification
     private $state;
 
     /**
-     * CustomerNotification constructor.
-     * 
      * @param Session $session
      * @param NotificationStorage $notificationStorage
      * @param State $state
+     * @param CustomerRepositoryInterface $customerRepository
      */
     public function __construct(
         Session $session,
diff --git a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
index 89cd1758c6462..c02abd9e8ee51 100644
--- a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
+++ b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
@@ -190,8 +190,7 @@ protected function _canProcessAddress($address)
             return true;
         }
 
-        if (
-            $this->_coreRegistry->registry(BeforeAddressSaveObserver::VIV_CURRENTLY_SAVED_ADDRESS) != $address->getId()
+        if ($this->_coreRegistry->registry(BeforeAddressSaveObserver::VIV_CURRENTLY_SAVED_ADDRESS) != $address->getId()
         ) {
             return false;
         }
diff --git a/app/code/Magento/Customer/Setup/InstallSchema.php b/app/code/Magento/Customer/Setup/InstallSchema.php
index bba058cde8319..efe926479683d 100644
--- a/app/code/Magento/Customer/Setup/InstallSchema.php
+++ b/app/code/Magento/Customer/Setup/InstallSchema.php
@@ -1273,6 +1273,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Customer/Setup/UpgradeSchema.php b/app/code/Magento/Customer/Setup/UpgradeSchema.php
index c4ab78f362fec..fdd776aa09a29 100755
--- a/app/code/Magento/Customer/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Customer/Setup/UpgradeSchema.php
@@ -187,13 +187,11 @@ private function getForeignKeys(SchemaSetupInterface $setup)
         $keysTree = $setup->getConnection()->getForeignKeysTree();
         foreach ($keysTree as $indexes) {
             foreach ($indexes as $index) {
-                if (
-                    $index['REF_TABLE_NAME'] == $setup->getTable('customer_group')
+                if ($index['REF_TABLE_NAME'] == $setup->getTable('customer_group')
                     && $index['REF_COLUMN_NAME'] == 'customer_group_id'
                 ) {
                     $foreignKeys[] = $index;
                 }
-
             }
         }
         return $foreignKeys;
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php
index 435b1edd77a1d..4a582b60e65aa 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php
@@ -129,11 +129,11 @@ protected function setUp()
         $this->storeManagerMock = $this->getMock(\Magento\Store\Model\StoreManager::class, [], [], '', false);
         $this->storeMock = $this->getMock(\Magento\Store\Model\Store::class, [], [], '', false);
         $this->redirectResultMock = $this->getMock(
-            \Magento\Framework\Controller\Result\Redirect::class,
-            [],
-            [],
-            '',
-            false
+            \Magento\Framework\Controller\Result\Redirect::class,
+            [],
+            [],
+            '',
+            false
         );
 
         $resultFactoryMock = $this->getMock(
@@ -314,8 +314,6 @@ public function testSuccessMessage($customerId, $key, $vatValidationEnabled, $ad
             ->method('getStore')
             ->will($this->returnValue($this->storeMock));
 
-
-
         $cookieMetadataManager = $this->getMockBuilder(\Magento\Framework\Stdlib\Cookie\PhpCookieManager::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php
index 34437b2d10d79..7898fa481b90f 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreatePostTest.php
@@ -129,6 +129,7 @@ class CreatePostTest extends \PHPUnit_Framework_TestCase
      * @var \Magento\Framework\Controller\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $resultRedirectFactoryMock;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -151,17 +152,17 @@ protected function setUp()
             ->method('create')
             ->will($this->returnValue($this->urlMock));
 
-        $this->customerMock = $this->getMock(
+        $this->customerMock = $this->getMock(
             \Magento\Customer\Api\Data\CustomerInterface::class,
             [],
             [],
             '',
             false
         );
-        $this->customerDetailsMock = $this->getMock(
+        $this->customerDetailsMock = $this->getMock(
             \Magento\Customer\Api\Data\CustomerInterface::class, [], [], '', false
         );
-        $this->customerDetailsFactoryMock = $this->getMock(
+        $this->customerDetailsFactoryMock = $this->getMock(
             \Magento\Customer\Api\Data\CustomerInterfaceFactory::class, [], [], '', false
         );
 
@@ -177,34 +178,34 @@ protected function setUp()
         $formFactoryMock = $this->getMock(\Magento\Customer\Model\Metadata\FormFactory::class, [], [], '', false);
 
         $this->subscriberMock = $this->getMock(\Magento\Newsletter\Model\Subscriber::class, [], [], '', false);
-        $subscriberFactoryMock = $this->getMock(
+        $subscriberFactoryMock = $this->getMock(
             \Magento\Newsletter\Model\SubscriberFactory::class, ['create'], [], '', false
         );
         $subscriberFactoryMock->expects($this->any())
             ->method('create')
             ->will($this->returnValue($this->subscriberMock));
 
-        $regionFactoryMock = $this->getMock(
+        $regionFactoryMock = $this->getMock(
             \Magento\Customer\Api\Data\RegionInterfaceFactory::class, [], [], '', false
         );
-        $addressFactoryMock = $this->getMock(
+        $addressFactoryMock = $this->getMock(
             \Magento\Customer\Api\Data\AddressInterfaceFactory::class, [], [], '', false
         );
         $this->customerUrl = $this->getMock(\Magento\Customer\Model\Url::class, [], [], '', false);
         $this->registration = $this->getMock(\Magento\Customer\Model\Registration::class, [], [], '', false);
         $escaperMock = $this->getMock(\Magento\Framework\Escaper::class, [], [], '', false);
-        $this->customerExtractorMock = $this->getMock(
-            \Magento\Customer\Model\CustomerExtractor::class,
-            [],
-            [],
-            '',
-            false
+        $this->customerExtractorMock = $this->getMock(
+            \Magento\Customer\Model\CustomerExtractor::class,
+            [],
+            [],
+            '',
+            false
         );
         $this->dataObjectHelperMock = $this->getMock(\Magento\Framework\Api\DataObjectHelper::class, [], [], '', false);
 
         $eventManagerMock = $this->getMock(\Magento\Framework\Event\ManagerInterface::class, [], [], '', false);
 
-        $this->resultRedirectFactoryMock = $this->getMockBuilder(
+        $this->resultRedirectFactoryMock = $this->getMockBuilder(
             \Magento\Framework\Controller\Result\RedirectFactory::class)
             ->setMethods(['create'])
             ->getMock();
@@ -232,7 +233,7 @@ protected function setUp()
             ->method('getResultRedirectFactory')
             ->willReturn($this->resultRedirectFactoryMock);
 
-        $this->model = $objectManager->getObject(
+        $this->model = $objectManager->getObject(
             \Magento\Customer\Controller\Account\CreatePost::class,
             [
                 'context' => $contextMock,
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreateTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreateTest.php
index dc4c80a7c2482..fa3faf9fdcab7 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Account/CreateTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Account/CreateTest.php
@@ -65,15 +65,15 @@ protected function setUp()
         $this->response = $this->getMock(\Magento\Framework\App\ResponseInterface::class);
         $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
             ->disableOriginalConstructor()->getMock();
-        $this->redirectResultMock = $this->getMock(
-            \Magento\Framework\Controller\Result\Redirect::class,
-            [],
-            [],
-            '',
-            false
+        $this->redirectResultMock = $this->getMock(
+            \Magento\Framework\Controller\Result\Redirect::class,
+            [],
+            [],
+            '',
+            false
         );
 
-        $this->redirectFactoryMock = $this->getMock(
+        $this->redirectFactoryMock = $this->getMock(
             \Magento\Framework\Controller\Result\RedirectFactory::class,
             ['create'],
             [],
@@ -84,7 +84,7 @@ protected function setUp()
         $this->resultPageMock = $this->getMock(\Magento\Framework\View\Result\Page::class, [], [], '', false );
         $this->pageFactoryMock = $this->getMock(\Magento\Framework\View\Result\PageFactory::class, [], [], '', false);
 
-        $this->object = $objectManager->getObject(
+        $this->object = $objectManager->getObject(
             \Magento\Customer\Controller\Account\Create::class,
             [
                 'request' => $this->request,
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php
index c399eac1f2d82..420bc81859ec4 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Ajax/LoginTest.php
@@ -77,14 +77,14 @@ protected function setUp()
     {
         $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
             ->disableOriginalConstructor()->getMock();
-        $this->response = $this->getMock(
+        $this->response = $this->getMock(
             \Magento\Framework\App\ResponseInterface::class,
             ['setRedirect', 'sendResponse', 'representJson', 'setHttpResponseCode'],
             [],
             '',
             false
         );
-        $this->customerSession = $this->getMock(
+        $this->customerSession = $this->getMock(
             \Magento\Customer\Model\Session::class,
             [
                 'isLoggedIn',
@@ -98,7 +98,7 @@ protected function setUp()
             '',
             false
         );
-        $this->objectManager = $this->getMock(
+        $this->objectManager = $this->getMock(
             \Magento\Framework\ObjectManager\ObjectManager::class,
             ['get'],
             [],
@@ -106,7 +106,7 @@ protected function setUp()
             false
         );
         $this->customerAccountManagementMock =
-            $this->getMock(
+            $this->getMock(
                 \Magento\Customer\Model\AccountManagement::class,
                 ['authenticate'],
                 [],
@@ -114,7 +114,7 @@ protected function setUp()
                 false
             );
 
-        $this->jsonHelperMock = $this->getMock(
+        $this->jsonHelperMock = $this->getMock(
             \Magento\Framework\Json\Helper\Data::class,
             ['jsonDecode'],
             [],
@@ -147,7 +147,7 @@ protected function setUp()
         $contextMock->expects($this->atLeastOnce())->method('getRequest')->willReturn($this->request);
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->object = $objectManager->getObject(
+        $this->object = $objectManager->getObject(
             \Magento\Customer\Controller\Ajax\Login::class,
             [
                 'context' => $contextMock,
diff --git a/app/code/Magento/Customer/Test/Unit/Helper/Session/CurrentCustomerTest.php b/app/code/Magento/Customer/Test/Unit/Helper/Session/CurrentCustomerTest.php
index 4a9b78bc121af..9376defd4b634 100644
--- a/app/code/Magento/Customer/Test/Unit/Helper/Session/CurrentCustomerTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Helper/Session/CurrentCustomerTest.php
@@ -72,21 +72,21 @@ protected function setUp()
     {
         $this->customerSessionMock = $this->getMock(\Magento\Customer\Model\Session::class, [], [], '', false);
         $this->layoutMock = $this->getMock(\Magento\Framework\View\Layout::class, [], [], '', false);
-        $this->customerInterfaceFactoryMock = $this->getMock(
+        $this->customerInterfaceFactoryMock = $this->getMock(
             \Magento\Customer\Api\Data\CustomerInterfaceFactory::class,
             ['create', 'setGroupId'],
             [],
             '',
             false
         );
-        $this->customerDataMock = $this->getMock(
+        $this->customerDataMock = $this->getMock(
             \Magento\Customer\Api\Data\CustomerInterface::class,
             [],
             [],
             '',
             false
         );
-        $this->customerRepositoryMock = $this->getMock(
+        $this->customerRepositoryMock = $this->getMock(
             \Magento\Customer\Api\CustomerRepositoryInterface::class,
             [],
             [],
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/DateTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/DateTest.php
index dee3e3a98d045..db88efbb99009 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/DateTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/DateTest.php
@@ -7,7 +7,6 @@
  */
 namespace Magento\Customer\Test\Unit\Model\Metadata\Form;
 
-
 class DateTest extends AbstractFormTestCase
 {
     /** @var \Magento\Customer\Model\Metadata\Form\Date */
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php
index b25f63bcfc663..fe88039363e9c 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/AddressTest.php
@@ -41,7 +41,6 @@ protected function setUp()
             false
         );
 
-
         $this->entityRelationCompositeMock = $this->getMock(
             \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite::class,
             [],
diff --git a/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php b/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
index ccea8265365cf..48adc02aa6d90 100644
--- a/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Ui/Component/DataProvider/DocumentTest.php
@@ -20,7 +20,7 @@
 
 /**
  * Class DocumentTest
- * 
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DocumentTest extends \PHPUnit_Framework_TestCase
diff --git a/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php b/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php
index ad89b7cb0564e..2c98d65c1a4c6 100644
--- a/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php
+++ b/app/code/Magento/Customer/Ui/Component/Listing/AttributeRepository.php
@@ -129,7 +129,6 @@ protected function getOptionArray(array $options)
         return $options;
     }
 
-
     /**
      * @param string $code
      * @return []
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
index 1cb17a9318ea9..6056a5e2ea7d9 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
@@ -28,7 +28,6 @@ abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entit
 
     const COLUMN_DEFAULT_SHIPPING = 'default_shipping';
 
-
     /**#@-*/
 
     /**#@+
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
index c137475e7d6f6..85f677e79c4e5 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -527,7 +527,6 @@ protected function _prepareDataForUpdate(array $rowData)
                         continue;
                     }
                 } elseif ($newAddress && !strlen($rowData[$attributeAlias])) {
-
                 } elseif ('select' == $attributeParams['type']) {
                     $value = $attributeParams['options'][strtolower($rowData[$attributeAlias])];
                 } elseif ('datetime' == $attributeParams['type']) {
@@ -599,7 +598,6 @@ protected function _saveAddressEntities(array $addRows, array $updateRows)
                 $fields = array_diff(array_keys($row), ['entity_id', 'parent_id', 'created_at']);
                 $this->_connection->insertOnDuplicate($this->_entityTable, $row, $fields);
             }
-
         }
         return $this;
     }
@@ -645,7 +643,6 @@ protected function _saveCustomerDefaults(array $defaults)
                 );
                 $this->_connection->insertOnDuplicate($tableName, $data, array_keys($defaultsData));
             }
-
         }
         return $this;
     }
@@ -753,8 +750,7 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                         }
                     }
 
-                    if (
-                        isset($rowData[self::COLUMN_POSTCODE])
+                    if (isset($rowData[self::COLUMN_POSTCODE])
                         && isset($rowData[self::COLUMN_COUNTRY_ID])
                         && !$this->postcodeValidator->isValid(
                             $rowData[self::COLUMN_COUNTRY_ID],
diff --git a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php
index 4f31066a37fc5..969243735e911 100644
--- a/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php
+++ b/app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php
@@ -131,7 +131,7 @@ protected function setUp()
 
         $this->_string = new \Magento\Framework\Stdlib\StringUtils();
 
-        $this->_importFactory = $this->getMock(
+        $this->_importFactory = $this->getMock(
             \Magento\ImportExport\Model\ImportFactory::class,
             [],
             [],
@@ -139,28 +139,28 @@ protected function setUp()
             false
         );
         $this->_resource = $this->getMock(\Magento\Framework\App\ResourceConnection::class, [], [], '', false);
-        $this->_resourceHelper = $this->getMock(
+        $this->_resourceHelper = $this->getMock(
             \Magento\ImportExport\Model\ResourceModel\Helper::class,
             [],
             [],
             '',
             false
         );
-        $this->_dataFactory = $this->getMock(
+        $this->_dataFactory = $this->getMock(
             \Magento\CustomerImportExport\Model\ResourceModel\Import\CustomerComposite\DataFactory::class,
             [],
             [],
             '',
             false
         );
-        $this->_customerFactory = $this->getMock(
+        $this->_customerFactory = $this->getMock(
             \Magento\CustomerImportExport\Model\Import\CustomerFactory::class,
             [],
             [],
             '',
             false
         );
-        $this->_addressFactory = $this->getMock(
+        $this->_addressFactory = $this->getMock(
             \Magento\CustomerImportExport\Model\Import\AddressFactory::class,
             [],
             [],
@@ -168,7 +168,7 @@ protected function setUp()
             false
         );
 
-        $this->errorFactory = $this->getMock(
+        $this->errorFactory = $this->getMock(
             \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorFactory::class,
             ['create'],
             [],
@@ -176,7 +176,7 @@ protected function setUp()
             false
         );
 
-        $this->error = $this->getMock(
+        $this->error = $this->getMock(
             \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError::class,
             ['init'],
             [],
@@ -187,7 +187,7 @@ protected function setUp()
         $this->errorFactory->expects($this->any())->method('create')->will($this->returnValue($this->error));
         $this->error->expects($this->any())->method('init')->will($this->returnValue(true));
 
-        $this->errorAggregator = $this->getMock(
+        $this->errorAggregator = $this->getMock(
             \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregator::class,
             ['hasToBeTerminated'],
             [$this->errorFactory],
@@ -309,7 +309,7 @@ protected function _getCustomerEntityMock(array $mockedMethods = null)
         $mockedMethods[] = 'getAttributeCollection';
         $mockedMethods[] = 'getWebsiteId';
 
-        $customerEntity = $this->getMock(
+        $customerEntity = $this->getMock(
             \Magento\CustomerImportExport\Model\Import\Customer::class,
             $mockedMethods,
             [],
@@ -344,7 +344,7 @@ protected function _getAddressEntityMock(array $mockedMethods = null)
         }
         $mockedMethods[] = 'getAttributeCollection';
 
-        $addressEntity = $this->getMock(
+        $addressEntity = $this->getMock(
             \Magento\CustomerImportExport\Model\Import\Address::class,
             $mockedMethods,
             [],
@@ -641,7 +641,7 @@ public function testSetSource()
 
         $modelUnderTest = $this->_createModelMock($data);
 
-        $source = $this->getMockForAbstractClass(
+        $source = $this->getMockForAbstractClass(
             \Magento\ImportExport\Model\Import\AbstractSource::class,
             [],
             '',
diff --git a/app/code/Magento/Deploy/Console/Command/SetModeCommand.php b/app/code/Magento/Deploy/Console/Command/SetModeCommand.php
index 4629ebe8b7c1c..410a223ac6227 100644
--- a/app/code/Magento/Deploy/Console/Command/SetModeCommand.php
+++ b/app/code/Magento/Deploy/Console/Command/SetModeCommand.php
@@ -89,7 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             );
             $toMode = $input->getArgument(self::MODE_ARGUMENT);
             $skipCompilation = $input->getOption(self::SKIP_COMPILATION_OPTION);
-            switch($toMode) {
+            switch ($toMode) {
                 case State::MODE_DEVELOPER:
                     $modeController->enableDeveloperMode();
                     break;
diff --git a/app/code/Magento/Deploy/Model/ConfigWriter.php b/app/code/Magento/Deploy/Model/ConfigWriter.php
index 8713442c9b0b1..126cd525cc828 100644
--- a/app/code/Magento/Deploy/Model/ConfigWriter.php
+++ b/app/code/Magento/Deploy/Model/ConfigWriter.php
@@ -96,8 +96,7 @@ private function setConfig(array $config, $configPath, $configValue)
     private function getPathPrefix($scope, $scopeCode)
     {
         $pathPrefixes = [System::CONFIG_TYPE, $scope];
-        if (
-            $scope !== ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+        if ($scope !== ScopeConfigInterface::SCOPE_TYPE_DEFAULT
             && !empty($scopeCode)
         ) {
             $pathPrefixes[] = $scopeCode;
diff --git a/app/code/Magento/Deploy/Model/Deploy/LocaleDeploy.php b/app/code/Magento/Deploy/Model/Deploy/LocaleDeploy.php
index 22274b45b14e9..f567dd2f1bfc6 100644
--- a/app/code/Magento/Deploy/Model/Deploy/LocaleDeploy.php
+++ b/app/code/Magento/Deploy/Model/Deploy/LocaleDeploy.php
@@ -333,7 +333,6 @@ private function isCanBeDeployed($fileArea, $fileTheme, $area, $themePath)
     private function deployLibFiles($area, $themePath, $locale)
     {
         foreach ($this->filesUtil->getStaticLibraryFiles() as $filePath) {
-
             if ($this->checkSkip($filePath)) {
                 continue;
             }
diff --git a/app/code/Magento/Deploy/Model/DeployManager.php b/app/code/Magento/Deploy/Model/DeployManager.php
index a5cbd0eb93a91..31b373c8292d0 100644
--- a/app/code/Magento/Deploy/Model/DeployManager.php
+++ b/app/code/Magento/Deploy/Model/DeployManager.php
@@ -182,7 +182,6 @@ private function runInParallel(DeployStrategyProvider $strategyProvider)
                 } else {
                     $dependentStrategy[] = $deploymentFunc;
                 }
-
             }
             $processQueueManager->addTaskToQueue($baseStrategy, $dependentStrategy);
         }
diff --git a/app/code/Magento/Developer/Model/Config/Backend/WorkflowType.php b/app/code/Magento/Developer/Model/Config/Backend/WorkflowType.php
index 9f57e1c517fd6..d3eafc236e6d3 100644
--- a/app/code/Magento/Developer/Model/Config/Backend/WorkflowType.php
+++ b/app/code/Magento/Developer/Model/Config/Backend/WorkflowType.php
@@ -55,7 +55,6 @@ public function beforeSave()
         if ($this->isValueChanged()
             && $this->_appState->getMode() == \Magento\Framework\App\State::MODE_PRODUCTION
             && $this->getValue() == \Magento\Developer\Model\Config\Source\WorkflowType::CLIENT_SIDE_COMPILATION) {
-
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('Client side compilation doesn\'t work in production mode')
             );
diff --git a/app/code/Magento/Directory/Model/Country/Postcode/ConfigInterface.php b/app/code/Magento/Directory/Model/Country/Postcode/ConfigInterface.php
index f6f13f6ecf6d7..ae1aed12f2b62 100644
--- a/app/code/Magento/Directory/Model/Country/Postcode/ConfigInterface.php
+++ b/app/code/Magento/Directory/Model/Country/Postcode/ConfigInterface.php
@@ -7,7 +7,6 @@
 
 interface ConfigInterface
 {
-
     /**
      * Returns array of postcodes validation patterns
      *
diff --git a/app/code/Magento/Directory/Model/Data/CurrencyInformation.php b/app/code/Magento/Directory/Model/Data/CurrencyInformation.php
index f58f9b09734e8..ecd8c3fc4b9ed 100644
--- a/app/code/Magento/Directory/Model/Data/CurrencyInformation.php
+++ b/app/code/Magento/Directory/Model/Data/CurrencyInformation.php
@@ -118,7 +118,6 @@ public function setExchangeRates(array $exchangeRates = null)
         return $this->setData(self::KEY_EXCHANGE_RATES, $exchangeRates);
     }
 
-
     /**
      * @inheritDoc
      */
diff --git a/app/code/Magento/Directory/Setup/InstallSchema.php b/app/code/Magento/Directory/Setup/InstallSchema.php
index ace5dfdf9108a..c064f6426cff3 100644
--- a/app/code/Magento/Directory/Setup/InstallSchema.php
+++ b/app/code/Magento/Directory/Setup/InstallSchema.php
@@ -206,6 +206,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Downloadable/Api/Data/LinkInterface.php b/app/code/Magento/Downloadable/Api/Data/LinkInterface.php
index 61ffb6aa826c4..b24056608f501 100644
--- a/app/code/Magento/Downloadable/Api/Data/LinkInterface.php
+++ b/app/code/Magento/Downloadable/Api/Data/LinkInterface.php
@@ -11,7 +11,6 @@
  */
 interface LinkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
-
     /**
      * @return int|null Sample(or link) id
      */
diff --git a/app/code/Magento/Downloadable/Api/Data/SampleInterface.php b/app/code/Magento/Downloadable/Api/Data/SampleInterface.php
index ed25cb24eea44..96e87b548d17b 100644
--- a/app/code/Magento/Downloadable/Api/Data/SampleInterface.php
+++ b/app/code/Magento/Downloadable/Api/Data/SampleInterface.php
@@ -13,7 +13,6 @@
  */
 interface SampleInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
-
     /**
      * Product sample id
      *
diff --git a/app/code/Magento/Downloadable/Model/Link.php b/app/code/Magento/Downloadable/Model/Link.php
index fa5f413026787..a632cf7be8b4c 100644
--- a/app/code/Magento/Downloadable/Model/Link.php
+++ b/app/code/Magento/Downloadable/Model/Link.php
@@ -428,5 +428,6 @@ public function setExtensionAttributes(\Magento\Downloadable\Api\Data\LinkExtens
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index bd93e99e68a22..5c28ec6373e77 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -31,7 +31,6 @@ public function __construct(
         $this->_scopeConfig = $scopeConfig;
     }
 
-
     /**
      * Check is allowed guest checkout if quote contain downloadable product(s)
      *
diff --git a/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php b/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
index 4962ac67bb711..c3fff29776ae4 100644
--- a/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
@@ -34,7 +34,6 @@ public function __construct(
         $this->_itemsFactory = $itemsFactory;
     }
 
-
     /**
      * Set status of link
      *
diff --git a/app/code/Magento/Downloadable/Setup/InstallSchema.php b/app/code/Magento/Downloadable/Setup/InstallSchema.php
index 01c3760913fd7..9adea2d14d350 100644
--- a/app/code/Magento/Downloadable/Setup/InstallSchema.php
+++ b/app/code/Magento/Downloadable/Setup/InstallSchema.php
@@ -717,6 +717,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
index 898e8d6085442..a00b3c8f5ae99 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php
@@ -111,7 +111,7 @@ protected function _prepareForm()
         $attributeObject = $this->getAttributeObject();
 
         /** @var \Magento\Framework\Data\Form $form */
-        $form = $this->_formFactory->create(
+        $form = $this->_formFactory->create(
             
             ['data' => ['id' => 'edit_form', 'action' => $this->getData('action'), 'method' => 'post']]
         );
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
index 5ec997b768939..a34bb483a0e8a 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
@@ -84,7 +84,7 @@ public function getStores()
 
     /**
      * Returns stores sorted by Sort Order
-     * 
+     *
      * @return array
      */
     public function getStoresSortedBySortOrder()
diff --git a/app/code/Magento/Eav/Model/CustomAttributesMapper.php b/app/code/Magento/Eav/Model/CustomAttributesMapper.php
index 8fb31324822f9..9365071950e80 100644
--- a/app/code/Magento/Eav/Model/CustomAttributesMapper.php
+++ b/app/code/Magento/Eav/Model/CustomAttributesMapper.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Eav\Model;
 
-
 use Magento\Framework\Api\AttributeInterface;
 use Magento\Framework\Api\CustomAttributesDataInterface;
 use Magento\Eav\Api\AttributeRepositoryInterface;
diff --git a/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator/ComplexType.php b/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator/ComplexType.php
index 5c4e7b477105f..48ce5c7ba442f 100644
--- a/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator/ComplexType.php
+++ b/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator/ComplexType.php
@@ -30,7 +30,7 @@ public function __construct(
 
     /**
      * Get attribute type based on its backend model.
-     * 
+     *
      * @param \Magento\Eav\Api\Data\AttributeInterface $attribute
      * @param string $serviceClass
      * @param $serviceBackendModelDataInterfaceMap array
diff --git a/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator/SimpleType.php b/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator/SimpleType.php
index e06b00b18d077..e6903d4688b3c 100644
--- a/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator/SimpleType.php
+++ b/app/code/Magento/Eav/Model/EavCustomAttributeTypeLocator/SimpleType.php
@@ -15,7 +15,7 @@ class SimpleType
 {
     /**
      * List of attributes, type of which cannot be identified reliably. We do not validate these attributes.
-     * 
+     *
      * @var string[]
      */
     private $anyTypeAttributes = ['quantity_and_stock_status'];
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
index b27cace0ee83c..e58c82f77397b 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
@@ -1106,6 +1106,7 @@ public function setIsRequired($isRequired)
     {
         return $this->setData(self::IS_REQUIRED, $isRequired);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
@@ -1264,6 +1265,7 @@ public function setSourceModel($sourceModel)
     {
         return $this->setData(self::SOURCE_MODEL, $sourceModel);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
index 45fa3351d8c96..06b7004013158 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Group.php
@@ -193,5 +193,6 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Set.php b/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
index 79476a4079f7c..adb7290851140 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
@@ -487,5 +487,6 @@ public function setExtensionAttributes(\Magento\Eav\Api\Data\AttributeSetExtensi
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Form/Fieldset/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Form/Fieldset/Collection.php
index ed902da57c8e1..26e36ab188dd2 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Form/Fieldset/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Form/Fieldset/Collection.php
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 /**
  * Eav Form Fieldset Resource Collection
  *
diff --git a/app/code/Magento/Eav/Plugin/Model/ResourceModel/Entity/Attribute.php b/app/code/Magento/Eav/Plugin/Model/ResourceModel/Entity/Attribute.php
index 3aa52b3618820..ac41a3be837e5 100644
--- a/app/code/Magento/Eav/Plugin/Model/ResourceModel/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Plugin/Model/ResourceModel/Entity/Attribute.php
@@ -82,7 +82,7 @@ public function aroundGetStoreLabelsByAttributeId(
 
     /**
      * Check if cache is enabled
-     * 
+     *
      * @return bool
      */
     private function isCacheEnabled()
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
index 5872057bebf92..8829ae6319cdb 100644
--- a/app/code/Magento/Eav/Setup/EavSetup.php
+++ b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -770,12 +770,12 @@ private function _validateAttributeData($data)
         $attributeCodeMaxLength = \Magento\Eav\Model\Entity\Attribute::ATTRIBUTE_CODE_MAX_LENGTH;
 
         if (isset(
-                $data['attribute_code']
-            ) && !\Zend_Validate::is(
-                $data['attribute_code'],
-                'StringLength',
-                ['max' => $attributeCodeMaxLength]
-            )
+            $data['attribute_code']
+        ) && !\Zend_Validate::is(
+            $data['attribute_code'],
+            'StringLength',
+            ['max' => $attributeCodeMaxLength]
+        )
         ) {
             throw new LocalizedException(
                 __('An attribute code must not be more than %1 characters.', $attributeCodeMaxLength)
diff --git a/app/code/Magento/Eav/Setup/InstallSchema.php b/app/code/Magento/Eav/Setup/InstallSchema.php
index 3494cf02f9622..2ab1ad3660684 100644
--- a/app/code/Magento/Eav/Setup/InstallSchema.php
+++ b/app/code/Magento/Eav/Setup/InstallSchema.php
@@ -1415,6 +1415,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
index 63afe832ec468..c2baf390d44b1 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
@@ -31,7 +31,7 @@ protected function setUp()
         $loggerMock = $this->getMock(\Psr\Log\LoggerInterface::class, [], [], '', false);
         $localeResolverMock = $this->getMock(\Magento\Framework\Locale\ResolverInterface::class);
         $this->urlEncoder = $this->getMock(\Magento\Framework\Url\EncoderInterface::class, [], [], '', false);
-        $this->fileValidatorMock = $this->getMock(
+        $this->fileValidatorMock = $this->getMock(
             \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension::class, ['isValid', 'getMessages'], [], '', false
         );
         $filesystemMock = $this->getMock(\Magento\Framework\Filesystem::class, [], [], '', false);
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
index e691f17a99cbe..bd25b99cc026b 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/ImageTest.php
@@ -22,7 +22,7 @@ protected function setUp()
         $loggerMock = $this->getMock(\Psr\Log\LoggerInterface::class, [], [], '', false);
         $localeResolverMock = $this->getMock(\Magento\Framework\Locale\ResolverInterface::class);
         $urlEncoder = $this->getMock(\Magento\Framework\Url\EncoderInterface::class, [], [], '', false);
-        $fileValidatorMock = $this->getMock(
+        $fileValidatorMock = $this->getMock(
             \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension::class, [], [], '', false
         );
         $filesystemMock = $this->getMock(\Magento\Framework\Filesystem::class, [], [], '', false);
diff --git a/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php b/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
index 7fe219851bb0e..735450e08a4c0 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/AttributeManagementTest.php
@@ -303,6 +303,7 @@ public function testUnassignInputException()
 
         $this->model->unassign($attributeSetId, $attributeCode);
     }
+
     /**
      * @expectedException \Magento\Framework\Exception\NoSuchEntityException
      * @expectedExceptionMessage Attribute set not found: 1
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php
index 11bdc07c8fe00..e50c0405ca2f0 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/AbstractAttributeTest.php
@@ -1,5 +1,5 @@
 <?php
-/** 
+/**
  *
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
index 37c35fe41831d..8245f8de4afb6 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
@@ -72,7 +72,7 @@ public function testAdd()
             'order' => [
                 'new_option' => 'optionSortOrder',
             ],
-        ];
+            ];
 
         $this->attributeRepositoryMock->expects($this->once())->method('get')->with($entityType, $attributeCode)
             ->willReturn($attributeMock);
diff --git a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/SetTest.php b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/SetTest.php
index 211487292d047..5dbe7d3b63413 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/SetTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Entity/Attribute/SetTest.php
@@ -1,5 +1,5 @@
 <?php
-/** 
+/**
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index 66309e6aa03c9..441af2eca775e 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -672,8 +672,7 @@ public function emulateDesign($storeId, $area = self::DEFAULT_DESIGN_AREA)
         if ($storeId !== null && $storeId !== false) {
             // save current design settings
             $this->emulatedDesignConfig = clone $this->getDesignConfig();
-            if (
-                $this->getDesignConfig()->getStore() != $storeId
+            if ($this->getDesignConfig()->getStore() != $storeId
                 || $this->getDesignConfig()->getArea() != $area
             ) {
                 $this->setDesignConfig(['area' => $area, 'store' => $storeId]);
diff --git a/app/code/Magento/Email/Setup/InstallSchema.php b/app/code/Magento/Email/Setup/InstallSchema.php
index 7aa58ff4517a2..66a2a45f1a0fe 100644
--- a/app/code/Magento/Email/Setup/InstallSchema.php
+++ b/app/code/Magento/Email/Setup/InstallSchema.php
@@ -119,6 +119,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         );
 
         $installer->getConnection()->createTable($table);
-
     }
 }
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
index ffb0fcb02e230..f927ee83cf8ff 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/Config/XsdTest.php
@@ -116,12 +116,12 @@ public function mergedXmlDataProvider()
      */
     protected function _testXmlAgainstXsd($fixtureXml, $schemaFile, array $expectedErrors)
     {
-        $validationStateMock = $this->getMock(
-            \Magento\Framework\Config\ValidationStateInterface::class,
-            [],
-            [],
-            '',
-            false
+        $validationStateMock = $this->getMock(
+            \Magento\Framework\Config\ValidationStateInterface::class,
+            [],
+            [],
+            '',
+            false
         );
         $validationStateMock->method('isValidationRequired')
             ->willReturn(true);
diff --git a/app/code/Magento/Fedex/Setup/InstallData.php b/app/code/Magento/Fedex/Setup/InstallData.php
index f59decdbeef20..12f871757c934 100644
--- a/app/code/Magento/Fedex/Setup/InstallData.php
+++ b/app/code/Magento/Fedex/Setup/InstallData.php
@@ -106,6 +106,5 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
                 $conn->update($configDataTable, ['value' => $mapNew], $whereConfigId);
             }
         }
-
     }
 }
diff --git a/app/code/Magento/GiftMessage/Model/Message.php b/app/code/Magento/GiftMessage/Model/Message.php
index 379d67fddc01c..87ae1cf82c74c 100644
--- a/app/code/Magento/GiftMessage/Model/Message.php
+++ b/app/code/Magento/GiftMessage/Model/Message.php
@@ -186,5 +186,6 @@ public function setExtensionAttributes(\Magento\GiftMessage\Api\Data\MessageExte
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php b/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php
index 0f064dc72b7d2..588ba3f637239 100644
--- a/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php
+++ b/app/code/Magento/GiftMessage/Model/Plugin/OrderSave.php
@@ -61,8 +61,7 @@ public function afterSave(
     protected function saveOrderGiftMessage(\Magento\Sales\Api\Data\OrderInterface $order)
     {
         $extensionAttributes = $order->getExtensionAttributes();
-        if (
-            null !== $extensionAttributes &&
+        if (null !== $extensionAttributes &&
             null !== $extensionAttributes->getGiftMessage()
         ) {
             /* @var \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage */
@@ -93,8 +92,7 @@ protected function saveOrderItemGiftMessage(\Magento\Sales\Api\Data\OrderInterfa
             /** @var \Magento\Sales\Api\Data\OrderItemInterface $orderItem */
             foreach ($items as $orderItem) {
                 $extensionAttribute = $orderItem->getExtensionAttributes();
-                if (
-                    null !== $extensionAttribute &&
+                if (null !== $extensionAttribute &&
                     null !== $extensionAttribute->getGiftMessage()
                 ) {
                     /* @var \Magento\GiftMessage\Api\Data\MessageInterface $giftMessage */
diff --git a/app/code/Magento/GiftMessage/Setup/InstallSchema.php b/app/code/Magento/GiftMessage/Setup/InstallSchema.php
index a3deb694aa23d..5c27f4ce66698 100644
--- a/app/code/Magento/GiftMessage/Setup/InstallSchema.php
+++ b/app/code/Magento/GiftMessage/Setup/InstallSchema.php
@@ -65,6 +65,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/GiftMessage/Setup/UpgradeData.php b/app/code/Magento/GiftMessage/Setup/UpgradeData.php
index 16ae64a6d5aba..58cf50372885c 100644
--- a/app/code/Magento/GiftMessage/Setup/UpgradeData.php
+++ b/app/code/Magento/GiftMessage/Setup/UpgradeData.php
@@ -42,7 +42,6 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
         $attribute = $categorySetup->getAttribute($entityTypeId, 'gift_message_available');
 
         if (version_compare($context->getVersion(), '2.0.1', '<')) {
-
             $groupName = 'Gift Options';
 
             if (!$categorySetup->getAttributeGroup(Product::ENTITY, $attributeSetId, $groupName)) {
@@ -59,7 +58,6 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
         }
 
         if (version_compare($context->getVersion(), '2.1.0', '<')) {
-
             $categorySetup->updateAttribute(
                 $entityTypeId,
                 $attribute['attribute_id'],
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/CartRepositoryTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/CartRepositoryTest.php
index 558bc5892af3e..c772f7ffced53 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/CartRepositoryTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/CartRepositoryTest.php
@@ -70,7 +70,7 @@ class CartRepositoryTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->quoteRepositoryMock = $this->getMock(\Magento\Quote\Api\CartRepositoryInterface::class);
-        $this->messageFactoryMock = $this->getMock(
+        $this->messageFactoryMock = $this->getMock(
             \Magento\GiftMessage\Model\MessageFactory::class,
             [
                 'create',
@@ -81,7 +81,7 @@ protected function setUp()
             false
         );
         $this->messageMock = $this->getMock(\Magento\GiftMessage\Model\Message::class, [], [], '', false);
-        $this->quoteItemMock = $this->getMock(
+        $this->quoteItemMock = $this->getMock(
             \Magento\Quote\Model\Quote\Item::class,
             [
                 'getGiftMessageId',
@@ -91,7 +91,7 @@ protected function setUp()
             '',
             false
         );
-        $this->quoteMock = $this->getMock(
+        $this->quoteMock = $this->getMock(
             \Magento\Quote\Model\Quote::class,
             [
                 'getGiftMessageId',
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageManagerTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageManagerTest.php
index 48bf40bbd5262..bd22086d2d11a 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageManagerTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/GiftMessageManagerTest.php
@@ -53,7 +53,7 @@ protected function setUp()
         $this->messageFactoryMock =
             $this->getMock(\Magento\GiftMessage\Model\MessageFactory::class, ['create', '__wakeup'], [], '', false);
 
-        $this->quoteMock = $this->getMock(
+        $this->quoteMock = $this->getMock(
             \Magento\Quote\Model\Quote::class,
             [
                 'setGiftMessageId',
@@ -69,7 +69,7 @@ protected function setUp()
             [],
             '',
             false);
-        $this->quoteItemMock = $this->getMock(
+        $this->quoteItemMock = $this->getMock(
             \Magento\Quote\Model\Quote\Item::class,
             [
                 'setGiftMessageId',
@@ -81,7 +81,7 @@ protected function setUp()
             '',
             false);
 
-        $this->quoteAddressMock = $this->getMock(
+        $this->quoteAddressMock = $this->getMock(
             \Magento\Quote\Model\Quote\Address::class,
             [
                 'getGiftMessageId',
@@ -94,7 +94,7 @@ protected function setUp()
             '',
             false);
 
-        $this->quoteAddressItemMock = $this->getMock(
+        $this->quoteAddressItemMock = $this->getMock(
             \Magento\Quote\Model\Quote\Address\Item::class,
             [
                 'getGiftMessageId',
@@ -106,7 +106,7 @@ protected function setUp()
             '',
             false);
 
-        $this->giftMessageMock = $this->getMock(
+        $this->giftMessageMock = $this->getMock(
             \Magento\GiftMessage\Model\Message::class,
             [
                 'setSender',
diff --git a/app/code/Magento/GiftMessage/Test/Unit/Model/Type/Plugin/OnepageTest.php b/app/code/Magento/GiftMessage/Test/Unit/Model/Type/Plugin/OnepageTest.php
index cb471bdf06624..d85117b15635f 100644
--- a/app/code/Magento/GiftMessage/Test/Unit/Model/Type/Plugin/OnepageTest.php
+++ b/app/code/Magento/GiftMessage/Test/Unit/Model/Type/Plugin/OnepageTest.php
@@ -34,7 +34,7 @@ protected function setUp()
         $this->messageMock = $this->getMock(\Magento\GiftMessage\Model\GiftMessageManager::class, [], [], '', false);
         $this->requestMock = $this->getMock(\Magento\Framework\App\RequestInterface::class);
 
-        $this->plugin = $objectManager->getObject(
+        $this->plugin = $objectManager->getObject(
             \Magento\GiftMessage\Model\Type\Plugin\Onepage::class,
             [
                 'message' => $this->messageMock,
diff --git a/app/code/Magento/GoogleAnalytics/Helper/Data.php b/app/code/Magento/GoogleAnalytics/Helper/Data.php
index df3a53f4aa003..5c1f580f69964 100644
--- a/app/code/Magento/GoogleAnalytics/Helper/Data.php
+++ b/app/code/Magento/GoogleAnalytics/Helper/Data.php
@@ -47,5 +47,4 @@ public function isAnonymizedIpActive($store = null) {
         $anonymize = $this->scopeConfig->getValue(self::XML_PATH_ANONYMIZE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
         return $anonymize;
     }
-
 }
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
index a421da5112988..45b263ea13e14 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/EntityCmsPage.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\GoogleOptimizer\Block\Adminhtml\Cms\Page;
 
-
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\GoogleOptimizer\Block\Adminhtml\EntityCodeResolverInterface;
diff --git a/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php b/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php
index eb6664af94dc3..40008efba18d4 100644
--- a/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php
+++ b/app/code/Magento/GoogleOptimizer/Setup/InstallSchema.php
@@ -84,6 +84,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/GroupedProduct/Setup/UpgradeData.php b/app/code/Magento/GroupedProduct/Setup/UpgradeData.php
index 3dc0b613266f8..71d29ae44266d 100644
--- a/app/code/Magento/GroupedProduct/Setup/UpgradeData.php
+++ b/app/code/Magento/GroupedProduct/Setup/UpgradeData.php
@@ -46,7 +46,8 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
 
             $connection->query(
                 $connection->insertFromSelect(
-                    $select, $this->relationProcessor->getMainTable(),
+                    $select,
+                    $this->relationProcessor->getMainTable(),
                     ['parent_id', 'child_id'],
                     AdapterInterface::INSERT_IGNORE
                 )
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php
index be9a613a877fe..5b4640f209916 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php
@@ -81,7 +81,6 @@ class GroupedTest extends AbstractModifierTest
      */
     protected $storeMock;
 
-
     protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
index 3367b9a534455..6af487d0338d1 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
@@ -3,6 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// @codingStandardsIgnoreFile
 /* @var $block \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts */
 ?>
 <script type="text/x-magento-template" id="group-product-template">
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index f9868b33b5d43..04d209bba9a03 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -433,7 +433,6 @@ public function importSource()
             $this->importHistoryModel->invalidateReport($this);
         }
 
-
         return $result;
     }
 
@@ -749,7 +748,6 @@ protected function createHistoryReport($sourceFileRelative, $entity, $extension
         return $this;
     }
 
-
     /**
      * Get count of created items
      *
diff --git a/app/code/Magento/ImportExport/Model/Import/Adapter.php b/app/code/Magento/ImportExport/Model/Import/Adapter.php
index 3fbd6f88357f4..9687ecfb482de 100644
--- a/app/code/Magento/ImportExport/Model/Import/Adapter.php
+++ b/app/code/Magento/ImportExport/Model/Import/Adapter.php
@@ -56,7 +56,7 @@ public static function factory($type, $directory, $source, $options = null)
      * @param string $source Source file path.
      * @param Write $directory
      * @param mixed $options OPTIONAL Adapter constructor options
-     *                       
+     *
      * @return AbstractSource
      */
     public static function findAdapterFor($source, $directory, $options = null)
diff --git a/app/code/Magento/ImportExport/Setup/InstallSchema.php b/app/code/Magento/ImportExport/Setup/InstallSchema.php
index 1905b2bcea430..77a11916ac131 100644
--- a/app/code/Magento/ImportExport/Setup/InstallSchema.php
+++ b/app/code/Magento/ImportExport/Setup/InstallSchema.php
@@ -110,6 +110,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
index 0c23fa8b35349..042238926e2f2 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
@@ -22,7 +22,7 @@ class DownloadTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\ImportExport\Block\Adminhtml\Grid\Column\Renderer\Download
      */
-     protected $download;
+    protected $download;
 
     /**
      * Set up
diff --git a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/DownloadTest.php b/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/DownloadTest.php
index d78d859052799..749393b9f485b 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/DownloadTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/History/DownloadTest.php
@@ -162,7 +162,6 @@ protected function setUp()
                 'reportHelper' => $this->reportHelper
             ]
         );
-
     }
 
     /**
diff --git a/app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php b/app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php
index 636709500a880..3f21ca329b42c 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php
@@ -91,7 +91,6 @@ protected function setUp()
                 'filesystem' =>$this->filesystem
             ]
         );
-
     }
 
     /**
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php
index 55bc4bb316d63..e6f9a5977b447 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php
@@ -212,7 +212,6 @@ protected function setUp()
             ])
             ->getMock();
         $this->setPropertyValue($this->import, '_varDirectory', $this->_varDirectory);
-
     }
 
     /**
diff --git a/app/code/Magento/Indexer/Model/Message/Invalid.php b/app/code/Magento/Indexer/Model/Message/Invalid.php
index 834f2e51a5443..58d18643c26c6 100644
--- a/app/code/Magento/Indexer/Model/Message/Invalid.php
+++ b/app/code/Magento/Indexer/Model/Message/Invalid.php
@@ -48,6 +48,7 @@ public function isDisplayed()
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * Retrieve unique message identity
      *
@@ -84,5 +85,6 @@ public function getSeverity()
     {
         return self::SEVERITY_MAJOR;
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Indexer/Setup/InstallSchema.php b/app/code/Magento/Indexer/Setup/InstallSchema.php
index 7afd9381abfc4..f59ffdebfdb3f 100644
--- a/app/code/Magento/Indexer/Setup/InstallSchema.php
+++ b/app/code/Magento/Indexer/Setup/InstallSchema.php
@@ -136,6 +136,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/ListActionTest.php b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/ListActionTest.php
index 2b04e047b82ab..087c2549d69ff 100644
--- a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/ListActionTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/ListActionTest.php
@@ -171,7 +171,6 @@ protected function setUp()
         $this->menu->expects($this->any())->method('getParentItems')->will($this->returnValue($this->items));
 
         $this->object = new \Magento\Indexer\Controller\Adminhtml\Indexer\ListAction($this->contextMock);
-
     }
 
     public function testExecute()
diff --git a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php
index e5beea4859ac1..a646a6dc8e662 100644
--- a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php
@@ -205,7 +205,6 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues)
                 ->method('addError')->with(__('Please select indexers.'))
                 ->will($this->returnValue(1));
         } else {
-
             $this->objectManager->expects($this->any())
                 ->method('get')->with(\Magento\Framework\Indexer\IndexerRegistry::class)
                 ->will($this->returnValue($this->indexReg));
diff --git a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php
index 58becbe0eb777..9870a25be4791 100644
--- a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php
@@ -205,7 +205,6 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues)
                 ->method('addError')->with(__('Please select indexers.'))
                 ->will($this->returnValue(1));
         } else {
-
             $this->objectManager->expects($this->any())
                 ->method('get')->with(\Magento\Framework\Indexer\IndexerRegistry::class)
                 ->will($this->returnValue($this->indexReg));
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/ResourceModel/AbstractResourceTest.php b/app/code/Magento/Indexer/Test/Unit/Model/ResourceModel/AbstractResourceTest.php
index 46614320b3025..f5d2de56b3948 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/ResourceModel/AbstractResourceTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/ResourceModel/AbstractResourceTest.php
@@ -158,7 +158,6 @@ public function testInsertFromTable($readToIndex)
             $this->_resourceMock->expects($this->any())->method('getConnection')->will(
                 $this->returnValue($connectionMock)
             );
-
         } else {
             $selectMock->expects($this->once())->method('insertFromSelect')->with(
                 $destTable,
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Webapi.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Webapi.php
index e2158e4ed1c66..c4e2c4086d223 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Webapi.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Webapi.php
@@ -140,7 +140,7 @@ protected function _construct()
 
     /**
      * Retrieve saved resource
-     * 
+     *
      * @return array|bool
      */
     protected function retrieveFormResources()
diff --git a/app/code/Magento/Integration/Model/Message/RecreatedIntegration.php b/app/code/Magento/Integration/Model/Message/RecreatedIntegration.php
index 53d54869c145b..77e62e65b3496 100644
--- a/app/code/Magento/Integration/Model/Message/RecreatedIntegration.php
+++ b/app/code/Magento/Integration/Model/Message/RecreatedIntegration.php
@@ -74,6 +74,7 @@ public function isDisplayed()
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * Retrieve unique message identity
      *
@@ -107,5 +108,6 @@ public function getSeverity()
     {
         return self::SEVERITY_MAJOR;
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Integration/Setup/InstallSchema.php b/app/code/Magento/Integration/Setup/InstallSchema.php
index a51ac93804341..9dc8bc59175a2 100644
--- a/app/code/Magento/Integration/Setup/InstallSchema.php
+++ b/app/code/Magento/Integration/Setup/InstallSchema.php
@@ -360,6 +360,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/TokensDialogTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/TokensDialogTest.php
index 625a782dc5db4..4c00685d865aa 100644
--- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/TokensDialogTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/TokensDialogTest.php
@@ -9,7 +9,6 @@
 
 namespace Magento\Integration\Test\Unit\Controller\Adminhtml\Integration;
 
-
 class TokensDialogTest extends \Magento\Integration\Test\Unit\Controller\Adminhtml\IntegrationTest
 {
     public function testTokensDialog()
diff --git a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/AbstractStorage.php b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/AbstractStorage.php
index 5006477015aa1..1d9d612a738d8 100644
--- a/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/AbstractStorage.php
+++ b/app/code/Magento/MediaStorage/Model/ResourceModel/File/Storage/AbstractStorage.php
@@ -40,7 +40,6 @@ public function getConnection()
         return $this->_getConnection($this->_connectionName);
     }
 
-
     /**
      * Get connection by name or type
      *
diff --git a/app/code/Magento/Msrp/Setup/UpgradeData.php b/app/code/Magento/Msrp/Setup/UpgradeData.php
index 578a93440d04f..b272acec3540e 100644
--- a/app/code/Magento/Msrp/Setup/UpgradeData.php
+++ b/app/code/Magento/Msrp/Setup/UpgradeData.php
@@ -59,6 +59,5 @@ private function changePriceAttributeDefaultScope($categorySetup, $entityTypeId)
             'is_global',
             \Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_GLOBAL
         );
-
     }
 }
diff --git a/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php b/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
index 3990da03c7e03..b447ce5d66518 100644
--- a/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Msrp/Test/Unit/Helper/DataTest.php
@@ -8,7 +8,6 @@
 
 namespace Magento\Msrp\Test\Unit\Helper;
 
-
 /**
  * Class DataTest
  */
@@ -39,7 +38,7 @@ protected function setUp()
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->helper = $objectManager->getObject(
+        $this->helper = $objectManager->getObject(
             \Magento\Msrp\Helper\Data::class,
             [
                 'priceCurrency' => $this->priceCurrencyMock,
diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Billing/ItemsTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Billing/ItemsTest.php
index e25750779e86d..b9c2be1f6f4b2 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Billing/ItemsTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Billing/ItemsTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Multishipping\Test\Unit\Block\Checkout\Billing;
 
-
 class ItemsTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Payment/InfoTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Payment/InfoTest.php
index 624ddbdd59e3f..c895db924f498 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Payment/InfoTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/Payment/InfoTest.php
@@ -28,7 +28,7 @@ protected function setUp()
         $this->multiShippingMock =
             $this->getMock(\Magento\Multishipping\Model\Checkout\Type\Multishipping::class, [], [], '', false);
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->model = $objectManager->getObject(
+        $this->model = $objectManager->getObject(
             \Magento\Multishipping\Block\Checkout\Payment\Info::class,
             [
                 'multishipping' => $this->multiShippingMock,
diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/StateTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/StateTest.php
index f71b36d95aa6c..f01b65b3eef57 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/StateTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/StateTest.php
@@ -28,7 +28,7 @@ protected function setUp()
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->mShippingStateMock =
             $this->getMock(\Magento\Multishipping\Model\Checkout\Type\Multishipping\State::class, [], [], '', false);
-        $this->model = $objectManager->getObject(
+        $this->model = $objectManager->getObject(
             \Magento\Multishipping\Block\Checkout\State::class,
             [
                 'multishippingState' => $this->mShippingStateMock,
diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php
index 9346aab322ea7..1ae4197dfa6fd 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/SuccessTest.php
@@ -34,7 +34,7 @@ class SuccessTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->sessionMock = $this->getMock(
+        $this->sessionMock = $this->getMock(
             \Magento\Framework\Session\SessionManagerInterface::class,
             [
                 'getOrderIds', 'start', 'writeClose', 'isSessionExists', 'getSessionId', 'getName', 'setName',
@@ -53,7 +53,7 @@ protected function setUp()
         $this->contextMock->expects($this->once())->method('getSession')->will($this->returnValue($this->sessionMock));
         $this->contextMock->expects($this->once())
             ->method('getStoreManager')->will($this->returnValue($this->storeManagerMock));
-        $this->model = $objectManager->getObject(
+        $this->model = $objectManager->getObject(
             \Magento\Multishipping\Block\Checkout\Success::class,
             [
                 'context' => $this->contextMock
diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditAddressTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditAddressTest.php
index 94607b9ff0722..9647eee36511e 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditAddressTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditAddressTest.php
@@ -25,7 +25,6 @@ class EditAddressTest extends \PHPUnit_Framework_TestCase
      */
     protected $configMock;
 
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -133,7 +132,6 @@ public function testExecute()
         $this->controller->execute();
     }
 
-
     public function testExecuteWhenCustomerAddressBlockNotExist()
     {
         $this->viewMock->expects($this->once())->method('loadLayout')->willReturnSelf();
diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditBillingTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditBillingTest.php
index 51e6d55ef0db2..2e3e182b797a6 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditBillingTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/EditBillingTest.php
@@ -176,5 +176,4 @@ public function testExecuteWhenCustomerAddressBlockNotExist()
         $this->viewMock->expects($this->once())->method('renderLayout');
         $this->controller->execute();
     }
-
 }
diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewBillingTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewBillingTest.php
index 799e69d6ee245..03497eb8a58eb 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewBillingTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewBillingTest.php
@@ -55,7 +55,6 @@ class NewBillingTest extends \PHPUnit_Framework_TestCase
      */
     protected $titleMock;
 
-
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -125,7 +124,6 @@ public function testExecute()
         $this->controller->execute();
     }
 
-
     public function testExecuteWhenCustomerAddressBlockNotExist()
     {
         $this->viewMock->expects($this->once())->method('loadLayout')->willReturnSelf();
diff --git a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php
index fcd602af08130..f9f07eebf3ab6 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Controller/Checkout/Address/NewShippingTest.php
@@ -172,7 +172,6 @@ public function executeDataProvider()
         ];
     }
 
-
     public function testExecuteWhenCustomerAddressBlockNotExist()
     {
         $this->stateMock
diff --git a/app/code/Magento/NewRelicReporting/Model/Config.php b/app/code/Magento/NewRelicReporting/Model/Config.php
index 960145187dd91..8a703e5756069 100644
--- a/app/code/Magento/NewRelicReporting/Model/Config.php
+++ b/app/code/Magento/NewRelicReporting/Model/Config.php
@@ -175,7 +175,7 @@ public function isCronEnabled()
 
     /**
      * Sets config value
-     * 
+     *
      * @param string $pathId
      * @param mixed $value
      * @param string $scope
diff --git a/app/code/Magento/NewRelicReporting/Model/Cron.php b/app/code/Magento/NewRelicReporting/Model/Cron.php
index ae2fb4ed2ce38..922219eb0477f 100644
--- a/app/code/Magento/NewRelicReporting/Model/Cron.php
+++ b/app/code/Magento/NewRelicReporting/Model/Cron.php
@@ -33,7 +33,7 @@ class Cron
 
     /**
      * Constructor
-     * 
+     *
      * @param Config $config
      * @param ReportModulesInfo $reportModulesInfo
      * @param ReportCounts $reportCounts
@@ -53,7 +53,7 @@ public function __construct(
 
     /**
      * The method run by the cron that fires all required events.
-     * 
+     *
      * @return \Magento\NewRelicReporting\Model\Cron
      */
     public function runCron()
diff --git a/app/code/Magento/NewRelicReporting/Model/Module/Collect.php b/app/code/Magento/NewRelicReporting/Model/Module/Collect.php
index 541ddafa7f502..ae1abc618fb8f 100644
--- a/app/code/Magento/NewRelicReporting/Model/Module/Collect.php
+++ b/app/code/Magento/NewRelicReporting/Model/Module/Collect.php
@@ -137,7 +137,7 @@ protected function getFinalCounts($moduleChanges)
         $disabledCount = $enabledCount = $uninstalledCount = 0;
 
         foreach ($stateValues as $state) {
-            switch($state){
+            switch ($state) {
                 case Config::ENABLED:
                     $enabledCount++;
                     break;
diff --git a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
index 92884f06a9e5b..8ff4b999076a4 100644
--- a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
+++ b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php
@@ -14,7 +14,7 @@ class NewRelicWrapper
 {
     /**
      * Wrapper for 'newrelic_add_custom_parameter' function
-     * 
+     *
      * @param string $param
      * @param string|int $value
      * @return bool
@@ -29,8 +29,8 @@ public function addCustomParameter($param, $value)
     }
 
     /**
-     * Checks whether newrelic-php5 agent is installed 
-     * 
+     * Checks whether newrelic-php5 agent is installed
+     *
      * @return bool
      */
     public function isExtensionInstalled()
diff --git a/app/code/Magento/NewRelicReporting/Setup/InstallSchema.php b/app/code/Magento/NewRelicReporting/Setup/InstallSchema.php
index 516956b9e94b7..4e607b55c1041 100644
--- a/app/code/Magento/NewRelicReporting/Setup/InstallSchema.php
+++ b/app/code/Magento/NewRelicReporting/Setup/InstallSchema.php
@@ -226,6 +226,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
          * Prepare database after install
          */
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
index dc33a0b712293..eb267764dca1a 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Module/CollectTest.php
@@ -65,7 +65,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->moduleFactoryMock = $this->getMock(
+        $this->moduleFactoryMock = $this->getMock(
             \Magento\NewRelicReporting\Model\ModuleFactory::class,
             ['create'],
             [],
@@ -73,7 +73,7 @@ protected function setUp()
             false
         );
 
-        $this->moduleCollectionFactoryMock = $this->getMock(
+        $this->moduleCollectionFactoryMock = $this->getMock(
             \Magento\NewRelicReporting\Model\ResourceModel\Module\CollectionFactory::class,
             ['create'],
             [],
@@ -97,7 +97,7 @@ protected function setUp()
      */
     public function testGetModuleDataWithoutRefresh()
     {
-        $moduleCollectionMock = $this->getMockBuilder(
+        $moduleCollectionMock = $this->getMockBuilder(
             \Magento\NewRelicReporting\Model\ResourceModel\Module\Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -186,12 +186,12 @@ public function testGetModuleDataWithoutRefresh()
      */
     public function testGetModuleDataRefresh($data)
     {
-        $moduleCollectionMock = $this->getMockBuilder(
+        $moduleCollectionMock = $this->getMockBuilder(
             \Magento\NewRelicReporting\Model\ResourceModel\Module\Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
         /** @var \Magento\NewRelicReporting\Model\Module|\PHPUnit_Framework_MockObject_MockObject $itemMock */
-        $itemMock = $this->getMock(
+        $itemMock = $this->getMock(
             \Magento\NewRelicReporting\Model\Module::class,
             ['getName', 'getData', 'setData', 'getState', 'save'],
             [],
@@ -282,12 +282,12 @@ public function testGetModuleDataRefresh($data)
      */
     public function testGetModuleDataRefreshOrStatement($data)
     {
-        $moduleCollectionMock = $this->getMockBuilder(
+        $moduleCollectionMock = $this->getMockBuilder(
             \Magento\NewRelicReporting\Model\ResourceModel\Module\Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
         /** @var \Magento\NewRelicReporting\Model\Module|\PHPUnit_Framework_MockObject_MockObject $itemMock */
-        $itemMock = $this->getMock(
+        $itemMock = $this->getMock(
             \Magento\NewRelicReporting\Model\Module::class,
             ['getName', 'getData', 'setData', 'getState', 'save'],
             [],
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index cff6d7f5893f8..57b95c300eebc 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -263,7 +263,6 @@ public function setStatus($value)
      * @param boolean $scope
      * @return $this
      */
-
     public function setMessagesScope($scope)
     {
         $this->getResource()->setMessagesScope($scope);
@@ -551,7 +550,7 @@ protected function _updateCustomerSubscription($customerId, $subscribe)
                 == $this->customerAccountManagement->getConfirmationStatus($customerId)
             ) {
                 $status = self::STATUS_UNCONFIRMED;
-            } else if ($isConfirmNeed) {
+            } elseif ($isConfirmNeed) {
                 $status = self::STATUS_NOT_ACTIVE;
             }
         } else {
@@ -589,7 +588,7 @@ protected function _updateCustomerSubscription($customerId, $subscribe)
             try {
                 if ($isConfirmNeed) {
                     $this->sendConfirmationRequestEmail();
-                } else if ($this->isStatusChanged() && $status == self::STATUS_UNSUBSCRIBED) {
+                } elseif ($this->isStatusChanged() && $status == self::STATUS_UNSUBSCRIBED) {
                     $this->sendUnsubscriptionEmail();
                 } elseif ($this->isStatusChanged() && $status == self::STATUS_SUBSCRIBED) {
                     $this->sendConfirmationSuccessEmail();
diff --git a/app/code/Magento/Newsletter/Setup/InstallSchema.php b/app/code/Magento/Newsletter/Setup/InstallSchema.php
index ad82ed9c6ad8d..bf8af11a925cf 100644
--- a/app/code/Magento/Newsletter/Setup/InstallSchema.php
+++ b/app/code/Magento/Newsletter/Setup/InstallSchema.php
@@ -459,6 +459,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php b/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php
index 5ac95da3b2b69..38d9213879e5d 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php
@@ -84,7 +84,7 @@ protected function setUp()
                 ->getMock();
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->action = $objectManager->getObject(
+        $this->action = $objectManager->getObject(
             \Magento\Newsletter\Controller\Manage\Save::class, [
                 'request' => $this->requestMock,
                 'response' => $this->responseMock,
diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/Template/FilterTest.php
index 364028758e87d..02776c4ec1e81 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/Template/FilterTest.php
@@ -76,7 +76,6 @@ protected function setUp()
             $widgetResource,
             $widget
         );
-
     }
 
     public function testWidgetDirective()
diff --git a/app/code/Magento/OfflineShipping/Setup/InstallSchema.php b/app/code/Magento/OfflineShipping/Setup/InstallSchema.php
index 4c0285dab0917..65e86223ca002 100644
--- a/app/code/Magento/OfflineShipping/Setup/InstallSchema.php
+++ b/app/code/Magento/OfflineShipping/Setup/InstallSchema.php
@@ -149,6 +149,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         );
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/Layout/DepersonalizePluginTest.php b/app/code/Magento/PageCache/Test/Unit/Model/Layout/DepersonalizePluginTest.php
index 3a0a58a04b3cd..e369176f3dcb3 100644
--- a/app/code/Magento/PageCache/Test/Unit/Model/Layout/DepersonalizePluginTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Model/Layout/DepersonalizePluginTest.php
@@ -45,14 +45,14 @@ protected function setUp()
     {
         $this->layoutMock = $this->getMock(\Magento\Framework\View\Layout::class, [], [], '', false);
         $this->eventManagerMock = $this->getMock(\Magento\Framework\Event\Manager::class, [], [], '', false);
-        $this->messageSessionMock = $this->getMock(
+        $this->messageSessionMock = $this->getMock(
             \Magento\Framework\Message\Session::class,
             ['clearStorage'],
             [],
             '',
             false
         );
-        $this->depersonalizeCheckerMock = $this->getMock(
+        $this->depersonalizeCheckerMock = $this->getMock(
             \Magento\PageCache\Model\DepersonalizeChecker::class,
             [],
             [],
diff --git a/app/code/Magento/PageCache/Test/Unit/Observer/FlushCacheByTagsTest.php b/app/code/Magento/PageCache/Test/Unit/Observer/FlushCacheByTagsTest.php
index ebf584572d0cf..f7a90e9b8b82b 100644
--- a/app/code/Magento/PageCache/Test/Unit/Observer/FlushCacheByTagsTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Observer/FlushCacheByTagsTest.php
@@ -49,7 +49,6 @@ protected function setUp()
 
         $this->tagResolver = $this->getMock(\Magento\Framework\App\Cache\Tag\Resolver::class, [], [], '', false);
 
-
         $helper->setBackwardCompatibleProperty($this->_model, 'tagResolver', $this->tagResolver);
         $reflection = new \ReflectionClass(\Magento\PageCache\Observer\FlushCacheByTags::class);
         $reflectionProperty = $reflection->getProperty('fullPageCache');
diff --git a/app/code/Magento/Payment/Block/ConfigurableInfo.php b/app/code/Magento/Payment/Block/ConfigurableInfo.php
index 8314fbb69d03d..4190fb70d67d8 100644
--- a/app/code/Magento/Payment/Block/ConfigurableInfo.php
+++ b/app/code/Magento/Payment/Block/ConfigurableInfo.php
@@ -67,7 +67,6 @@ protected function _prepareSpecificInformation($transport = null)
                     $field,
                     $payment->getAdditionalInformation($field)
                 );
-
             }
         }
 
diff --git a/app/code/Magento/Payment/Gateway/Config/ValueHandlerPool.php b/app/code/Magento/Payment/Gateway/Config/ValueHandlerPool.php
index 6991a4370776a..5ff17bfeb43c3 100644
--- a/app/code/Magento/Payment/Gateway/Config/ValueHandlerPool.php
+++ b/app/code/Magento/Payment/Gateway/Config/ValueHandlerPool.php
@@ -48,7 +48,7 @@ public function __construct(
      */
     public function get($field)
     {
-        return isset ($this->handlers[$field])
+        return isset($this->handlers[$field])
             ? $this->handlers[$field]
             : $this->handlers[self::DEFAULT_HANDLER];
     }
diff --git a/app/code/Magento/Payment/Gateway/Http/Client/Zend.php b/app/code/Magento/Payment/Gateway/Http/Client/Zend.php
index 30e02eb8850ba..30070402c6b70 100644
--- a/app/code/Magento/Payment/Gateway/Http/Client/Zend.php
+++ b/app/code/Magento/Payment/Gateway/Http/Client/Zend.php
@@ -65,7 +65,7 @@ public function placeRequest(TransferInterface $transferObject)
         $client->setConfig($transferObject->getClientConfig());
         $client->setMethod($transferObject->getMethod());
 
-        switch($transferObject->getMethod()) {
+        switch ($transferObject->getMethod()) {
             case \Zend_Http_Client::GET:
                 $client->setParameterGet($transferObject->getBody());
                 break;
diff --git a/app/code/Magento/Payment/Model/Method/Adapter.php b/app/code/Magento/Payment/Model/Method/Adapter.php
index 20adfdc7a872a..bab803f6ef73e 100644
--- a/app/code/Magento/Payment/Model/Method/Adapter.php
+++ b/app/code/Magento/Payment/Model/Method/Adapter.php
@@ -542,7 +542,6 @@ private function executeCommand($commandCode, array $arguments = [])
         $command = $this->commandPool->get($commandCode);
 
         return $command->execute($arguments);
-
     }
 
     /**
diff --git a/app/code/Magento/Payment/Model/MethodInterface.php b/app/code/Magento/Payment/Model/MethodInterface.php
index 15269c8a5ba23..88f58e079aaa0 100644
--- a/app/code/Magento/Payment/Model/MethodInterface.php
+++ b/app/code/Magento/Payment/Model/MethodInterface.php
@@ -18,7 +18,7 @@ interface MethodInterface
      * Retrieve payment method code
      *
      * @return string
-     * 
+     *
      */
     public function getCode();
 
@@ -26,7 +26,7 @@ public function getCode();
      * Retrieve block type for method form generation
      *
      * @return string
-     * 
+     *
      * @deprecated
      */
     public function getFormBlockType();
@@ -35,7 +35,7 @@ public function getFormBlockType();
      * Retrieve payment method title
      *
      * @return string
-     * 
+     *
      */
     public function getTitle();
 
@@ -56,7 +56,7 @@ public function getStore();
      * Check order availability
      *
      * @return bool
-     * 
+     *
      */
     public function canOrder();
 
@@ -64,7 +64,7 @@ public function canOrder();
      * Check authorize availability
      *
      * @return bool
-     * 
+     *
      */
     public function canAuthorize();
 
@@ -72,7 +72,7 @@ public function canAuthorize();
      * Check capture availability
      *
      * @return bool
-     * 
+     *
      */
     public function canCapture();
 
@@ -80,7 +80,7 @@ public function canCapture();
      * Check partial capture availability
      *
      * @return bool
-     * 
+     *
      */
     public function canCapturePartial();
 
@@ -88,7 +88,7 @@ public function canCapturePartial();
      * Check whether capture can be performed once and no further capture possible
      *
      * @return bool
-     * 
+     *
      */
     public function canCaptureOnce();
 
@@ -96,7 +96,7 @@ public function canCaptureOnce();
      * Check refund availability
      *
      * @return bool
-     * 
+     *
      */
     public function canRefund();
 
@@ -104,14 +104,14 @@ public function canRefund();
      * Check partial refund availability for invoice
      *
      * @return bool
-     * 
+     *
      */
     public function canRefundPartialPerInvoice();
 
     /**
      * Check void availability
      * @return bool
-     * 
+     *
      */
     public function canVoid();
 
@@ -134,7 +134,7 @@ public function canUseCheckout();
      * Can be edit order (renew order)
      *
      * @return bool
-     * 
+     *
      */
     public function canEdit();
 
@@ -142,7 +142,7 @@ public function canEdit();
      * Check fetch transaction info availability
      *
      * @return bool
-     * 
+     *
      */
     public function canFetchTransactionInfo();
 
@@ -153,7 +153,7 @@ public function canFetchTransactionInfo();
      * @param string $transactionId
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * 
+     *
      */
     public function fetchTransactionInfo(InfoInterface $payment, $transactionId);
 
@@ -161,7 +161,7 @@ public function fetchTransactionInfo(InfoInterface $payment, $transactionId);
      * Retrieve payment system relation flag
      *
      * @return bool
-     * 
+     *
      */
     public function isGateway();
 
@@ -169,7 +169,7 @@ public function isGateway();
      * Retrieve payment method online/offline flag
      *
      * @return bool
-     * 
+     *
      */
     public function isOffline();
 
@@ -177,7 +177,7 @@ public function isOffline();
      * Flag if we need to run payment initialize while order place
      *
      * @return bool
-     * 
+     *
      */
     public function isInitializeNeeded();
 
@@ -202,7 +202,7 @@ public function canUseForCurrency($currencyCode);
      * Retrieve block type for display method information
      *
      * @return string
-     * 
+     *
      * @deprecated
      */
     public function getInfoBlockType();
@@ -212,7 +212,7 @@ public function getInfoBlockType();
      *
      * @return InfoInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * 
+     *
      * @deprecated
      */
     public function getInfoInstance();
@@ -222,7 +222,7 @@ public function getInfoInstance();
      *
      * @param InfoInterface $info
      * @return void
-     * 
+     *
      * @deprecated
      */
     public function setInfoInstance(InfoInterface $info);
@@ -232,7 +232,7 @@ public function setInfoInstance(InfoInterface $info);
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * 
+     *
      */
     public function validate();
 
@@ -242,7 +242,7 @@ public function validate();
      * @param InfoInterface $payment
      * @param float $amount
      * @return $this
-     * 
+     *
      */
     public function order(\Magento\Payment\Model\InfoInterface $payment, $amount);
 
@@ -252,7 +252,7 @@ public function order(\Magento\Payment\Model\InfoInterface $payment, $amount);
      * @param InfoInterface $payment
      * @param float $amount
      * @return $this
-     * 
+     *
      */
     public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount);
 
@@ -262,7 +262,7 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
      * @param InfoInterface $payment
      * @param float $amount
      * @return $this
-     * 
+     *
      */
     public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount);
 
@@ -272,7 +272,7 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount);
      * @param InfoInterface $payment
      * @param float $amount
      * @return $this
-     * 
+     *
      */
     public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount);
 
@@ -281,7 +281,7 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount);
      *
      * @param InfoInterface $payment
      * @return $this
-     * 
+     *
      */
     public function cancel(\Magento\Payment\Model\InfoInterface $payment);
 
@@ -290,14 +290,14 @@ public function cancel(\Magento\Payment\Model\InfoInterface $payment);
      *
      * @param InfoInterface $payment
      * @return $this
-     * 
+     *
      */
     public function void(\Magento\Payment\Model\InfoInterface $payment);
 
     /**
      * Whether this method can accept or deny payment
      * @return bool
-     * 
+     *
      */
     public function canReviewPayment();
 
@@ -307,7 +307,7 @@ public function canReviewPayment();
      * @param InfoInterface $payment
      * @return false
      * @throws \Magento\Framework\Exception\LocalizedException
-     * 
+     *
      */
     public function acceptPayment(InfoInterface $payment);
 
@@ -317,7 +317,7 @@ public function acceptPayment(InfoInterface $payment);
      * @param InfoInterface $payment
      * @return false
      * @throws \Magento\Framework\Exception\LocalizedException
-     * 
+     *
      */
     public function denyPayment(InfoInterface $payment);
 
@@ -336,7 +336,7 @@ public function getConfigData($field, $storeId = null);
      *
      * @param DataObject $data
      * @return $this
-     * 
+     *
      */
     public function assignData(DataObject $data);
 
@@ -345,7 +345,7 @@ public function assignData(DataObject $data);
      *
      * @param CartInterface|null $quote
      * @return bool
-     * 
+     *
      */
     public function isAvailable(CartInterface $quote = null);
 
@@ -354,7 +354,7 @@ public function isAvailable(CartInterface $quote = null);
      *
      * @param int|null $storeId
      * @return bool
-     * 
+     *
      */
     public function isActive($storeId = null);
 
@@ -367,7 +367,7 @@ public function isActive($storeId = null);
      *
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * 
+     *
      */
     public function initialize($paymentAction, $stateObject);
 
@@ -376,7 +376,7 @@ public function initialize($paymentAction, $stateObject);
      * Used to universalize payment actions when processing payment place
      *
      * @return string
-     * 
+     *
      */
     public function getConfigPaymentAction();
 }
diff --git a/app/code/Magento/Payment/Test/Unit/Block/FormTest.php b/app/code/Magento/Payment/Test/Unit/Block/FormTest.php
index 0b966d3bf6771..f618bac4ca2b6 100644
--- a/app/code/Magento/Payment/Test/Unit/Block/FormTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Block/FormTest.php
@@ -35,18 +35,18 @@ class FormTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_storeManager = $this->getMockBuilder(
+        $this->_storeManager = $this->getMockBuilder(
             \Magento\Store\Model\StoreManager::class
         )->setMethods(
                 ['getStore']
             )->disableOriginalConstructor()->getMock();
-        $this->_eventManager = $this->getMockBuilder(
+        $this->_eventManager = $this->getMockBuilder(
             \Magento\Framework\Event\ManagerInterface::class
         )->setMethods(
                 ['dispatch']
             )->disableOriginalConstructor()->getMock();
         $this->_escaper = $this->getMock(\Magento\Framework\Escaper::class, null, [], '', true);
-        $context = $helper->getObject(
+        $context = $helper->getObject(
             \Magento\Framework\View\Element\Template\Context::class,
             [
                 'storeManager' => $this->_storeManager,
@@ -90,7 +90,7 @@ public function testGetInfoData($field, $value, $expected)
             ->method('getData')
             ->with($field)
             ->will($this->returnValue($value));
-        $method = $this->getMockBuilder(
+        $method = $this->getMockBuilder(
             \Magento\Payment\Model\MethodInterface::class
         )->getMockForAbstractClass();
         $method->expects($this->any())
diff --git a/app/code/Magento/Payment/Test/Unit/Gateway/Http/Converter/Soap/ObjectToArrayConverterTest.php b/app/code/Magento/Payment/Test/Unit/Gateway/Http/Converter/Soap/ObjectToArrayConverterTest.php
index e20464541bb58..c6f97cb84ee59 100644
--- a/app/code/Magento/Payment/Test/Unit/Gateway/Http/Converter/Soap/ObjectToArrayConverterTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Gateway/Http/Converter/Soap/ObjectToArrayConverterTest.php
@@ -30,6 +30,5 @@ public function testConvert()
 
         $converter = new ObjectToArrayConverter();
         static::assertEquals($output, $converter->convert($input));
-
     }
 }
diff --git a/app/code/Magento/Paypal/Block/Cart/ValidationMessages.php b/app/code/Magento/Paypal/Block/Cart/ValidationMessages.php
index 69713999bf602..ea2361475b1a3 100644
--- a/app/code/Magento/Paypal/Block/Cart/ValidationMessages.php
+++ b/app/code/Magento/Paypal/Block/Cart/ValidationMessages.php
@@ -81,7 +81,6 @@ protected function addQuoteMessages()
             } else {
                 $messages[] = $message;
             }
-
         }
         $this->messageManager->addUniqueMessages(
             $messages
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php
index 28eb3d22b9353..978a53a9918bb 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Start.php
@@ -23,7 +23,6 @@ public function execute()
         try {
             $token = $this->getToken();
             if ($token === null) {
-
                 return;
             }
 
diff --git a/app/code/Magento/Paypal/Controller/Express/GetToken.php b/app/code/Magento/Paypal/Controller/Express/GetToken.php
index 25dd71be94f7b..d4dfb4bbf3475 100644
--- a/app/code/Magento/Paypal/Controller/Express/GetToken.php
+++ b/app/code/Magento/Paypal/Controller/Express/GetToken.php
@@ -99,8 +99,7 @@ protected function getToken()
                 $quote->getBillingAddress(),
                 $quote->getShippingAddress()
             );
-        } else if (
-            (!$quoteCheckoutMethod || $quoteCheckoutMethod !== Onepage::METHOD_REGISTER)
+        } elseif ((!$quoteCheckoutMethod || $quoteCheckoutMethod !== Onepage::METHOD_REGISTER)
                 && !$checkoutHelper->isAllowedGuestCheckout($quote, $quote->getStoreId())
         ) {
             $expressRedirect = $this->_objectManager->get(ExpressRedirect::class);
diff --git a/app/code/Magento/Paypal/Gateway/Payflowpro/Command/AuthorizationCommand.php b/app/code/Magento/Paypal/Gateway/Payflowpro/Command/AuthorizationCommand.php
index 17a843e14a1a7..fa21a04f125b7 100644
--- a/app/code/Magento/Paypal/Gateway/Payflowpro/Command/AuthorizationCommand.php
+++ b/app/code/Magento/Paypal/Gateway/Payflowpro/Command/AuthorizationCommand.php
@@ -79,6 +79,5 @@ public function execute(array $commandSubject)
         $this->payflowFacade->setTransStatus($payment, $response);
 
         return $this;
-
     }
 }
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
index ae64b04f019a0..a36059051630d 100644
--- a/app/code/Magento/Paypal/Model/Express/Checkout.php
+++ b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -543,7 +543,6 @@ public function start($returnUrl, $cancelUrl, $button = null)
             }
             $this->_getApi()->setSuppressShipping(true);
         } else {
-
             $this->_getApi()->setBillingAddress($this->_quote->getBillingAddress());
 
             $address = $this->_quote->getShippingAddress();
diff --git a/app/code/Magento/Paypal/Model/IframeConfigProvider.php b/app/code/Magento/Paypal/Model/IframeConfigProvider.php
index 00a517781ed2a..2667b12cd4ec5 100644
--- a/app/code/Magento/Paypal/Model/IframeConfigProvider.php
+++ b/app/code/Magento/Paypal/Model/IframeConfigProvider.php
@@ -80,7 +80,7 @@ public function getConfig()
     protected function getFrameActionUrl($code)
     {
         $url = '';
-        switch($code) {
+        switch ($code) {
             case Config::METHOD_PAYFLOWADVANCED:
                 $url = $this->urlBuilder->getUrl('paypal/payflowadvanced/form', ['_secure' => true]);
                 break;
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Gateway.php b/app/code/Magento/Paypal/Model/Payflow/Service/Gateway.php
index e269e270a1f76..bd1ecc0dc3670 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Gateway.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Gateway.php
@@ -104,7 +104,6 @@ public function postRequest(DataObject $request, ConfigInterface $config)
 
             $result->setData(array_change_key_case($responseArray, CASE_LOWER));
             $result->setData('result_code', $result->getData('result'));
-
         } catch (\Zend_Http_Client_Exception $e) {
             $result->addData(
                 [
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/FraudHandler.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/FraudHandler.php
index 4ebd6138846b7..d5a22bb381a6d 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/FraudHandler.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Handler/FraudHandler.php
@@ -56,8 +56,7 @@ public function __construct(Info $paypalInfoManager, Security $xmlSecurity)
      */
     public function handle(InfoInterface $payment, DataObject $response)
     {
-        if (
-        !in_array(
+        if (!in_array(
             $response->getData('result'),
             [
                 Payflowpro::RESPONSE_CODE_DECLINED_BY_FILTER,
@@ -108,7 +107,6 @@ private function getFraudRulesDictionary($rulesString)
                 $rules[(string)$rule->{'ruleDescription'}] = (string)$rule->{'triggeredMessage'};
             }
         } catch (\Exception $e) {
-
         } finally {
             libxml_use_internal_errors(false);
         }
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/AVSResponse.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/AVSResponse.php
index 689bfcf3dfd84..90529582a0ad0 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/AVSResponse.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/AVSResponse.php
@@ -38,19 +38,19 @@ class AVSResponse implements ValidatorInterface
      */
     const IAVS = 'iavs';
 
-    /** Values of the response */
+    /**#@+ Values of the response */
     const RESPONSE_YES = 'y';
 
     const RESPONSE_NO = 'n';
 
     const RESPONSE_NOT_SUPPORTED = 'x';
-    /**  */
+    /**#@-*/
 
-    /** Values of the validation settings payments */
+    /**#@+ Values of the validation settings payments */
     const CONFIG_ON = 1;
 
     const CONFIG_OFF = 0;
-    /**  */
+    /**#@-*/
 
     /**
      * @var array
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/CVV2Match.php b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/CVV2Match.php
index be32c101b4f98..178458a01b895 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/CVV2Match.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Service/Response/Validator/CVV2Match.php
@@ -30,21 +30,21 @@ class CVV2Match implements ValidatorInterface
      */
     const ERROR_MESSAGE = 'Card security code does not match.';
 
-    /** Values of the response */
+    /**#@+ Values of the response */
     const RESPONSE_YES = 'y';
 
     const RESPONSE_NO = 'n';
 
     const RESPONSE_NOT_SUPPORTED = 'x';
-    /**  */
+    /**#@-*/
 
-    /** Validation settings payments */
+    /**#@+ Validation settings payments */
     const CONFIG_ON = 1;
 
     const CONFIG_OFF = 0;
 
     const CONFIG_NAME = 'avs_security_code';
-    /**  */
+    /**#@-*/
 
     /**
      * Validate data
diff --git a/app/code/Magento/Paypal/Setup/InstallData.php b/app/code/Magento/Paypal/Setup/InstallData.php
index 19032a19c8cdc..298dce8569df2 100644
--- a/app/code/Magento/Paypal/Setup/InstallData.php
+++ b/app/code/Magento/Paypal/Setup/InstallData.php
@@ -27,7 +27,6 @@ class InstallData implements InstallDataInterface
      */
     protected $quoteSetupFactory;
 
-
     /**
      * @param SalesSetupFactory $salesSetupFactory
      * @param QuoteSetupFactory $quoteSetupFactory
@@ -80,6 +79,5 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
          * Prepare database after install
          */
         $setup->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Paypal/Setup/InstallSchema.php b/app/code/Magento/Paypal/Setup/InstallSchema.php
index c948c0c129773..69d1b7faed765 100644
--- a/app/code/Magento/Paypal/Setup/InstallSchema.php
+++ b/app/code/Magento/Paypal/Setup/InstallSchema.php
@@ -421,6 +421,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
          * Prepare database after install
          */
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
index e82353c78b4da..75516cb2a335d 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
@@ -39,7 +39,7 @@ protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_group = $this->getMock(\Magento\Config\Model\Config\Structure\Element\Group::class, [], [], '', false);
-        $this->_element = $this->getMockForAbstractClass(
+        $this->_element = $this->getMockForAbstractClass(
             \Magento\Framework\Data\Form\Element\AbstractElement::class,
             [],
             '',
@@ -69,7 +69,7 @@ protected function setUp()
             ->method('__call')
             ->with('getUser')
             ->will($this->returnValue($this->_user));
-        $this->_model = $helper->getObject(
+        $this->_model = $helper->getObject(
             \Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group::class,
             ['authSession' => $this->_authSession]
         );
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Express/ShortcutTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Express/ShortcutTest.php
index b726d04dcbefa..b8e4069f09158 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Express/ShortcutTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Express/ShortcutTest.php
@@ -31,7 +31,6 @@ public function testGetAlias()
             ->disableOriginalConstructor()
             ->getMock();
 
-
         $paypalConfigFactoryMock->expects(self::once())
             ->method('create')
             ->willReturn($configMock);
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/BillingAgreementConfigProviderTest.php b/app/code/Magento/Paypal/Test/Unit/Model/BillingAgreementConfigProviderTest.php
index 62f82d58c4bea..459b4c40983eb 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/BillingAgreementConfigProviderTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/BillingAgreementConfigProviderTest.php
@@ -38,7 +38,6 @@ protected function setUp()
             $this->currentCustomerMock,
             $this->agreementFactoryMock
         );
-
     }
 
     public function testGetConfig()
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/IpnTest.php b/app/code/Magento/Paypal/Test/Unit/Model/IpnTest.php
index 47e8e930f47d1..25528f29ba7b0 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/IpnTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/IpnTest.php
@@ -64,7 +64,7 @@ protected function setUp()
         $this->_orderMock->expects($this->any())->method('getStoreId')->will($this->returnSelf());
         $this->_orderMock->expects($this->any())->method('getEmailSent')->will($this->returnValue(true));
 
-        $this->configFactory = $this->getMock(
+        $this->configFactory = $this->getMock(
             \Magento\Paypal\Model\ConfigFactory::class,
             ['create'],
             [],
@@ -81,7 +81,7 @@ protected function setUp()
         $configMock->expects($this->any())->method('getPayPalIpnUrl')
             ->will($this->returnValue('https://ipnpb_paypal_url'));
 
-        $this->curlFactory = $this->getMock(
+        $this->curlFactory = $this->getMock(
             \Magento\Framework\HTTP\Adapter\CurlFactory::class,
             ['create', 'setConfig', 'write', 'read'],
             [],
@@ -95,7 +95,7 @@ protected function setUp()
             '
                 VERIFIED'
         ));
-        $this->_paypalInfo = $this->getMock(
+        $this->_paypalInfo = $this->getMock(
             \Magento\Paypal\Model\Info::class,
             ['importToPayment', 'getMethod', 'getAdditionalInformation'],
             [],
@@ -104,7 +104,7 @@ protected function setUp()
         );
         $this->_paypalInfo->expects($this->any())->method('getMethod')->will($this->returnValue('some_method'));
         $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_ipn = $objectHelper->getObject(
+        $this->_ipn = $objectHelper->getObject(
             \Magento\Paypal\Model\Ipn::class,
             [
                 'configFactory' => $this->configFactory,
@@ -151,7 +151,7 @@ public function testPaymentReviewRegisterPaymentAuthorization()
 
     public function testPaymentReviewRegisterPaymentFraud()
     {
-        $paymentMock = $this->getMock(
+        $paymentMock = $this->getMock(
             \Magento\Sales\Model\Order\Payment::class,
             ['getAdditionalInformation', '__wakeup', 'registerCaptureNotification'],
             [],
@@ -180,7 +180,7 @@ public function testPaymentReviewRegisterPaymentFraud()
                 $paymentMock
             );
         $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_ipn = $objectHelper->getObject(
+        $this->_ipn = $objectHelper->getObject(
             \Magento\Paypal\Model\Ipn::class,
             [
                 'configFactory' => $this->configFactory,
@@ -225,7 +225,7 @@ public function testRegisterPaymentDenial()
             ->with(['payment_status' => 'denied'], $paymentMock);
 
         $objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_ipn = $objectHelper->getObject(
+        $this->_ipn = $objectHelper->getObject(
             \Magento\Paypal\Model\Ipn::class,
             [
                 'configFactory' => $this->configFactory,
diff --git a/app/code/Magento/Paypal/Test/Unit/Observer/RestrictAdminBillingAgreementUsageObserverTest.php b/app/code/Magento/Paypal/Test/Unit/Observer/RestrictAdminBillingAgreementUsageObserverTest.php
index 41ec96ec9154b..bb23620330488 100644
--- a/app/code/Magento/Paypal/Test/Unit/Observer/RestrictAdminBillingAgreementUsageObserverTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Observer/RestrictAdminBillingAgreementUsageObserverTest.php
@@ -53,7 +53,7 @@ public function restrictAdminBillingAgreementUsageDataProvider()
         return [
             [new \stdClass(), false, true],
             [
-                $this->getMockForAbstractClass(
+                $this->getMockForAbstractClass(
                     \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgreement::class,
                     [],
                     '',
@@ -63,7 +63,7 @@ public function restrictAdminBillingAgreementUsageDataProvider()
                 true
             ],
             [
-                $this->getMockForAbstractClass(
+                $this->getMockForAbstractClass(
                     \Magento\Paypal\Model\Payment\Method\Billing\AbstractAgreement::class,
                     [],
                     '',
diff --git a/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml b/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
index e696fc755c6be..fc0403905088f 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
@@ -3,9 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-
-
+// @codingStandardsIgnoreFile
 /**
  * @var \Magento\Paypal\Block\Payflow\Link\Info $block
  * @see \Magento\Paypal\Block\Payflow\Link\Info
diff --git a/app/code/Magento/Persistent/Model/Plugin/CustomerData.php b/app/code/Magento/Persistent/Model/Plugin/CustomerData.php
index f035224d2116b..cfedfee4aad45 100644
--- a/app/code/Magento/Persistent/Model/Plugin/CustomerData.php
+++ b/app/code/Magento/Persistent/Model/Plugin/CustomerData.php
@@ -59,8 +59,7 @@ public function aroundGetSectionData(
         \Closure $proceed
     ) {
         /** unset customer first name  */
-        if (
-            !$this->customerSession->isLoggedIn()
+        if (!$this->customerSession->isLoggedIn()
             && $this->persistentData->isEnabled()
             && $this->persistentSession->isPersistent()
         ) {
diff --git a/app/code/Magento/Persistent/Setup/InstallSchema.php b/app/code/Magento/Persistent/Setup/InstallSchema.php
index 1e057dd028874..ab90aa1ef2312 100644
--- a/app/code/Magento/Persistent/Setup/InstallSchema.php
+++ b/app/code/Magento/Persistent/Setup/InstallSchema.php
@@ -114,6 +114,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         );
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
index 379c56cc0328f..0d0b944606b02 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
@@ -57,7 +57,7 @@ protected function setUp()
     {
         $this->persistentSessionMock = $this->getMock(\Magento\Persistent\Helper\Session::class, [], [], '', false);
         $this->sessionMock =
-            $this->getMock(
+            $this->getMock(
                 \Magento\Persistent\Model\Session::class,
                 [
                     'setLoadInactive',
@@ -78,7 +78,7 @@ protected function setUp()
             $this->getMock(\Magento\Eav\Model\Entity\Collection\AbstractCollection::class, [], [], '', false);
 
         $this->quoteRepositoryMock = $this->getMock(\Magento\Quote\Api\CartRepositoryInterface::class);
-        $this->quoteMock = $this->getMock(
+        $this->quoteMock = $this->getMock(
             \Magento\Quote\Model\Quote::class,
             [
                 'getId',
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/ApplyBlockPersistentDataObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/ApplyBlockPersistentDataObserverTest.php
index 4b92d1f18fb2d..085359df6e76a 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/ApplyBlockPersistentDataObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/ApplyBlockPersistentDataObserverTest.php
@@ -67,12 +67,12 @@ protected function setUp()
         $this->observerMock = $this->getMock(\Magento\Framework\Event\Observer::class, [], [], '', false);
         $this->eventMock = $this->getMock(\Magento\Framework\Event::class, $eventMethods, [], '', false);
         $this->blockMock = $this->getMock(\Magento\Framework\View\Element\AbstractBlock::class, [], [], '', false);
-        $this->persistentConfigMock = $this->getMock(
-            \Magento\Persistent\Model\Persistent\Config::class,
-            [],
-            [],
-            '',
-            false
+        $this->persistentConfigMock = $this->getMock(
+            \Magento\Persistent\Model\Persistent\Config::class,
+            [],
+            [],
+            '',
+            false
         );
         $this->model = new \Magento\Persistent\Observer\ApplyBlockPersistentDataObserver(
                 $this->sessionMock,
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
index c6c723142189b..e346ed62ad9ae 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php
@@ -98,6 +98,7 @@ public function testExecuteWhenPersistentIsNotEnabled()
         $this->eventManagerMock->expects($this->never())->method('dispatch');
         $this->model->execute($this->observerMock);
     }
+
     public function testExecuteWhenPersistentIsEnabled()
     {
         $this->persistentHelperMock
diff --git a/app/code/Magento/Persistent/Test/Unit/Observer/UpdateCustomerCookiesObserverTest.php b/app/code/Magento/Persistent/Test/Unit/Observer/UpdateCustomerCookiesObserverTest.php
index ca50d839db804..9450c83b8cc20 100644
--- a/app/code/Magento/Persistent/Test/Unit/Observer/UpdateCustomerCookiesObserverTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Observer/UpdateCustomerCookiesObserverTest.php
@@ -53,7 +53,7 @@ protected function setUp()
         $eventMethods = ['getCustomerCookies', '__wakeUp'];
         $sessionMethods = ['getId', 'getGroupId', 'getCustomerId', '__wakeUp'];
         $this->sessionHelperMock = $this->getMock(\Magento\Persistent\Helper\Session::class, [], [], '', false);
-        $this->customerRepository = $this->getMockForAbstractClass(
+        $this->customerRepository = $this->getMockForAbstractClass(
             \Magento\Customer\Api\CustomerRepositoryInterface::class,
             [],
             '',
@@ -62,7 +62,7 @@ protected function setUp()
         $this->observerMock = $this->getMock(\Magento\Framework\Event\Observer::class, [], [], '', false);
         $this->eventManagerMock = $this->getMock(\Magento\Framework\Event::class, $eventMethods, [], '', false);
         $this->sessionMock = $this->getMock(\Magento\Persistent\Model\Session::class, $sessionMethods, [], '', false);
-        $this->customerMock = $this->getMockForAbstractClass(
+        $this->customerMock = $this->getMockForAbstractClass(
             \Magento\Customer\Api\Data\CustomerInterface::class,
             [],
             '',
@@ -86,7 +86,7 @@ public function testExecuteWhenCustomerCookieExist()
         $customerId = 1;
         $customerGroupId = 2;
         $cookieMock =
-            $this->getMock(
+            $this->getMock(
                 \Magento\Framework\DataObject::class,
                 ['setCustomerId', 'setCustomerGroupId', '__wakeUp'],
                 [], '', false);
diff --git a/app/code/Magento/ProductAlert/Block/Email/Stock.php b/app/code/Magento/ProductAlert/Block/Email/Stock.php
index a2187bbd34f52..b12268dca9e92 100644
--- a/app/code/Magento/ProductAlert/Block/Email/Stock.php
+++ b/app/code/Magento/ProductAlert/Block/Email/Stock.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\ProductAlert\Block\Email;
 
-
 /**
  * ProductAlert email back in stock grid
  *
diff --git a/app/code/Magento/ProductAlert/Block/Product/View/Price.php b/app/code/Magento/ProductAlert/Block/Product/View/Price.php
index 3e87f3a249897..a2556f2e9358e 100644
--- a/app/code/Magento/ProductAlert/Block/Product/View/Price.php
+++ b/app/code/Magento/ProductAlert/Block/Product/View/Price.php
@@ -18,8 +18,7 @@ class Price extends \Magento\ProductAlert\Block\Product\View
      */
     public function setTemplate($template)
     {
-        if (
-            !$this->_helper->isPriceAlertAllowed()
+        if (!$this->_helper->isPriceAlertAllowed()
             || !$this->getProduct() ||
             false === $this->getProduct()->getCanShowPrice()
         ) {
diff --git a/app/code/Magento/ProductAlert/Setup/InstallSchema.php b/app/code/Magento/ProductAlert/Setup/InstallSchema.php
index a9fb914d23700..f1cc33d7e4d28 100644
--- a/app/code/Magento/ProductAlert/Setup/InstallSchema.php
+++ b/app/code/Magento/ProductAlert/Setup/InstallSchema.php
@@ -201,6 +201,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/ProductVideo/Helper/Media.php b/app/code/Magento/ProductVideo/Helper/Media.php
index 7078db5f2492b..5f74ee3601a44 100644
--- a/app/code/Magento/ProductVideo/Helper/Media.php
+++ b/app/code/Magento/ProductVideo/Helper/Media.php
@@ -33,6 +33,7 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
      * Configuration path for show related
      */
     const XML_PATH_SHOW_RELATED = 'catalog/product_video/show_related';
+
     /**
      * Configuration path for video auto restart
      */
diff --git a/app/code/Magento/Quote/Api/Data/ShippingInterface.php b/app/code/Magento/Quote/Api/Data/ShippingInterface.php
index 13fe0c423dced..9eeb960a4cb01 100644
--- a/app/code/Magento/Quote/Api/Data/ShippingInterface.php
+++ b/app/code/Magento/Quote/Api/Data/ShippingInterface.php
@@ -27,7 +27,6 @@ public function getAddress();
      */
     public function setAddress(\Magento\Quote\Api\Data\AddressInterface $value);
 
-
     /**
      * Get shipping method
      *
diff --git a/app/code/Magento/Quote/Api/Data/TotalsItemInterface.php b/app/code/Magento/Quote/Api/Data/TotalsItemInterface.php
index 1067bd89cec6c..9be321b0cad2a 100644
--- a/app/code/Magento/Quote/Api/Data/TotalsItemInterface.php
+++ b/app/code/Magento/Quote/Api/Data/TotalsItemInterface.php
@@ -110,7 +110,6 @@ interface TotalsItemInterface extends \Magento\Framework\Api\ExtensibleDataInter
      */
     const KEY_WEEE_TAX_APPLIED_AMOUNT = 'weee_tax_applied_amount';
 
-
     /**
      * Item Weee Tax Applied Amount.
      */
@@ -422,6 +421,7 @@ public function getWeeeTaxApplied();
      * @return $this
      */
     public function setWeeeTaxApplied($weeeTaxApplied);
+
     /**
      * Retrieve existing extension attributes object or create a new one.
      *
diff --git a/app/code/Magento/Quote/Model/Cart/ShippingMethod.php b/app/code/Magento/Quote/Model/Cart/ShippingMethod.php
index 897f596aca4c8..20fb76e9eabdf 100644
--- a/app/code/Magento/Quote/Model/Cart/ShippingMethod.php
+++ b/app/code/Magento/Quote/Model/Cart/ShippingMethod.php
@@ -227,7 +227,6 @@ public function setPriceExclTax($priceExclTax)
         return $this->setData(self::KEY_PRICE_EXCL_TAX, $priceExclTax);
     }
 
-
     /**
      * {@inheritdoc}
      *
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index fd6c382d5735f..05c49608c3573 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -719,6 +719,7 @@ public function setCustomerNoteNotify($customerNoteNotify)
     {
         return $this->setData(self::KEY_CUSTOMER_NOTE_NOTIFY, $customerNoteNotify);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
@@ -841,7 +842,7 @@ public function beforeSave()
      * Loading quote data by customer
      *
      * @param \Magento\Customer\Model\Customer|int $customer
-     * @deprecated 
+     * @deprecated
      * @return $this
      */
     public function loadByCustomer($customer)
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 085edf0cc90e4..4c47e56c25135 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -1664,6 +1664,7 @@ public function setSaveInAddressBook($saveInAddressBook)
     {
         return $this->setData(self::SAVE_IN_ADDRESS_BOOK, $saveInAddressBook);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php b/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php
index b65c59bb390af..c6aae4f049456 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/ToOrder.php
@@ -90,6 +90,5 @@ public function convert(Address $object, $data = [])
             ['order' => $order, 'quote' => $object->getQuote()]
         );
         return $order;
-
     }
 }
diff --git a/app/code/Magento/Quote/Model/Quote/Item.php b/app/code/Magento/Quote/Model/Quote/Item.php
index e26ac7bdf2ce7..ce594880ae03e 100644
--- a/app/code/Magento/Quote/Model/Quote/Item.php
+++ b/app/code/Magento/Quote/Model/Quote/Item.php
@@ -615,8 +615,7 @@ public function addOption($option)
     {
         if (is_array($option)) {
             $option = $this->_itemOptionFactory->create()->setData($option)->setItem($this);
-        } elseif (
-            $option instanceof \Magento\Framework\DataObject &&
+        } elseif ($option instanceof \Magento\Framework\DataObject &&
             !$option instanceof \Magento\Quote\Model\Quote\Item\Option
         ) {
             $option = $this->_itemOptionFactory->create()->setData(
@@ -1045,6 +1044,7 @@ public function setProductOption(\Magento\Quote\Api\Data\ProductOptionInterface
     {
         return $this->setData(self::KEY_PRODUCT_OPTION, $productOption);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Quote/Model/Quote/Item/CartItemOptionsProcessor.php b/app/code/Magento/Quote/Model/Quote/Item/CartItemOptionsProcessor.php
index 2fe5cd2a7b1dd..d326a819fee6d 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/CartItemOptionsProcessor.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/CartItemOptionsProcessor.php
@@ -53,7 +53,7 @@ private function addCustomOptionsToBuyRequest(CartItemInterface $cartItem, $para
             }
             if ($params instanceof \Magento\Framework\DataObject) {
                 $buyRequestUpdate->addData($params->getData());
-            } else if (is_numeric($params)) {
+            } elseif (is_numeric($params)) {
                 $buyRequestUpdate->setData('qty', $params);
             }
             return $buyRequestUpdate;
diff --git a/app/code/Magento/Quote/Model/Quote/Payment.php b/app/code/Magento/Quote/Model/Quote/Payment.php
index 221a2da683be8..18a919f30fc6e 100644
--- a/app/code/Magento/Quote/Model/Quote/Payment.php
+++ b/app/code/Magento/Quote/Model/Quote/Payment.php
@@ -357,6 +357,7 @@ public function setAdditionalData($additionalData)
     {
         return $this->setData(self::KEY_ADDITIONAL_DATA, $additionalData);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
index efd373d4cd992..e5925a4b9cc7b 100644
--- a/app/code/Magento/Quote/Model/QuoteManagement.php
+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -263,7 +263,6 @@ public function assignCustomer($cartId, $customerId, $storeId)
                 __('Cannot assign customer to the given cart. Customer already has active cart.')
             );
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-
         }
 
         $quote->setCustomer($customer);
@@ -276,7 +275,6 @@ public function assignCustomer($cartId, $customerId, $storeId)
         }
         $this->quoteRepository->save($quote);
         return true;
-
     }
 
     /**
diff --git a/app/code/Magento/Quote/Model/ShippingAssignment.php b/app/code/Magento/Quote/Model/ShippingAssignment.php
index c23dfaed87763..5ee27c14e1c5b 100644
--- a/app/code/Magento/Quote/Model/ShippingAssignment.php
+++ b/app/code/Magento/Quote/Model/ShippingAssignment.php
@@ -12,6 +12,7 @@ class ShippingAssignment extends \Magento\Framework\Model\AbstractExtensibleMode
 {
     const SHIPPING = 'shipping';
     const ITEMS = 'items';
+
     /**
      * @inheritDoc
      */
diff --git a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
index 041ba15b353ff..1072ccb711db1 100644
--- a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
+++ b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
@@ -47,13 +47,13 @@ class CollectTotalsObserver implements ObserverInterface
     protected $groupManagement;
 
     /**
-     * Initialize dependencies.
-     *
      * @param \Magento\Customer\Helper\Address $customerAddressHelper
      * @param \Magento\Customer\Model\Vat $customerVat
      * @param VatValidator $vatValidator
      * @param \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerDataFactory
      * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
+     * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
+     * @param \Magento\Customer\Model\Session $customerSession
      */
     public function __construct(
         \Magento\Customer\Helper\Address $customerAddressHelper,
@@ -78,6 +78,7 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/app/code/Magento/Quote/Setup/InstallSchema.php b/app/code/Magento/Quote/Setup/InstallSchema.php
index 236fa02795715..1b6157fe2e548 100644
--- a/app/code/Magento/Quote/Setup/InstallSchema.php
+++ b/app/code/Magento/Quote/Setup/InstallSchema.php
@@ -1568,6 +1568,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Quote/Setup/QuoteSetup.php b/app/code/Magento/Quote/Setup/QuoteSetup.php
index 3418192bb3b08..303253b090af6 100644
--- a/app/code/Magento/Quote/Setup/QuoteSetup.php
+++ b/app/code/Magento/Quote/Setup/QuoteSetup.php
@@ -94,10 +94,10 @@ protected function _flatTableExist($table)
     public function addAttribute($entityTypeId, $code, array $attr)
     {
         if (isset(
-                $this->_flatEntityTables[$entityTypeId]
-            ) && $this->_flatTableExist(
-                $this->_flatEntityTables[$entityTypeId]
-            )
+            $this->_flatEntityTables[$entityTypeId]
+        ) && $this->_flatTableExist(
+            $this->_flatEntityTables[$entityTypeId]
+        )
         ) {
             $this->_addFlatAttribute($this->_flatEntityTables[$entityTypeId], $code, $attr);
         } else {
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalManagementTest.php
index d9d8988839fb9..3f5ebe623ef0b 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Cart/CartTotalManagementTest.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\Quote\Test\Unit\Model\Cart;
 
-
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class CartTotalManagementTest extends \PHPUnit_Framework_TestCase
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Cart/ShippingMethodConverterTest.php b/app/code/Magento/Quote/Test/Unit/Model/Cart/ShippingMethodConverterTest.php
index 9ecb08ebc601f..fb026b5abe2ee 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Cart/ShippingMethodConverterTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Cart/ShippingMethodConverterTest.php
@@ -56,7 +56,7 @@ class ShippingMethodConverterTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->shippingMethodDataFactoryMock = $this->getMock(
+        $this->shippingMethodDataFactoryMock = $this->getMock(
             \Magento\Quote\Api\Data\ShippingMethodInterfaceFactory::class,
             ['create'],
             [],
@@ -65,7 +65,7 @@ protected function setUp()
         );
         $this->storeManagerMock = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->currencyMock = $this->getMock(\Magento\Directory\Model\Currency::class, [], [], '', false);
-        $this->shippingMethodMock = $this->getMock(
+        $this->shippingMethodMock = $this->getMock(
             \Magento\Quote\Model\Cart\ShippingMethod::class,
             [
                 'create',
@@ -82,7 +82,7 @@ protected function setUp()
             [],
             '',
             false);
-        $this->rateModelMock = $this->getMock(
+        $this->rateModelMock = $this->getMock(
             \Magento\Quote\Model\Quote\Address\Rate::class,
             [
                 'getPrice',
@@ -99,7 +99,7 @@ protected function setUp()
         $this->storeMock = $this->getMock(\Magento\Store\Model\Store::class, [], [], '', false);
         $this->taxHelper = $this->getMock(\Magento\Tax\Helper\Data::class, [], [], '', false);
 
-        $this->converter = $objectManager->getObject(
+        $this->converter = $objectManager->getObject(
             \Magento\Quote\Model\Cart\ShippingMethodConverter::class,
             [
                 'shippingMethodDataFactory' => $this->shippingMethodDataFactoryMock,
diff --git a/app/code/Magento/Quote/Test/Unit/Model/CouponManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/CouponManagementTest.php
index ebec370bfa11d..7720de543e4ea 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/CouponManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/CouponManagementTest.php
@@ -42,7 +42,7 @@ protected function setUp()
     {
         $this->quoteRepositoryMock = $this->getMock(\Magento\Quote\Api\CartRepositoryInterface::class);
         $this->storeMock = $this->getMock(\Magento\Store\Model\Store::class, [], [], '', false);
-        $this->quoteMock = $this->getMock(
+        $this->quoteMock = $this->getMock(
             \Magento\Quote\Model\Quote::class,
             [
                 'getItemsCount',
@@ -57,7 +57,7 @@ protected function setUp()
             '',
             false
         );
-        $this->quoteAddressMock = $this->getMock(
+        $this->quoteAddressMock = $this->getMock(
             \Magento\Quote\Model\Quote\Address::class,
             [
                 'setCollectShippingRates',
@@ -84,7 +84,6 @@ public function testGetCoupon()
             ->with($cartId)
             ->will($this->returnValue($quoteMock));
 
-
         $this->assertEquals($couponCode, $this->couponManagement->get($cartId));
     }
 
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php
index fd4a5a5f9a8a3..dc4017809e8a8 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php
@@ -270,6 +270,5 @@ protected function freeShippingAssertions()
         $this->cartItem->expects($this->atLeastOnce())
             ->method('getFreeShipping')
             ->willReturn(true);
-
     }
 }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Payment/ToOrderPaymentTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Payment/ToOrderPaymentTest.php
index 0c2804a3a5eb8..355b2446030b7 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Payment/ToOrderPaymentTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Payment/ToOrderPaymentTest.php
@@ -43,7 +43,7 @@ class ToOrderPaymentTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->paymentMock = $this->getMock(
+        $this->paymentMock = $this->getMock(
             \Magento\Quote\Model\Quote\Payment::class,
             ['getCcNumber', 'getCcCid', 'getMethodInstance', 'getAdditionalInformation'],
             [],
@@ -51,7 +51,7 @@ protected function setUp()
             false
         );
         $this->objectCopyMock = $this->getMock(\Magento\Framework\DataObject\Copy::class, [], [], '', false);
-        $this->orderPaymentRepositoryMock = $this->getMockForAbstractClass(
+        $this->orderPaymentRepositoryMock = $this->getMockForAbstractClass(
             \Magento\Sales\Api\OrderPaymentRepositoryInterface::class,
             [],
             '',
@@ -60,7 +60,7 @@ protected function setUp()
         );
         $this->dataObjectHelper = $this->getMock(\Magento\Framework\Api\DataObjectHelper::class, [], [], '', false);
         $objectManager = new ObjectManager($this);
-        $this->converter = $objectManager->getObject(
+        $this->converter = $objectManager->getObject(
             \Magento\Quote\Model\Quote\Payment\ToOrderPayment::class,
             [
                 'orderPaymentRepository' => $this->orderPaymentRepositoryMock,
@@ -102,7 +102,7 @@ public function testConvert()
             ->method('getCcCid')
             ->willReturn($ccCid);
 
-        $orderPayment = $this->getMockForAbstractClass(
+        $orderPayment = $this->getMockForAbstractClass(
             \Magento\Sales\Api\Data\OrderPaymentInterface::class,
             [],
             '',
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
index 635c3a011098f..8dc1a002a46f7 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php
@@ -280,7 +280,6 @@ protected function setUp()
         $this->quoteIdMock = $this->getMock(\Magento\Quote\Model\QuoteIdMask::class, [], [], '', false);
         $quoteIdFactoryMock = $this->getMock(\Magento\Quote\Model\QuoteIdMaskFactory::class, ['create'], [], '', false);
         $this->setPropertyValue($this->model, 'quoteIdMaskFactory', $quoteIdFactoryMock);
-
     }
 
     public function testCreateEmptyCartAnonymous()
diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php
index 9dbcc5095c5e1..17c1100404871 100644
--- a/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Observer/Backend/CustomerQuoteObserverTest.php
@@ -58,7 +58,7 @@ protected function setUp()
             ->getMock();
         $this->observerMock->expects($this->any())->method('getEvent')->will($this->returnValue($this->eventMock));
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->customerQuote = $objectManager->getObject(
+        $this->customerQuote = $objectManager->getObject(
             \Magento\Quote\Observer\Backend\CustomerQuoteObserver::class,
             [
                 'storeManager' => $this->storeManagerMock,
@@ -129,7 +129,7 @@ public function testDispatch($isWebsiteScope, $websites)
             ->method('getCustomerDataObject')
             ->will($this->returnValue($customerDataObjectMock));
         /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\Quote $quoteMock */
-        $quoteMock = $this->getMockBuilder(
+        $quoteMock = $this->getMockBuilder(
             \Magento\Quote\Model\Quote::class
         )->setMethods(
                 [
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
index 1c6087355f9d9..0fca10b4225f0 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshLifetime.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Statistics;
 
-
 class RefreshLifetime extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
 {
     /**
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
index 40dcbd0863664..1f20ee50e7019 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics/RefreshRecent.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\Reports\Controller\Adminhtml\Report\Statistics;
 
-
 class RefreshRecent extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
 {
     /**
diff --git a/app/code/Magento/Reports/Observer/EventSaver.php b/app/code/Magento/Reports/Observer/EventSaver.php
index fac439bbfe6f9..f1764597e4428 100644
--- a/app/code/Magento/Reports/Observer/EventSaver.php
+++ b/app/code/Magento/Reports/Observer/EventSaver.php
@@ -47,6 +47,7 @@ public function __construct(
         $this->_customerSession = $customerSession;
         $this->_customerVisitor = $customerVisitor;
     }
+
     /**
      * Save event
      *
diff --git a/app/code/Magento/Reports/Setup/InstallSchema.php b/app/code/Magento/Reports/Setup/InstallSchema.php
index c8ef39f551522..71717cab29827 100644
--- a/app/code/Magento/Reports/Setup/InstallSchema.php
+++ b/app/code/Magento/Reports/Setup/InstallSchema.php
@@ -874,6 +874,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
          * Prepare database for tables install
          */
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php
index 964dc5eb05e68..f213d9bcaf25d 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php
@@ -105,7 +105,6 @@ public function testUpdateCustomerTypeWithoutType()
             ->method('update');
 
         $this->event->updateCustomerType($eventMock, 1, 1);
-
     }
 
     /**
@@ -121,7 +120,6 @@ public function testUpdateCustomerTypeWithType()
             ->method('update');
 
         $this->event->updateCustomerType($eventMock, 1, 1, ['type']);
-
     }
 
     /**
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
index 0017862d847d7..18d40490bc684 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
@@ -33,7 +33,9 @@ require([
         }
 
         if (jQuery('#filter_form').valid()) {
-            setLocation('<?php /* @escapeNotVerified */ echo $block->getFilterUrl(); ?>filter/'+Base64.encode(Form.serializeElements(elements))+'/');
+            setLocation('<?php /* @escapeNotVerified */ echo $block->getFilterUrl();?>filter/'+
+                Base64.encode(Form.serializeElements(elements))+'/'
+            );
         }
     }
 //]]>
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
index b28883ee92eef..ffd7265a58e03 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit/Tab/Form.php
@@ -242,7 +242,8 @@ protected function initFieldset($formId, array $config)
         if (!isset($this->fieldset[$formId])) {
             if (!$this->getForm()->getElement($formId)) {
                 $this->fieldset[$formId] = $this->getForm()->addFieldset($formId, $config);
-            } elseif ($this->getForm()->getElement($formId));
+            } elseif ($this->getForm()->getElement($formId)) {
+            }
         }
     }
 
diff --git a/app/code/Magento/Review/Controller/Customer/View.php b/app/code/Magento/Review/Controller/Customer/View.php
index a3602216269d6..a5168105acfa8 100644
--- a/app/code/Magento/Review/Controller/Customer/View.php
+++ b/app/code/Magento/Review/Controller/Customer/View.php
@@ -31,6 +31,7 @@ public function __construct(
         $this->reviewFactory = $reviewFactory;
         parent::__construct($context, $customerSession);
     }
+
     /**
      * Render review details
      *
diff --git a/app/code/Magento/Review/Setup/InstallData.php b/app/code/Magento/Review/Setup/InstallData.php
index 3977116843bf9..0cc6cd7b9d988 100644
--- a/app/code/Magento/Review/Setup/InstallData.php
+++ b/app/code/Magento/Review/Setup/InstallData.php
@@ -72,6 +72,5 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
                 $installer->getConnection()->insertMultiple($installer->getTable('rating_option'), $optionData);
             }
         }
-        
     }
 }
diff --git a/app/code/Magento/Review/Setup/InstallSchema.php b/app/code/Magento/Review/Setup/InstallSchema.php
index b700aef7c728a..eae6c4c6e1f6c 100644
--- a/app/code/Magento/Review/Setup/InstallSchema.php
+++ b/app/code/Magento/Review/Setup/InstallSchema.php
@@ -746,6 +746,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $setup->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Review/Test/Unit/Controller/Adminhtml/Product/PostTest.php b/app/code/Magento/Review/Test/Unit/Controller/Adminhtml/Product/PostTest.php
index f3d3725a31034..93e335a5360a8 100644
--- a/app/code/Magento/Review/Test/Unit/Controller/Adminhtml/Product/PostTest.php
+++ b/app/code/Magento/Review/Test/Unit/Controller/Adminhtml/Product/PostTest.php
@@ -94,7 +94,6 @@ protected function setUp()
                 'context' => $this->context
             ]
         );
-
     }
 
     /**
diff --git a/app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/CollectionTest.php b/app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/CollectionTest.php
index 66b9438f30b0f..1332512ae6cff 100644
--- a/app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/CollectionTest.php
+++ b/app/code/Magento/Review/Test/Unit/Model/ResourceModel/Review/CollectionTest.php
@@ -76,7 +76,6 @@ protected function setUp()
                 'resource' => $this->resourceMock,
             ]
         );
-
     }
 
     public function testInitSelect()
diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssManagerTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssManagerTest.php
index 4f76a02df00b9..df26beeb2576c 100644
--- a/app/code/Magento/Rss/Test/Unit/Model/RssManagerTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Model/RssManagerTest.php
@@ -27,7 +27,7 @@ protected function setUp()
         $this->objectManager = $this->getMock(\Magento\Framework\ObjectManagerInterface::class);
 
         $objectManagerHelper = new ObjectManagerHelper($this);
-        $this->rssManager = $objectManagerHelper->getObject(
+        $this->rssManager = $objectManagerHelper->getObject(
             \Magento\Rss\Model\RssManager::class,
             [
                 'objectManager' => $this->objectManager,
@@ -44,7 +44,7 @@ public function testGetProvider()
         $dataProvider = $this->getMock(\Magento\Framework\App\Rss\DataProviderInterface::class);
         $this->objectManager->expects($this->once())->method('get')->will($this->returnValue($dataProvider));
 
-        $this->assertInstanceOf(
+        $this->assertInstanceOf(
              \Magento\Framework\App\Rss\DataProviderInterface::class,
              $this->rssManager->getProvider('rss_feed')
         );
diff --git a/app/code/Magento/Rss/Test/Unit/Model/UrlBuilderTest.php b/app/code/Magento/Rss/Test/Unit/Model/UrlBuilderTest.php
index 6ab5e344b47b0..6a7d55e709855 100644
--- a/app/code/Magento/Rss/Test/Unit/Model/UrlBuilderTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Model/UrlBuilderTest.php
@@ -37,7 +37,7 @@ protected function setUp()
         $this->scopeConfigInterface = $this->getMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
 
         $objectManagerHelper = new ObjectManagerHelper($this);
-        $this->urlBuilder = $objectManagerHelper->getObject(
+        $this->urlBuilder = $objectManagerHelper->getObject(
             \Magento\Rss\Model\UrlBuilder::class,
             [
                 'urlBuilder' => $this->urlInterface,
diff --git a/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php b/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php
index e68e791cd9085..003d8905ecdb1 100644
--- a/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php
+++ b/app/code/Magento/Sales/Api/Data/CreditmemoInterface.php
@@ -491,6 +491,7 @@ public function getOrderId();
      * @return int|null Credit memo shipping address ID.
      */
     public function getShippingAddressId();
+
     /**
      * Gets the credit memo shipping amount.
      *
diff --git a/app/code/Magento/Sales/Api/Data/OrderAddressInterface.php b/app/code/Magento/Sales/Api/Data/OrderAddressInterface.php
index b84723839472c..fe31e7742c96b 100644
--- a/app/code/Magento/Sales/Api/Data/OrderAddressInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderAddressInterface.php
@@ -15,107 +15,132 @@
  */
 interface OrderAddressInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
-    /*
+    /**
      * Entity ID.
      */
     const ENTITY_ID = 'entity_id';
-    /*
+
+    /**
      * Parent ID.
      */
     const PARENT_ID = 'parent_id';
-    /*
+
+    /**
      * Customer address ID.
      */
     const CUSTOMER_ADDRESS_ID = 'customer_address_id';
-    /*
+
+    /**
      * Region ID.
      */
     const REGION_ID = 'region_id';
+
     /**
      * Region code.
      */
     const KEY_REGION_CODE = 'region_code';
-    /*
+
+    /**
      * Customer ID.
      */
     const CUSTOMER_ID  = 'customer_id';
-    /*
+
+    /**
      * Fax.
      */
     const FAX = 'fax';
-    /*
+
+    /**
      * Region.
      */
     const REGION = 'region';
-    /*
+
+    /**
      * Postal code.
      */
     const POSTCODE = 'postcode';
-    /*
+
+    /**
      * Last name.
      */
     const LASTNAME = 'lastname';
-    /*
+
+    /**
      * Street.
      */
     const STREET = 'street';
-    /*
+
+    /**
      * City.
      */
     const CITY = 'city';
-    /*
+
+    /**
      * Email address.
      */
     const EMAIL = 'email';
-    /*
+
+    /**
      * Telephone number.
      */
     const TELEPHONE = 'telephone';
-    /*
+
+    /**
      * Country ID.
      */
     const COUNTRY_ID = 'country_id';
-    /*
+
+    /**
      * First name.
      */
     const FIRSTNAME = 'firstname';
-    /*
+
+    /**
      * Address type.
      */
     const ADDRESS_TYPE = 'address_type';
-    /*
+
+    /**
      * Prefix.
      */
     const PREFIX = 'prefix';
-    /*
+
+    /**
      * Middle name.
      */
     const MIDDLENAME = 'middlename';
-    /*
+
+    /**
      * Suffix.
      */
     const SUFFIX = 'suffix';
-    /*
+
+    /**
      * Company.
      */
     const COMPANY = 'company';
-    /*
+
+    /**
      * Value-added tax (VAT) ID.
      */
     const VAT_ID = 'vat_id';
-    /*
+
+    /**
      * VAT-is-valid flag.
      */
     const VAT_IS_VALID = 'vat_is_valid';
-    /*
+
+    /**
      * VAT request ID.
      */
     const VAT_REQUEST_ID = 'vat_request_id';
-    /*
+
+    /**
      * VAT request date.
      */
     const VAT_REQUEST_DATE = 'vat_request_date';
-    /*
+
+    /**
      * VAT-request-success flag.
      */
     const VAT_REQUEST_SUCCESS = 'vat_request_success';
diff --git a/app/code/Magento/Sales/Api/Data/OrderItemInterface.php b/app/code/Magento/Sales/Api/Data/OrderItemInterface.php
index c2c5a45ab6eba..e183f37c4db8d 100644
--- a/app/code/Magento/Sales/Api/Data/OrderItemInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderItemInterface.php
@@ -397,7 +397,6 @@ interface OrderItemInterface extends \Magento\Framework\Api\ExtensibleDataInterf
      */
     const KEY_PRODUCT_OPTION = 'product_option';
 
-
     /**
      * Gets the additional data for the order item.
      *
diff --git a/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php b/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
index cb28a2e2c4661..61e644c27bc9e 100644
--- a/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
@@ -113,7 +113,7 @@ interface OrderPaymentInterface extends \Magento\Framework\Api\ExtensibleDataInt
     
     /**
      * Credit card SS start year.
-     * 
+     *
      * @deprecated unused constant
      */
     const CC_SS_START_YEAR = 'cc_ss_start_year';
@@ -160,7 +160,7 @@ interface OrderPaymentInterface extends \Magento\Framework\Api\ExtensibleDataInt
     
     /**
      * Credit card SS start month.
-     * 
+     *
      * @deprecated unused constant
      */
     const CC_SS_START_MONTH = 'cc_ss_start_month';
@@ -215,7 +215,7 @@ interface OrderPaymentInterface extends \Magento\Framework\Api\ExtensibleDataInt
     
     /**
      * Credit card SS issue.
-     * 
+     *
      * @deprecated unused constant
      */
     const CC_SS_ISSUE = 'cc_ss_issue';
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentItemCreationInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentItemCreationInterface.php
index 6af60bcfd8774..602b2c061b6c4 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentItemCreationInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentItemCreationInterface.php
@@ -13,8 +13,9 @@
  *
  * @api
  */
-interface ShipmentItemCreationInterface extends LineItemInterface,
-\Magento\Framework\Api\ExtensibleDataInterface
+interface ShipmentItemCreationInterface extends
+    LineItemInterface,
+    \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**
      * Retrieve existing extension attributes object or create a new one.
diff --git a/app/code/Magento/Sales/Api/Data/ShipmentItemInterface.php b/app/code/Magento/Sales/Api/Data/ShipmentItemInterface.php
index e139f69d2fb9e..f70dc6def4fce 100644
--- a/app/code/Magento/Sales/Api/Data/ShipmentItemInterface.php
+++ b/app/code/Magento/Sales/Api/Data/ShipmentItemInterface.php
@@ -12,8 +12,9 @@
  * document lists the products and their quantities in the delivery package. A product is an item in a shipment.
  * @api
  */
-interface ShipmentItemInterface extends \Magento\Sales\Api\Data\LineItemInterface,
-\Magento\Framework\Api\ExtensibleDataInterface
+interface ShipmentItemInterface extends
+    \Magento\Sales\Api\Data\LineItemInterface,
+    \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**#@+
      * Constants for keys of data array. Identical to the name of the getter in snake case
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
index a920c43253678..2182159e6a427 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php
@@ -311,7 +311,7 @@ public static function sortHistoryByTimestamp($a, $b)
 
     /**
      * Get order admin date
-     * 
+     *
      * @param int $createdAt
      * @return \DateTime
      */
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
index 47bd80e5c0635..8cda05a011fb8 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
@@ -71,6 +71,7 @@ protected function getComponentRefererUrl()
     {
         return $this->filter->getComponentRefererUrl()?: 'sales/*/';
     }
+
     /**
      * Set status to collection items
      *
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/PrintAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/PrintAction.php
index a04e64425dc42..d6bb1e88fbe58 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/PrintAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/PrintAction.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
-
 class PrintAction extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\PrintAction
 {
 }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php
index 9f01abc09069c..2df30d384f266 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/ReviewPayment.php
@@ -43,7 +43,7 @@ public function execute()
                         $order->getPayment()->update();
                         if ($order->getPayment()->getIsTransactionApproved()) {
                             $message = __('Transaction has been approved.');
-                        } else if ($order->getPayment()->getIsTransactionDenied()) {
+                        } elseif ($order->getPayment()->getIsTransactionDenied()) {
                             $message = __('Transaction has been voided/declined.');
                         } else {
                             $message = __('There is no update for the transaction.');
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 58b3b94b49c69..b1f8d966ec495 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -4343,5 +4343,6 @@ public function setShippingMethod($shippingMethod)
     {
         return $this->setData('shipping_method', $shippingMethod);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Address.php b/app/code/Magento/Sales/Model/Order/Address.php
index 2a065fd142da9..382064d11603d 100644
--- a/app/code/Magento/Sales/Model/Order/Address.php
+++ b/app/code/Magento/Sales/Model/Order/Address.php
@@ -88,7 +88,6 @@ public function __construct(
             $resourceCollection,
             $data
         );
-
     }
 
     /**
@@ -729,5 +728,6 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderAddressExten
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index 743cf53b5b528..de415fad20d8a 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -666,6 +666,7 @@ public function getComments()
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * Returns discount_description
      *
@@ -1523,5 +1524,6 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\CreditmemoExtensi
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
index a3b6d0fbd5e83..9880b59202a9b 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
@@ -222,5 +222,6 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
index 7d455ae60f3d2..a879113404b71 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
@@ -876,5 +876,6 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Validation/QuantityValidator.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Validation/QuantityValidator.php
index bf43803b66fd3..9ccfff17cfdb8 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Validation/QuantityValidator.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Validation/QuantityValidator.php
@@ -81,8 +81,7 @@ public function validate($entity)
             }
             $orderItem = $orderItemsById[$item->getOrderItemId()];
 
-            if (
-                !$this->canRefundItem($orderItem, $item->getQty(), $invoiceQtysRefundLimits) ||
+            if (!$this->canRefundItem($orderItem, $item->getQty(), $invoiceQtysRefundLimits) ||
                 !$this->isQtyAvailable($orderItem, $item->getQty())
             ) {
                 $messages[] =__(
@@ -129,8 +128,7 @@ private function getInvoiceQtysRefundLimits(CreditmemoInterface $creditmemo, Ord
             $invoiceQtysRefunded = [];
             $invoice = $this->invoiceRepository->get($creditmemo->getInvoiceId());
             foreach ($order->getCreditmemosCollection() as $createdCreditmemo) {
-                if (
-                    $createdCreditmemo->getState() != Creditmemo::STATE_CANCELED &&
+                if ($createdCreditmemo->getState() != Creditmemo::STATE_CANCELED &&
                     $createdCreditmemo->getInvoiceId() == $invoice->getId()
                 ) {
                     foreach ($createdCreditmemo->getAllItems() as $createdCreditmemoItem) {
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
index 4d32dd653d03f..c07153cf88f0d 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoDocumentFactory.php
@@ -99,7 +99,6 @@ private function attachComment(
             ->setIsCustomerNotified($appendComment);
         $creditmemo->setComments([$comment]);
         return $creditmemo;
-
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/Container.php b/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
index 51be933d6a859..ee67c5ffc331b 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
@@ -49,6 +49,7 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
         $this->storeManager = $storeManager;
     }
+
     /**
      * Return store configuration value
      *
diff --git a/app/code/Magento/Sales/Model/Order/Invoice.php b/app/code/Magento/Sales/Model/Order/Invoice.php
index a48addd7afe64..d7e69154dad7a 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice.php
@@ -1607,5 +1607,6 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\InvoiceExtensionI
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Comment.php b/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
index e749b7668358e..b04b3fca7c0eb 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
@@ -218,5 +218,6 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Item.php b/app/code/Magento/Sales/Model/Order/Invoice/Item.php
index 3b2d21302656e..8ea82d863d222 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Item.php
@@ -694,5 +694,6 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\InvoiceItemExtens
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Validation/CanRefund.php b/app/code/Magento/Sales/Model/Order/Invoice/Validation/CanRefund.php
index 3b5e420b00992..2149b5eb37f79 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Validation/CanRefund.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Validation/CanRefund.php
@@ -47,8 +47,7 @@ public function __construct(
      */
     public function validate($entity)
     {
-        if (
-            $entity->getState() == Invoice::STATE_PAID &&
+        if ($entity->getState() == Invoice::STATE_PAID &&
             $this->isGrandTotalEnoughToRefund($entity) &&
             $this->isPaymentAllowRefund($entity)
         ) {
diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
index eabf66fedcf9b..dbb9f3c1badb3 100644
--- a/app/code/Magento/Sales/Model/Order/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Item.php
@@ -2389,5 +2389,6 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderItemExtensio
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index 759ecbbdd2acd..a015e57af1d97 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -1419,6 +1419,7 @@ private function getOrderStateResolver()
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * Returns account_status
      *
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Repository.php b/app/code/Magento/Sales/Model/Order/Payment/Repository.php
index 665d082f79f27..cad2b71aeebba 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Repository.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Repository.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Sales\Model\Order\Payment;
 
-
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Sales\Api\OrderPaymentRepositoryInterface;
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
index 9f51e32d57a68..1b16edd055695 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction.php
@@ -814,6 +814,7 @@ protected function _verifyThisTransactionExists()
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * Returns transaction_id
      *
@@ -993,5 +994,6 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\TransactionExtens
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Builder.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Builder.php
index 92989782c583b..9344dc96b0f47 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Builder.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Builder.php
@@ -120,7 +120,6 @@ public function setTransactionId($transactionId)
         return $this;
     }
 
-
     /**
      * {@inheritdoc}
      */
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction/BuilderInterface.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction/BuilderInterface.php
index b3b9ec05ec93c..3682dc159defc 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction/BuilderInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction/BuilderInterface.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Sales\Model\Order\Payment\Transaction;
 
-
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 use Magento\Sales\Api\Data\TransactionInterface;
diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
index 1940edebf8337..8e51ce6077459 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -845,5 +845,6 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\ShipmentExtension
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Comment.php b/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
index 031cc1bc426a3..14d49250c389c 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
@@ -222,5 +222,6 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Item.php b/app/code/Magento/Sales/Model/Order/Shipment/Item.php
index 8c079a3d4c3c9..f5aa3fcab2b93 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Item.php
@@ -168,6 +168,7 @@ public function register()
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * Returns additional_data
      *
@@ -378,5 +379,6 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\ShipmentItemExten
     {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php b/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php
index 24315e5c79e7b..b3060c378e97e 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/ItemCreation.php
@@ -83,5 +83,6 @@ public function setExtensionAttributes(
         $this->extensionAttributes = $extensionAttributes;
         return $this;
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/Order/Status/History.php b/app/code/Magento/Sales/Model/Order/Status/History.php
index b8b9371823ad8..5b4775d8eb9c4 100644
--- a/app/code/Magento/Sales/Model/Order/Status/History.php
+++ b/app/code/Magento/Sales/Model/Order/Status/History.php
@@ -328,5 +328,6 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
index 10cbb175c70bc..1b527483dda1c 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
@@ -67,6 +67,7 @@ public function getGridTable()
     {
         return $this->getTable($this->gridTableName);
     }
+
     /**
      * Purge grid row
      *
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Attribute.php b/app/code/Magento/Sales/Model/ResourceModel/Attribute.php
index 1264bd721d00a..5b20ec7574158 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Attribute.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Attribute.php
@@ -22,6 +22,7 @@ class Attribute
      * @var \Magento\Framework\DB\Adapter\AdapterInterface
      */
     protected $connection;
+
     /**
      * @var \Magento\Framework\Event\ManagerInterface
      */
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Relation.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Relation.php
index 1cf21456bbcd2..225ad52a3829e 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Relation.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Relation.php
@@ -86,7 +86,6 @@ public function processRelation(\Magento\Framework\Model\AbstractModel $object)
                 $statusHistory->setParentId($object->getId());
                 $statusHistory->setOrder($object);
                 $this->orderStatusHistoryResource->save($statusHistory);
-
             }
         }
         if (null !== $object->getRelatedObjects()) {
diff --git a/app/code/Magento/Sales/Setup/InstallSchema.php b/app/code/Magento/Sales/Setup/InstallSchema.php
index 6b0b27739ca15..bba787c2a05c6 100644
--- a/app/code/Magento/Sales/Setup/InstallSchema.php
+++ b/app/code/Magento/Sales/Setup/InstallSchema.php
@@ -5569,6 +5569,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Sales/Setup/SalesSetup.php b/app/code/Magento/Sales/Setup/SalesSetup.php
index 3227688beba2c..c36b82897f23b 100644
--- a/app/code/Magento/Sales/Setup/SalesSetup.php
+++ b/app/code/Magento/Sales/Setup/SalesSetup.php
@@ -58,7 +58,7 @@ class SalesSetup extends EavSetup
 
     /**
      * Constructor
-     * 
+     *
      * @param ModuleDataSetupInterface $setup
      * @param Context $context
      * @param CacheInterface $cache
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php
index 65271b09fbd48..88a17e5dcf130 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/Items/GridTest.php
@@ -442,5 +442,4 @@ public function getSubtotalWithDiscountDataProvider()
         ];
         return $result;
     }
-
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/TotalsTest.php b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/TotalsTest.php
index a4e4661c87c00..348775046c121 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/TotalsTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Create/TotalsTest.php
@@ -39,10 +39,10 @@ protected function setUp()
     {
         $this->objectManager = new ObjectManager($this);
 
-        $this->quoteMock = $this->getMock(
+        $this->quoteMock = $this->getMock(
             \Magento\Quote\Model\Quote::class, ['getCustomerNoteNotify'], [], '', false
         );
-        $this->sessionQuoteMock = $this->getMock(
+        $this->sessionQuoteMock = $this->getMock(
             \Magento\Backend\Model\Session\Quote::class, [], [], '', false
         );
 
@@ -50,7 +50,7 @@ protected function setUp()
             ->method('getQuote')
             ->willReturn($this->quoteMock);
 
-        $this->totals = $this->objectManager->getObject(
+        $this->totals = $this->objectManager->getObject(
             \Magento\Sales\Block\Adminhtml\Order\Create\Totals::class,
             [
                 'sessionQuote' => $this->sessionQuoteMock
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Order/Email/Items/DefaultItemsTest.php b/app/code/Magento/Sales/Test/Unit/Block/Order/Email/Items/DefaultItemsTest.php
index 71ad58663f5c1..105412da2cc2c 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Order/Email/Items/DefaultItemsTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Order/Email/Items/DefaultItemsTest.php
@@ -45,10 +45,10 @@ protected function setUp()
             ->setMethods(['getBlock'])
             ->getMock();
 
-        $this->block = $this->objectManager->getObject(
+        $this->block = $this->objectManager->getObject(
             \Magento\Sales\Block\Order\Email\Items\DefaultItems::class,
             [
-                'context' => $this->objectManager->getObject(
+                'context' => $this->objectManager->getObject(
                     \Magento\Backend\Block\Template\Context::class,
                         ['layout' => $this->layoutMock]
                     )
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Order/Email/Items/Order/DefaultOrderTest.php b/app/code/Magento/Sales/Test/Unit/Block/Order/Email/Items/Order/DefaultOrderTest.php
index 6818dd20145bf..22fd807a53ac0 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Order/Email/Items/Order/DefaultOrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Order/Email/Items/Order/DefaultOrderTest.php
@@ -45,10 +45,10 @@ protected function setUp()
             ->setMethods(['getBlock'])
             ->getMock();
 
-        $this->block = $this->objectManager->getObject(
+        $this->block = $this->objectManager->getObject(
             \Magento\Sales\Block\Order\Email\Items\Order\DefaultOrder::class,
             [
-                'context' => $this->objectManager->getObject(
+                'context' => $this->objectManager->getObject(
                     \Magento\Backend\Block\Template\Context::class,
                         ['layout' => $this->layoutMock]
                     )
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Order/Item/Renderer/DefaultRendererTest.php b/app/code/Magento/Sales/Test/Unit/Block/Order/Item/Renderer/DefaultRendererTest.php
index 1c15d4a0c46eb..d8e733ffdac71 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Order/Item/Renderer/DefaultRendererTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Order/Item/Renderer/DefaultRendererTest.php
@@ -45,10 +45,10 @@ protected function setUp()
             ->setMethods(['getBlock'])
             ->getMock();
 
-        $this->block = $this->objectManager->getObject(
+        $this->block = $this->objectManager->getObject(
             \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer::class,
             [
-                'context' => $this->objectManager->getObject(
+                'context' => $this->objectManager->getObject(
                     \Magento\Backend\Block\Template\Context::class,
                         ['layout' => $this->layoutMock]
                     )
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CreditmemoLoaderTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CreditmemoLoaderTest.php
index f8fd5fd42d78f..f6b53e96727ba 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CreditmemoLoaderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/CreditmemoLoaderTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Test\Unit\Controller\Adminhtml\Order;
 
-
 /**
  * Class CreditmemoLoaderTest
  *
diff --git a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
index 08cfcc93a9380..959ff287032f0 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/AdminOrder/CreateTest.php
@@ -258,7 +258,6 @@ public function testSetAccountData()
             ->method('toFlatArray')
             ->willReturn(['group_id' => 1]);
 
-
         $quoteMock = $this->getMock(\Magento\Quote\Model\Quote::class, [], [], '', false);
         $quoteMock->expects($this->any())->method('getCustomer')->will($this->returnValue($customerMock));
         $quoteMock->expects($this->once())
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Grid/Child/CollectionUpdaterTest.php b/app/code/Magento/Sales/Test/Unit/Model/Grid/Child/CollectionUpdaterTest.php
index f316680e558dd..777ea046e53e9 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Grid/Child/CollectionUpdaterTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Grid/Child/CollectionUpdaterTest.php
@@ -31,7 +31,7 @@ protected function setUp()
 
     public function testUpdateIfOrderExists()
     {
-        $collectionMock = $this->getMock(
+        $collectionMock = $this->getMock(
             \Magento\Sales\Model\ResourceModel\Order\Payment\Transaction\Collection::class, [], [], '', false
         );
         $transactionMock = $this->getMock(\Magento\Sales\Model\Order\Payment\Transaction::class, [], [], '', false);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Grid/CollectionUpdaterTest.php b/app/code/Magento/Sales/Test/Unit/Model/Grid/CollectionUpdaterTest.php
index f7578b8f08551..859ca753712f0 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Grid/CollectionUpdaterTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Grid/CollectionUpdaterTest.php
@@ -31,7 +31,7 @@ protected function setUp()
 
     public function testUpdateIfOrderNotExists()
     {
-        $collectionMock = $this->getMock(
+        $collectionMock = $this->getMock(
             \Magento\Sales\Model\ResourceModel\Order\Payment\Transaction\Collection::class, [], [], '', false
         );
         $this->registryMock
@@ -50,7 +50,7 @@ public function testUpdateIfOrderNotExists()
 
     public function testUpdateIfOrderExists()
     {
-        $collectionMock = $this->getMock(
+        $collectionMock = $this->getMock(
             \Magento\Sales\Model\ResourceModel\Order\Payment\Transaction\Collection::class, [], [], '', false
         );
         $orderMock = $this->getMock(\Magento\Sales\Model\Order::class, [], [], '', false);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/ShippingTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/ShippingTest.php
index dc5c17bca0611..6d8f63959b177 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/ShippingTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/ShippingTest.php
@@ -58,7 +58,7 @@ function ($amount) {
 
         $this->taxConfig = $this->getMock(\Magento\Tax\Model\Config::class, [], [], '', false);
 
-        $this->shippingCollector = $objectManager->getObject(
+        $this->shippingCollector = $objectManager->getObject(
             \Magento\Sales\Model\Order\Creditmemo\Total\Shipping::class,
             [
                 'priceCurrency' => $priceCurrencyMock,
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php
index 7b0f9cb65bd86..7556fd44b5f24 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Total/TaxTest.php
@@ -43,7 +43,7 @@ protected function setUp()
         /** @var \Magento\Sales\Model\Order\Creditmemo\Total\Tax $model */
         $this->model = $this->objectManager->getObject(\Magento\Sales\Model\Order\Creditmemo\Total\Tax::class);
 
-        $this->order = $this->getMock(
+        $this->order = $this->getMock(
             \Magento\Sales\Model\Order::class,
             [
                 '__wakeup'
@@ -53,7 +53,7 @@ protected function setUp()
             false
         );
 
-        $this->invoice = $this->getMock(
+        $this->invoice = $this->getMock(
             \Magento\Sales\Model\Order\Invoice::class,
             [
                 '__wakeup',
@@ -63,7 +63,7 @@ protected function setUp()
             false
         );
 
-        $this->creditmemo = $this->getMock(
+        $this->creditmemo = $this->getMock(
             \Magento\Sales\Model\Order\Creditmemo::class,
             [
                 'getAllItems',
@@ -631,7 +631,7 @@ public function collectDataProvider()
     protected function getCreditmemoItem($creditmemoItemData)
     {
         /** @var \Magento\Sales\Model\Order\Item|\PHPUnit_Framework_MockObject_MockObject $orderItem */
-        $orderItem = $this->getMock(
+        $orderItem = $this->getMock(
             \Magento\Sales\Model\Order\Item::class,
             [
                 'isDummy',
@@ -646,7 +646,7 @@ protected function getCreditmemoItem($creditmemoItemData)
         }
 
         /** @var \Magento\Sales\Model\Order\Creditmemo\Item|\PHPUnit_Framework_MockObject_MockObject $creditmemoItem */
-        $creditmemoItem = $this->getMock(
+        $creditmemoItem = $this->getMock(
             \Magento\Sales\Model\Order\Creditmemo\Item::class,
             [
                 'getOrderItem',
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
index 803d88538b4aa..375870c5efffc 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
@@ -172,7 +172,6 @@ public function stepAddressFormat($billingAddress, $isVirtual = false)
                 ->method('getShippingAddress')
                 ->will($this->returnValue($billingAddress));
         }
-
     }
 
     public function stepSendWithoutSendCopy()
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Total/TaxTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Total/TaxTest.php
index 9407a91b4dce0..9889d68fdba82 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Total/TaxTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Total/TaxTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Invoice\Total;
 
-
 class TaxTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/RepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/RepositoryTest.php
index b18d09cc7f059..83f43e2ab077d 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/RepositoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/RepositoryTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Sales\Test\Unit\Model\Order\Payment;
 
-
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/ManagerTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/ManagerTest.php
index e4aa14a3cf127..1c60def117e81 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/ManagerTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/ManagerTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Sales\Test\Unit\Model\Order\Payment\Transaction;
 
-
 use Magento\Sales\Model\Order\Payment\Transaction;
 
 /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php
index e860a6262076f..70ff338ec3cca 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/Transaction/RepositoryTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Sales\Test\Unit\Model\Order\Payment\Transaction;
 
-
 use Magento\Sales\Model\Order\Payment\Transaction;
 
 /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
index f38bc862bd8bd..116a27b717fd5 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/OrderTest.php
@@ -701,8 +701,8 @@ public function testCanVoidPayment($actionFlags, $orderState)
             $canVoidOrder = false;
         }
         if ($orderState == \Magento\Sales\Model\Order::STATE_HOLDED && (!isset(
-                    $actionFlags[\Magento\Sales\Model\Order::ACTION_FLAG_UNHOLD]
-                ) || $actionFlags[\Magento\Sales\Model\Order::ACTION_FLAG_UNHOLD] !== false)
+            $actionFlags[\Magento\Sales\Model\Order::ACTION_FLAG_UNHOLD]
+        ) || $actionFlags[\Magento\Sales\Model\Order::ACTION_FLAG_UNHOLD] !== false)
         ) {
             $canVoidOrder = false;
         }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/GridPoolTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/GridPoolTest.php
index f9b09260c459d..389c024ac5bd5 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/GridPoolTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/GridPoolTest.php
@@ -43,16 +43,16 @@ class GridPoolTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->orderGridMock = $this->getMock(
+        $this->orderGridMock = $this->getMock(
             \Magento\Sales\Model\ResourceModel\Grid::class, [], [], '', false
         );
-        $this->invoiceGridMock = $this->getMock(
+        $this->invoiceGridMock = $this->getMock(
             \Magento\Sales\Model\ResourceModel\Grid::class, [], [], '', false
         );
-        $this->shipmentGridMock = $this->getMock(
+        $this->shipmentGridMock = $this->getMock(
             \Magento\Sales\Model\ResourceModel\Grid::class, [], [], '', false
         );
-        $this->creditmemoGridMock = $this->getMock(
+        $this->creditmemoGridMock = $this->getMock(
             \Magento\Sales\Model\ResourceModel\Grid::class, [], [], '', false
         );
         $this->statementMock = $this->getMockForAbstractClass(\Zend_Db_Statement_Interface::class);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/StatusTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/StatusTest.php
index 27e2f30b0884f..abdcafddd3ee3 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/StatusTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/StatusTest.php
@@ -46,7 +46,7 @@ protected function setUp()
         $this->selectMock->expects($this->any())->method('from')->will($this->returnSelf());
         $this->selectMock->expects($this->any())->method('where');
 
-        $this->connectionMock = $this->getMock(
+        $this->connectionMock = $this->getMock(
             \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
             ['update', 'insertOnDuplicate'],
             [],
@@ -55,7 +55,7 @@ protected function setUp()
         );
         $this->connectionMock->expects($this->any())->method('select')->will($this->returnValue($this->selectMock));
 
-        $this->resourceMock = $this->getMock(
+        $this->resourceMock = $this->getMock(
             \Magento\Framework\App\ResourceConnection::class,
             [],
             [],
@@ -75,7 +75,7 @@ protected function setUp()
 
         $this->configMock = $this->getMock(\Magento\Eav\Model\Config::class, ['getConnectionName'], [], '', false);
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->model = $objectManager->getObject(
+        $this->model = $objectManager->getObject(
             \Magento\Sales\Model\ResourceModel\Order\Status::class,
             ['resource' => $this->resourceMock]
         );
diff --git a/app/code/Magento/Sales/Ui/Component/Control/PdfAction.php b/app/code/Magento/Sales/Ui/Component/Control/PdfAction.php
index 75b233f49a8d7..5a578ee0c93e2 100644
--- a/app/code/Magento/Sales/Ui/Component/Control/PdfAction.php
+++ b/app/code/Magento/Sales/Ui/Component/Control/PdfAction.php
@@ -14,7 +14,7 @@ class PdfAction extends Action
 {
     /**
      * Prepare
-     * 
+     *
      * @return void
      */
     public function prepare()
diff --git a/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnValidatorTest.php b/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnValidatorTest.php
index 52a00241054a5..fe8c1a40bc43f 100644
--- a/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnValidatorTest.php
+++ b/app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnValidatorTest.php
@@ -119,7 +119,6 @@ public function testValidationWithWrongOrderItems()
             $this->returnValidator->validate($returnToStockItems, $this->creditMemoMock),
             __('The return to stock argument contains product item that is not part of the original order.')
         );
-
     }
 
     public function dataProvider()
diff --git a/app/code/Magento/SalesRule/Api/Data/ConditionInterface.php b/app/code/Magento/SalesRule/Api/Data/ConditionInterface.php
index 329f786371693..59305c7d64b8d 100644
--- a/app/code/Magento/SalesRule/Api/Data/ConditionInterface.php
+++ b/app/code/Magento/SalesRule/Api/Data/ConditionInterface.php
@@ -28,7 +28,6 @@ public function getConditionType();
      */
     public function setConditionType($conditionType);
 
-
     /**
      * Return list of conditions
      *
diff --git a/app/code/Magento/SalesRule/Model/Coupon.php b/app/code/Magento/SalesRule/Model/Coupon.php
index ae5467a369708..725518699c24d 100644
--- a/app/code/Magento/SalesRule/Model/Coupon.php
+++ b/app/code/Magento/SalesRule/Model/Coupon.php
@@ -302,5 +302,6 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
     //@codeCoverageIgnoreEnd
 }
diff --git a/app/code/Magento/SalesRule/Model/Data/RuleLabel.php b/app/code/Magento/SalesRule/Model/Data/RuleLabel.php
index d6346930eeefe..59cd82cc23b2f 100644
--- a/app/code/Magento/SalesRule/Model/Data/RuleLabel.php
+++ b/app/code/Magento/SalesRule/Model/Data/RuleLabel.php
@@ -18,7 +18,6 @@ class RuleLabel extends \Magento\Framework\Api\AbstractExtensibleObject implemen
     const KEY_STORE_ID = 'store_id';
     const KEY_STORE_LABEL = 'store_label';
 
-
     /**
      * Get storeId
      *
diff --git a/app/code/Magento/SalesRule/Setup/InstallData.php b/app/code/Magento/SalesRule/Setup/InstallData.php
index 8008f1abd113f..b599ccff9c95b 100644
--- a/app/code/Magento/SalesRule/Setup/InstallData.php
+++ b/app/code/Magento/SalesRule/Setup/InstallData.php
@@ -41,6 +41,5 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
         $installer->doUpdateClassAliases();
         
         $setup->endSetup();
-        
     }
 }
diff --git a/app/code/Magento/SalesRule/Setup/InstallSchema.php b/app/code/Magento/SalesRule/Setup/InstallSchema.php
index bf1e180b0de6c..32e26eb1e2f21 100644
--- a/app/code/Magento/SalesRule/Setup/InstallSchema.php
+++ b/app/code/Magento/SalesRule/Setup/InstallSchema.php
@@ -790,6 +790,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Report/CollectionTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Report/CollectionTest.php
index f3782269afc8c..9cd2d68c22e68 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Report/CollectionTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/ResourceModel/Report/CollectionTest.php
@@ -57,7 +57,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->entityFactory = $this->getMock(
+        $this->entityFactory = $this->getMock(
             \Magento\Framework\Data\Collection\EntityFactory::class,
             [],
             [],
@@ -67,7 +67,7 @@ protected function setUp()
 
         $this->loggerMock = $this->getMock(\Psr\Log\LoggerInterface::class);
 
-        $this->fetchStrategy = $this->getMock(
+        $this->fetchStrategy = $this->getMock(
             \Magento\Framework\Data\Collection\Db\FetchStrategyInterface::class,
             [],
             [],
@@ -75,7 +75,7 @@ protected function setUp()
             false
         );
 
-        $this->eventManager = $this->getMock(
+        $this->eventManager = $this->getMock(
             \Magento\Framework\Event\ManagerInterface::class,
             [],
             [],
@@ -83,7 +83,7 @@ protected function setUp()
             false
         );
 
-        $this->reportResource = $this->getMock(
+        $this->reportResource = $this->getMock(
             \Magento\Sales\Model\ResourceModel\Report::class,
             ['getConnection', 'getMainTable'],
             [],
@@ -91,7 +91,7 @@ protected function setUp()
             false
         );
 
-        $this->connection = $this->getMock(
+        $this->connection = $this->getMock(
             \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
             ['select', 'getDateFormatSql', 'quoteInto'],
             [],
@@ -99,7 +99,7 @@ protected function setUp()
             false
         );
 
-        $this->selectMock = $this->getMock(
+        $this->selectMock = $this->getMock(
             \Magento\Framework\DB\Select::class,
             ['from', 'where', 'group'],
             [],
@@ -118,7 +118,7 @@ protected function setUp()
             ->method('getMainTable')
             ->will($this->returnValue('test_main_table'));
 
-        $this->ruleFactory = $this->getMock(
+        $this->ruleFactory = $this->getMock(
             \Magento\SalesRule\Model\ResourceModel\Report\RuleFactory::class,
             ['create'],
             [],
@@ -218,7 +218,7 @@ public function testApplyRulesFilterWithRulesList()
      */
     protected function getRuleMock()
     {
-        return $this->getMock(
+        return $this->getMock(
             \Magento\SalesRule\Model\ResourceModel\Report\Rule::class,
             ['getUniqRulesNamesList'],
             [],
diff --git a/app/code/Magento/SalesSequence/Model/Builder.php b/app/code/Magento/SalesSequence/Model/Builder.php
index 50218d3f59803..de0cd19a42d90 100644
--- a/app/code/Magento/SalesSequence/Model/Builder.php
+++ b/app/code/Magento/SalesSequence/Model/Builder.php
@@ -105,7 +105,6 @@ public function __construct(
         $this->data = array_flip($this->pattern);
     }
 
-
     /**
      * @param string $entityType
      * @return $this
diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
index 2702eef0c03f0..51af383629357 100644
--- a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
+++ b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php
@@ -151,7 +151,7 @@ private function getMemoryInBytes($value)
     {
         $unit = strtolower(substr($value, -1, 1));
         $value = (int) $value;
-        switch($unit) {
+        switch ($unit) {
             case 'g':
                 $value *= 1024 * 1024 * 1024;
                 break;
diff --git a/app/code/Magento/Search/Adapter/Query/Preprocessor/Synonyms.php b/app/code/Magento/Search/Adapter/Query/Preprocessor/Synonyms.php
index 92cdbc26cdd45..bd8a73c8b9e89 100644
--- a/app/code/Magento/Search/Adapter/Query/Preprocessor/Synonyms.php
+++ b/app/code/Magento/Search/Adapter/Query/Preprocessor/Synonyms.php
@@ -17,7 +17,7 @@ class Synonyms implements PreprocessorInterface
 
     /**
      * Constructor
-     * 
+     *
      * @param SynonymAnalyzerInterface $synonymsAnalyzer
      */
     public function __construct(SynonymAnalyzerInterface $synonymsAnalyzer)
diff --git a/app/code/Magento/Search/Block/Adminhtml/Synonyms.php b/app/code/Magento/Search/Block/Adminhtml/Synonyms.php
index 98bca0615155d..463266879821a 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Synonyms.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Synonyms.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Search\Block\Adminhtml;
 
-
 /**
  * Adminhtml synonym group content block
  */
diff --git a/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php b/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
index e88e0bc4d81be..d42f80a149931 100644
--- a/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
+++ b/app/code/Magento/Search/Model/ResourceModel/SynonymReader.php
@@ -116,10 +116,10 @@ private function getSynRowsPerScope($rows)
             if ($this->isSynRowForStoreView($row)) {
                 // Check for current store view
                 $synRowsForStoreView[] = $row;
-            } else if (empty($synRowsForStoreView) && $this->isSynRowForWebsite($row)) {
+            } elseif (empty($synRowsForStoreView) && $this->isSynRowForWebsite($row)) {
                 // Check for current website
                 $synRowsForWebsite[] = $row;
-            } else if (empty($synRowsForStoreView)
+            } elseif (empty($synRowsForStoreView)
                 && empty($synRowsForWebsite)
                 && $this->isSynRowForDefaultScope($row)) {
                 // Check for all store views (i.e. global/default config)
diff --git a/app/code/Magento/Search/Model/SearchEngine/MenuBuilder.php b/app/code/Magento/Search/Model/SearchEngine/MenuBuilder.php
index dd461a2e18739..04f2cb05193b0 100644
--- a/app/code/Magento/Search/Model/SearchEngine/MenuBuilder.php
+++ b/app/code/Magento/Search/Model/SearchEngine/MenuBuilder.php
@@ -61,7 +61,6 @@ public function afterGetResult(Builder $subject, Menu $menu)
         if (!$this->searchFeatureConfig
             ->isFeatureSupported(ConfigInterface::SEARCH_ENGINE_FEATURE_SYNONYMS, $searchEngine)
         ) {
-
             // "Search Synonyms" feature is not supported by the current configured search engine.
             // Menu will be updated to remove it from the list
             $menu->remove(self::SEARCH_SYNONYMS_MENU_ITEM_ID);
diff --git a/app/code/Magento/Search/Model/SynonymGroupRepository.php b/app/code/Magento/Search/Model/SynonymGroupRepository.php
index 8bb0f6669c649..e526cbc6ae8cf 100644
--- a/app/code/Magento/Search/Model/SynonymGroupRepository.php
+++ b/app/code/Magento/Search/Model/SynonymGroupRepository.php
@@ -126,7 +126,6 @@ private function create(SynonymGroupInterface $synonymGroup, $errorOnMergeConfli
             $this->resourceModel->save($newSynonymGroupModel);
             $synonymGroup->setSynonymGroup($newSynonymGroupModel->getSynonymGroup());
             $synonymGroup->setGroupId($newSynonymGroupModel->getGroupId());
-
         } else {
             // no merge conflict, perform simple insert
             /** @var SynonymGroup $synonymGroupModel */
diff --git a/app/code/Magento/Search/Setup/InstallSchema.php b/app/code/Magento/Search/Setup/InstallSchema.php
index 6c289df3154d0..b8d2315b92ee9 100644
--- a/app/code/Magento/Search/Setup/InstallSchema.php
+++ b/app/code/Magento/Search/Setup/InstallSchema.php
@@ -134,6 +134,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Search/Setup/UpgradeSchema.php b/app/code/Magento/Search/Setup/UpgradeSchema.php
index b816c660ca9e0..4ede89000d183 100644
--- a/app/code/Magento/Search/Setup/UpgradeSchema.php
+++ b/app/code/Magento/Search/Setup/UpgradeSchema.php
@@ -94,7 +94,6 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
         }
 
         if (version_compare($context->getVersion(), '2.0.3') < 0) {
-
             // Drop and recreate 'search_synonyms' table
             $connection->dropTable($installer->getTable('search_synonyms'));
 
diff --git a/app/code/Magento/Search/Ui/Component/Listing/Column/Scope/Options.php b/app/code/Magento/Search/Ui/Component/Listing/Column/Scope/Options.php
index f1f8ba6c80466..3f72844d6d610 100644
--- a/app/code/Magento/Search/Ui/Component/Listing/Column/Scope/Options.php
+++ b/app/code/Magento/Search/Ui/Component/Listing/Column/Scope/Options.php
@@ -117,6 +117,5 @@ protected function generateCurrentOptions()
             $this->currentOptions[$name]['label'] = $name;
             $this->currentOptions[$name]['value'] = array_values($groups);
         }
-
     }
 }
diff --git a/app/code/Magento/Security/Model/Plugin/AuthSession.php b/app/code/Magento/Security/Model/Plugin/AuthSession.php
index 6b74801121c1e..87edee9f7cd17 100644
--- a/app/code/Magento/Security/Model/Plugin/AuthSession.php
+++ b/app/code/Magento/Security/Model/Plugin/AuthSession.php
@@ -81,7 +81,7 @@ private function addUserLogoutNotification()
             $this->securityCookie->setLogoutReasonCookie(
                 $this->sessionsManager->getCurrentSession()->getStatus()
             );
-        } else if ($message = $this->sessionsManager->getLogoutReasonMessage()) {
+        } elseif ($message = $this->sessionsManager->getLogoutReasonMessage()) {
             $this->messageManager->addError($message);
         }
 
diff --git a/app/code/Magento/SendFriend/Setup/InstallSchema.php b/app/code/Magento/SendFriend/Setup/InstallSchema.php
index 8df7eb5d5b507..630aa0d783c65 100644
--- a/app/code/Magento/SendFriend/Setup/InstallSchema.php
+++ b/app/code/Magento/SendFriend/Setup/InstallSchema.php
@@ -62,6 +62,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Shipping/Model/Simplexml/Element.php b/app/code/Magento/Shipping/Model/Simplexml/Element.php
index 97eb8d9c80983..780023c739d75 100644
--- a/app/code/Magento/Shipping/Model/Simplexml/Element.php
+++ b/app/code/Magento/Shipping/Model/Simplexml/Element.php
@@ -21,7 +21,7 @@ class Element extends \Magento\Framework\Simplexml\Element
      */
     public function addAttribute($name, $value = null, $namespace = null)
     {
-        if (!is_null($value)) {
+        if ($value !== null) {
             $value = $this->xmlentities($value);
         }
         parent::addAttribute($name, $value, $namespace);
@@ -37,7 +37,7 @@ public function addAttribute($name, $value = null, $namespace = null)
      */
     public function addChild($name, $value = null, $namespace = null)
     {
-        if (!is_null($value)) {
+        if ($value !== null) {
             $value = $this->xmlentities($value);
         }
         return parent::addChild($name, $value, $namespace);
diff --git a/app/code/Magento/Shipping/Test/Unit/Model/ShipmentTest.php b/app/code/Magento/Shipping/Test/Unit/Model/ShipmentTest.php
index 0cefe944f0a6c..441691bc30ff7 100644
--- a/app/code/Magento/Shipping/Test/Unit/Model/ShipmentTest.php
+++ b/app/code/Magento/Shipping/Test/Unit/Model/ShipmentTest.php
@@ -28,7 +28,7 @@ class ShipmentTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->orderRepository = $this->getMock(
+        $this->orderRepository = $this->getMock(
             \Magento\Sales\Api\OrderRepositoryInterface::class,
             [],
             [],
@@ -40,32 +40,32 @@ protected function setUp()
         $arguments = [
             'context' => $this->getMock(\Magento\Framework\Model\Context::class, [], [], '', false),
             'registry' => $this->getMock(\Magento\Framework\Registry::class, [], [], '', false),
-            'localeDate' => $this->getMock(
+            'localeDate' => $this->getMock(
                 \Magento\Framework\Stdlib\DateTime\TimezoneInterface::class, [], [], '', false),
             'dateTime' => $this->getMock(\Magento\Framework\Stdlib\DateTime::class, [], [], '', false),
             'orderRepository' => $this->orderRepository,
-            'shipmentItemCollectionFactory' => $this->getMock(
+            'shipmentItemCollectionFactory' => $this->getMock(
                 \Magento\Sales\Model\ResourceModel\Order\Shipment\Item\CollectionFactory::class,
                     [],
                     [],
                     '',
                     false
                 ),
-            'trackCollectionFactory' => $this->getMock(
+            'trackCollectionFactory' => $this->getMock(
                 \Magento\Sales\Model\ResourceModel\Order\Shipment\Track\CollectionFactory::class,
                     [],
                     [],
                     '',
                     false
                 ),
-            'commentFactory' => $this->getMock(
+            'commentFactory' => $this->getMock(
                 \Magento\Sales\Model\Order\Shipment\CommentFactory::class,
                     [],
                     [],
                     '',
                     false
                 ),
-            'commentCollectionFactory' => $this->getMock(
+            'commentCollectionFactory' => $this->getMock(
                 \Magento\Sales\Model\ResourceModel\Order\Shipment\Comment\CollectionFactory::class,
                     [],
                     [],
@@ -73,7 +73,7 @@ protected function setUp()
                     false
                 ),
         ];
-        $this->shipment = $objectManagerHelper->getObject(
+        $this->shipment = $objectManagerHelper->getObject(
             \Magento\Sales\Model\Order\Shipment::class,
             $arguments
         );
@@ -84,7 +84,7 @@ public function testGetOrder()
         $orderId = 100000041;
         $this->shipment->setOrderId($orderId);
         $entityName = 'shipment';
-        $order = $this->getMock(
+        $order = $this->getMock(
             \Magento\Sales\Model\Order::class,
             ['load', 'setHistoryEntityName', '__wakeUp'],
             [],
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
index 087fbda42c1f1..40ae15623f4c1 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Generate.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
 
-
 class Generate extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
 {
     /**
diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/NewAction.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/NewAction.php
index 77f5931459314..437b702aa4483 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/NewAction.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/NewAction.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
 
-
 class NewAction extends \Magento\Sitemap\Controller\Adminhtml\Sitemap
 {
     /**
diff --git a/app/code/Magento/Sitemap/Setup/InstallSchema.php b/app/code/Magento/Sitemap/Setup/InstallSchema.php
index b01a3f435157b..65ec63f1b883d 100644
--- a/app/code/Magento/Sitemap/Setup/InstallSchema.php
+++ b/app/code/Magento/Sitemap/Setup/InstallSchema.php
@@ -81,6 +81,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Store/Api/Data/StoreInterface.php b/app/code/Magento/Store/Api/Data/StoreInterface.php
index d5b4c56da14e0..380e2b22d9794 100644
--- a/app/code/Magento/Store/Api/Data/StoreInterface.php
+++ b/app/code/Magento/Store/Api/Data/StoreInterface.php
@@ -36,14 +36,14 @@ public function setCode($code);
 
     /**
      * Retrieve store name
-     * 
+     *
      * @return string
      */
     public function getName();
 
     /**
      * Set store name
-     * 
+     *
      * @param string $name
      * @return $this
      */
diff --git a/app/code/Magento/Store/Api/Data/WebsiteInterface.php b/app/code/Magento/Store/Api/Data/WebsiteInterface.php
index 11a3012426959..b73fab7040bc7 100644
--- a/app/code/Magento/Store/Api/Data/WebsiteInterface.php
+++ b/app/code/Magento/Store/Api/Data/WebsiteInterface.php
@@ -36,14 +36,14 @@ public function setCode($code);
 
     /**
      * Rethreive website name
-     * 
+     *
      * @return string
      */
     public function getName();
 
     /**
      * Set website name
-     * 
+     *
      * @param string $name
      * @return $this
      */
diff --git a/app/code/Magento/Store/App/Response/Redirect.php b/app/code/Magento/Store/App/Response/Redirect.php
index 97420f58f12e4..144b591e6060e 100644
--- a/app/code/Magento/Store/App/Response/Redirect.php
+++ b/app/code/Magento/Store/App/Response/Redirect.php
@@ -257,8 +257,7 @@ protected function normalizeRefererQueryParts($refererQuery)
     {
         $store = $this->_storeManager->getStore();
 
-        if (
-            $store
+        if ($store
             && !empty($refererQuery[StoreResolverInterface::PARAM_NAME])
             && ($refererQuery[StoreResolverInterface::PARAM_NAME] !== $store->getCode())
         ) {
diff --git a/app/code/Magento/Store/Model/Config/StoreView.php b/app/code/Magento/Store/Model/Config/StoreView.php
index 4e8085a75f9a1..b8779ca423833 100644
--- a/app/code/Magento/Store/Model/Config/StoreView.php
+++ b/app/code/Magento/Store/Model/Config/StoreView.php
@@ -16,8 +16,10 @@ class StoreView
 {
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface */
     private $scopeConfig;
+
     /** @var \Magento\Store\Model\StoreManagerInterface */
     private $storeManager;
+
     /** @var \Magento\Framework\View\Design\Theme\ThemeProviderInterface */
     private $themeProvider;
 
diff --git a/app/code/Magento/Store/Model/Data/StoreConfig.php b/app/code/Magento/Store/Model/Data/StoreConfig.php
index ed789a8af65ad..c497d13befdd6 100644
--- a/app/code/Magento/Store/Model/Data/StoreConfig.php
+++ b/app/code/Magento/Store/Model/Data/StoreConfig.php
@@ -30,7 +30,6 @@ class StoreConfig extends \Magento\Framework\Api\AbstractExtensibleObject implem
     const KEY_SECURE_BASE_STATIC_URL = 'secure_base_static_url';
     const KEY_SECURE_BASE_MEDIA_URL = 'secure_base_media_url';
 
-
     /**
      * Get store id
      *
diff --git a/app/code/Magento/Store/Model/PathConfig.php b/app/code/Magento/Store/Model/PathConfig.php
index d5490bcf7ff63..9ffad227bfdee 100644
--- a/app/code/Magento/Store/Model/PathConfig.php
+++ b/app/code/Magento/Store/Model/PathConfig.php
@@ -9,8 +9,10 @@ class PathConfig implements \Magento\Framework\App\Router\PathConfigInterface
 {
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface */
     private $scopeConfig;
+
     /** @var \Magento\Framework\Url\SecurityInfoInterface */
     private $urlSecurityInfo;
+
     /** @var StoreManagerInterface */
     private $storeManager;
 
diff --git a/app/code/Magento/Store/Model/StoreManagement.php b/app/code/Magento/Store/Model/StoreManagement.php
index 273588276164f..eea9850013bb6 100644
--- a/app/code/Magento/Store/Model/StoreManagement.php
+++ b/app/code/Magento/Store/Model/StoreManagement.php
@@ -25,6 +25,7 @@ public function __construct(CollectionFactory $storesFactory)
     {
         $this->storesFactory = $storesFactory;
     }
+
     /**
      * {@inheritdoc}
      */
diff --git a/app/code/Magento/Store/Model/StoreResolver/ReaderList.php b/app/code/Magento/Store/Model/StoreResolver/ReaderList.php
index 44232be873bb5..42d6075b4f0a0 100644
--- a/app/code/Magento/Store/Model/StoreResolver/ReaderList.php
+++ b/app/code/Magento/Store/Model/StoreResolver/ReaderList.php
@@ -20,6 +20,7 @@ class ReaderList
     protected $resolverMap;
 
     // @codingStandardsIgnoreStart
+
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param array $resolverMap
@@ -35,6 +36,7 @@ public function __construct(
         $this->resolverMap = $resolverMap;
         $this->objectManager = $objectManager;
     }
+
     // @codingStandardsIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Store/Model/WebsiteManagement.php b/app/code/Magento/Store/Model/WebsiteManagement.php
index 2a22fc61deeb0..19cf5f08bd80b 100644
--- a/app/code/Magento/Store/Model/WebsiteManagement.php
+++ b/app/code/Magento/Store/Model/WebsiteManagement.php
@@ -25,6 +25,7 @@ public function __construct(CollectionFactory $websitesFactory)
     {
         $this->websitesFactory = $websitesFactory;
     }
+
     /**
      * {@inheritdoc}
      */
diff --git a/app/code/Magento/Store/Setup/InstallSchema.php b/app/code/Magento/Store/Setup/InstallSchema.php
index 8c7935d8d18ba..b77a472283f0d 100644
--- a/app/code/Magento/Store/Setup/InstallSchema.php
+++ b/app/code/Magento/Store/Setup/InstallSchema.php
@@ -312,6 +312,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         );
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
index 672622c78d6d4..7d870810d30c2 100644
--- a/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/StoreTest.php
@@ -198,7 +198,6 @@ public function testGetUrl()
         $defaultStore = $this->getMock(\Magento\Store\Model\Store::class, ['getId', '__wakeup'], [], '', false);
         $defaultStore->expects($this->atLeastOnce())->method('getId')->will($this->returnValue(5));
 
-
         $url = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
         $url->expects($this->atLeastOnce())->method('setScope')->will($this->returnSelf());
         $url->expects($this->atLeastOnce())->method('getUrl')
@@ -387,13 +386,11 @@ public function testGetCurrentUrl($secure, $url, $expected)
 
         $config = $this->getMockForAbstractClass(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
 
-
         $this->requestMock->expects($this->atLeastOnce())->method('getRequestString')->will($this->returnValue(''));
         $this->requestMock->expects($this->atLeastOnce())->method('getQueryValue')->will($this->returnValue([
             'SID' => 'sid'
         ]));
 
-
         $urlMock = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
         $urlMock->expects($this->atLeastOnce())->method('setScope')->will($this->returnSelf());
         $urlMock->expects($this->any())->method('getUrl')
diff --git a/app/code/Magento/Store/Ui/Component/Form/Fieldset/Websites.php b/app/code/Magento/Store/Ui/Component/Form/Fieldset/Websites.php
index 355c316b2bc92..23a677aa91f05 100644
--- a/app/code/Magento/Store/Ui/Component/Form/Fieldset/Websites.php
+++ b/app/code/Magento/Store/Ui/Component/Form/Fieldset/Websites.php
@@ -38,7 +38,6 @@ public function __construct(
     ) {
         parent::__construct($context, $components, $data);
         $this->storeManager = $storeManager;
-
     }
 
     /**
diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
index 50ab7894532b9..449192d233e24 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
@@ -244,8 +244,7 @@ protected function addSwatchDataForAttribute(
      */
     protected function addAdditionalMediaData(array $swatch, $optionId, array $attributeDataArray)
     {
-        if (
-            isset($attributeDataArray['use_product_image_for_swatch'])
+        if (isset($attributeDataArray['use_product_image_for_swatch'])
             && $attributeDataArray['use_product_image_for_swatch']
         ) {
             $variationMedia = $this->getVariationMedia($attributeDataArray['attribute_code'], $optionId);
diff --git a/app/code/Magento/Swatches/Helper/Media.php b/app/code/Magento/Swatches/Helper/Media.php
index 9356b2c13840d..b741006a0a23e 100644
--- a/app/code/Magento/Swatches/Helper/Media.php
+++ b/app/code/Magento/Swatches/Helper/Media.php
@@ -91,7 +91,6 @@ public function __construct(
         $this->imageFactory = $imageFactory;
         $this->themeCollection = $themeCollection;
         $this->viewConfig = $configInterface;
-
     }
 
     /**
diff --git a/app/code/Magento/Swatches/Model/Plugin/Configurable.php b/app/code/Magento/Swatches/Model/Plugin/Configurable.php
index b25358d7c86b4..40a75d965d782 100644
--- a/app/code/Magento/Swatches/Model/Plugin/Configurable.php
+++ b/app/code/Magento/Swatches/Model/Plugin/Configurable.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Swatches\Model\Plugin;
 
-
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProductType;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection;
 
@@ -56,8 +55,7 @@ public function afterGetUsedProductCollection(
             $entityType = $result->getEntity()->getType();
             foreach ($this->eavConfig->getEntityAttributeCodes($entityType) as $code) {
                 $attribute = $this->eavConfig->getAttribute($entityType, $code);
-                if (
-                    $attribute->getData('additional_data')
+                if ($attribute->getData('additional_data')
                     && (
                         $this->swatchHelper->isVisualSwatch($attribute) || $this->swatchHelper->isTextSwatch($attribute)
                     )
diff --git a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
index 602a4b4ce1198..5b42069169bbc 100644
--- a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
+++ b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
@@ -372,7 +372,6 @@ protected function saveSwatchData($swatch, $optionId, $storeId, $type, $value)
         if ($this->isSwatchExists) {
             $swatch->setData('type', $type);
             $swatch->setData('value', $value);
-
         } else {
             $swatch->setData('option_id', $optionId);
             $swatch->setData('store_id', $storeId);
@@ -398,8 +397,7 @@ protected function saveDefaultSwatchOptionValue(Attribute $attribute)
             /** @var \Magento\Swatches\Model\Swatch $swatch */
             $swatch = $this->swatchFactory->create();
             // created and removed on frontend option not exists in dependency array
-            if (
-                substr($defaultValue, 0, 6) == self::BASE_OPTION_TITLE &&
+            if (substr($defaultValue, 0, 6) == self::BASE_OPTION_TITLE &&
                 isset($this->dependencyArray[$defaultValue])
             ) {
                 $defaultValue = $this->dependencyArray[$defaultValue];
diff --git a/app/code/Magento/Swatches/Model/Plugin/ProductImage.php b/app/code/Magento/Swatches/Model/Plugin/ProductImage.php
index 225b63ec91ba7..70c56becf2838 100644
--- a/app/code/Magento/Swatches/Model/Plugin/ProductImage.php
+++ b/app/code/Magento/Swatches/Model/Plugin/ProductImage.php
@@ -39,7 +39,7 @@ class ProductImage
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\App\Request\Http $request
      */
-    public function __construct (
+    public function __construct(
         \Magento\Swatches\Helper\Data $swatchesHelperData,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\App\Request\Http $request
diff --git a/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php b/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php
index 2e80798d32b94..710f109633c0d 100644
--- a/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Controller/Adminhtml/Iframe/ShowTest.php
@@ -95,7 +95,6 @@ protected function setUp()
                 'uploaderFactory' => $this->uploaderFactoryMock,
             ]
         );
-
     }
 
     public function testExecuteException()
diff --git a/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php b/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
index aadb429d5ce34..f24bfc669d1f0 100644
--- a/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
@@ -438,7 +438,6 @@ protected function getUsedProducts(array $attributes)
 
         $this->configurableMock->expects($this->once())->method('getUsedProducts')->with($this->productMock)
             ->willReturn($simpleProducts);
-
     }
 
     protected function getAttributesFromConfigurable()
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php
index 2cd1fbb71df7d..d897f41bcfeb1 100644
--- a/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Model/Plugin/ConfigurableTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Swatches\Test\Unit\Model\Plugin;
 
-
 class ConfigurableTest extends \PHPUnit_Framework_TestCase
 {
     /** @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
diff --git a/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php b/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php
index f405457275320..7fe0be5d6d52f 100644
--- a/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Observer/AddFieldsToAttributeObserverTest.php
@@ -53,7 +53,6 @@ protected function setUp()
                 'yesNo' => $this->yesNoMock,
             ]
         );
-
     }
 
     /**
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
index dbed0abbc8ff2..9b858c8476637 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
@@ -3,6 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// @codingStandardsIgnoreFile
 //"swatchRenderer": {
 ?>
 <?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Configurable */ ?>
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index bc1b4b491b5bd..04dee20e0e3ce 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -289,7 +289,7 @@ protected function _prepareForm()
 
         $this->setChild(
             'form_after',
-            $this->getLayout()->createBlock(
+            $this->getLayout()->createBlock(
                  \Magento\Framework\View\Element\Template::class)->setTemplate('Magento_Tax::rate/js.phtml')
         );
 
diff --git a/app/code/Magento/Tax/Block/Item/Price/Renderer.php b/app/code/Magento/Tax/Block/Item/Price/Renderer.php
index 82dad0627a3f6..dc80f8115e1b0 100644
--- a/app/code/Magento/Tax/Block/Item/Price/Renderer.php
+++ b/app/code/Magento/Tax/Block/Item/Price/Renderer.php
@@ -110,6 +110,7 @@ public function getStoreId()
     {
         return $this->storeId;
     }
+
     /**
      * Get quote or order item
      *
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php
index 9776c0cb64dc9..fd06536de8971 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Index.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Rule;
 
-
 class Index extends \Magento\Tax\Controller\Adminhtml\Rule
 {
     /**
diff --git a/app/code/Magento/Tax/Model/Calculation.php b/app/code/Magento/Tax/Model/Calculation.php
index 27df9fd01cdfb..cfe23bc23f6d9 100644
--- a/app/code/Magento/Tax/Model/Calculation.php
+++ b/app/code/Magento/Tax/Model/Calculation.php
@@ -521,7 +521,6 @@ public function getRateRequest(
         ) {
             $basedOn = 'default';
         } else {
-
             if (($billingAddress === null || !$billingAddress->getCountryId())
                 && $basedOn == 'billing'
                 || ($shippingAddress === null || !$shippingAddress->getCountryId())
diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
index 31dfb6547c813..b5e548673b3a8 100644
--- a/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/AbstractCalculator.php
@@ -205,6 +205,7 @@ public function setCustomerId($customerId)
     {
         $this->customerId = $customerId;
     }
+
     // @codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Tax/Model/Calculation/Rate.php b/app/code/Magento/Tax/Model/Calculation/Rate.php
index d8bec3e00a755..0aec1585f295a 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rate.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rate.php
@@ -400,6 +400,7 @@ public function getZipIsRange()
     {
         return $this->getData(self::KEY_ZIP_IS_RANGE);
     }
+
     /**
      * Set country id
      *
@@ -509,6 +510,7 @@ public function setTitles(array $titles = null)
     {
         return $this->setData(self::KEY_TITLES, $titles);
     }
+
     // @codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Tax/Model/Calculation/Rate/Converter.php b/app/code/Magento/Tax/Model/Calculation/Rate/Converter.php
index 36a7595cadd85..3efcf8cffc9d8 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rate/Converter.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rate/Converter.php
@@ -33,6 +33,7 @@ public function __construct(
         $this->taxRateDataObjectFactory = $taxRateDataObjectFactory;
         $this->taxRateTitleDataObjectFactory = $taxRateTitleDataObjectFactory;
     }
+
     /**
      * Convert a tax rate data object to an array of associated titles
      *
@@ -109,7 +110,6 @@ public function createArrayFromServiceObject(
         return $taxRateFormData;
     }
 
-
     /**
      * Convert an array to a tax rate data object
      *
diff --git a/app/code/Magento/Tax/Model/Calculation/Rate/Title.php b/app/code/Magento/Tax/Model/Calculation/Rate/Title.php
index 69832938ce19b..a407ab7e10250 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rate/Title.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rate/Title.php
@@ -83,6 +83,7 @@ public function setValue($value)
     {
         return $this->setData(self::KEY_VALUE_ID, $value);
     }
+
     // @codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Tax/Model/Calculation/RateRepository.php b/app/code/Magento/Tax/Model/Calculation/RateRepository.php
index a6d7b50e2aa6a..4d15c7cca8973 100644
--- a/app/code/Magento/Tax/Model/Calculation/RateRepository.php
+++ b/app/code/Magento/Tax/Model/Calculation/RateRepository.php
@@ -181,7 +181,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
      * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @return void
-     * @deprecated 
+     * @deprecated
      * @throws \Magento\Framework\Exception\InputException
      */
     protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collection $collection)
@@ -201,7 +201,7 @@ protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collecti
     /**
      * Translates a field name to a DB column name for use in collection queries.
      *
-     * @deprecated 
+     * @deprecated
      * @param string $field a field name that should be translated to a DB column name.
      * @return string
      */
diff --git a/app/code/Magento/Tax/Model/Calculation/RowBaseCalculator.php b/app/code/Magento/Tax/Model/Calculation/RowBaseCalculator.php
index 9085aab9bcdf2..6de5f0438b87b 100644
--- a/app/code/Magento/Tax/Model/Calculation/RowBaseCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/RowBaseCalculator.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Tax\Model\Calculation;
 
-
 class RowBaseCalculator extends AbstractAggregateCalculator
 {
     /**
diff --git a/app/code/Magento/Tax/Model/Calculation/Rule.php b/app/code/Magento/Tax/Model/Calculation/Rule.php
index dc0284b424f54..6dec5c5dd726d 100644
--- a/app/code/Magento/Tax/Model/Calculation/Rule.php
+++ b/app/code/Magento/Tax/Model/Calculation/Rule.php
@@ -231,6 +231,7 @@ public function getPriority()
     {
         return $this->getData(self::KEY_PRIORITY);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Tax/Model/Calculation/TotalBaseCalculator.php b/app/code/Magento/Tax/Model/Calculation/TotalBaseCalculator.php
index da2bdeba24fb1..3694b962887de 100644
--- a/app/code/Magento/Tax/Model/Calculation/TotalBaseCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/TotalBaseCalculator.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Tax\Model\Calculation;
 
-
 class TotalBaseCalculator extends AbstractAggregateCalculator
 {
     /**
diff --git a/app/code/Magento/Tax/Model/ClassModel.php b/app/code/Magento/Tax/Model/ClassModel.php
index 83fa6218c06e4..b043cace22a72 100644
--- a/app/code/Magento/Tax/Model/ClassModel.php
+++ b/app/code/Magento/Tax/Model/ClassModel.php
@@ -186,6 +186,7 @@ public function setClassType($classType)
     {
         return $this->setData(self::KEY_TYPE, $classType);
     }
+
     //@codeCoverageIgnoreEnd
 
     /**
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Calculation.php b/app/code/Magento/Tax/Model/ResourceModel/Calculation.php
index 08769cebf62fe..b4da48b2ca8b6 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Calculation.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Calculation.php
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 /**
  * Tax Calculation Resource Model
  */
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
index 98a1f9b706469..6f41915b1d175 100755
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
@@ -250,7 +250,7 @@ public function mapQuoteExtraTaxables(
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
-    protected function processExtraTaxables(Address\Total $total, Array $itemsByType)
+    protected function processExtraTaxables(Address\Total $total, array $itemsByType)
     {
         $extraTaxableDetails = [];
         foreach ($itemsByType as $itemType => $itemTaxDetails) {
diff --git a/app/code/Magento/Tax/Test/Unit/Block/Adminhtml/Items/Price/RendererTest.php b/app/code/Magento/Tax/Test/Unit/Block/Adminhtml/Items/Price/RendererTest.php
index f0cbe12785f8d..06e278dab4285 100644
--- a/app/code/Magento/Tax/Test/Unit/Block/Adminhtml/Items/Price/RendererTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Block/Adminhtml/Items/Price/RendererTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Tax\Test\Unit\Block\Adminhtml\Items\Price;
 
-
 class RendererTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/app/code/Magento/Tax/Test/Unit/Block/Checkout/Shipping/PriceTest.php b/app/code/Magento/Tax/Test/Unit/Block/Checkout/Shipping/PriceTest.php
index 7d9cf86f33f14..2dbbb4517ea73 100644
--- a/app/code/Magento/Tax/Test/Unit/Block/Checkout/Shipping/PriceTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Block/Checkout/Shipping/PriceTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Tax\Test\Unit\Block\Checkout\Shipping;
 
-
 class PriceTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/app/code/Magento/Tax/Test/Unit/GetterSetterTest.php b/app/code/Magento/Tax/Test/Unit/GetterSetterTest.php
index 653bce33661c2..95a8f05d6b18b 100644
--- a/app/code/Magento/Tax/Test/Unit/GetterSetterTest.php
+++ b/app/code/Magento/Tax/Test/Unit/GetterSetterTest.php
@@ -34,7 +34,7 @@ public function testGettersSetters($className = null, $variables = null)
                     $variableValue = [$obj];
                     $variables[$variableName] = $variableValue;
                 }
-            } else if (strpos($variableValue, 'Magento') !== false) {
+            } elseif (strpos($variableValue, 'Magento') !== false) {
                 $obj = $objectManager->getObject($variableValue);
                 $variableValue = $obj;
                 $variables[$variableName] = $variableValue;
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
index 70914b194efde..1f4dfe7e405ae 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Calculation/RowBaseAndTotalBaseCalculatorTestCase.php
@@ -205,7 +205,6 @@ protected function initMockConfig()
      *
      * @param boolean $isTaxIncluded
      */
-
     protected function initMockCalculationTool($isTaxIncluded)
     {
         $mockValues = [
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Config/TaxClassTest.php b/app/code/Magento/Tax/Test/Unit/Model/Config/TaxClassTest.php
index 21596dea56027..7a32ccc0a7f6f 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Config/TaxClassTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Config/TaxClassTest.php
@@ -56,7 +56,7 @@ public function testAfterSave()
             ->will($this->returnValue($resourceMock));
 
         $objectManager = new ObjectManager($this);
-        $taxClass = $objectManager->getObject(
+        $taxClass = $objectManager->getObject(
             \Magento\Tax\Model\Config\TaxClass::class,
             [
                 'resource' => $resourceMock,
diff --git a/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php b/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php
index 6ec9295dd88a6..1d8d87ac55940 100644
--- a/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Plugin/Checkout/CustomerData/CartTest.php
@@ -122,6 +122,5 @@ public function testAfterGetSectionData()
         $this->assertEquals(2, count($result['items']));
         $this->assertEquals(1, count($result['items'][0]['product_price']));
         $this->assertEquals(1, count($result['items'][1]['product_price']));
-
     }
 }
diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php
index 2285aebb52042..eb5f68a69e6ab 100644
--- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php
+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php
@@ -94,6 +94,5 @@ protected function _isAllowed()
         ) || $this->_authorization->isAllowed(
             'Magento_TaxImportExport::import_export'
         );
-
     }
 }
diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php
index 575994d22f387..6ac92e424d07c 100644
--- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php
+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php
@@ -49,6 +49,5 @@ protected function _isAllowed()
         ) || $this->_authorization->isAllowed(
             'Magento_TaxImportExport::import_export'
         );
-
     }
 }
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Design/Config/Edit/SaveAndContinueButton.php b/app/code/Magento/Theme/Block/Adminhtml/Design/Config/Edit/SaveAndContinueButton.php
index 4b4f229bfed6a..9bb17f135c9f9 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Design/Config/Edit/SaveAndContinueButton.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Design/Config/Edit/SaveAndContinueButton.php
@@ -9,7 +9,6 @@
 
 class SaveAndContinueButton implements ButtonProviderInterface
 {
-
     /**
      * @return array
      */
diff --git a/app/code/Magento/Theme/Model/Design/Config/ValueChecker.php b/app/code/Magento/Theme/Model/Design/Config/ValueChecker.php
index 64f54681b6bd5..4d8643fd1a46e 100644
--- a/app/code/Magento/Theme/Model/Design/Config/ValueChecker.php
+++ b/app/code/Magento/Theme/Model/Design/Config/ValueChecker.php
@@ -79,7 +79,7 @@ public function isDifferentFromDefault($value, $scope, $scopeId, array $fieldCon
      * @param mixed $defaultValue
      * @return bool
      */
-    protected function isEqual ($value, $defaultValue)
+    protected function isEqual($value, $defaultValue)
     {
         switch (gettype($value)) {
             case 'array':
diff --git a/app/code/Magento/Theme/Model/Indexer/Design/Config/FieldsProvider.php b/app/code/Magento/Theme/Model/Indexer/Design/Config/FieldsProvider.php
index 7d6eb1047aae1..76e5192d2fa2c 100644
--- a/app/code/Magento/Theme/Model/Indexer/Design/Config/FieldsProvider.php
+++ b/app/code/Magento/Theme/Model/Indexer/Design/Config/FieldsProvider.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Theme\Model\Indexer\Design\Config;
 
-
 use Magento\Framework\Indexer\FieldsetInterface;
 use Magento\Theme\Model\Design\Config\MetadataProviderInterface;
 
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Scope/Collection.php b/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Scope/Collection.php
index 8b4260a00b2f2..a7c1d29b493c6 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Scope/Collection.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Scope/Collection.php
@@ -135,7 +135,7 @@ protected function prepareItemData(array $websiteScope = [], array $groupScope =
 
     /**
      * Retrieve scope data
-     * 
+     *
      * @param array $websiteScope
      * @param array $groupScope
      * @param array $storeScope
diff --git a/app/code/Magento/Theme/Model/ThemeValidator.php b/app/code/Magento/Theme/Model/ThemeValidator.php
index 9fa53c28f0377..0c3cb962c3c8a 100644
--- a/app/code/Magento/Theme/Model/ThemeValidator.php
+++ b/app/code/Magento/Theme/Model/ThemeValidator.php
@@ -38,7 +38,6 @@ class ThemeValidator
      */
     private $configData;
 
-
     /**
      * @param StoreManagerInterface $storeManager
      * @param ThemeProviderInterface $themeProvider
@@ -73,7 +72,7 @@ public function validateIsThemeInUse($themePaths)
             ->addFieldToFilter('path', DesignInterface::XML_PATH_THEME_ID)
             ->addFieldToFilter('value', ['in' => array_keys($themesById)]);
         foreach ($configData as $row) {
-            switch($row['scope']) {
+            switch ($row['scope']) {
                 case 'default':
                     $messages[] = '<error>' . $themesById[$row['value']] . ' is in use in default config' . '</error>';
                     break;
diff --git a/app/code/Magento/Theme/Setup/InstallSchema.php b/app/code/Magento/Theme/Setup/InstallSchema.php
index ad788665177df..03927d8a947a3 100644
--- a/app/code/Magento/Theme/Setup/InstallSchema.php
+++ b/app/code/Magento/Theme/Setup/InstallSchema.php
@@ -200,6 +200,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $connection->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php
index fa117964cf336..7268af96ea6ad 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php
@@ -60,7 +60,6 @@ protected function setUp()
             '',
             false
         );
-
     }
 
     public function testExecuteWithoutTheme()
diff --git a/app/code/Magento/Theme/Test/Unit/Helper/ThemeTest.php b/app/code/Magento/Theme/Test/Unit/Helper/ThemeTest.php
index e1b5b4684c26b..d0c368aaa3cb6 100644
--- a/app/code/Magento/Theme/Test/Unit/Helper/ThemeTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Helper/ThemeTest.php
@@ -20,7 +20,7 @@ public function testGetCssAssets($layoutStr, $expectedResult)
         $theme = $this->getMockForAbstractClass(\Magento\Framework\View\Design\ThemeInterface::class);
         $theme->expects($this->once())->method('getArea')->will($this->returnValue('area'));
         $layoutMergeFactory = $this->_getLayoutMergeFactory($theme, $layoutStr);
-        $assetRepo = $this->getMock(
+        $assetRepo = $this->getMock(
             \Magento\Framework\View\Asset\Repository::class, ['createAsset'], [], '', false
         );
         $assetRepo->expects($this->any())
@@ -129,7 +129,7 @@ protected function _getLayoutMergeFactory($theme, $layoutStr)
         );
 
         /** @var $processorFactory \Magento\Framework\View\Layout\ProcessorFactory */
-        $processorFactory = $this->getMock(
+        $processorFactory = $this->getMock(
             \Magento\Framework\View\Layout\ProcessorFactory::class, ['create'], [], '', false
         );
         $processorFactory->expects($this->any())
diff --git a/app/code/Magento/Theme/Test/Unit/Model/ResourceModel/Design/Config/Scope/CollectionTest.php b/app/code/Magento/Theme/Test/Unit/Model/ResourceModel/Design/Config/Scope/CollectionTest.php
index 948bfda3a16ef..51982a0b21524 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/ResourceModel/Design/Config/Scope/CollectionTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/ResourceModel/Design/Config/Scope/CollectionTest.php
@@ -88,7 +88,7 @@ public function testLoadData()
                                ],
                            ],
                        ],
-                   ],
+                    ],
                 ]
             );
 
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/FileTest.php
index 435e4aacf9bc8..b2c67fc2fbe5b 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Theme/FileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/FileTest.php
@@ -204,6 +204,7 @@ public function testGetContent()
         $this->model->setContent($content);
         $this->assertEquals($content, $this->model->getContent());
     }
+
     public function testGetFileInfo()
     {
         $fileId = 123;
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Theme/Image/PathTest.php b/app/code/Magento/Theme/Test/Unit/Model/Theme/Image/PathTest.php
index 852c3630df074..0b796ec4e114f 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Theme/Image/PathTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Theme/Image/PathTest.php
@@ -46,7 +46,7 @@ class PathTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->filesystem = $this->getMock(\Magento\Framework\Filesystem::class, [], [], '', false);
-        $this->mediaDirectory = $this->getMock(
+        $this->mediaDirectory = $this->getMock(
             \Magento\Framework\Filesystem\Directory\ReadInterface::class, [], [], '', false
         );
         $this->_assetRepo = $this->getMock(\Magento\Framework\View\Asset\Repository::class, [], [], '', false);
@@ -73,7 +73,7 @@ protected function setUp()
     public function testGetPreviewImageUrl()
     {
         /** @var $theme \Magento\Theme\Model\Theme|\PHPUnit_Framework_MockObject_MockObject */
-        $theme = $this->getMock(
+        $theme = $this->getMock(
             \Magento\Theme\Model\Theme::class,
             ['getPreviewImage', 'isPhysical', '__wakeup'],
             [],
@@ -96,7 +96,7 @@ public function testGetPreviewImagePath()
         $expectedPath = 'theme/preview/preview.jpg';
 
         /** @var $theme \Magento\Theme\Model\Theme|\PHPUnit_Framework_MockObject_MockObject */
-        $theme = $this->getMock(
+        $theme = $this->getMock(
             \Magento\Theme\Model\Theme::class,
             ['getPreviewImage', 'isPhysical', '__wakeup'],
             [],
diff --git a/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php b/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php
index 2ae9f9c1145d0..0c07c312619c4 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/ThemeTest.php
@@ -598,7 +598,7 @@ public function populateFromArrayDataProvider()
                     'theme_data' => 'theme_data',
                     'parent_theme' => 'theme_instance'
                 ],
-                'expected call count' => 1
+                    'expected call count' => 1
             ],
             'valid data with children' => [
                 'value' => [
diff --git a/app/code/Magento/Theme/Ui/Component/Design/Config/SearchRobots/ResetButton.php b/app/code/Magento/Theme/Ui/Component/Design/Config/SearchRobots/ResetButton.php
index dac04d1697d96..4f1b0f02ce96a 100644
--- a/app/code/Magento/Theme/Ui/Component/Design/Config/SearchRobots/ResetButton.php
+++ b/app/code/Magento/Theme/Ui/Component/Design/Config/SearchRobots/ResetButton.php
@@ -47,13 +47,15 @@ public function __construct(
     private function getRobotsDefaultCustomInstructions()
     {
         return trim((string)$this->scopeConfig->getValue(
-            self::XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS, ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+            self::XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS,
+            ScopeConfigInterface::SCOPE_TYPE_DEFAULT
         ));
     }
 
     /**
      * Add js listener to reset button
      *
+     * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function prepare()
diff --git a/app/code/Magento/Theme/Ui/Component/Listing/Column/EditAction.php b/app/code/Magento/Theme/Ui/Component/Listing/Column/EditAction.php
index 334d83b07e814..2a1a0a0ce4fe5 100644
--- a/app/code/Magento/Theme/Ui/Component/Listing/Column/EditAction.php
+++ b/app/code/Magento/Theme/Ui/Component/Listing/Column/EditAction.php
@@ -57,7 +57,7 @@ public function prepareDataSource(array $dataSource)
                     if (isset($item['store_id'])) {
                         $scope = ScopeInterface::SCOPE_STORES;
                         $scopeId = $item['store_id'];
-                    } else if (isset($item['store_website_id'])) {
+                    } elseif (isset($item['store_website_id'])) {
                         $scope = ScopeInterface::SCOPE_WEBSITES;
                         $scopeId = $item['store_website_id'];
                     } else {
diff --git a/app/code/Magento/Translation/Block/Js.php b/app/code/Magento/Translation/Block/Js.php
index 74f43068be006..1536afbf108f3 100644
--- a/app/code/Magento/Translation/Block/Js.php
+++ b/app/code/Magento/Translation/Block/Js.php
@@ -64,6 +64,5 @@ public function getTranslationFileTimestamp()
     public function getTranslationFilePath()
     {
         return $this->fileManager->getTranslationFilePath();
-
     }
 }
diff --git a/app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php b/app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php
index 6b439b9b66205..c140261462b7c 100644
--- a/app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php
+++ b/app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php
@@ -19,7 +19,7 @@
 
 /**
  * Command for uninstalling language and backup-code feature
- * 
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class UninstallLanguageCommand extends Command
diff --git a/app/code/Magento/Translation/Model/Js/PreProcessor.php b/app/code/Magento/Translation/Model/Js/PreProcessor.php
index 42bf4e93fc5c5..74552642af5d4 100644
--- a/app/code/Magento/Translation/Model/Js/PreProcessor.php
+++ b/app/code/Magento/Translation/Model/Js/PreProcessor.php
@@ -55,7 +55,6 @@ public function __construct(Config $config, AreaList $areaList, TranslateInterfa
     public function process(Chain $chain)
     {
         if ($this->config->isEmbeddedStrategy()) {
-
             $context = $chain->getAsset()->getContext();
 
             $areaCode = \Magento\Backend\App\Area\FrontNameResolver::AREA_CODE;
diff --git a/app/code/Magento/Translation/Setup/InstallSchema.php b/app/code/Magento/Translation/Setup/InstallSchema.php
index 1fe943e995b24..a859d2121e73d 100644
--- a/app/code/Magento/Translation/Setup/InstallSchema.php
+++ b/app/code/Magento/Translation/Setup/InstallSchema.php
@@ -101,6 +101,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Translation/Test/Unit/Model/FileManagerTest.php b/app/code/Magento/Translation/Test/Unit/Model/FileManagerTest.php
index e14cd59e9105c..c0d4be47759b6 100644
--- a/app/code/Magento/Translation/Test/Unit/Model/FileManagerTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Model/FileManagerTest.php
@@ -121,6 +121,5 @@ public function testGetTranslationFilePath()
             ->willReturn($contextMock);
         $contextMock->expects($this->atLeastOnce())->method('getPath')->willReturn($path);
         $this->assertEquals($path, $this->model->getTranslationFilePath());
-
     }
 }
diff --git a/app/code/Magento/Ui/Block/Component/StepsWizard.php b/app/code/Magento/Ui/Block/Component/StepsWizard.php
index 44b0698ea9087..f87dc5eede470 100644
--- a/app/code/Magento/Ui/Block/Component/StepsWizard.php
+++ b/app/code/Magento/Ui/Block/Component/StepsWizard.php
@@ -40,6 +40,7 @@ public function getSteps()
     }
 
     // @codeCoverageIgnoreStart
+
     /**
      * @return array
      */
diff --git a/app/code/Magento/Ui/Component/Action.php b/app/code/Magento/Ui/Component/Action.php
index 3918a90629598..1e818eaeca5e7 100644
--- a/app/code/Magento/Ui/Component/Action.php
+++ b/app/code/Magento/Ui/Component/Action.php
@@ -48,7 +48,6 @@ public function prepare()
         parent::prepare();
     }
 
-
     /**
      * Get component name
      *
diff --git a/app/code/Magento/Ui/Component/Bookmark.php b/app/code/Magento/Ui/Component/Bookmark.php
index 5b18ccf6dd2ee..7af3b41965514 100644
--- a/app/code/Magento/Ui/Component/Bookmark.php
+++ b/app/code/Magento/Ui/Component/Bookmark.php
@@ -51,7 +51,6 @@ public function __construct(
         $this->bookmarkManagement = $bookmarkManagement;
     }
 
-
     /**
      * Get component name
      *
diff --git a/app/code/Magento/Ui/Component/Filters.php b/app/code/Magento/Ui/Component/Filters.php
index ee67c35ba3e39..bb7bd4069d6ec 100644
--- a/app/code/Magento/Ui/Component/Filters.php
+++ b/app/code/Magento/Ui/Component/Filters.php
@@ -55,7 +55,6 @@ public function __construct(
         $this->uiComponentFactory = $uiComponentFactory;
     }
 
-
     /**
      * Get component name
      *
diff --git a/app/code/Magento/Ui/Component/Layout/Tabs.php b/app/code/Magento/Ui/Component/Layout/Tabs.php
index 3ae87d43aed4f..54e4d00716dc1 100644
--- a/app/code/Magento/Ui/Component/Layout/Tabs.php
+++ b/app/code/Magento/Ui/Component/Layout/Tabs.php
@@ -300,7 +300,7 @@ protected function prepareConfig(array $config, $name, $parentName)
         if (isset($config['dataScope'])) {
             $dataScope = $config['dataScope'];
             unset($config['dataScope']);
-        } else if ($name !== $parentName) {
+        } elseif ($name !== $parentName) {
             $dataScope = $name;
         }
 
diff --git a/app/code/Magento/Ui/Component/MassAction.php b/app/code/Magento/Ui/Component/MassAction.php
index 5e13c6aada491..865caf30b27ff 100644
--- a/app/code/Magento/Ui/Component/MassAction.php
+++ b/app/code/Magento/Ui/Component/MassAction.php
@@ -34,7 +34,6 @@ public function prepare()
         parent::prepare();
     }
 
-
     /**
      * Get component name
      *
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php
index 9b62d1123f6f5..bf1e871612899 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php
@@ -21,6 +21,7 @@ class Delete extends AbstractAction
      * @var BookmarkRepositoryInterface
      */
     protected $bookmarkRepository;
+
     /**
      * @var BookmarkManagementInterface
      */
@@ -59,6 +60,5 @@ public function execute()
         if ($bookmark && $bookmark->getId()) {
             $this->bookmarkRepository->delete($bookmark);
         }
-
     }
 }
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
index d73563c3dc3dc..1235484d8fac1 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
@@ -96,7 +96,7 @@ public function execute()
         }
         $data = $this->jsonDecoder->decode($jsonData);
         $action = key($data);
-        switch($action) {
+        switch ($action) {
             case self::ACTIVE_IDENTIFIER:
                 $this->updateCurrentBookmark($data[$action]);
                 break;
diff --git a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
index 936e849133a1e..a256432f2631d 100644
--- a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
+++ b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
@@ -76,6 +76,7 @@ public function getCollection()
     {
         return $this->collection;
     }
+
     /**
      * Get Data Provider name
      *
@@ -156,6 +157,7 @@ public function addFilter(\Magento\Framework\Api\Filter $filter)
             [$filter->getConditionType() => $filter->getValue()]
         );
     }
+
     /**
      * Returns search criteria
      *
diff --git a/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Render.php b/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Render.php
index 0efcd77bbb7c0..1495f2186270d 100644
--- a/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Render.php
+++ b/app/code/Magento/Ui/TemplateEngine/Xhtml/Compiler/Element/Render.php
@@ -37,7 +37,7 @@ public function compile(
         $result = $processedObject->renderChildComponent($node->getAttribute('name'));
         if ($result instanceof ResultInterface) {
             $node->parentNode->replaceChild($result->getDocumentElement(), $node);
-        } else if (!empty($result) && is_scalar($result)) {
+        } elseif (!empty($result) && is_scalar($result)) {
             $newFragment = $node->ownerDocument->createDocumentFragment();
             $newFragment->appendXML($result);
             $node->parentNode->replaceChild($newFragment, $node);
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php
index 62c7fcdde0c0a..891cbd328febb 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Form/Element/DataType/DateTest.php
@@ -108,7 +108,6 @@ public function testPrepareWithoutTimeOffset()
         $this->assertArrayHasKey('options', $config);
         $this->assertArrayHasKey('dateFormat', $config['options']);
         $this->assertEquals($localeDateFormat, $config['options']['dateFormat']);
-
     }
 
     /**
diff --git a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php
index 118b95594cb8a..efba513d105dd 100644
--- a/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/Render/HandleTest.php
@@ -60,7 +60,6 @@ public function setUp()
         $this->contextMock->expects($this->atLeastOnce())->method('getView')->willReturn($this->viewMock);
 
         $this->controller = new Handle($this->contextMock, $this->componentFactoryMock);
-
     }
 
     public function testExecuteNoButtons()
diff --git a/app/code/Magento/UrlRewrite/Setup/InstallSchema.php b/app/code/Magento/UrlRewrite/Setup/InstallSchema.php
index 708e479ded197..45f4f81c36d24 100644
--- a/app/code/Magento/UrlRewrite/Setup/InstallSchema.php
+++ b/app/code/Magento/UrlRewrite/Setup/InstallSchema.php
@@ -121,6 +121,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
index 9331f3ffa443b..ad6aabdebee25 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Model/Storage/DbStorageTest.php
@@ -51,11 +51,11 @@ protected function setUp()
         $this->urlRewriteFactory = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewriteFactory::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()->getMock();
-        $this->dataObjectHelper = $this->getMock(
+        $this->dataObjectHelper = $this->getMock(
             \Magento\Framework\Api\DataObjectHelper::class, [], [], '',
             false);
         $this->connectionMock = $this->getMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
-        $this->select = $this->getMock(
+        $this->select = $this->getMock(
             \Magento\Framework\DB\Select::class, ['from', 'where', 'deleteFromSelect'], [], '',
             false);
         $this->resource = $this->getMock(\Magento\Framework\App\ResourceConnection::class, [], [], '', false);
diff --git a/app/code/Magento/User/Setup/InstallSchema.php b/app/code/Magento/User/Setup/InstallSchema.php
index 04334ae63fa65..8c0531029544a 100644
--- a/app/code/Magento/User/Setup/InstallSchema.php
+++ b/app/code/Magento/User/Setup/InstallSchema.php
@@ -141,6 +141,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             $installer->getConnection()->createTable($table);
         }
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Usps/Setup/InstallData.php b/app/code/Magento/Usps/Setup/InstallData.php
index 4eec096c1a45c..179c88dbc11d7 100644
--- a/app/code/Magento/Usps/Setup/InstallData.php
+++ b/app/code/Magento/Usps/Setup/InstallData.php
@@ -96,6 +96,5 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
                 $connection->update($configDataTable, ['value' => $newValue], $whereConfigId);
             }
         }
-        
     }
 }
diff --git a/app/code/Magento/Variable/Setup/InstallSchema.php b/app/code/Magento/Variable/Setup/InstallSchema.php
index 2a78b8a5742eb..f3ed3c6b9bc16 100644
--- a/app/code/Magento/Variable/Setup/InstallSchema.php
+++ b/app/code/Magento/Variable/Setup/InstallSchema.php
@@ -69,7 +69,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
             $connection->createTable($table);
         }
 
-
         /**
          * Rename/Create table 'variable_value'
          */
diff --git a/app/code/Magento/Variable/Test/Unit/Controller/Adminhtml/System/Variable/ValidateTest.php b/app/code/Magento/Variable/Test/Unit/Controller/Adminhtml/System/Variable/ValidateTest.php
index 22571c1db3a58..fe8bfcf8c503e 100644
--- a/app/code/Magento/Variable/Test/Unit/Controller/Adminhtml/System/Variable/ValidateTest.php
+++ b/app/code/Magento/Variable/Test/Unit/Controller/Adminhtml/System/Variable/ValidateTest.php
@@ -121,7 +121,6 @@ protected function setUp()
         $this->validateMock->expects($this->any())
             ->method('_initVariable')
             ->willReturn($this->variableMock);
-
     }
 
     /**
diff --git a/app/code/Magento/Variable/Test/Unit/Model/Variable/ConfigTest.php b/app/code/Magento/Variable/Test/Unit/Model/Variable/ConfigTest.php
index d20ea107845f8..b87ac2591cff5 100644
--- a/app/code/Magento/Variable/Test/Unit/Model/Variable/ConfigTest.php
+++ b/app/code/Magento/Variable/Test/Unit/Model/Variable/ConfigTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Variable\Test\Unit\Model\Variable;
 
-
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class ConfigTest extends \PHPUnit_Framework_TestCase
diff --git a/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php b/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php
index 836ee40f1c79f..db5a7ea712dba 100644
--- a/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php
+++ b/app/code/Magento/Variable/Test/Unit/Model/VariableTest.php
@@ -81,7 +81,6 @@ public function testValidateMissingInfo($code, $name)
     {
         $this->model->setCode($code)->setName($name);
         $this->assertEquals($this->validationFailedPhrase, $this->model->validate());
-
     }
 
     /**
diff --git a/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php b/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
index 3ff0e622fe798..d9e6371981d84 100644
--- a/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
+++ b/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
@@ -3,6 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// @codingStandardsIgnoreFile
 namespace Magento\Vault\Api\Data;
 
 /**
diff --git a/app/code/Magento/Vault/Block/Customer/PaymentTokens.php b/app/code/Magento/Vault/Block/Customer/PaymentTokens.php
index 44958ff90e958..24cc4355e0671 100644
--- a/app/code/Magento/Vault/Block/Customer/PaymentTokens.php
+++ b/app/code/Magento/Vault/Block/Customer/PaymentTokens.php
@@ -44,7 +44,7 @@ public function __construct(
      * Get type of token
      * @return string
      */
-    abstract function getType();
+    abstract public function getType();
 
     /**
      * @return PaymentTokenInterface[]
diff --git a/app/code/Magento/Vault/Model/Method/NullPaymentProvider.php b/app/code/Magento/Vault/Model/Method/NullPaymentProvider.php
index d097c9bf10f08..6544fb6cafbd6 100644
--- a/app/code/Magento/Vault/Model/Method/NullPaymentProvider.php
+++ b/app/code/Magento/Vault/Model/Method/NullPaymentProvider.php
@@ -17,7 +17,7 @@ class NullPaymentProvider implements MethodInterface
      * Retrieve payment method code
      *
      * @return string
-     * 
+     *
      */
     public function getCode()
     {
@@ -28,7 +28,7 @@ public function getCode()
      * Retrieve block type for method form generation
      *
      * @return string
-     * 
+     *
      * @deprecated
      */
     public function getFormBlockType()
@@ -40,7 +40,7 @@ public function getFormBlockType()
      * Retrieve payment method title
      *
      * @return string
-     * 
+     *
      */
     public function getTitle()
     {
@@ -70,7 +70,7 @@ public function getStore()
      * Check order availability
      *
      * @return bool
-     * 
+     *
      */
     public function canOrder()
     {
@@ -81,7 +81,7 @@ public function canOrder()
      * Check authorize availability
      *
      * @return bool
-     * 
+     *
      */
     public function canAuthorize()
     {
@@ -92,7 +92,7 @@ public function canAuthorize()
      * Check capture availability
      *
      * @return bool
-     * 
+     *
      */
     public function canCapture()
     {
@@ -103,7 +103,7 @@ public function canCapture()
      * Check partial capture availability
      *
      * @return bool
-     * 
+     *
      */
     public function canCapturePartial()
     {
@@ -114,7 +114,7 @@ public function canCapturePartial()
      * Check whether capture can be performed once and no further capture possible
      *
      * @return bool
-     * 
+     *
      */
     public function canCaptureOnce()
     {
@@ -125,7 +125,7 @@ public function canCaptureOnce()
      * Check refund availability
      *
      * @return bool
-     * 
+     *
      */
     public function canRefund()
     {
@@ -136,7 +136,7 @@ public function canRefund()
      * Check partial refund availability for invoice
      *
      * @return bool
-     * 
+     *
      */
     public function canRefundPartialPerInvoice()
     {
@@ -146,7 +146,7 @@ public function canRefundPartialPerInvoice()
     /**
      * Check void availability
      * @return bool
-     * 
+     *
      */
     public function canVoid()
     {
@@ -178,7 +178,7 @@ public function canUseCheckout()
      * Can be edit order (renew order)
      *
      * @return bool
-     * 
+     *
      */
     public function canEdit()
     {
@@ -189,7 +189,7 @@ public function canEdit()
      * Check fetch transaction info availability
      *
      * @return bool
-     * 
+     *
      */
     public function canFetchTransactionInfo()
     {
@@ -203,7 +203,7 @@ public function canFetchTransactionInfo()
      * @param string $transactionId
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * 
+     *
      */
     public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
     {
@@ -214,7 +214,7 @@ public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
      * Retrieve payment system relation flag
      *
      * @return bool
-     * 
+     *
      */
     public function isGateway()
     {
@@ -225,7 +225,7 @@ public function isGateway()
      * Retrieve payment method online/offline flag
      *
      * @return bool
-     * 
+     *
      */
     public function isOffline()
     {
@@ -236,7 +236,7 @@ public function isOffline()
      * Flag if we need to run payment initialize while order place
      *
      * @return bool
-     * 
+     *
      */
     public function isInitializeNeeded()
     {
@@ -270,7 +270,7 @@ public function canUseForCurrency($currencyCode)
      * Retrieve block type for display method information
      *
      * @return string
-     * 
+     *
      * @deprecated
      */
     public function getInfoBlockType()
@@ -283,7 +283,7 @@ public function getInfoBlockType()
      *
      * @return InfoInterface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * 
+     *
      * @deprecated
      */
     public function getInfoInstance()
@@ -296,7 +296,7 @@ public function getInfoInstance()
      *
      * @param InfoInterface $info
      * @return void
-     * 
+     *
      * @deprecated
      */
     public function setInfoInstance(InfoInterface $info)
@@ -309,7 +309,7 @@ public function setInfoInstance(InfoInterface $info)
      *
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException
-     * 
+     *
      */
     public function validate()
     {
@@ -322,7 +322,7 @@ public function validate()
      * @param InfoInterface $payment
      * @param float $amount
      * @return $this
-     * 
+     *
      */
     public function order(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -335,7 +335,7 @@ public function order(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @param InfoInterface $payment
      * @param float $amount
      * @return $this
-     * 
+     *
      */
     public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -348,7 +348,7 @@ public function authorize(\Magento\Payment\Model\InfoInterface $payment, $amount
      * @param InfoInterface $payment
      * @param float $amount
      * @return $this
-     * 
+     *
      */
     public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -361,7 +361,7 @@ public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
      * @param InfoInterface $payment
      * @param float $amount
      * @return $this
-     * 
+     *
      */
     public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
     {
@@ -373,7 +373,7 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
      *
      * @param InfoInterface $payment
      * @return $this
-     * 
+     *
      */
     public function cancel(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -385,7 +385,7 @@ public function cancel(\Magento\Payment\Model\InfoInterface $payment)
      *
      * @param InfoInterface $payment
      * @return $this
-     * 
+     *
      */
     public function void(\Magento\Payment\Model\InfoInterface $payment)
     {
@@ -395,7 +395,7 @@ public function void(\Magento\Payment\Model\InfoInterface $payment)
     /**
      * Whether this method can accept or deny payment
      * @return bool
-     * 
+     *
      */
     public function canReviewPayment()
     {
@@ -408,7 +408,7 @@ public function canReviewPayment()
      * @param InfoInterface $payment
      * @return false
      * @throws \Magento\Framework\Exception\LocalizedException
-     * 
+     *
      */
     public function acceptPayment(InfoInterface $payment)
     {
@@ -421,7 +421,7 @@ public function acceptPayment(InfoInterface $payment)
      * @param InfoInterface $payment
      * @return false
      * @throws \Magento\Framework\Exception\LocalizedException
-     * 
+     *
      */
     public function denyPayment(InfoInterface $payment)
     {
@@ -446,7 +446,7 @@ public function getConfigData($field, $storeId = null)
      *
      * @param DataObject $data
      * @return $this
-     * 
+     *
      */
     public function assignData(DataObject $data)
     {
@@ -484,7 +484,7 @@ public function isActive($storeId = null)
      *
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * 
+     *
      * @deprecated
      */
     public function initialize($paymentAction, $stateObject)
@@ -497,7 +497,7 @@ public function initialize($paymentAction, $stateObject)
      * Used to universalize payment actions when processing payment place
      *
      * @return string
-     * 
+     *
      */
     public function getConfigPaymentAction()
     {
diff --git a/app/code/Magento/Vault/Test/Unit/Model/PaymentTokenManagementTest.php b/app/code/Magento/Vault/Test/Unit/Model/PaymentTokenManagementTest.php
index 2f662c1a8384a..98bc8436ebabf 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/PaymentTokenManagementTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/PaymentTokenManagementTest.php
@@ -508,7 +508,6 @@ public function testGetVisibleAvailableTokens()
             [$token],
             $this->paymentTokenManagement->getVisibleAvailableTokens($customerId)
         );
-
     }
 
     /**
diff --git a/app/code/Magento/Vault/Test/Unit/Model/PaymentTokenRepositoryTest.php b/app/code/Magento/Vault/Test/Unit/Model/PaymentTokenRepositoryTest.php
index 4237e1a249917..f858906f565c9 100644
--- a/app/code/Magento/Vault/Test/Unit/Model/PaymentTokenRepositoryTest.php
+++ b/app/code/Magento/Vault/Test/Unit/Model/PaymentTokenRepositoryTest.php
@@ -211,7 +211,6 @@ public function testRepositoryDelete()
         $this->paymentTokenMock->setPublicHash('');
         $this->assertFalse($this->repositoryModel->delete($this->paymentTokenMock));
         $this->assertFalse($this->paymentTokenMock->getIsActive());
-
     }
 
     /**
diff --git a/app/code/Magento/Webapi/Controller/PathProcessor.php b/app/code/Magento/Webapi/Controller/PathProcessor.php
index 46f11520acc31..2f0a9609154f3 100644
--- a/app/code/Magento/Webapi/Controller/PathProcessor.php
+++ b/app/code/Magento/Webapi/Controller/PathProcessor.php
@@ -53,7 +53,7 @@ public function process($pathInfo)
         if (isset($stores[$storeCode])) {
             $this->storeManager->setCurrentStore($storeCode);
             $path = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
-        } else if ($storeCode === self::ALL_STORE_CODE) {
+        } elseif ($storeCode === self::ALL_STORE_CODE) {
             $this->storeManager->setCurrentStore(\Magento\Store\Model\Store::ADMIN_CODE);
             $path = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
         } else {
diff --git a/app/code/Magento/Webapi/Controller/Rest/RequestValidator.php b/app/code/Magento/Webapi/Controller/Rest/RequestValidator.php
index 6435d5801277e..47b728370b034 100644
--- a/app/code/Magento/Webapi/Controller/Rest/RequestValidator.php
+++ b/app/code/Magento/Webapi/Controller/Rest/RequestValidator.php
@@ -86,7 +86,7 @@ private function checkPermissions()
         if (!$this->authorization->isAllowed($route->getAclResources())) {
             $params = ['resources' => implode(', ', $route->getAclResources())];
             throw new AuthorizationException(
-                __(AuthorizationException::NOT_AUTHORIZED, $params)
+                __('Consumer is not authorized to access %resources', $params)
             );
         }
     }
diff --git a/app/code/Magento/Webapi/Controller/Soap.php b/app/code/Magento/Webapi/Controller/Soap.php
index e6928e66cedef..c6cb29274f272 100644
--- a/app/code/Magento/Webapi/Controller/Soap.php
+++ b/app/code/Magento/Webapi/Controller/Soap.php
@@ -132,7 +132,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
                 );
                 $this->_setResponseContentType(self::CONTENT_TYPE_WSDL_REQUEST);
                 $this->_setResponseBody($responseBody);
-            } else if ($this->_isWsdlListRequest()) {
+            } elseif ($this->_isWsdlListRequest()) {
                 $servicesList = [];
                 foreach ($this->_wsdlGenerator->getListOfServices() as $serviceName) {
                     $servicesList[$serviceName]['wsdl_endpoint'] = $this->_soapServer->getEndpointUri()
diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
index bee6af8aeb144..037055e4bf24f 100644
--- a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
+++ b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
@@ -28,6 +28,7 @@
  * compliant with {@link https://github.com/swagger-api/swagger-spec/blob/master/versions/2.0.md Swagger specification}
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
 class Generator extends AbstractSchemaGenerator
 {
@@ -279,8 +280,7 @@ private function generateMethodParameters($httpMethodData)
 
         $phpMethodData = $httpMethodData[Converter::KEY_METHOD];
         /** Return nothing if necessary fields are not set */
-        if (
-            !isset($phpMethodData['interface']['in']['parameters'])
+        if (!isset($phpMethodData['interface']['in']['parameters'])
             || !isset($httpMethodData['uri'])
             || !isset($httpMethodData['httpOperation'])
         ) {
@@ -289,8 +289,7 @@ private function generateMethodParameters($httpMethodData)
 
         foreach ($phpMethodData['interface']['in']['parameters'] as $parameterName => $parameterInfo) {
             /** Omit forced parameters */
-            if (
-                isset($httpMethodData['parameters'][$parameterName]['force'])
+            if (isset($httpMethodData['parameters'][$parameterName]['force'])
                 && $httpMethodData['parameters'][$parameterName]['force']
             ) {
                 continue;
@@ -318,7 +317,6 @@ private function generateMethodParameters($httpMethodData)
                     $description,
                     $bodySchema
                 );
-
             }
         }
 
diff --git a/app/code/Magento/Webapi/Model/ServiceMetadata.php b/app/code/Magento/Webapi/Model/ServiceMetadata.php
index dd2ad797a40a6..4fdff4c17c047 100644
--- a/app/code/Magento/Webapi/Model/ServiceMetadata.php
+++ b/app/code/Magento/Webapi/Model/ServiceMetadata.php
@@ -306,7 +306,6 @@ protected function initRoutesMetadata()
                 $routes[$serviceName][self::KEY_ROUTES][$url][$method][self::KEY_ROUTE_METHOD] = $methodName;
                 $routes[$serviceName][self::KEY_ROUTES][$url][$method][self::KEY_ROUTE_PARAMS]
                     = $data[Converter::KEY_DATA_PARAMETERS];
-
             }
         }
         return $routes;
diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/Soap/Request/HandlerTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/Soap/Request/HandlerTest.php
index 6e7b61fa91598..d01922fcc5af5 100644
--- a/app/code/Magento/Webapi/Test/Unit/Controller/Soap/Request/HandlerTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Controller/Soap/Request/HandlerTest.php
@@ -54,27 +54,27 @@ protected function setUp()
         $this->_requestMock = $this->getMock(\Magento\Framework\Webapi\Request::class, [], [], '', false);
         $this->_objectManagerMock = $this->getMock(\Magento\Framework\ObjectManagerInterface::class);
         $this->_authorizationMock = $this->getMock(\Magento\Framework\Webapi\Authorization::class, [], [], '', false);
-        $this->_dataObjectConverter = $this->getMock(
+        $this->_dataObjectConverter = $this->getMock(
             \Magento\Framework\Api\SimpleDataObjectConverter::class,
             ['convertStdObjectToArray'],
             [],
             '',
             false
         );
-        $this->_serviceInputProcessorMock = $this->getMock(
+        $this->_serviceInputProcessorMock = $this->getMock(
             \Magento\Framework\Webapi\ServiceInputProcessor::class,
             [],
             [],
             '',
             false
         );
-        $this->_dataObjectProcessorMock = $this->getMock(
+        $this->_dataObjectProcessorMock = $this->getMock(
             \Magento\Framework\Reflection\DataObjectProcessor::class,
             [],
             [],
             '',
             false);
-        $this->_methodsMapProcessorMock = $this->getMock(
+        $this->_methodsMapProcessorMock = $this->getMock(
             \Magento\Framework\Reflection\MethodsMap::class,
             [],
             [],
diff --git a/app/code/Magento/WebapiSecurity/Model/Plugin/CacheInvalidator.php b/app/code/Magento/WebapiSecurity/Model/Plugin/CacheInvalidator.php
index 7d192e8684e4b..3489a46d8e017 100644
--- a/app/code/Magento/WebapiSecurity/Model/Plugin/CacheInvalidator.php
+++ b/app/code/Magento/WebapiSecurity/Model/Plugin/CacheInvalidator.php
@@ -24,7 +24,7 @@ public function __construct(\Magento\Framework\App\Cache\TypeListInterface $cach
 
     /**
      * Invalidate WebApi cache if needed.
-     * 
+     *
      * @param \Magento\Framework\App\Config\Value $subject
      * @param \Magento\Framework\App\Config\Value $result
      * @return \Magento\Framework\App\Config\Value
diff --git a/app/code/Magento/Weee/Helper/Data.php b/app/code/Magento/Weee/Helper/Data.php
index f79545502be15..6cee0832eb7b2 100644
--- a/app/code/Magento/Weee/Helper/Data.php
+++ b/app/code/Magento/Weee/Helper/Data.php
@@ -830,7 +830,7 @@ public function getWeeeAttributesForBundle($product)
                         if ($priceIncludesTax == false) {
                             $weeeAttribute['amount'] = $weeeAttribute['amount_excl_tax'] + $weeeAttribute['tax_amount'];
                         }
-                    } else if ($priceTaxDisplay == \Magento\Tax\Model\Config::DISPLAY_TYPE_EXCLUDING_TAX) {
+                    } elseif ($priceTaxDisplay == \Magento\Tax\Model\Config::DISPLAY_TYPE_EXCLUDING_TAX) {
                         if ($priceIncludesTax == true) {
                             $weeeAttribute['amount'] = $weeeAttribute['amount_excl_tax'];
                         }
diff --git a/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php b/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php
index 0578162e5584c..5d16680e70b30 100644
--- a/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php
+++ b/app/code/Magento/Weee/Model/App/Action/ContextPlugin.php
@@ -123,7 +123,7 @@ public function beforeDispatch(
         if (!$countryId && !$regionId) {
             // country and region does not exist
             return;
-        } else if ($countryId && !$regionId) {
+        } elseif ($countryId && !$regionId) {
             // country exist and region does not exist
             $regionId = 0;
             $exist = $this->weeeTax->isWeeeInLocation(
@@ -186,8 +186,7 @@ protected function getWeeeTaxRegion($basedOn)
                 $countryId = $defaultShippingAddress['country_id'];
                 $regionId = $defaultShippingAddress['region_id'];
             }
-
-        } else if ($basedOn == 'billing') {
+        } elseif ($basedOn == 'billing') {
             $defaultBillingAddress = $this->customerSession->getDefaultTaxBillingAddress();
             if (empty($defaultBillingAddress)) {
                 $countryId = $defaultCountryId;
diff --git a/app/code/Magento/Weee/Model/WeeeConfigProvider.php b/app/code/Magento/Weee/Model/WeeeConfigProvider.php
index d3430fc0cbe1d..85567e74eafe8 100644
--- a/app/code/Magento/Weee/Model/WeeeConfigProvider.php
+++ b/app/code/Magento/Weee/Model/WeeeConfigProvider.php
@@ -86,7 +86,6 @@ public function iDisplayPriceWithWeeeDetails()
         return true;
     }
 
-
     /**
      * Whether to display final price that include Weee amounts
      *
diff --git a/app/code/Magento/Weee/Observer/AfterAddressSave.php b/app/code/Magento/Weee/Observer/AfterAddressSave.php
index ae60b138bb643..c5ca7ddcda500 100644
--- a/app/code/Magento/Weee/Observer/AfterAddressSave.php
+++ b/app/code/Magento/Weee/Observer/AfterAddressSave.php
@@ -91,6 +91,7 @@ public function execute(Observer $observer)
             }
         }
     }
+
     /**
      * Check whether specified billing address is default for its customer
      *
diff --git a/app/code/Magento/Weee/Observer/UpdateProductOptionsObserver.php b/app/code/Magento/Weee/Observer/UpdateProductOptionsObserver.php
index ef301b6e61777..62770224404c2 100644
--- a/app/code/Magento/Weee/Observer/UpdateProductOptionsObserver.php
+++ b/app/code/Magento/Weee/Observer/UpdateProductOptionsObserver.php
@@ -61,7 +61,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
         // if the Weee module is enabled, then only do processing on bundle products
         if ($this->weeeData->isEnabled() && $product->getTypeId() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) {
-
             if ($this->taxData->priceIncludesTax() && $this->taxData->displayPriceExcludingTax()) {
                 // the Tax module might have set up a default, but we will re-decide which calcPrice field to use
                 unset($options['optionTemplate']);
diff --git a/app/code/Magento/Weee/Pricing/Adjustment.php b/app/code/Magento/Weee/Pricing/Adjustment.php
index 6250ba3d41aa1..2b720010a9fbd 100644
--- a/app/code/Magento/Weee/Pricing/Adjustment.php
+++ b/app/code/Magento/Weee/Pricing/Adjustment.php
@@ -40,6 +40,7 @@ class Adjustment implements AdjustmentInterface
      * @var PriceCurrencyInterface
      */
     protected $priceCurrency;
+
     /**
      * Constructor
      *
diff --git a/app/code/Magento/Weee/Setup/InstallData.php b/app/code/Magento/Weee/Setup/InstallData.php
index 275a0752193a5..49ea3e3b4f822 100644
--- a/app/code/Magento/Weee/Setup/InstallData.php
+++ b/app/code/Magento/Weee/Setup/InstallData.php
@@ -64,7 +64,6 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
         $quoteSetup->addAttribute('quote_item', 'base_weee_tax_disposition', ['type' => 'decimal']);
         $quoteSetup->addAttribute('quote_item', 'base_weee_tax_row_disposition', ['type' => 'decimal']);
 
-
         /** @var SalesSetup $salesSetup */
         $salesSetup = $this->salesSetupFactory->create(['setup' => $setup]);
         $salesSetup->addAttribute('order_item', 'weee_tax_applied', ['type' => 'text']);
diff --git a/app/code/Magento/Weee/Setup/InstallSchema.php b/app/code/Magento/Weee/Setup/InstallSchema.php
index fe33c8fa8f8f4..c584440245c04 100644
--- a/app/code/Magento/Weee/Setup/InstallSchema.php
+++ b/app/code/Magento/Weee/Setup/InstallSchema.php
@@ -111,6 +111,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $setup->getConnection()->createTable($table);
 
         $setup->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Weee/Test/Unit/Pricing/TaxAdjustmentTest.php b/app/code/Magento/Weee/Test/Unit/Pricing/TaxAdjustmentTest.php
index fa39232a56194..3c2ff548bc83b 100644
--- a/app/code/Magento/Weee/Test/Unit/Pricing/TaxAdjustmentTest.php
+++ b/app/code/Magento/Weee/Test/Unit/Pricing/TaxAdjustmentTest.php
@@ -10,7 +10,6 @@
 
 use \Magento\Weee\Pricing\TaxAdjustment;
 
-
 class TaxAdjustmentTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Manager/Website.php b/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Manager/Website.php
index 6f9e1fe0cf6d8..fc834683c9dac 100644
--- a/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Manager/Website.php
+++ b/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Manager/Website.php
@@ -59,15 +59,13 @@ public function getWebsites(ProductInterface $product, EavAttribute $eavAttribut
             ]
         ];
 
-        if (
-            $this->storeManager->hasSingleStore()
+        if ($this->storeManager->hasSingleStore()
             || ($eavAttribute->getEntityAttribute() && $eavAttribute->getEntityAttribute()->isScopeGlobal()
             )
         ) {
             return $this->websites = $websites;
         }
 
-
         if ($storeId = $this->locator->getStore()->getId()) {
             /** @var WebsiteInterface $website */
             $website = $this->storeManager->getStore($storeId)->getWebsite();
diff --git a/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Weee.php b/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Weee.php
index d5558c8875723..c6475b8069143 100644
--- a/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Weee.php
+++ b/app/code/Magento/Weee/Ui/DataProvider/Product/Form/Modifier/Weee.php
@@ -116,8 +116,7 @@ protected function modifyMetaConfig(array $metaConfig)
             foreach ($metaConfig['children'] as $attributeCode => $attributeConfig) {
                 if ($this->startsWith($attributeCode, self::CONTAINER_PREFIX)) {
                     $metaConfig['children'][$attributeCode] = $this->modifyMetaConfig($attributeConfig);
-                } elseif (
-                    !empty($attributeConfig['arguments']['data']['config']['formElement']) &&
+                } elseif (!empty($attributeConfig['arguments']['data']['config']['formElement']) &&
                     $attributeConfig['arguments']['data']['config']['formElement'] === static::FORM_ELEMENT_WEEE
                 ) {
                     $metaConfig['children'][$attributeCode] =
diff --git a/app/code/Magento/Widget/Setup/InstallData.php b/app/code/Magento/Widget/Setup/InstallData.php
index b4c60b33d4755..9a7fb60f992a0 100644
--- a/app/code/Magento/Widget/Setup/InstallData.php
+++ b/app/code/Magento/Widget/Setup/InstallData.php
@@ -42,6 +42,5 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
         $installer->doUpdateClassAliases();
 
         $setup->endSetup();
-        
     }
 }
diff --git a/app/code/Magento/Widget/Setup/InstallSchema.php b/app/code/Magento/Widget/Setup/InstallSchema.php
index 84407f385124a..e1484c7b3bd58 100644
--- a/app/code/Magento/Widget/Setup/InstallSchema.php
+++ b/app/code/Magento/Widget/Setup/InstallSchema.php
@@ -402,6 +402,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Options.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Options.php
index c7b8c60f18e49..4b358bc67593e 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Options.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Options.php
@@ -111,11 +111,9 @@ public function getConfiguredOptions()
                         foreach ($option['value'] as $key => $value) {
                             $option['value'][$key] = $this->escapeHtml($value);
                         }
-
                     } else {
                         $option['value'] = $this->escapeHtml($option['value']);
                     }
-
                 }
                 $options[$index]['value'] = $option['value'];
             }
diff --git a/app/code/Magento/Wishlist/Block/Rss/Link.php b/app/code/Magento/Wishlist/Block/Rss/Link.php
index b64ab20ef0b0b..1a643eb742aa9 100644
--- a/app/code/Magento/Wishlist/Block/Rss/Link.php
+++ b/app/code/Magento/Wishlist/Block/Rss/Link.php
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 /**
  * Wishlist block customer items
  */
diff --git a/app/code/Magento/Wishlist/Observer/AddToCart.php b/app/code/Magento/Wishlist/Observer/AddToCart.php
index 8511dc977c92d..fd50fc4edbbe9 100644
--- a/app/code/Magento/Wishlist/Observer/AddToCart.php
+++ b/app/code/Magento/Wishlist/Observer/AddToCart.php
@@ -15,7 +15,7 @@
 
 /**
  * Class AddToCart
- * @deprecated 
+ * @deprecated
  * @package Magento\Wishlist\Observer
  */
 class AddToCart implements ObserverInterface
diff --git a/app/code/Magento/Wishlist/Setup/InstallSchema.php b/app/code/Magento/Wishlist/Setup/InstallSchema.php
index bf4913f59c295..93f5a0e677e6b 100644
--- a/app/code/Magento/Wishlist/Setup/InstallSchema.php
+++ b/app/code/Magento/Wishlist/Setup/InstallSchema.php
@@ -208,6 +208,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }
diff --git a/dev/tests/api-functional/_files/Magento/TestModule2/Service/V1/Entity/Item.php b/dev/tests/api-functional/_files/Magento/TestModule2/Service/V1/Entity/Item.php
index 7fbc798503c16..95c88fd0fc7f5 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule2/Service/V1/Entity/Item.php
+++ b/dev/tests/api-functional/_files/Magento/TestModule2/Service/V1/Entity/Item.php
@@ -24,7 +24,6 @@ public function setId($id)
         return $this->setData('id', $id);
     }
 
-
     /**
      * @return string
      */
@@ -32,6 +31,7 @@ public function getName()
     {
         return $this->_data['name'];
     }
+
     /**
      * @param string $name
      * @return $this
diff --git a/dev/tests/api-functional/_files/Magento/TestModule5/Service/V1/OverrideService.php b/dev/tests/api-functional/_files/Magento/TestModule5/Service/V1/OverrideService.php
index b0ac0ce55ce25..022098e3ac109 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule5/Service/V1/OverrideService.php
+++ b/dev/tests/api-functional/_files/Magento/TestModule5/Service/V1/OverrideService.php
@@ -22,6 +22,7 @@ public function __construct(AllSoapAndRestFactory $factory)
     {
         $this->factory = $factory;
     }
+
     /**
      * {@inheritdoc}
      */
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest/CurlClient.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest/CurlClient.php
index cf405626e2fc8..96272ac4d86ee 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest/CurlClient.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest/CurlClient.php
@@ -10,6 +10,7 @@
 class CurlClient
 {
     const EMPTY_REQUEST_BODY = 'Empty body';
+
     /**
      * @var string REST URL base path
      */
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php b/dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php
index f2e8bf1a35e09..014cbd7eb95a7 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\TestFramework;
 
-
 /**
  * Provides access to the application for the tests
  *
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/TierPriceStorageTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/TierPriceStorageTest.php
index 06c9cdee3bd12..897c96054da77 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/TierPriceStorageTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/TierPriceStorageTest.php
@@ -257,8 +257,7 @@ private function isPriceCorrect(array $price, array $tierPrices)
             $priceIsCorrect = $price['price_type'] === \Magento\Catalog\Api\Data\TierPriceInterface::PRICE_TYPE_DISCOUNT
                 ? (float)$tierPrice->getExtensionAttributes()->getPercentageValue() === (float)$price['price']
                 : (float)$tierPrice->getValue() === (float)$price['price'];
-            if (
-                $priceIsCorrect
+            if ($priceIsCorrect
                 && (int)$tierPrice->getQty() === (int)$price['quantity']
                 && $tierPrice->getExtensionAttributes()->getWebsiteId() == $price['website_id']
             ) {
diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php
index 28824f812c4e4..c53fd8c871bd4 100644
--- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php
@@ -77,7 +77,6 @@ public function testGetList()
 
         $this->assertCount(2, $option['values']);
 
-
         foreach ($option['values'] as $value) {
             $this->assertTrue(is_array($value));
             $this->assertNotEmpty($value);
diff --git a/dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php b/dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php
index 0e2ae3e72b9b9..5534fca33b9c9 100644
--- a/dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php
@@ -120,12 +120,10 @@ private function validateCustomerData($expectedData, $actualData)
             $actualData['addresses'][0]['id'],
             $actualData['addresses'][1]['region_id'],
             $actualData['addresses'][1]['id'],
-
             $expectedData['addresses'][0]['default_shipping'],
             $expectedData['addresses'][0]['default_billing'],
             $expectedData['addresses'][1]['default_shipping'],
             $expectedData['addresses'][1]['default_billing'],
-
             $expectedData['created_at'],
             $expectedData['updated_at'],
             $actualData['created_at'],
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php
index 3578f933fcef5..e07e6bcba9d2d 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php
@@ -30,6 +30,7 @@ protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
     }
+
     /**
      * @magentoApiDataFixture Magento/Sales/_files/order.php
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/SalesInventory/Api/Service/V1/ReturnItemsAfterRefundOrderTest.php b/dev/tests/api-functional/testsuite/Magento/SalesInventory/Api/Service/V1/ReturnItemsAfterRefundOrderTest.php
index 2457ec005d202..d850f2f7a0f07 100644
--- a/dev/tests/api-functional/testsuite/Magento/SalesInventory/Api/Service/V1/ReturnItemsAfterRefundOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/SalesInventory/Api/Service/V1/ReturnItemsAfterRefundOrderTest.php
@@ -73,7 +73,6 @@ public function testRefundWithReturnItemsToStock($qtyRefund)
                 $qtyAfterRefund,
                 'Failed asserting qty of returned items incorrect.'
             );
-
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
             $this->fail('Failed asserting that Creditmemo was created');
         }
diff --git a/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxRuleRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxRuleRepositoryInterfaceTest.php
index 92ccb256d451f..753fae021ad67 100644
--- a/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxRuleRepositoryInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxRuleRepositoryInterfaceTest.php
@@ -510,6 +510,7 @@ public function testUpdateTaxRule()
             'Tax rates were updated incorrectly.'
         );
     }
+
     public function testUpdateTaxRuleNotExisting()
     {
         $requestData = [
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
index 58e7525a79c47..675700bf98609 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertGlobalSearchCustomerName.php
@@ -46,7 +46,6 @@ public function processAssert(Dashboard $dashboard, GlobalSearch $search, Custom
             $customerIndex->getCustomerGridBlock()->getAllIds(),
             'Customer grid does not have ' . $customerName . ' in search results'
         );
-
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Paypal/PopupWindow.php b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Paypal/PopupWindow.php
index a4f8983d8538f..02ab8387c499b 100755
--- a/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Paypal/PopupWindow.php
+++ b/dev/tests/functional/tests/app/Magento/Braintree/Test/Block/Paypal/PopupWindow.php
@@ -41,7 +41,7 @@ public function waitForFormLoaded()
      * Process PayPal auth flow
      *
      * @param null|string $parentWindow
-     * 
+     *
      */
     public function process($parentWindow = null)
     {
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Webapi.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Webapi.php
index 1219a0753e5dd..2ef7dd25d09e7 100644
--- a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Webapi.php
+++ b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/BundleProduct/Webapi.php
@@ -135,7 +135,6 @@ protected function parseResponseSelections(array $response)
                     'selection_id' => (int)$optionValue['id'],
                     'option_id' => $option['option_id']
                 ];
-
             }
         }
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/Search/Grid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/Search/Grid.php
index 54d24e8d54583..e70ee8c983c81 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/Search/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Grouped/AssociatedProducts/Search/Grid.php
@@ -43,7 +43,7 @@ class Grid extends GridInterface
 
     /**
      * Press 'Add Selected Products' button.
-     * 
+     *
      * @return void
      */
     public function addProducts()
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
index e149e51211227..ec29850dadad1 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryIsNotActive.php
@@ -67,7 +67,6 @@ protected function getCategoryUrl(Category $category)
         return $_ENV['app_frontend_url'] . implode('/', array_reverse($categoryUrlKey)) . '.html';
     }
 
-
     /**
      * Category not find in top menu
      *
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
index 0ce432b86dd34..caae3e8f2fa54 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryPage.php
@@ -177,8 +177,7 @@ protected function verifyContent(array $categoryData)
             }
         }
 
-        if (
-            isset($categoryData['landing_page'])
+        if (isset($categoryData['landing_page'])
             && isset($categoryData['display_mode'])
             && in_array($categoryData['display_mode'], $this->visibleCmsBlockMode)
         ) {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertImagesAreVisibleOnProductPage.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertImagesAreVisibleOnProductPage.php
index 99f5fae234b7f..c949f52380e39 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertImagesAreVisibleOnProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertImagesAreVisibleOnProductPage.php
@@ -132,7 +132,7 @@ protected function verifyFullImage()
 
     /**
      * Check is image file can be loaded (displayed)
-     * 
+     *
      * @param string $src
      * @return bool
      */
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php
index dd2384bf8d632..25b9880e5433b 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Category/ParentId.php
@@ -37,7 +37,7 @@ public function __construct(FixtureFactory $fixtureFactory, array $params, $data
                 $this->parentCategory->persist();
             }
             $this->data = $this->parentCategory->getId();
-        } else if (isset($data['source']) && $data['source'] instanceof Category) {
+        } elseif (isset($data['source']) && $data['source'] instanceof Category) {
             $this->parentCategory = $data['source'];
             $this->data = $data['source']->getId();
         } else {
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResultOrder.php b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResultOrder.php
index fa96742de1eea..798ce5ce80aee 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResultOrder.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/Constraint/AssertCatalogSearchResultOrder.php
@@ -43,7 +43,6 @@ public function processAssert(CatalogSearchQuery $catalogSearch, AdvancedResult
             $productNamesOnPage = $resultPage->getListProductBlock()->getProductNames();
 
             foreach ($productNamesOnPage as $productOnPage) {
-
                 $idxInArray = array_search($productOnPage, $productsOrder, true);
                 if (false !== $idxInArray) {
                     if (0 !== $idxInArray) {
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
index 167e9a65afec5..7aa3dbc17993c 100644
--- a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.php
@@ -219,7 +219,6 @@ public function tearDown()
             \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
             ['configData' => $this->configData, 'rollback' => true, 'flushCache' => $this->flushCache]
         )->run();
-
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/UpdateTermEntityStep.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/UpdateTermEntityStep.php
index 45809ae12e60e..a31f7f6fe02cf 100644
--- a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/UpdateTermEntityStep.php
+++ b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestStep/UpdateTermEntityStep.php
@@ -21,6 +21,7 @@ class UpdateTermEntityStep implements TestStepInterface
      * @var CheckoutAgreement
      */
     protected $agreement;
+
     /**
      * Original checkout agreement data.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
index df8846c4b2762..3b854e3c15ead 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax.php
@@ -21,7 +21,6 @@ class AssertTaxRuleIsAppliedToAllPricesDownloadableExcludingTax extends
      */
     protected $severeness = 'high';
 
-
     /**
      * Get prices on category page.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/CreateEmailTemplateEntityTest.php b/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/CreateEmailTemplateEntityTest.php
index 7f00ea52e0788..2f6b0810519e7 100644
--- a/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/CreateEmailTemplateEntityTest.php
+++ b/dev/tests/functional/tests/app/Magento/Email/Test/TestCase/CreateEmailTemplateEntityTest.php
@@ -66,7 +66,6 @@ public function __inject(
     /**
      * @param EmailTemplate $emailTemplate
      */
-
     public function test(EmailTemplate $emailTemplate)
     {
         $this->emailTemplateIndex->open();
diff --git a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php
index 57eb05ae94f22..20c1dc1d2dc1d 100644
--- a/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php
+++ b/dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php
@@ -62,7 +62,6 @@ public function processAssert(
 
             $expectedData[] = $giftMessageForm->getData();
             $actualData[] = $salesOrderView->getGiftOptionsBlock()->getData($giftMessageForm);
-
         }
 
         if ($giftMessage->getAllowGiftOptionsForItems() === 'Yes') {
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesOnGroupedProductPage.php
index c7d1b459fe9cc..513259a4479cc 100644
--- a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesOnGroupedProductPage.php
+++ b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesOnGroupedProductPage.php
@@ -21,7 +21,6 @@
 abstract class AbstractAssertTaxRuleIsAppliedToAllPricesOnGroupedProductPage extends
  AbstractAssertTaxRuleIsAppliedToAllPrices
 {
-
     /**
      * Get grouped product view prices.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.php
index d0c46c7a8492d..cf93e2a1e6e4d 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreatePayFlowOrderBackendNegativeTest.php
@@ -24,7 +24,7 @@
  * 9. Click Get Shipping Method and rates.
  * 10. Fill data according dataset.
  * 11. Select payment method Credit Card (PayFlow Pro)
- * 12. Leave empty required fields for credit card 
+ * 12. Leave empty required fields for credit card
  * 13. Click Submit order button
  *
  * @group PayPal
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/ContinueToPaypalInContextStep.php b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/ContinueToPaypalInContextStep.php
index 2f25f212a2183..de01b69cc0839 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/ContinueToPaypalInContextStep.php
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestStep/ContinueToPaypalInContextStep.php
@@ -29,6 +29,7 @@ public function __construct(CheckoutOnepage $checkoutOnepage)
     {
         $this->checkoutOnepage = $checkoutOnepage;
     }
+
     /**
      * Click Continue to PayPal button.
      *
diff --git a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertNoVideoCategoryView.php b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertNoVideoCategoryView.php
index 832ba49b9c59b..c9810c106812a 100755
--- a/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertNoVideoCategoryView.php
+++ b/dev/tests/functional/tests/app/Magento/ProductVideo/Test/Constraint/AssertNoVideoCategoryView.php
@@ -16,7 +16,6 @@
  */
 class AssertNoVideoCategoryView extends AbstractConstraint
 {
-
     /**
      * Assert that video is absent on category page on Store front.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Counts/Grid.php b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Counts/Grid.php
index 9bbec18911671..8f044883135f6 100644
--- a/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Counts/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Reports/Test/Block/Adminhtml/Customer/Counts/Grid.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Reports\Test\Block\Adminhtml\Customer\Counts;
 
-
 /**
  * Class Grid
  * Order count report grid
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
index 68e4a12a78446..d3ff1d7dc856f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm/Product.php
@@ -81,7 +81,6 @@ public function getItemSubExclTax()
      *
      * @return string|null
      */
-
     public function getItemSubInclTax()
     {
         $price = $this->_rootElement->find($this->itemSubInclTax, Locator::SELECTOR_XPATH);
diff --git a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewUserTest.php b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewUserTest.php
index 4c47edf9d5548..95275124e9387 100644
--- a/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewUserTest.php
+++ b/dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenCreatingNewUserTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Security\Test\TestCase;
 
-
 use Magento\User\Test\Page\Adminhtml\UserEdit;
 use Magento\User\Test\Page\Adminhtml\UserIndex;
 use Magento\Mtf\TestCase\Injectable;
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
index b917cff3c128f..20c706f0197a5 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPrices.php
@@ -144,7 +144,6 @@ public function openCategory($productCategory)
         $this->cmsIndex->getTopmenu()->selectCategoryByName($productCategory);
     }
 
-
     /**
      * Get cart prices.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
index 7887e991ea7da..8fc65d669be8e 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertOrderTaxOnBackendExcludingTax.php
@@ -18,7 +18,6 @@ class AssertOrderTaxOnBackendExcludingTax extends AbstractAssertOrderTaxOnBacken
      */
     protected $severeness = 'high';
 
-
     /**
      * Get order totals.
      *
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php
index a128c36bd8d24..494f4fdee8aac 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Block/Adminhtml/Catalog/Category/Tree.php
@@ -6,7 +6,6 @@
 
 namespace Magento\UrlRewrite\Test\Block\Adminhtml\Catalog\Category;
 
-
 use Magento\Mtf\Block\Block;
 use Magento\Mtf\Client\Locator;
 use Magento\Catalog\Test\Fixture\Category;
diff --git a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductInGrid.php b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductInGrid.php
index 9e44e046c702d..a7dda09690688 100644
--- a/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductInGrid.php
+++ b/dev/tests/functional/tests/app/Magento/UrlRewrite/Test/Constraint/AssertUrlRewriteProductInGrid.php
@@ -97,7 +97,6 @@ public function processAssert(
                     $urlRewriteIndex->getUrlRedirectGrid()->isRowVisible($filter, true, false),
                     'URL Rewrite with request path \'' . $filter['request_path'] . '\' is absent in grid.'
                 );
-
             }
         }
     }
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php
index 7d1168724134b..43866ff2db6dc 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Handler/Role/Curl.php
@@ -124,6 +124,7 @@ protected function prepareAssignedUsers(FixtureInterface $fixture)
     }
 
     // TODO: Method should be removed in scope of  MAGETWO-31563
+
     /**
      * Prepare admin gws option.
      *
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/Block/StoredPayments.php b/dev/tests/functional/tests/app/Magento/Vault/Test/Block/StoredPayments.php
index e9716c505eb76..81ea111adf1ef 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/Block/StoredPayments.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/Block/StoredPayments.php
@@ -60,12 +60,12 @@ public function getCreditCards()
         $result = [];
         $elements = $this->_rootElement->getElements('./tbody/tr', Locator::SELECTOR_XPATH);
         foreach ($elements as $row) {
-            $number = substr($row->find('./td[@data-th="Card Number"]', Locator::SELECTOR_XPATH)->getText(), -4, 4);
+            $card = substr($row->find('./td[@data-th="Card Number"]', Locator::SELECTOR_XPATH)->getText(), -4, 4);
             $deleteButton = $row->find(
-                "./td[text()[contains(.,'{$number}')]]/following-sibling::td[@data-th='Actions']//span[text()='Delete']",
+                "./td[text()[contains(.,'{$card}')]]/following-sibling::td[@data-th='Actions']//span[text()='Delete']",
                 Locator::SELECTOR_XPATH
             );
-            $result[$number] = $deleteButton;
+            $result[$card] = $deleteButton;
         }
         return $result;
     }
diff --git a/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/UseSavedPaymentMethodStep.php b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/UseSavedPaymentMethodStep.php
index f28370f3c18c0..1c0b02451b252 100644
--- a/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/UseSavedPaymentMethodStep.php
+++ b/dev/tests/functional/tests/app/Magento/Vault/Test/TestStep/UseSavedPaymentMethodStep.php
@@ -33,7 +33,7 @@ class UseSavedPaymentMethodStep implements TestStepInterface
      * @param CheckoutOnepage $checkoutOnepage
      * @param array $vault
      */
-    public function __construct (CheckoutOnepage $checkoutOnepage, array $vault)
+    public function __construct(CheckoutOnepage $checkoutOnepage, array $vault)
     {
         $this->checkoutOnepage = $checkoutOnepage;
         $this->vault = $vault;
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DbIsolation.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DbIsolation.php
index 819183610b313..7fcee8d90f949 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DbIsolation.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DbIsolation.php
@@ -11,6 +11,7 @@
 class DbIsolation
 {
     const MAGENTO_DB_ISOLATION = 'magentoDbIsolation';
+
     /**
      * @var bool
      */
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
index 635a1aa7e3501..722b87a70a0c2 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
@@ -186,7 +186,6 @@ function ($classFile) {
                     self::$backupStaticVariables[$className][$staticProperty->getName()] = $value;
                 }
             }
-
         }
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/_files/paypal_quote.php b/dev/tests/integration/testsuite/Magento/Braintree/_files/paypal_quote.php
index 8e58a83af58bc..28d3cbb882c8e 100644
--- a/dev/tests/integration/testsuite/Magento/Braintree/_files/paypal_quote.php
+++ b/dev/tests/integration/testsuite/Magento/Braintree/_files/paypal_quote.php
@@ -22,4 +22,3 @@
 /** @var CartRepositoryInterface $quoteRepository */
 $quoteRepository = $objectManager->get(CartRepositoryInterface::class);
 $quoteRepository->save($quote);
-
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product_rollback.php
index 3354c7962babf..73cae8f2bb9a7 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/issaleable_product_rollback.php
@@ -23,6 +23,5 @@
     //Product already removed
 }
 
-
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/EavTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/EavTest.php
index e0419c5ca821b..b5ce4fc63b944 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/EavTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/EavTest.php
@@ -116,9 +116,9 @@ private function prepareDataForComparison(array &$data, array $expectedData)
             }
             if ($item instanceof \Magento\Framework\Phrase) {
                 $item = (string)$item;
-            } else if (is_array($item)) {
+            } elseif (is_array($item)) {
                 $this->prepareDataForComparison($item, $expectedData[$key]);
-            } else if ($key === 'price_id' || $key === 'sortOrder') {
+            } elseif ($key === 'price_id' || $key === 'sortOrder') {
                 $data[$key] = '__placeholder__';
             }
         }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
index 6cf3f84a0b765..3bf99e5c09f20 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
@@ -35,7 +35,6 @@
     }
 }
 
-
 /**
  * After installation system has two categories: root one with ID:1 and Default category with ID:2
  */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/price_row_fixture_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/price_row_fixture_rollback.php
index 06868115161f8..5d96d7f7ec225 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/price_row_fixture_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/price_row_fixture_rollback.php
@@ -12,7 +12,6 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-
 $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Catalog\Model\ProductRepository::class
 );
@@ -27,6 +26,5 @@
 $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
 $category->load(9)->delete();
 
-
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_rollback.php
index b048e0ca65975..abed0001932cf 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_rollback.php
@@ -20,7 +20,6 @@
     $product = $productRepository->get('simple', false, null, true);
     $productRepository->delete($product);
 } catch (NoSuchEntityException $e) {
-
 }
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options_rollback.php
index dc35cf6b70ce8..c0c11800df7d1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_options_rollback.php
@@ -20,7 +20,6 @@
     $product = $productRepository->get('simple_with_custom_options', false, null, true);
     $productRepository->delete($product);
 } catch (NoSuchEntityException $e) {
-
 }
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_dropdown_option_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_dropdown_option_rollback.php
index 7aecb2899b232..5e4a28a4b8ccf 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_dropdown_option_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_dropdown_option_rollback.php
@@ -18,7 +18,6 @@
     $product = $productRepository->get('simple_dropdown_option', false, null, true);
     $product->delete();
 } catch (NoSuchEntityException $e) {
-
 }
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_for_search_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_for_search_rollback.php
index 69cc49d961f90..f0de25a76325e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_for_search_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_for_search_rollback.php
@@ -26,7 +26,6 @@
         $product = $productRepository->get($sku, false, null, true);
         $productRepository->delete($product);
     } catch (NoSuchEntityException $e) {
-
     }
 }
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/quote_with_product_and_custom_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/quote_with_product_and_custom_options.php
index 95940d25d5204..a299126874a73 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/quote_with_product_and_custom_options.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/quote_with_product_and_custom_options.php
@@ -48,7 +48,6 @@
     $options[] = $customOption;
 }
 
-
 $quote->load('test_order_1', 'reserved_order_id');
 $cartItem->setQty(1);
 $cartItem->setSku('simple');
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
index d96c02c3e9ae7..8f314345ed7d9 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php
@@ -122,7 +122,7 @@ public function testExportWithProductLinks()
 
     /**
      * Verify that all stock item attribute values are exported (aren't equal to empty string)
-     * 
+     *
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
      * @covers \Magento\CatalogImportExport\Model\Export\Product::export
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/IndexSwitcherMock.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/IndexSwitcherMock.php
index 35423d4c5d70d..f75db2d00b1fb 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/IndexSwitcherMock.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/IndexSwitcherMock.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogSearch\Model\Indexer;
 
-
 use Magento\CatalogSearch\Model\Indexer\IndexSwitcherInterface;
 
 /**
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/indexer_fulltext_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/indexer_fulltext_rollback.php
index da7d8cc83c0e2..9f38100e0e32e 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/indexer_fulltext_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/indexer_fulltext_rollback.php
@@ -15,6 +15,5 @@
 $collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
 $collection->addAttributeToSelect('id')->load()->delete();
 
-
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/search_attributes.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/search_attributes.php
index fdf3bf291ffe6..bb844ccd8027f 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/search_attributes.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/search_attributes.php
@@ -61,7 +61,6 @@
     $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
 }
 
-
 /** @var \Magento\Eav\Model\Config $eavConfig */
 $eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
 $eavConfig->clear();
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
index d9932b0517fb9..52d561fbeae3c 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
@@ -11,7 +11,6 @@
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\UrlRewrite\Model\OptionProvider;
 
-
 /**
  * @magentoAppArea adminhtml
  */
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_products_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_products_rollback.php
index ad6e15538267c..44b6d725b5332 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_products_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/categories_with_products_rollback.php
@@ -17,5 +17,4 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
 
-
 require __DIR__ . '/categories_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/CatalogWidget/Model/Rule/Condition/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogWidget/Model/Rule/Condition/ProductTest.php
index ef1e1172a9062..742fc4b4a8650 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogWidget/Model/Rule/Condition/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogWidget/Model/Rule/Condition/ProductTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogWidget\Model\Rule\Condition;
 
-
 class ProductTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_saved.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_saved.php
index 265d423c9596b..347d1d960c9cc 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_saved.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_saved.php
@@ -11,7 +11,6 @@
 
 require 'quote_with_address.php';
 
-
 $quoteRepository = \Magento\Framework\App\ObjectManager::getInstance()->get(
     \Magento\Quote\Api\CartRepositoryInterface::class
 );
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address.php
index 7aa0988f5258d..3de29def90201 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_virtual_product_and_address.php
@@ -11,15 +11,15 @@
 require __DIR__ . '/../../../Magento/Catalog/_files/product_virtual.php';
 
 /** @var \Magento\Quote\Model\Quote\Address $quoteShippingAddress */
-$quoteShippingAddress = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$quoteShippingAddress = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Quote\Model\Quote\Address::class
 );
 /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
-$customerRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$customerRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Customer\Api\CustomerRepositoryInterface::class
 );
 /** @var \Magento\Customer\Api\AddressRepositoryInterface $addressRepository */
-$addressRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$addressRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Customer\Api\AddressRepositoryInterface::class
 );
 $quoteShippingAddress->importCustomerAddressData($addressRepository->getById(1));
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/MatrixTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/MatrixTest.php
index 8ac94836ac4c4..14251d88aa631 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/MatrixTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config/MatrixTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config;
 
-
 /**
  * @magentoAppArea adminhtml
  */
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php
index 0f23cd2ab40bc..6ffaba60cc5ed 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Data/AssociatedProductsTest.php
@@ -21,7 +21,6 @@ public function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->registry = $this->objectManager->get(\Magento\Framework\Registry::class);
-
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/tax_rule.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/tax_rule.php
index cb7e518948a0a..6da5af2117c60 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/tax_rule.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/tax_rule.php
@@ -9,7 +9,6 @@
 $customerTaxClass = $objectManager->create(\Magento\Tax\Model\ClassModel::class)->load('Retail Customer', 'class_name');
 $productTaxClass1 = $objectManager->create(\Magento\Tax\Model\ClassModel::class)->load('Taxable Goods', 'class_name');
 
-
 $taxRate = [
     'tax_country_id' => 'US',
     'tax_region_id' => '0',
diff --git a/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php b/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php
index f68f2281e2854..c53362466caba 100644
--- a/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php
@@ -46,6 +46,7 @@ public function testInvalidPostAction($params, $expectedMessage)
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
+
     public static function dataInvalidPostAction()
     {
         return [
diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
index d6f208bc8c7ce..7e6cc8582373e 100644
--- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currencysymbol/SaveTest.php
@@ -7,7 +7,6 @@
 
 class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
-
     /**
      * Test save action
      *
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartsTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartsTest.php
index 905a507eddc1f..9e4db9e3aac2a 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartsTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Customer\Block\Adminhtml\Edit\Tab;
 
-
 /**
  * Magento\Customer\Block\Adminhtml\Edit\Tab\Carts
  *
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
index 3d47f12677657..3736095998f1d 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerTest.php
@@ -85,7 +85,7 @@ public function testImportData()
         );
 
         /** @var $customersCollection \Magento\Customer\Model\ResourceModel\Customer\Collection */
-        $customersCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $customersCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Customer\Model\ResourceModel\Customer\Collection::class
         );
         $customersCollection->addAttributeToSelect('firstname', 'inner')->addAttributeToSelect('lastname', 'inner');
@@ -112,7 +112,7 @@ public function testImportData()
         /** @var $objectManager \Magento\TestFramework\ObjectManager */
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
-        $existingCustomer = $objectManager->get(
+        $existingCustomer = $objectManager->get(
             \Magento\Framework\Registry::class
         )->registry(
                 '_fixture/Magento_ImportExport_Customer'
@@ -154,7 +154,7 @@ public function testDeleteData()
         );
 
         /** @var $customerCollection \Magento\Customer\Model\ResourceModel\Customer\Collection */
-        $customerCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $customerCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Customer\Model\ResourceModel\Customer\Collection::class
         );
         $this->assertEquals(3, $customerCollection->count(), 'Count of existing customers are invalid');
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product.php
index c0f4396278378..dd6f709bcc72e 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_downloadable_product.php
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-$billingAddress = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$billingAddress = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Sales\Model\Order\Address::class,
     [
         'data' => [
@@ -24,11 +24,11 @@
 );
 $billingAddress->setAddressType('billing');
 
-$payment = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$payment = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Sales\Model\Order\Payment::class);
 $payment->setMethod('checkmo');
 
-$orderItem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$orderItem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Sales\Model\Order\Item::class);
 $orderItem->setProductId(
     1
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_rollback.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_rollback.php
index 127d948962b3e..bcf6076e198c0 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_rollback.php
@@ -20,7 +20,6 @@
     $product = $productRepository->get('downloadable-product', false, null, true);
     $productRepository->delete($product);
 } catch (NoSuchEntityException $e) {
-
 }
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_files.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_files.php
index 4bb0fea9989e9..eeb5c390deea7 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_files.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable_with_files.php
@@ -112,8 +112,6 @@
 }
 $links[] = $link;
 
-
-
 $extension->setDownloadableProductLinks($links);
 
 if (isset($downloadableData['sample']) && is_array($downloadableData['sample'])) {
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php b/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
index 75e238ccc00c8..30ad4bb800767 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php
@@ -33,7 +33,6 @@ public function tearDown()
         restore_error_handler();
     }
 
-
     /**
      * Test lost connection re-initializing
      *
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attribute.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attribute.php
index 5956440e3de79..3063e2582a3a7 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attribute.php
@@ -65,7 +65,6 @@
 );
 $multiselectOptions->setAttributeFilter($multiselectAttribute->getId());
 
-
 /* Create simple products per each select(dropdown) option */
 foreach ($selectOptions as $option) {
     /** @var $product \Magento\Catalog\Model\Product */
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/products_rollback.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/products_rollback.php
index f3a82df16fec5..f29e6bd08626f 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/products_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/products_rollback.php
@@ -17,6 +17,5 @@
     $collection->delete();
 }
 
-
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
index 6e46163ef0119..734ba8130537a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
@@ -210,7 +210,7 @@ protected function createCookieScope($params = [])
      */
     protected function createSensitiveMetadata($metadata = [])
     {
-        return $this->objectManager->create(
+        return $this->objectManager->create(
             \Magento\Framework\Stdlib\Cookie\SensitiveCookieMetadata::class,
             ['metadata' => $metadata]
         );
@@ -224,7 +224,7 @@ protected function createSensitiveMetadata($metadata = [])
      */
     protected function createPublicMetadata($metadata = [])
     {
-        return $this->objectManager->create(
+        return $this->objectManager->create(
             \Magento\Framework\Stdlib\Cookie\PublicCookieMetadata::class,
             ['metadata' => $metadata]
         );
@@ -238,7 +238,7 @@ protected function createPublicMetadata($metadata = [])
      */
     protected function createCookieMetadata($metadata = [])
     {
-        return $this->objectManager->create(
+        return $this->objectManager->create(
             \Magento\Framework\Stdlib\Cookie\CookieMetadata::class,
             ['metadata' => $metadata]
         );
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/PhpCookieReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/PhpCookieReaderTest.php
index eb79234573e9b..2e46fd0077845 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/PhpCookieReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/PhpCookieReaderTest.php
@@ -33,6 +33,7 @@ public function setUp()
         $_COOKIE[self::NAME] = self::VALUE;
         $this->model = new PhpCookieReader();
     }
+
     public function testGetCookieExists()
     {
         $this->assertSame(self::VALUE, $this->model->getCookie(self::NAME, self::DEFAULT_VAL));
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Asset/MinifierTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Asset/MinifierTest.php
index cc14104f014b0..1d198e3479fac 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/Asset/MinifierTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Asset/MinifierTest.php
@@ -93,7 +93,7 @@ public function testCSSminLibrary()
 
     /**
      * Test JS minification library
-     * 
+     *
      * @return void
      */
     public function testJshrinkLibrary()
diff --git a/dev/tests/integration/testsuite/Magento/GiftMessage/Model/OrderItemRepositoryTest.php b/dev/tests/integration/testsuite/Magento/GiftMessage/Model/OrderItemRepositoryTest.php
index 580b566605a52..49a2f3167c444 100644
--- a/dev/tests/integration/testsuite/Magento/GiftMessage/Model/OrderItemRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/GiftMessage/Model/OrderItemRepositoryTest.php
@@ -28,7 +28,6 @@ protected function setUp()
         $this->giftMessageOrderItemRepository = $this->objectManager->create(
             \Magento\GiftMessage\Model\OrderItemRepository::class
         );
-
     }
 
     protected function tearDown()
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Integration/EditTest.php b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Integration/EditTest.php
index 1b9d3ea1725ba..844356cfb78e8 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Integration/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Integration/EditTest.php
@@ -118,6 +118,5 @@ public function testGetFormActionUrl()
     {
         $baseUrl = Bootstrap::getObjectManager()->get(\Magento\Framework\Url::class)->getBaseUrl();
         $this->assertContains($baseUrl, $this->editBlock->getFormActionUrl());
-
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
index 1ebb7006af772..8aaa1fe6100ff 100644
--- a/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Block/Checkout/Address/SelectTest.php
@@ -2,48 +2,48 @@
 /**
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-namespace Magento\Multishipping\Block\Checkout\Address;
-
-use Magento\TestFramework\Helper\Bootstrap;
-
+ */
+
+// @codingStandardsIgnoreFile
+
+namespace Magento\Multishipping\Block\Checkout\Address;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * @magentoAppArea frontend
- */
-class SelectTest extends \PHPUnit_Framework_TestCase
-{
-    /** @var \Magento\Multishipping\Block\Checkout\Address\Select */
-    protected $_selectBlock;
-
-    protected function setUp()
-    {
-        $this->_selectBlock = Bootstrap::getObjectManager()->create(
-            \Magento\Multishipping\Block\Checkout\Address\Select::class
-        );
-        parent::setUp();
-    }
-
+ */
+class SelectTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\Multishipping\Block\Checkout\Address\Select */
+    protected $_selectBlock;
+
+    protected function setUp()
+    {
+        $this->_selectBlock = Bootstrap::getObjectManager()->create(
+            \Magento\Multishipping\Block\Checkout\Address\Select::class
+        );
+        parent::setUp();
+    }
+
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
-     */
-    public function testGetAddressAsHtml()
-    {
-        /** @var \Magento\Customer\Api\AddressRepositoryInterface $addressRepository */
-        $addressRepository = Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Api\AddressRepositoryInterface::class
-        );
-        $fixtureAddressId = 1;
-        $address = $addressRepository->getById($fixtureAddressId);
-        $addressAsHtml = $this->_selectBlock->getAddressAsHtml($address);
-        $this->assertEquals(
-            "John Smith<br />CompanyName<br />Green str, 67<br />CityM,  Alabama, 75477"
-                . "<br />United States<br />T: <a href=\"tel:3468676\">3468676</a>",
-            str_replace("\n", '', $addressAsHtml),
-            "Address was represented as HTML incorrectly"
-        );
-    }
-}
+     */
+    public function testGetAddressAsHtml()
+    {
+        /** @var \Magento\Customer\Api\AddressRepositoryInterface $addressRepository */
+        $addressRepository = Bootstrap::getObjectManager()->create(
+            \Magento\Customer\Api\AddressRepositoryInterface::class
+        );
+        $fixtureAddressId = 1;
+        $address = $addressRepository->getById($fixtureAddressId);
+        $addressAsHtml = $this->_selectBlock->getAddressAsHtml($address);
+        $this->assertEquals(
+            "John Smith<br />CompanyName<br />Green str, 67<br />CityM,  Alabama, 75477"
+                . "<br />United States<br />T: <a href=\"tel:3468676\">3468676</a>",
+            str_replace("\n", '', $addressAsHtml),
+            "Address was represented as HTML incorrectly"
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreementTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreementTest.php
index 148fb56e16e36..63983761fbacc 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Payment/Method/Billing/AbstractAgreementTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Paypal\Model\Payment\Method\Billing;
 
-
 use Magento\Quote\Api\Data\PaymentInterface;
 
 class AbstractAgreementTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express.php
index 787c178b052b0..082254649c495 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_express.php
@@ -7,7 +7,7 @@
 // @codingStandardsIgnoreFile
 
 $addressData = include __DIR__ . '/address_data.php';
-$billingAddress = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$billingAddress = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Sales\Model\Order\Address::class,
     ['data' => $addressData]
 );
@@ -15,7 +15,7 @@
 $shippingAddress = clone $billingAddress;
 $shippingAddress->setId(null)->setAddressType('shipping');
 
-$payment = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$payment = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Sales\Model\Order\Payment::class);
 $payment->setMethod(\Magento\Paypal\Model\Config::METHOD_WPP_EXPRESS);
 
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflowpro.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflowpro.php
index 432f80e3152e0..202e14c1d221e 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflowpro.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/order_payflowpro.php
@@ -7,7 +7,7 @@
 // @codingStandardsIgnoreFile
 
 $addressData = include __DIR__ . '/address_data.php';
-$billingAddress = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$billingAddress = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Sales\Model\Order\Address::class,
     ['data' => $addressData]
 );
@@ -16,7 +16,7 @@
 $shippingAddress = clone $billingAddress;
 $shippingAddress->setId(null)->setAddressType('shipping');
 
-$payment = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$payment = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Sales\Model\Order\Payment::class);
 $payment->setMethod(\Magento\Paypal\Model\Config::METHOD_PAYFLOWPRO);
 
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php
index 33ae308c76ff3..08db34c2ff86e 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php
@@ -11,7 +11,6 @@
  */
 class ShippingMethodManagementTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @magentoAppIsolation enabled
      * @magentoDbIsolation enabled
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php b/dev/tests/integration/testsuite/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
index db6c5b96dcdcc..f2532d196aab5 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
@@ -72,7 +72,7 @@ public function testChangeQuoteCustomerGroupIdForCustomerWithDisabledAutomaticGr
                 'quote' => $quote,
                 'shipping_assignment' => $shippingAssignment,
                 'total' => $total
-        ]
+            ]
             ]
         );
         $this->model->execute($eventObserver);
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php b/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php
index 3ace7ec42672f..a67a44398293b 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php
@@ -24,7 +24,7 @@
 
 // imitate product views
 /** @var \Magento\Reports\Observer\CatalogProductViewObserver $reportObserver */
-$reportObserver = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$reportObserver = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Reports\Observer\CatalogProductViewObserver::class
 );
 
@@ -46,7 +46,7 @@
 
 // refresh report statistics
 /** @var \Magento\Reports\Model\ResourceModel\Report\Product\Viewed $reportResource */
-$reportResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$reportResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\Reports\Model\ResourceModel\Report\Product\Viewed::class
 );
 $reportResource->beginTransaction();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/StatusTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/StatusTest.php
index 636121a5af530..9a96251e5c3cb 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/StatusTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/StatusTest.php
@@ -26,7 +26,7 @@ class StatusTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->resourceModel = Bootstrap::getObjectManager()
-            ->create(
+            ->create(
                 \Magento\Sales\Model\ResourceModel\Order\Status::class,
                 [
                     'data' => ['status' => 'fake_status']
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_item_list.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_item_list.php
index 9f0510edbc333..63eb90a214eae 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_item_list.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_item_list.php
@@ -44,7 +44,6 @@
     ]
 ];
 
-
 /** @var array $orderItemData */
 foreach ($orderItems as $orderItemData) {
     /** @var $orderItem \Magento\Sales\Model\Order\Item */
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_dummy_item_and_invoiced.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_dummy_item_and_invoiced.php
index dd51f4ecb63d5..6ac4c6d43daa0 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_dummy_item_and_invoiced.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_dummy_item_and_invoiced.php
@@ -43,7 +43,6 @@
 
 saveOrderItems($orderItems);
 
-
 /**
  * Save Order Items.
  *
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/RuleTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/RuleTest.php
index 3c389be70baba..3b8db3a430abc 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/RuleTest.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/RuleTest.php
@@ -11,7 +11,6 @@
  */
 class RuleTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @magentoDataFixture Magento/SalesRule/_files/rule_custom_product_attribute.php
      */
diff --git a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
index cc4cba24cbc49..623287365e9ef 100644
--- a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php
@@ -47,7 +47,7 @@ public static function loadByPhraseDataProvider()
                 'MONARCH English', [
                 ['synonyms' => 'queen,monarch', 'store_id' => 1, 'website_id' => 0],
                 ['synonyms' => 'british,english', 'store_id' => 1, 'website_id' => 0]
-            ]
+                ]
             ]
         ];
     }
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowFrameworkCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowFrameworkCommandTest.php
index 3ae1dc428cc12..b7d043feef29f 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowFrameworkCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/DependenciesShowFrameworkCommandTest.php
@@ -82,6 +82,5 @@ public function testExecute()
         $this->assertContains('"Dependencies for each module:",' . PHP_EOL, $fileContents);
         $this->assertContains('"Magento\A",1' . PHP_EOL . '" -- Magento\Framework",3' . PHP_EOL, $fileContents);
         $this->assertContains('"Magento\B",1' . PHP_EOL . '" -- Magento\Framework",3' . PHP_EOL, $fileContents);
-
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/I18nPackCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/I18nPackCommandTest.php
index 44af81f8192f3..1fd96c556f2f1 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/I18nPackCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/I18nPackCommandTest.php
@@ -60,7 +60,6 @@ public function testExecute()
         $this->assertFileExists($basePath . '/Magento/B/i18n/de_DE.csv');
         $this->assertFileExists($basePath . '/Magento/C/i18n/de_DE.csv');
         $this->assertFileExists($basePath . '/Magento/D/i18n/de_DE.csv');
-
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Model/ConfigOptionsListCollectorTest.php b/dev/tests/integration/testsuite/Magento/Setup/Model/ConfigOptionsListCollectorTest.php
index d734302fb3781..3c64079bb0549 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Model/ConfigOptionsListCollectorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Model/ConfigOptionsListCollectorTest.php
@@ -70,6 +70,5 @@ public function testCollectOptionsLists()
         ];
 
         $this->assertEquals($expected, $result);
-
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Parser/Config/XmlTest.php b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Parser/Config/XmlTest.php
index f26cb3091f372..8f993b450ee0e 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Parser/Config/XmlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/Dependency/Parser/Config/XmlTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Setup\Module\Dependency\Parser\Config;
 
-
 class XmlTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/GeneratorTest.php
index 531bd77ddc600..db9ec56ba348d 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/GeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Dictionary/GeneratorTest.php
@@ -73,7 +73,6 @@ protected function setUp()
         );
 
         $this->generator = ServiceLocator::getDictionaryGenerator();
-
     }
 
     protected function tearDown()
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php
index 482f628b5c71c..8c7a9c6f4568a 100644
--- a/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php
@@ -84,6 +84,5 @@ function ($values, $index) use ($optionsPerAttribute) {
         $attribute = $om->get(ProductAttributeRepositoryInterface::class)->save($attribute);
         $this->assertNotEmpty($attribute->getId());
         $this->assertEquals('swatch_visual', $attribute->getFrontendInput());
-
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php
index d08d470a8cca6..312865ec63735 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php
@@ -11,6 +11,7 @@
 
 /**
  * @magentoDbIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TaxCalculationTest extends \PHPUnit_Framework_TestCase
 {
@@ -2675,7 +2676,7 @@ private function convertObjectToArray($object)
     {
         if ($object instanceof \Magento\Framework\DataObject) {
             $data = $object->getData();
-        } else if (is_object($object)) {
+        } elseif (is_object($object)) {
             $data = (array)$object;
         } else {
             throw new \InvalidArgumentException("Provided argument is not an object.");
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/AclConfigFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/AclConfigFilesTest.php
index e4e08acccce81..90951f894c4c9 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/AclConfigFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/AclConfigFilesTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Test\Integrity\Modular;
 
-
 class AclConfigFilesTest extends \PHPUnit_Framework_TestCase
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php
index dd79f27ec28bc..1ce09ac5a5038 100644
--- a/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Controller/Adminhtml/User/InvalidateTokenTest.php
@@ -51,7 +51,7 @@ public function testInvalidateMultipleTokens()
         $tokenService = Bootstrap::getObjectManager()->get(\Magento\Integration\Api\AdminTokenServiceInterface::class);
 
         /** @var \Magento\Integration\Model\ResourceModel\Oauth\Token\CollectionFactory $tokenModelCollectionFactory */
-        $tokenModelCollectionFactory = Bootstrap::getObjectManager()->get(
+        $tokenModelCollectionFactory = Bootstrap::getObjectManager()->get(
             \Magento\Integration\Model\ResourceModel\Oauth\Token\CollectionFactory::class
         );
 
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Service/Entity/TestService.php b/dev/tests/integration/testsuite/Magento/Webapi/Service/Entity/TestService.php
index ef0fd6ecc9322..6a794169fe50e 100644
--- a/dev/tests/integration/testsuite/Magento/Webapi/Service/Entity/TestService.php
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Service/Entity/TestService.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Webapi\Service\Entity;
 
-
-
 class TestService
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
index 3a0846f101fcf..567c469f57f88 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Config/ReaderTest.php
@@ -26,7 +26,7 @@ public function setUp()
     {
         $this->fileResolver = $this->getMockForAbstractClass(\Magento\Framework\Config\FileResolverInterface::class);
         $objectManager = Bootstrap::getObjectManager();
-        $this->model = $objectManager->create(
+        $this->model = $objectManager->create(
             \Magento\Widget\Model\Config\Reader::class, ['fileResolver' => $this->fileResolver]
         );
     }
diff --git a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/FinalImplementation.php b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/FinalImplementation.php
index 79f4ff4b95cc0..f17076529c633 100644
--- a/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/FinalImplementation.php
+++ b/dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/FinalImplementation.php
@@ -17,7 +17,6 @@
  */
 class FinalImplementation extends AbstractRule implements ClassAware, MethodAware
 {
-
     /**
      * @inheritdoc
      */
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
index 51a84b2c76386..648c49b1fb100 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/CommentLevelsSniff.php
@@ -180,7 +180,6 @@ private function checkNthLevelComment(PHP_CodeSniffer_File $phpcsFile, $stackPtr
 
         $commentLinePtr = $stackPtr;
         while ($tokens[$commentLinePtr - 2]['line'] > 1) {
-
             $commentLinePtr = $phpcsFile->findPrevious(T_STRING, $commentLinePtr - 1, null, false, '//');
 
             if (false === $commentLinePtr) {
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
index de3d02d53bb23..8b8cf91e560c2 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Less/SelectorDelimiterSniff.php
@@ -72,7 +72,6 @@ private function validateParenthesis(PHP_CodeSniffer_File $phpcsFile, $stackPtr,
 
         // Check that each class declaration goes from new line
         if (($stackLine === $nextClassLine) && ($stackLine === $nextOpenBraceLine)) {
-
             $prevParenthesis = $phpcsFile->findPrevious(T_OPEN_PARENTHESIS, $stackPtr);
             $nextParenthesis = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $stackPtr);
 
diff --git a/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php b/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
index 9375cded7cabd..c3ce29ea44668 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
@@ -23,7 +23,6 @@ class ConstantUsageSniff implements \PHP_CodeSniffer_Sniff
     public function register()
     {
         return [T_OPEN_TAG];
-
     }
 
     /**
@@ -83,7 +82,7 @@ private function checkIfFirstArgumentConstant(
             if (preg_match($variableRegexp, $lineContent) !== 0) {
                 $phpcsFile->addError($error, $stackPtr, 'VariableTranslation');
             }
-        } else if ($previousLineMatch) {
+        } elseif ($previousLineMatch) {
             $variableRegexp = "/^{$constantRegexp}/";
             if (preg_match($variableRegexp, $lineContent) !== 0) {
                 $phpcsFile->addError($error, $stackPtr, 'VariableTranslation');
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 eba745bfe2da9..d0b9868796be8 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/CodeSniffer.php
@@ -40,7 +40,7 @@ class CodeSniffer implements ToolInterface, ExtensionInterface
      *
      * @var array
      */
-    private $extensions = ['php'];
+    private $extensions = ['php', 'phtml'];
 
     /**
      * Constructor
@@ -51,8 +51,11 @@ class CodeSniffer implements ToolInterface, ExtensionInterface
      */
     public function __construct($rulesetDir, $reportFile, Wrapper $wrapper)
     {
-        $this->reportFile = $reportFile;
         $this->rulesetDir = $rulesetDir;
+        if (!file_exists($rulesetDir) && file_exists($fullPath = realpath(__DIR__ . '/../../../../' . $rulesetDir))) {
+            $this->rulesetDir = $fullPath;
+        }
+        $this->reportFile = $reportFile;
         $this->wrapper = $wrapper;
     }
 
diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
index d8ea6f34a428d..1a4daac0086db 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/DiRule.php
@@ -1,152 +1,151 @@
-<?php
-/**
- * Rule for searching php file dependency
- *
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\TestFramework\Dependency;
-
-use DOMDocument;
-use DOMXPath;
-use Magento\Framework\App\Utility\Files;
-use Magento\TestFramework\Dependency\VirtualType\VirtualTypeMapper;
-
-class DiRule implements RuleInterface
-{
-    /**
-     * @var VirtualTypeMapper
-     */
-    private $mapper;
-
-    /**
-     * @var string
-     */
-    private $pattern;
-
-    /**
-     * @param VirtualTypeMapper $mapper
-     */
-    public function __construct(VirtualTypeMapper $mapper)
-    {
-        $this->mapper = $mapper;
-    }
-
-    /**
-     * @return string
-     * @throws \Exception
-     */
-    private function getPattern()
-    {
-        if ($this->pattern === null) {
-            $this->pattern = '~\b(?<class>(?<module>('
-                . implode('_|', Files::init()->getNamespaces())
-                . '[_\\\\])[a-zA-Z0-9]+)[a-zA-Z0-9_\\\\]*)\b~';
-        }
-
-        return $this->pattern;
-    }
-
-    /**
-     * @var array
-     */
-    private static $tagNameMap = [
-        'type' => ['name'],
-        'preference' => [
-            'type',
-            'for'
-        ],
-        'plugin' => ['type'],
-        'virtualType' => ['type']
-    ];
-
-    /**
-     * Gets alien dependencies information for current module by analyzing file's contents
-     *
-     * @param string $currentModule
-     * @param string $fileType
-     * @param string $file
-     * @param string $contents
-     * @return array
-     * @throws \Exception
-     */
-    public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
-    {
-        if (pathinfo($file, PATHINFO_BASENAME) !== 'di.xml') {
-            return [];
-        }
-
-        $dependenciesInfo = [];
-        $scope = $this->mapper->getScopeFromFile($file);
-        foreach ($this->fetchPossibleDependencies($contents) as $type => $deps) {
-            foreach ($deps as $dep) {
-                $dep = $this->mapper->getType($dep, $scope);
-
-                if (preg_match($this->getPattern(), $dep, $matches)) {
-                    $referenceModule = str_replace('_', '\\', $matches['module']);
-                    if ($currentModule === $referenceModule) {
-                        continue;
-                    }
-                    $dependenciesInfo[] = [
-                        'module' => $referenceModule,
-                        'type' => $type,
-                        'source' => $matches['class'],
-                    ];
-                }
-            }
-        }
-        return $dependenciesInfo;
-    }
-
-    /**
-     * @param string $contents
-     * @return array
-     */
-    private function fetchPossibleDependencies($contents)
-    {
-        $doc = new DOMDocument();
-        $doc->loadXML($contents);
-
-        return [
-            RuleInterface::TYPE_SOFT => $this->getSoftDependencies($doc),
-            RuleInterface::TYPE_HARD => $this->getHardDependencies($doc)
-        ];
-    }
-
-    /**
-     * @param DOMDocument $doc
-     * @return array
-     */
-    private function getSoftDependencies(DOMDocument $doc)
-    {
-        $result = [];
-        foreach (self::$tagNameMap as $tagName => $attributeNames) {
-            $nodes = $doc->getElementsByTagName($tagName);
-            /** @var \DOMElement $node */
-            foreach ($nodes as $node) {
-                foreach ($attributeNames as $attributeName) {
-                    $result[] = $node->getAttribute($attributeName);
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param DOMDocument $doc
-     * @return array
-     */
-    private function getHardDependencies(DOMDocument $doc)
-    {
-        $result = [];
-        $xpath = new DOMXPath($doc);
-        $textNodes = $xpath->query('//*[@xsi:type="object"]');
-        /** @var \DOMElement $node */
-        foreach ($textNodes as $node) {
-            $result[] = $node->nodeValue;
-        }
-
-        return $result;
-    }
-}
+<?php
+/**
+ * Rule for searching php file dependency
+ *
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Dependency;
+
+use DOMDocument;
+use DOMXPath;
+use Magento\Framework\App\Utility\Files;
+use Magento\TestFramework\Dependency\VirtualType\VirtualTypeMapper;
+
+class DiRule implements RuleInterface
+{
+    /**
+     * @var VirtualTypeMapper
+     */
+    private $mapper;
+
+    /**
+     * @var string
+     */
+    private $pattern;
+
+    /**
+     * @param VirtualTypeMapper $mapper
+     */
+    public function __construct(VirtualTypeMapper $mapper)
+    {
+        $this->mapper = $mapper;
+    }
+
+    /**
+     * @return string
+     * @throws \Exception
+     */
+    private function getPattern()
+    {
+        if ($this->pattern === null) {
+            $this->pattern = '~\b(?<class>(?<module>('
+                . implode('_|', Files::init()->getNamespaces())
+                . '[_\\\\])[a-zA-Z0-9]+)[a-zA-Z0-9_\\\\]*)\b~';
+        }
+
+        return $this->pattern;
+    }
+
+    /**
+     * @var array
+     */
+    private static $tagNameMap = [
+        'type' => ['name'],
+        'preference' => [
+            'type',
+            'for'
+        ],
+        'plugin' => ['type'],
+        'virtualType' => ['type']
+    ];
+
+    /**
+     * Gets alien dependencies information for current module by analyzing file's contents
+     *
+     * @param string $currentModule
+     * @param string $fileType
+     * @param string $file
+     * @param string $contents
+     * @return array
+     * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
+    {
+        if (pathinfo($file, PATHINFO_BASENAME) !== 'di.xml') {
+            return [];
+        }
+
+        $dependenciesInfo = [];
+        $scope = $this->mapper->getScopeFromFile($file);
+        foreach ($this->fetchPossibleDependencies($contents) as $type => $deps) {
+            foreach ($deps as $dep) {
+                $dep = $this->mapper->getType($dep, $scope);
+                if (preg_match($this->getPattern(), $dep, $matches)) {
+                    $referenceModule = str_replace('_', '\\', $matches['module']);
+                    if ($currentModule === $referenceModule) {
+                        continue;
+                    }
+                    $dependenciesInfo[] = [
+                        'module' => $referenceModule,
+                        'type' => $type,
+                        'source' => $matches['class'],
+                    ];
+                }
+            }
+        }
+        return $dependenciesInfo;
+    }
+
+    /**
+     * @param string $contents
+     * @return array
+     */
+    private function fetchPossibleDependencies($contents)
+    {
+        $doc = new DOMDocument();
+        $doc->loadXML($contents);
+        return [
+            RuleInterface::TYPE_SOFT => $this->getSoftDependencies($doc),
+            RuleInterface::TYPE_HARD => $this->getHardDependencies($doc)
+        ];
+    }
+
+    /**
+     * @param DOMDocument $doc
+     * @return array
+     */
+    private function getSoftDependencies(DOMDocument $doc)
+    {
+        $result = [];
+        foreach (self::$tagNameMap as $tagName => $attributeNames) {
+            $nodes = $doc->getElementsByTagName($tagName);
+        /** @var \DOMElement $node */
+            foreach ($nodes as $node) {
+                foreach ($attributeNames as $attributeName) {
+                    $result[] = $node->getAttribute($attributeName);
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param DOMDocument $doc
+     * @return array
+     */
+    private function getHardDependencies(DOMDocument $doc)
+    {
+        $result = [];
+        $xpath = new DOMXPath($doc);
+        $textNodes = $xpath->query('//*[@xsi:type="object"]');
+/** @var \DOMElement $node */
+        foreach ($textNodes as $node) {
+            $result[] = $node->nodeValue;
+        }
+
+        return $result;
+    }
+}
diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
index b04fd775cbc1d..458475cd49074 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
@@ -195,7 +195,7 @@ private function isPluginDependency($dependent, $dependency)
             : null;
         if ($subject === $dependency) {
             return true;
-        } else if ($subject) {
+        } elseif ($subject) {
             $subjectModule = substr($subject, 0, strpos($subject, '\\', 9)); // (strlen('Magento\\') + 1) === 9
             return strpos($dependency, $subjectModule) === 0;
         } else {
@@ -203,7 +203,6 @@ private function isPluginDependency($dependent, $dependency)
         }
     }
 
-
     /**
      * Check get URL method
      *
diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/VirtualType/VirtualTypeMapper.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/VirtualType/VirtualTypeMapper.php
index 677492592dec8..d4a6996765f14 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Dependency/VirtualType/VirtualTypeMapper.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/VirtualType/VirtualTypeMapper.php
@@ -1,109 +1,107 @@
-<?php
-/**
- * Rule for searching php file dependency
- *
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\TestFramework\Dependency\VirtualType;
-
-use DOMDocument;
-use Magento\Framework\App\Utility\Files;
-
-class VirtualTypeMapper
-{
-    /**
-     * @var array
-     */
-    private $map = [];
-
-    /**
-     * @var string
-     */
-    private static $mainScope = 'global';
-
-    /**
-     * VirtualTypeMapper constructor.
-     * @param array $map
-     */
-    public function __construct(array $map = [])
-    {
-        $this->map = $map;
-    }
-
-    /**
-     * @param string $name
-     * @param string $scope
-     * @return string|null
-     */
-    public function getType($name, $scope = null)
-    {
-        if (empty($this->map)) {
-            $this->loadMap();
-        }
-
-        $scopes = [];
-        if ($scope !== null && $scope !== self::$mainScope) {
-            array_unshift($scopes, $scope);
-        }
-        $scopes[] = self::$mainScope;
-
-        foreach ($scopes as $scp) {
-            if (isset($this->map[$scp][$name])) {
-                return $this->map[$scp][$name];
-            }
-        }
-
-        return $name;
-    }
-
-    /**
-     * @param string $file
-     * @return string
-     */
-    public function getScopeFromFile($file)
-    {
-        $basename = basename(pathinfo($file, PATHINFO_DIRNAME));
-        return $basename === 'etc' ? 'global' : $basename;
-    }
-
-    /**
-     * @return array
-     * @throws \Exception
-     */
-    private function loadDiConfigs()
-    {
-        return Files::init()->getDiConfigs();
-    }
-
-    /**
-     * @param array $diFiles
-     * @return array
-     * @throws \Exception
-     */
-    public function loadMap(array $diFiles = [])
-    {
-        if (empty($diFiles)) {
-            $diFiles = $this->loadDiConfigs();
-        }
-
-        foreach ($diFiles as $file) {
-            $scope = $this->getScopeFromFile($file);
-            $doc = new DOMDocument();
-            $doc->loadXML(file_get_contents($file));
-
-            $nodes = $doc->getElementsByTagName('virtualType');
-            /** @var \DOMElement $node */
-            foreach ($nodes as $node) {
-                $name = $node->getAttribute('name');
-                $type = $node->getAttribute('type');
-                if (empty($type)) {
-                    continue;
-                }
-                $this->map[$scope][$name] = $type;
-            }
-        }
-
-        return $this->map;
-    }
-}
+<?php
+/**
+ * Rule for searching php file dependency
+ *
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Dependency\VirtualType;
+
+use DOMDocument;
+use Magento\Framework\App\Utility\Files;
+
+class VirtualTypeMapper
+{
+    /**
+     * @var array
+     */
+    private $map = [];
+
+    /**
+     * @var string
+     */
+    private static $mainScope = 'global';
+
+    /**
+     * VirtualTypeMapper constructor.
+     * @param array $map
+     */
+    public function __construct(array $map = [])
+    {
+        $this->map = $map;
+    }
+
+    /**
+     * @param string $name
+     * @param string $scope
+     * @return string|null
+     */
+    public function getType($name, $scope = null)
+    {
+        if (empty($this->map)) {
+            $this->loadMap();
+        }
+
+        $scopes = [];
+        if ($scope !== null && $scope !== self::$mainScope) {
+            array_unshift($scopes, $scope);
+        }
+        $scopes[] = self::$mainScope;
+        foreach ($scopes as $scp) {
+            if (isset($this->map[$scp][$name])) {
+                return $this->map[$scp][$name];
+            }
+        }
+
+        return $name;
+    }
+
+    /**
+     * @param string $file
+     * @return string
+     */
+    public function getScopeFromFile($file)
+    {
+        $basename = basename(pathinfo($file, PATHINFO_DIRNAME));
+        return $basename === 'etc' ? 'global' : $basename;
+    }
+
+    /**
+     * @return array
+     * @throws \Exception
+     */
+    private function loadDiConfigs()
+    {
+        return Files::init()->getDiConfigs();
+    }
+
+    /**
+     * @param array $diFiles
+     * @return array
+     * @throws \Exception
+     */
+    public function loadMap(array $diFiles = [])
+    {
+        if (empty($diFiles)) {
+            $diFiles = $this->loadDiConfigs();
+        }
+
+        foreach ($diFiles as $file) {
+            $scope = $this->getScopeFromFile($file);
+            $doc = new DOMDocument();
+            $doc->loadXML(file_get_contents($file));
+            $nodes = $doc->getElementsByTagName('virtualType');
+/** @var \DOMElement $node */
+            foreach ($nodes as $node) {
+                $name = $node->getAttribute('name');
+                $type = $node->getAttribute('type');
+                if (empty($type)) {
+                    continue;
+                }
+                $this->map[$scope][$name] = $type;
+            }
+        }
+
+        return $this->map;
+    }
+}
diff --git a/dev/tests/static/framework/Magento/TestFramework/Inspection/WordsFinder.php b/dev/tests/static/framework/Magento/TestFramework/Inspection/WordsFinder.php
index 79639e13cde35..3b655ee822c2d 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Inspection/WordsFinder.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Inspection/WordsFinder.php
@@ -88,7 +88,7 @@ class WordsFinder
 
     /**
      * Map of phrase to exclude from the file content
-     * 
+     *
      * @var  array
      */
     private $exclude = [];
diff --git a/dev/tests/static/framework/Magento/TestFramework/Integrity/PluginValidator.php b/dev/tests/static/framework/Magento/TestFramework/Integrity/PluginValidator.php
index bbfc9455d355a..fd7e42f73921d 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Integrity/PluginValidator.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Integrity/PluginValidator.php
@@ -44,7 +44,8 @@ public function validate($pluginClass, $interceptedType)
      */
     private function validateClassNameMatchesCase($className)
     {
-        $declarationName = (new \ReflectionClass($className))->getName();;
+        $declarationName = (new \ReflectionClass($className))->getName();
+        ;
         if (ltrim($className, '\\') != ltrim($declarationName)) {
             throw new ValidatorException(
                 new Phrase(
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php b/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php
index c9dc71c962448..a1eb36ce67b3f 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php
@@ -213,8 +213,7 @@ public function isXssUnsafeCommand($command)
     {
         $command = trim($command);
 
-        switch (true)
-        {
+        switch (true) {
             case preg_match(
                 '/->(' . implode('|', $this->escapeFunctions) . '|.*html.*)\(/simU',
                 $this->getLastMethod($command)
@@ -302,7 +301,6 @@ private function replacePhpQuoteWithPlaceholders($fileContent)
         $replacements = [];
         if (preg_match_all('/<[?](php|=)(.*?)[?]>/sm', $fileContent, $phpBlockMatches)) {
             foreach ($phpBlockMatches[2] as $phpBlock) {
-
                 $phpBlockQuoteReplaced = preg_replace(
                     ['/([^\\\\])\'\'/si', '/([^\\\\])""/si'],
                     ["\1'-*=single=*-'", '\1"-*=double=*-"'],
diff --git a/dev/tests/static/framework/Magento/ruleset.xml b/dev/tests/static/framework/Magento/ruleset.xml
index a636b13c7ff99..d877eb17104d4 100644
--- a/dev/tests/static/framework/Magento/ruleset.xml
+++ b/dev/tests/static/framework/Magento/ruleset.xml
@@ -7,6 +7,9 @@
 -->
 <ruleset name="Magento">
     <description>Custom Magento coding standard.</description>
+
+    <rule ref="PSR2"/>
+
     <rule ref="Magento.Files.LineLength">
         <properties>
             <property name="lineLimit" value="120"/>
@@ -16,4 +19,11 @@
     <rule ref="Magento.LiteralNamespaces.LiteralNamespaces">
         <exclude-pattern>*/_files/*</exclude-pattern>
     </rule>
+
+    <rule ref="Generic.Functions.CallTimePassByReference"/>
+    <rule ref="Generic.PHP.DeprecatedFunctions"/>
+
+    <rule ref="Squiz.Commenting.DocCommentAlignment"/>
+    <rule ref="Squiz.Functions.GlobalFunction"/>
+    <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
 </ruleset>
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DiRuleTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DiRuleTest.php
index e60155746fd6c..94b9ad006a9d6 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DiRuleTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/DiRuleTest.php
@@ -1,120 +1,112 @@
-<?php
-/**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\TestFramework\Dependency;
-
-use Magento\TestFramework\Dependency\VirtualType\VirtualTypeMapper;
-
-class DiRuleTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @param string $module
-     * @param string $contents
-     * @param array $expected
-     * @dataProvider getDependencyInfoDataProvider
-     */
-    public function testGetDependencyInfo($module, $contents, array $expected)
-    {
-
-        $diRule = new DiRule(
-            new VirtualTypeMapper(
-                [
-                    'scope' => [
-                        'someVirtualType1' => 'Magento\AnotherModule\Some\Class1',
-                        'someVirtualType2' => 'Magento\AnotherModule\Some\Class2'
-                    ]
-                ]
-            )
-        );
-
-        $file = '/some/path/scope/di.xml';
-        static::assertEquals(
-            $expected,
-            $diRule->getDependencyInfo($module, null, $file, $contents)
-        );
-    }
-
-    /**
-     * @return array
-     */
-    public function getDependencyInfoDataProvider()
-    {
-        return [
-            'Di without dependencies' => [
-                'Magento\SomeModule',
-                $this->getFileContent('di_no_dependency.xml'),
-                []
-            ],
-            'Di only in module dependencies' => [
-                'Magento\SomeModule',
-                $this->getFileContent('di_in_module_dependency.xml'),
-                []
-            ],
-            'Di external dependencies' => [
-                'Magento\SomeModule',
-                $this->getFileContent('di_external_dependency.xml'),
-                [
-                    [
-                        'module' => 'Magento\ExternalModule3',
-                        'type' => RuleInterface::TYPE_SOFT,
-                        'source' => 'Magento\ExternalModule3\Some\Another\Class'
-                    ],
-                    [
-                        'module' => 'Magento\ExternalModule5',
-                        'type' => RuleInterface::TYPE_SOFT,
-                        'source' => 'Magento\ExternalModule5\Some\Another\Class'
-                    ],
-                    [
-                        'module' => 'Magento\ExternalModule6',
-                        'type' => RuleInterface::TYPE_SOFT,
-                        'source' => 'Magento\ExternalModule6\Some\Plugin\Class'
-                    ],
-                    [
-                        'module' => 'Magento\ExternalModule1',
-                        'type' => RuleInterface::TYPE_HARD,
-                        'source' => 'Magento\ExternalModule1\Some\Argument1'
-                    ],
-                    [
-                        'module' => 'Magento\ExternalModule2',
-                        'type' => RuleInterface::TYPE_HARD,
-                        'source' => 'Magento\ExternalModule2\Some\Argument2'
-                    ],
-                    [
-                        'module' => 'Magento\ExternalModule4',
-                        'type' => RuleInterface::TYPE_HARD,
-                        'source' => 'Magento\ExternalModule4\Some\Argument3'
-                    ]
-                ]
-            ],
-            'Di virtual dependencies' => [
-                'Magento\SomeModule',
-                $this->getFileContent('di_virtual_dependency.xml'),
-                [
-                    [
-                        'module' => 'Magento\AnotherModule',
-                        'type' => RuleInterface::TYPE_HARD,
-                        'source' => 'Magento\AnotherModule\Some\Class1',
-                    ],
-                    [
-                        'module' => 'Magento\AnotherModule',
-                        'type' => RuleInterface::TYPE_HARD,
-                        'source' => 'Magento\AnotherModule\Some\Class2',
-                    ]
-                ]
-            ]
-        ];
-    }
-
-    /**
-     * Get content of di file
-     *
-     * @param string $fileName
-     * @return string
-     */
-    private function getFileContent($fileName)
-    {
-        return file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $fileName);
-    }
-}
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Dependency;
+
+use Magento\TestFramework\Dependency\VirtualType\VirtualTypeMapper;
+
+class DiRuleTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @param string $module
+     * @param string $contents
+     * @param array $expected
+     * @dataProvider getDependencyInfoDataProvider
+     */
+    public function testGetDependencyInfo($module, $contents, array $expected)
+    {
+
+        $diRule = new DiRule(new VirtualTypeMapper([
+                    'scope' => [
+                        'someVirtualType1' => 'Magento\AnotherModule\Some\Class1',
+                        'someVirtualType2' => 'Magento\AnotherModule\Some\Class2'
+                    ]
+                ]));
+        $file = '/some/path/scope/di.xml';
+        static::assertEquals($expected, $diRule->getDependencyInfo($module, null, $file, $contents));
+    }
+
+    /**
+     * @return array
+     */
+    public function getDependencyInfoDataProvider()
+    {
+        return [
+            'Di without dependencies' => [
+                'Magento\SomeModule',
+                $this->getFileContent('di_no_dependency.xml'),
+                []
+            ],
+            'Di only in module dependencies' => [
+                'Magento\SomeModule',
+                $this->getFileContent('di_in_module_dependency.xml'),
+                []
+            ],
+            'Di external dependencies' => [
+                'Magento\SomeModule',
+                $this->getFileContent('di_external_dependency.xml'),
+                [
+                    [
+                        'module' => 'Magento\ExternalModule3',
+                        'type' => RuleInterface::TYPE_SOFT,
+                        'source' => 'Magento\ExternalModule3\Some\Another\Class'
+                    ],
+                    [
+                        'module' => 'Magento\ExternalModule5',
+                        'type' => RuleInterface::TYPE_SOFT,
+                        'source' => 'Magento\ExternalModule5\Some\Another\Class'
+                    ],
+                    [
+                        'module' => 'Magento\ExternalModule6',
+                        'type' => RuleInterface::TYPE_SOFT,
+                        'source' => 'Magento\ExternalModule6\Some\Plugin\Class'
+                    ],
+                    [
+                        'module' => 'Magento\ExternalModule1',
+                        'type' => RuleInterface::TYPE_HARD,
+                        'source' => 'Magento\ExternalModule1\Some\Argument1'
+                    ],
+                    [
+                        'module' => 'Magento\ExternalModule2',
+                        'type' => RuleInterface::TYPE_HARD,
+                        'source' => 'Magento\ExternalModule2\Some\Argument2'
+                    ],
+                    [
+                        'module' => 'Magento\ExternalModule4',
+                        'type' => RuleInterface::TYPE_HARD,
+                        'source' => 'Magento\ExternalModule4\Some\Argument3'
+                    ]
+                ]
+            ],
+            'Di virtual dependencies' => [
+                'Magento\SomeModule',
+                $this->getFileContent('di_virtual_dependency.xml'),
+                [
+                    [
+                        'module' => 'Magento\AnotherModule',
+                        'type' => RuleInterface::TYPE_HARD,
+                        'source' => 'Magento\AnotherModule\Some\Class1',
+                    ],
+                    [
+                        'module' => 'Magento\AnotherModule',
+                        'type' => RuleInterface::TYPE_HARD,
+                        'source' => 'Magento\AnotherModule\Some\Class2',
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Get content of di file
+     *
+     * @param string $fileName
+     * @return string
+     */
+    private function getFileContent($fileName)
+    {
+        return file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $fileName);
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/PhpRuleTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/PhpRuleTest.php
index 140d3a230e3a5..28c092c5627dd 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/PhpRuleTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/PhpRuleTest.php
@@ -209,7 +209,6 @@ public function getDefaultModelDependencyDataProvider()
         ];
     }
 
-
     /**
      * Make some fake filepath to correspond to the class name
      *
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/VirtualType/VirtualTypeMapperTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/VirtualType/VirtualTypeMapperTest.php
index 2b90a246afee8..1b432869ef9fb 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/VirtualType/VirtualTypeMapperTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Dependency/VirtualType/VirtualTypeMapperTest.php
@@ -95,7 +95,6 @@ public function testLoad(array $diFilesPath, array $expectedVirtualTypesDependen
             $expectedVirtualTypesDependencies,
             $mapper->loadMap($diFilesPath)
         );
-
     }
 
     /**
@@ -116,7 +115,6 @@ public function testGetTypeComplex(array $diFilesPath, array $expectedVirtualTyp
                 self::assertEquals($baseType, $mapper->getType($virtualType, $scope));
             }
         }
-
     }
 
     /**
diff --git a/dev/tests/static/get_github_changes.php b/dev/tests/static/get_github_changes.php
index 8fcf66ee93492..9ff376d961ff6 100644
--- a/dev/tests/static/get_github_changes.php
+++ b/dev/tests/static/get_github_changes.php
@@ -176,7 +176,6 @@ function validateInput(array $options, array $requiredOptions)
     return true;
 }
 
-
 class GitRepo
 {
     /**
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
index aa4c0b4ddc7bc..ad753ef069a90 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -151,7 +151,6 @@ public static function setUpBeforeClass()
         $root = BP;
         $rootJson = json_decode(file_get_contents($root . '/composer.json'), true);
         if (preg_match('/magento\/project-*/', $rootJson['name']) == 1) {
-
             // The Dependency test is skipped for vendor/magento build
             self::markTestSkipped(
                 'MAGETWO-43654: The build is running from vendor/magento. DependencyTest is skipped.'
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Indexer/ConfigTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Indexer/ConfigTest.php
index 201de5608a791..6a959d7e7e16e 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Indexer/ConfigTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Indexer/ConfigTest.php
@@ -78,7 +78,6 @@ protected function _getKnownInvalidPartialXml()
     protected function _getFileXsd()
     {
         return $this->urnResolver->getRealPath('urn:magento:framework:Indexer/etc/indexer.xsd');
-
     }
 
     /**
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Phrase/ArgumentsTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Phrase/ArgumentsTest.php
index 48a3df46866f7..c25a8ffb84637 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Phrase/ArgumentsTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Phrase/ArgumentsTest.php
@@ -103,7 +103,6 @@ private function checkArgumentMismatch($phrase, &$incorrectNumberOfArgumentsErro
 
             // Check for zend placeholders %placeholder% and sprintf placeholder %s
             if (preg_match_all('/%((s)|([A-Za-z]+)%)/', $phrase['phrase'], $placeHolders, PREG_OFFSET_CAPTURE)) {
-
                 foreach ($placeHolders[0] as $ph) {
                     // Check if char after placeholder is not a digit or letter
                     $charAfterPh = $phrase['phrase'][$ph[1] + strlen($ph[0])];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
index 101602acb1d55..b2b6225eac836 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
@@ -584,7 +584,6 @@ private function _checkExistenceOfObsoleteConstants(
                             break;
                         }
                     }
-
                 }
             } else {
                 $result = 1;
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
index 05b5cd721d8e2..13977a9ad04ee 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/copyright/blacklist.php
@@ -7,4 +7,3 @@
     '/\.(jpe?g|png|gif|ttf|swf|eot|woff|pdf|mp3|pdf|jar|jbf)$/',
     '/pub\/opt\/magento\/var/'
 ];
-
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index 036805558830f..209e620dadf5e 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -189,101 +189,27 @@ function ($file) use ($fileHasAllowedType, $fileIsInAllowedDirectory) {
     }
 
     /**
-     * Run the PSR2 code sniffs on the code
+     * Retrieves full list of codebase paths without any files/folders filtered out
      *
-     * @TODO: combine with testCodeStyle
-     * @return void
+     * @return array
      */
-    public function testCodeStylePsr2()
+    private function getFullWhitelist()
     {
-        $reportFile = self::$reportDir . '/phpcs_psr2_report.txt';
-        $wrapper = new Wrapper();
-        $codeSniffer = new CodeSniffer('PSR2', $reportFile, $wrapper);
-        if (!$codeSniffer->canRun()) {
-            $this->markTestSkipped('PHP Code Sniffer is not installed.');
-        }
-        if (version_compare($wrapper->version(), '1.4.7') === -1) {
-            $this->markTestSkipped('PHP Code Sniffer Build Too Old.');
-        }
-
-        $result = $codeSniffer->run(self::getWhitelist());
-
-        $output = "";
-        if (file_exists($reportFile)) {
-            $output = file_get_contents($reportFile);
-        }
-        $this->assertEquals(
-            0,
-            $result,
-            "PHP Code Sniffer has found {$result} error(s): " . PHP_EOL . $output
-        );
+        return Files::init()->readLists(__DIR__ . '/_files/whitelist/common.txt');
     }
 
-    /**
-     * Run the magento specific coding standards on the code
-     *
-     * @return void
-     */
-    public function testCodeStyle()
+    public function testNoViolationsDetectedByPhpCodeSniffer()
     {
         $reportFile = self::$reportDir . '/phpcs_report.txt';
-        $wrapper = new Wrapper();
-        $codeSniffer = new CodeSniffer(realpath(__DIR__ . '/_files/phpcs'), $reportFile, $wrapper);
-        if (!$codeSniffer->canRun()) {
-            $this->markTestSkipped('PHP Code Sniffer is not installed.');
-        }
-        $codeSniffer->setExtensions(['php', 'phtml']);
-        $result = $codeSniffer->run(self::getWhitelist(['php', 'phtml']));
-
-        $output = "";
-        if (file_exists($reportFile)) {
-            $output = file_get_contents($reportFile);
-        }
-
+        $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper());
         $this->assertEquals(
             0,
-            $result,
-            "PHP Code Sniffer has found {$result} error(s): " . PHP_EOL . $output
+            $result = $codeSniffer->run($this->getFullWhitelist()),
+            "PHP Code Sniffer detected {$result} violation(s): " . PHP_EOL . file_get_contents($reportFile)
         );
     }
 
-    /**
-     * Run the annotations sniffs on the code
-     *
-     * @return void
-     * @todo Combine with normal code style at some point.
-     */
-    public function testAnnotationStandard()
-    {
-        $reportFile = self::$reportDir . '/phpcs_annotations_report.txt';
-        $wrapper = new Wrapper();
-        $codeSniffer = new CodeSniffer(
-            realpath(__DIR__ . '/../../../../framework/Magento/ruleset.xml'),
-            $reportFile,
-            $wrapper
-        );
-        if (!$codeSniffer->canRun()) {
-            $this->markTestSkipped('PHP Code Sniffer is not installed.');
-        }
-
-        $result = $codeSniffer->run(self::getWhitelist(['php']));
-        $output = "";
-        if (file_exists($reportFile)) {
-            $output = file_get_contents($reportFile);
-        }
-        $this->assertEquals(
-            0,
-            $result,
-            "PHP Code Sniffer has found {$result} error(s): " . PHP_EOL . $output
-        );
-    }
-
-    /**
-     * Run mess detector on code
-     *
-     * @return void
-     */
-    public function testCodeMess()
+    public function testNoViolationsDetectedByPhpMessDetector()
     {
         $reportFile = self::$reportDir . '/phpmd_report.txt';
         $codeMessDetector = new CodeMessDetector(realpath(__DIR__ . '/_files/phpmd/ruleset.xml'), $reportFile);
@@ -292,7 +218,6 @@ public function testCodeMess()
             $this->markTestSkipped('PHP Mess Detector is not available.');
         }
 
-
         $result = $codeMessDetector->run(self::getWhitelist(['php']));
 
         $output = "";
@@ -312,12 +237,7 @@ public function testCodeMess()
         }
     }
 
-    /**
-     * Run copy paste detector on code
-     *
-     * @return void
-     */
-    public function testCopyPaste()
+    public function testNoViolationsDetectedByPhpCopyPasteDetector()
     {
         $reportFile = self::$reportDir . '/phpcpd_report.xml';
         $copyPasteDetector = new CopyPasteDetector($reportFile);
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/ruleset.xml b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/ruleset.xml
deleted file mode 100644
index 8a3a701c15feb..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcs/ruleset.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<ruleset name="Magento">
-    <description>Magento coding standard.</description>
-    <rule ref="Zend.Files.ClosingTag"/>
-    <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
-    <rule ref="Generic.WhiteSpace.ScopeIndent"/>
-    <rule ref="Generic.Files.LineEndings"/>
-    <rule ref="PEAR.NamingConventions.ValidClassName"/>
-    <rule ref="Squiz.Functions.GlobalFunction"/>
-    <rule ref="Zend.NamingConventions.ValidVariableName">
-        <!-- Excluding as it conflicts with the PSR2 standard which over rides this one -->
-        <exclude name="Zend.NamingConventions.ValidVariableName.PrivateNoUnderscore"/>
-    </rule>
-    <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
-    <rule ref="Generic.PHP.DisallowShortOpenTag"/>
-    <rule ref="PEAR.Classes.ClassDeclaration"/>
-    <rule ref="PEAR.Functions.FunctionDeclaration"/>
-    <rule ref="Squiz.Scope.MethodScope"/>
-    <rule ref="Generic.Functions.CallTimePassByReference"/>
-    <rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
-    <rule ref="PEAR.WhiteSpace.ScopeClosingBrace"/>
-    <rule ref="Generic.ControlStructures.InlineControlStructure"/>
-    <rule ref="PEAR.ControlStructures.ControlSignature"/>
-    <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
-    <rule ref="Squiz.Commenting.DocCommentAlignment"/>
-    <rule ref="Generic.PHP.DeprecatedFunctions"/>
-    <rule ref="../../../../../../framework/Magento"/>
-</ruleset>
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
index e5c31e5afcb0c..8e1e6f16bc351 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
@@ -1,8 +1,7 @@
-module * /
-library * /
-dev/tools/Magento
-dev/tests/api-functional
-dev/tests/functional
-dev/tests/integration
-dev/tests/static
-setup
\ No newline at end of file
+# Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>
+* * /
+dev
+phpserver
+pub
+setup
+*.php
diff --git a/dev/tests/unit/framework/bootstrap.php b/dev/tests/unit/framework/bootstrap.php
index 2988c71ff8289..6e82d65f60002 100644
--- a/dev/tests/unit/framework/bootstrap.php
+++ b/dev/tests/unit/framework/bootstrap.php
@@ -21,8 +21,8 @@
 ini_set('display_errors', 1);
 
 /**
-* Set custom error handler
-*/
+ * Set custom error handler
+ */
 function setCustomErrorHandler()
 {
     set_error_handler(
@@ -54,5 +54,5 @@ function ($errNo, $errStr, $errFile, $errLine) {
                 );
             }
         }
-   );
+    );
 }
diff --git a/lib/internal/Magento/Framework/Api/DataObjectHelper.php b/lib/internal/Magento/Framework/Api/DataObjectHelper.php
index 8a9e0e2a553a1..c6212511314f3 100644
--- a/lib/internal/Magento/Framework/Api/DataObjectHelper.php
+++ b/lib/internal/Magento/Framework/Api/DataObjectHelper.php
@@ -176,7 +176,7 @@ protected function setComplexValue(
         if (is_subclass_of($returnType, \Magento\Framework\Api\ExtensibleDataInterface::class)) {
             $object = $this->objectFactory->create($returnType, []);
             $this->populateWithArray($object, $value, $returnType);
-        } else if (is_subclass_of($returnType, \Magento\Framework\Api\ExtensionAttributesInterface::class)) {
+        } elseif (is_subclass_of($returnType, \Magento\Framework\Api\ExtensionAttributesInterface::class)) {
             foreach ($value as $extensionAttributeKey => $extensionAttributeValue) {
                 $extensionAttributeGetterMethodName
                     = 'get' . \Magento\Framework\Api\SimpleDataObjectConverter::snakeCaseToUpperCamelCase(
diff --git a/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php b/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
index 463cfd8ea3478..29c16a5332b59 100644
--- a/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
+++ b/lib/internal/Magento/Framework/Api/ExtensibleDataObjectConverter.php
@@ -48,7 +48,7 @@ public function toNestedArray(
         if (!empty($dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY])) {
             /** @var AttributeValue[] $customAttributes */
             $customAttributes = $dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY];
-            unset ($dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY]);
+            unset($dataObjectArray[AbstractExtensibleObject::CUSTOM_ATTRIBUTES_KEY]);
             foreach ($customAttributes as $attributeValue) {
                 if (!in_array($attributeValue[AttributeValue::ATTRIBUTE_CODE], $skipAttributes)) {
                     $dataObjectArray[$attributeValue[AttributeValue::ATTRIBUTE_CODE]]
@@ -59,7 +59,7 @@ public function toNestedArray(
         if (!empty($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY])) {
             /** @var array $extensionAttributes */
             $extensionAttributes = $dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY];
-            unset ($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
+            unset($dataObjectArray[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
             foreach ($extensionAttributes as $attributeKey => $attributeValue) {
                 if (!in_array($attributeKey, $skipAttributes)) {
                     $dataObjectArray[$attributeKey] = $attributeValue;
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php
index 24a9dfafa5eec..b5b811c63b2de 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Api\SearchCriteria\CollectionProcessor;
 
-
 use Magento\Framework\Api\SearchCriteria\CollectionProcessor\JoinProcessor\CustomJoinInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
diff --git a/lib/internal/Magento/Framework/Api/SortOrder.php b/lib/internal/Magento/Framework/Api/SortOrder.php
index 5255c33718821..83488823b7dd3 100644
--- a/lib/internal/Magento/Framework/Api/SortOrder.php
+++ b/lib/internal/Magento/Framework/Api/SortOrder.php
@@ -32,7 +32,6 @@ public function __construct(array $data = [])
         }
     }
 
-
     /**
      * Get sorting field.
      *
@@ -78,7 +77,7 @@ public function setDirection($direction)
 
     /**
      * Validate direction argument ASC or DESC
-     * 
+     *
      * @param mixed $direction
      * @return null
      * @throws InputException
diff --git a/lib/internal/Magento/Framework/Api/SortOrderBuilder.php b/lib/internal/Magento/Framework/Api/SortOrderBuilder.php
index c2adf1b6e5e4b..a857bbb76dea8 100644
--- a/lib/internal/Magento/Framework/Api/SortOrderBuilder.php
+++ b/lib/internal/Magento/Framework/Api/SortOrderBuilder.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\Api;
 
-
 /**
  * Builder for sort order data object.
  * @method SortOrder create()
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageContentValidatorTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageContentValidatorTest.php
index 54abb82e53837..2075b920dbd6f 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageContentValidatorTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageContentValidatorTest.php
@@ -26,8 +26,8 @@ class ImageContentValidatorTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->imageContentValidator = $this->objectManager->getObject(
-            \Magento\Framework\Api\ImageContentValidator::class
+        $this->imageContentValidator = $this->objectManager->getObject(
+            \Magento\Framework\Api\ImageContentValidator::class
         );
     }
 
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageProcessorTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageProcessorTest.php
index 1e4093624a061..6dd301b474ab1 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageProcessorTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/Api/ImageProcessorTest.php
@@ -57,7 +57,7 @@ protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
-        $this->directoryWriteMock = $this->getMockForAbstractClass(
+        $this->directoryWriteMock = $this->getMockForAbstractClass(
             \Magento\Framework\Filesystem\Directory\WriteInterface::class
         );
         $this->fileSystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
@@ -66,7 +66,7 @@ protected function setUp()
         $this->fileSystemMock->expects($this->any())
             ->method('getDirectoryWrite')
             ->willReturn($this->directoryWriteMock);
-        $this->contentValidatorMock = $this->getMockBuilder(
+        $this->contentValidatorMock = $this->getMockBuilder(
             \Magento\Framework\Api\ImageContentValidatorInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -90,7 +90,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->imageProcessor = $this->objectManager->getObject(
+        $this->imageProcessor = $this->objectManager->getObject(
             \Magento\Framework\Api\ImageProcessor::class,
             [
                 'fileSystem' => $this->fileSystemMock,
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/GenerateSearchResultsTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/GenerateSearchResultsTest.php
index 431ef42c3c856..7f2e6ac9eeeeb 100644
--- a/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/GenerateSearchResultsTest.php
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/GenerateSearchResultsTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Api\Test\Unit\Code\Generator;
 
-
 /**
  * Class SearchResultTest
  */
diff --git a/lib/internal/Magento/Framework/Api/Uploader.php b/lib/internal/Magento/Framework/Api/Uploader.php
index d0b1e5b2b6918..2916af6c7d08c 100644
--- a/lib/internal/Magento/Framework/Api/Uploader.php
+++ b/lib/internal/Magento/Framework/Api/Uploader.php
@@ -11,13 +11,11 @@
  */
 class Uploader extends \Magento\Framework\File\Uploader
 {
-
     /**
      * Avoid running the default constructor specific to FILE upload
      */
     public function __construct()
     {
-
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/Config.php b/lib/internal/Magento/Framework/App/Config.php
index 68f2fdebaa6e0..01db8483142ba 100644
--- a/lib/internal/Magento/Framework/App/Config.php
+++ b/lib/internal/Magento/Framework/App/Config.php
@@ -67,7 +67,7 @@ public function getValue(
         if ($scope !== 'default') {
             if (is_numeric($scopeCode) || $scopeCode === null) {
                 $scopeCode = $this->scopeCodeResolver->resolve($scope, $scopeCode);
-            } else if ($scopeCode instanceof \Magento\Framework\App\ScopeInterface) {
+            } elseif ($scopeCode instanceof \Magento\Framework\App\ScopeInterface) {
                 $scopeCode = $scopeCode->getCode();
             }
             if ($scopeCode) {
diff --git a/lib/internal/Magento/Framework/App/PageCache/Kernel.php b/lib/internal/Magento/Framework/App/PageCache/Kernel.php
index 076033b748c0c..b498501718754 100644
--- a/lib/internal/Magento/Framework/App/PageCache/Kernel.php
+++ b/lib/internal/Magento/Framework/App/PageCache/Kernel.php
@@ -169,7 +169,6 @@ private function getPreparedData(\Magento\Framework\App\Response\Http $response)
             'headers' => $response->getHeaders()->toArray(),
             'context' => $this->context->toArray()
         ];
-
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/RequestInterface.php b/lib/internal/Magento/Framework/App/RequestInterface.php
index 6b23536324746..d20a59953e1eb 100644
--- a/lib/internal/Magento/Framework/App/RequestInterface.php
+++ b/lib/internal/Magento/Framework/App/RequestInterface.php
@@ -66,7 +66,6 @@ public function setParams(array $params);
      */
     public function getParams();
 
-
     /**
      * Retrieve cookie value
      *
diff --git a/lib/internal/Magento/Framework/App/Response/HttpInterface.php b/lib/internal/Magento/Framework/App/Response/HttpInterface.php
index 22557e76b95c4..da1800deb8f50 100644
--- a/lib/internal/Magento/Framework/App/Response/HttpInterface.php
+++ b/lib/internal/Magento/Framework/App/Response/HttpInterface.php
@@ -38,7 +38,7 @@ public function setHeader($name, $value, $replace = false);
 
     /**
      * Get header value by name
-     * 
+     *
      * Returns first found header by passed name.
      * If header with specified name was not found returns false.
      *
@@ -57,14 +57,14 @@ public function clearHeader($name);
 
     /**
      * Allow granular setting of HTTP response status code, version and phrase
-     * 
+     *
      * For example, a HTTP response as the following:
      *     HTTP 200 1.1 Your response has been served
      * Can be set with the arguments
      *     $httpCode = 200
      *     $version = 1.1
      *     $phrase = 'Your response has been served'
-     * 
+     *
      * @param int|string $httpCode
      * @param null|int|string $version
      * @param null|string $phrase
@@ -74,7 +74,7 @@ public function setStatusHeader($httpCode, $version = null, $phrase = null);
 
     /**
      * Append the given string to the response body
-     * 
+     *
      * @param string $value
      * @return self
      */
@@ -82,9 +82,9 @@ public function appendBody($value);
 
     /**
      * Set the response body to the given value
-     * 
+     *
      * Any previously set contents will be replaced by the new content.
-     * 
+     *
      * @param string $value
      * @return self
      */
diff --git a/lib/internal/Magento/Framework/App/SetupInfo.php b/lib/internal/Magento/Framework/App/SetupInfo.php
index fac38e28ee2bc..636095344bd6e 100644
--- a/lib/internal/Magento/Framework/App/SetupInfo.php
+++ b/lib/internal/Magento/Framework/App/SetupInfo.php
@@ -111,7 +111,7 @@ public function getProjectUrl()
         $isProjectInDocRoot = false !== strpos($this->projectRoot . '/', $this->docRoot . '/');
         if (empty($this->server['HTTP_HOST'])) {
             return '';
-        } else if (!$isProjectInDocRoot) {
+        } elseif (!$isProjectInDocRoot) {
             return 'http://' . $this->server['HTTP_HOST'] . '/';
         }
         return 'http://' . $this->server['HTTP_HOST'] . substr($this->projectRoot . '/', strlen($this->docRoot));
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php
index 5620d1ee63b31..4b7fe1a43532d 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php
@@ -40,7 +40,6 @@ protected function setUp()
             ['test'],
             $this->tagResolver
         );
-
     }
 
     public function testAroundSave()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/FactoryTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/FactoryTest.php
index 85bdcc4b16639..c34832d536e4d 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/FactoryTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/Frontend/FactoryTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\App\Test\Unit\Cache\Frontend;
 
-
 class FactoryTest extends \PHPUnit_Framework_TestCase
 {
     public static function setUpBeforeClass()
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/InitialConfigSourceTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/InitialConfigSourceTest.php
index 99fe505433281..50c263b8c88db 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Config/InitialConfigSourceTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Config/InitialConfigSourceTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\App\Test\Unit\Config;
 
-
 use Magento\Framework\App\Config\InitialConfigSource;
 use Magento\Framework\App\DeploymentConfig\Reader;
 
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/ConfigTesting.php b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/ConfigTesting.php
index 95f040085990d..c261828e5b43c 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/ConfigTesting.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/Environment/ConfigTesting.php
@@ -11,7 +11,6 @@
 
 class ConfigTesting implements ConfigInterface
 {
-
     /**
      * Set class relations
      *
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/FactoryStub.php b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/FactoryStub.php
index 1b7ba43ec39a5..a4d08771d4d46 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/FactoryStub.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/ObjectManager/FactoryStub.php
@@ -47,6 +47,5 @@ public function create($requestedType, array $arguments = [])
      */
     public function setObjectManager(ObjectManagerInterface $objectManager)
     {
-
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
index a076e2e0ef3fc..d1ed0d6256e19 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php
@@ -283,7 +283,6 @@ public function getDistroBaseUrlPathDataProvider()
         ];
     }
 
-
     public function serverVariablesProvider()
     {
         $returnValue = [];
diff --git a/lib/internal/Magento/Framework/App/Utility/Classes.php b/lib/internal/Magento/Framework/App/Utility/Classes.php
index 62ad2dd56ea3e..57b84971eee0f 100644
--- a/lib/internal/Magento/Framework/App/Utility/Classes.php
+++ b/lib/internal/Magento/Framework/App/Utility/Classes.php
@@ -271,11 +271,10 @@ public static function resolveVirtualType($className)
      */
     public static function isAutogenerated($className)
     {
-        if (
-            preg_match(
-                '/.*\\\\[a-zA-Z0-9]{1,}(Factory|SearchResults|DataBuilder|Extension|ExtensionInterface)$/',
-                $className
-            )
+        if (preg_match(
+            '/.*\\\\[a-zA-Z0-9]{1,}(Factory|SearchResults|DataBuilder|Extension|ExtensionInterface)$/',
+            $className
+        )
             || preg_match('/Magento\\\\[\w]+\\\\(Test\\\\(Page|Fixture))\\\\/', $className)
             || preg_match('/.*\\\\[a-zA-Z0-9]{1,}\\\\Proxy$/', $className)
         ) {
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
index 98e12804b0c65..f97fa904c3d09 100644
--- a/lib/internal/Magento/Framework/App/Utility/Files.php
+++ b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -391,6 +391,7 @@ function ($file) use ($excludedFileNames) {
         }
         return self::$_cache[$cacheKey];
     }
+
     // @codingStandardsIgnoreEnd
 
     /**
diff --git a/lib/internal/Magento/Framework/Backup/Media.php b/lib/internal/Magento/Framework/Backup/Media.php
index d8b01f782e990..5ea8e86bd975a 100644
--- a/lib/internal/Magento/Framework/Backup/Media.php
+++ b/lib/internal/Magento/Framework/Backup/Media.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Backup;
 
-
 /**
  * Class to work media folder and database backups
  *
diff --git a/lib/internal/Magento/Framework/Cache/Backend/MongoDb.php b/lib/internal/Magento/Framework/Cache/Backend/MongoDb.php
index c14192447a2e2..69a56b477a86c 100644
--- a/lib/internal/Magento/Framework/Cache/Backend/MongoDb.php
+++ b/lib/internal/Magento/Framework/Cache/Backend/MongoDb.php
@@ -24,7 +24,6 @@ class MongoDb extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Extende
     const COMPARISON_MODE_NOT_MATCHING_TAG = \Zend_Cache::CLEANING_MODE_NOT_MATCHING_TAG;
 
     const COMPARISON_MODE_MATCHING_ANY_TAG = \Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG;
-
     /**#@-*/
 
     /**
@@ -38,14 +37,10 @@ class MongoDb extends \Zend_Cache_Backend implements \Zend_Cache_Backend_Extende
      * @var array
      */
     protected $_options = [
-        /** MongoDB connection string */
-        'connection_string' => 'mongodb://localhost:27017',
-        /** MongoDB connection options */
-        'mongo_options' => [],
-        /** Name of a database to be used for cache storage */
-        'db' => '',
-        /** Name of a collection to be used for cache storage */
-        'collection' => 'cache',
+        'connection_string' => 'mongodb://localhost:27017', // MongoDB connection string
+        'mongo_options' => [], // MongoDB connection options
+        'db' => '', // Name of a database to be used for cache storage
+        'collection' => 'cache', // Name of a collection to be used for cache storage
     ];
 
     /**
diff --git a/lib/internal/Magento/Framework/Code/GeneratedFiles.php b/lib/internal/Magento/Framework/Code/GeneratedFiles.php
index 4ee3c6680d6dd..98790b0e75c95 100644
--- a/lib/internal/Magento/Framework/Code/GeneratedFiles.php
+++ b/lib/internal/Magento/Framework/Code/GeneratedFiles.php
@@ -64,7 +64,6 @@ public function regenerate()
     public function cleanGeneratedFiles()
     {
         if ($this->write->isExist(self::REGENERATE_FLAG)) {
-
             $enabledCacheTypes = [];
 
             //TODO: to be removed in scope of MAGETWO-53476
diff --git a/lib/internal/Magento/Framework/Code/Generator.php b/lib/internal/Magento/Framework/Code/Generator.php
index afffbcd76fe1f..80e13fc60373e 100644
--- a/lib/internal/Magento/Framework/Code/Generator.php
+++ b/lib/internal/Magento/Framework/Code/Generator.php
@@ -199,7 +199,7 @@ protected function shouldSkipGeneration($resultEntityType, $sourceClassName, $re
     {
         if (!$resultEntityType || !$sourceClassName) {
             return self::GENERATION_ERROR;
-        } else if ($this->definedClasses->isClassLoadableFromDisc($resultClass)) {
+        } elseif ($this->definedClasses->isClassLoadableFromDisc($resultClass)) {
             $generatedFileName = $this->_ioObject->generateResultFileName($resultClass);
             /**
              * Must handle two edge cases: a competing process has generated the class and written it to disc already,
@@ -211,7 +211,7 @@ protected function shouldSkipGeneration($resultEntityType, $sourceClassName, $re
                 $this->_ioObject->includeFile($generatedFileName);
             }
             return self::GENERATION_SKIP;
-        } else if (!isset($this->_generatedEntities[$resultEntityType])) {
+        } elseif (!isset($this->_generatedEntities[$resultEntityType])) {
             throw new \InvalidArgumentException('Unknown generation entity.');
         }
         return false;
diff --git a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
index b8f80489d9dba..9df1117b2d1b9 100644
--- a/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
+++ b/lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
@@ -252,8 +252,7 @@ protected function _validateData()
         if (!$this->definedClasses->isClassLoadable($sourceClassName)) {
             $this->_addError('Source class ' . $sourceClassName . ' doesn\'t exist.');
             return false;
-        } elseif (
-            /**
+        } elseif (/**
              * If makeResultFileDirectory only fails because the file is already created,
              * a competing process has generated the file, no exception should be thrown.
              */
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php
index cdd0c57d614a3..2b74454bb4040 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php
@@ -93,7 +93,7 @@ public function testWriteResultFileAlreadyExists($resultFileName, $fileExists, $
 
         if (!$exceptionDuringRename) {
             $renameMockEvent = $this->returnValue(true);
-        } else if ($fileExists) {
+        } elseif ($fileExists) {
             $renameMockEvent = $this->throwException(new FileSystemException(new Phrase('File already exists')));
         } else {
             $exceptionMessage = 'Some error renaming file';
diff --git a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorArgumentTypesTest.php b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorArgumentTypesTest.php
index 07415893ffeee..55e6c751d2b33 100644
--- a/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorArgumentTypesTest.php
+++ b/lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorArgumentTypesTest.php
@@ -28,14 +28,14 @@ class ConstructorArgumentTypesTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->argumentsReaderMock = $this->getMock(
+        $this->argumentsReaderMock = $this->getMock(
             \Magento\Framework\Code\Reader\ArgumentsReader::class,
             [],
             [],
             '',
             false
         );
-        $this->sourceArgumentsReaderMock = $this->getMock(
+        $this->sourceArgumentsReaderMock = $this->getMock(
             \Magento\Framework\Code\Reader\SourceArgumentsReader::class,
             [],
             [],
@@ -75,4 +75,3 @@ public function testValidateWithException()
     }
 }
 
-
diff --git a/lib/internal/Magento/Framework/Communication/Config/Reader/EnvReader/Validator.php b/lib/internal/Magento/Framework/Communication/Config/Reader/EnvReader/Validator.php
index 5922d52fcc548..b1f7c82be9238 100644
--- a/lib/internal/Magento/Framework/Communication/Config/Reader/EnvReader/Validator.php
+++ b/lib/internal/Magento/Framework/Communication/Config/Reader/EnvReader/Validator.php
@@ -178,8 +178,7 @@ private function validateTopicResponseHandler($configDataItem)
                 )
             );
         }
-        if (
-            $this->booleanUtils->toBoolean($configDataItem[ConfigInterface::TOPIC_IS_SYNCHRONOUS]) &&
+        if ($this->booleanUtils->toBoolean($configDataItem[ConfigInterface::TOPIC_IS_SYNCHRONOUS]) &&
             count($configDataItem[ConfigInterface::TOPIC_HANDLERS]) != 1
         ) {
             throw new \LogicException(
diff --git a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
index 4acc295ea2000..5727ef0a9c66b 100644
--- a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
+++ b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
@@ -133,7 +133,7 @@ protected function extractTopics($config)
                     $serviceMethod[ConfigParser::METHOD_NAME],
                     $handlers
                 );
-            } else if ($requestSchema && $responseSchema) {
+            } elseif ($requestSchema && $responseSchema) {
                 $output[$topicName] = [
                     Config::TOPIC_NAME => $topicName,
                     Config::TOPIC_IS_SYNCHRONOUS => true,
@@ -142,7 +142,7 @@ protected function extractTopics($config)
                     Config::TOPIC_RESPONSE => $responseSchema,
                     Config::TOPIC_HANDLERS => $handlers
                 ];
-            } else if ($requestSchema) {
+            } elseif ($requestSchema) {
                 $output[$topicName] = [
                     Config::TOPIC_NAME => $topicName,
                     Config::TOPIC_IS_SYNCHRONOUS => false,
diff --git a/lib/internal/Magento/Framework/Composer/BufferIoFactory.php b/lib/internal/Magento/Framework/Composer/BufferIoFactory.php
index 20524912a812c..852fc24584f76 100644
--- a/lib/internal/Magento/Framework/Composer/BufferIoFactory.php
+++ b/lib/internal/Magento/Framework/Composer/BufferIoFactory.php
@@ -15,7 +15,7 @@ class BufferIoFactory
 {
     /**
      * Creates BufferIO instance
-     * 
+     *
      * @return BufferIO
      */
     public function create()
diff --git a/lib/internal/Magento/Framework/Config/ConverterInterface.php b/lib/internal/Magento/Framework/Config/ConverterInterface.php
index dce670b012483..ed68070b5f10c 100644
--- a/lib/internal/Magento/Framework/Config/ConverterInterface.php
+++ b/lib/internal/Magento/Framework/Config/ConverterInterface.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Config;
 
-
 /**
  * Config DOM-to-array converter interface.
  *
diff --git a/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php b/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
index 0720b284f393f..a09276c25339f 100644
--- a/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
+++ b/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
@@ -37,7 +37,7 @@ public function getRealPath($schema)
             //urn:magento:module:Magento_Catalog:etc/catalog_attributes.xsd
             $package = $componentRegistrar
                 ->getPath(ComponentRegistrar::MODULE, $matches['module']);
-        } else if (preg_match($frameworkPattern, $schema, $matches)) {
+        } elseif (preg_match($frameworkPattern, $schema, $matches)) {
             //urn:magento:framework:Module/etc/module.xsd
             //urn:magento:framework-amqp:Module/etc/module.xsd
             $package = $componentRegistrar
diff --git a/lib/internal/Magento/Framework/Console/Cli.php b/lib/internal/Magento/Framework/Console/Cli.php
index 5f3a4cb23e6d4..eed170f213958 100644
--- a/lib/internal/Magento/Framework/Console/Cli.php
+++ b/lib/internal/Magento/Framework/Console/Cli.php
@@ -191,8 +191,7 @@ private function assertGenerationPermissions()
         /** @var State $state */
         $state = $this->objectManager->get(State::class);
 
-        if (
-            $state->getMode() !== State::MODE_PRODUCTION
+        if ($state->getMode() !== State::MODE_PRODUCTION
             && !$generationDirectoryAccess->check()
         ) {
             $this->writeGenerationDirectoryReadError();
diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index 69505ba36411b..8cc4e25803da8 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -928,7 +928,6 @@ public function getDateExtractSql($date, $unit);
      */
     public function getTableName($tableName);
 
-
     /**
      * Build a trigger name based on table name and trigger details
      *
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index a6fcab0edf5d0..b4e9b9a3866ae 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -540,7 +540,6 @@ protected function _query($sql, $bind = [])
         } while ($retry);
     }
 
-
     /**
      * Special handling for PDO query().
      * All bind parameter names must begin with ':'.
@@ -3248,7 +3247,6 @@ public function getTableName($tableName)
      * @return string
      * @codeCoverageIgnore
      */
-
     public function getTriggerName($tableName, $time, $event)
     {
         $triggerName = 'trg_' . $tableName . '_' . $time . '_' . $event;
diff --git a/lib/internal/Magento/Framework/DB/Helper/AbstractHelper.php b/lib/internal/Magento/Framework/DB/Helper/AbstractHelper.php
index 343f000a5c615..8120616b88d41 100644
--- a/lib/internal/Magento/Framework/DB/Helper/AbstractHelper.php
+++ b/lib/internal/Magento/Framework/DB/Helper/AbstractHelper.php
@@ -43,7 +43,6 @@ protected function getConnection()
         return $this->_resource->getConnection($this->_modulePrefix);
     }
 
-
     /**
      * Escapes value, that participates in LIKE, with '\' symbol.
      * Note: this func cannot be used on its own, because different RDMBS may use different default escape symbols,
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
index 7e7c00e01189a..df3e3ac1e637f 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
@@ -6,9 +6,6 @@
 
 // @codingStandardsIgnoreFile
 
-/**
- * \Magento\Framework\DB\Adapter\Pdo\Mysql class test
- */
 namespace Magento\Framework\DB\Test\Unit\Adapter\Pdo;
 
 use Magento\Framework\DB\Adapter\AdapterInterface;
@@ -17,6 +14,10 @@
 use Magento\Framework\Model\ResourceModel\Type\Db\Pdo\Mysql;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
+/**
+ * \Magento\Framework\DB\Adapter\Pdo\Mysql class test
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class MysqlTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -60,7 +61,7 @@ protected function setUp()
 //        LoggerInterface $logger,
 //        SelectFactory $selectFactory,
 //        array $config = []
-        $this->_mockAdapter = $this->getMock(
+        $this->_mockAdapter = $this->getMock(
             \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
             ['beginTransaction', 'getTransactionLevel'],
             [
@@ -82,7 +83,7 @@ protected function setUp()
              ->method('getTransactionLevel')
              ->will($this->returnValue(1));
 
-        $this->_adapter = $this->getMock(
+        $this->_adapter = $this->getMock(
             \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
             [
                 'getCreateTable',
@@ -108,7 +109,7 @@ protected function setUp()
             true
         );
 
-        $profiler = $this->getMock(
+        $profiler = $this->getMock(
             \Zend_Db_Profiler::class
         );
 
@@ -468,7 +469,7 @@ public function testInsertOnDuplicateWithQuotedColumnName()
      */
     public function testAddColumn($options, $expectedQuery)
     {
-        $connectionMock = $this->getMock(
+        $connectionMock = $this->getMock(
             \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
             ['tableColumnExists', '_getTableName', 'rawQuery', 'resetDdlCache', 'quote'], [], '', false
         );
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/ExpressionConverterTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/ExpressionConverterTest.php
index 05d882b07b6ef..b54fb0d10000d 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/ExpressionConverterTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/ExpressionConverterTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\DB\Test\Unit;
 
-
 use Magento\Framework\DB\ExpressionConverter;
 
 class ExpressionConverterTest extends \PHPUnit_Framework_TestCase
diff --git a/lib/internal/Magento/Framework/Data/AbstractSearchResult.php b/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
index ab11900384a9a..cde5c973c25c0 100644
--- a/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
+++ b/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Data;
 
-
 /**
  * Class AbstractSearchResult
  */
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
index 6389c30b72988..88ed5f7be87aa 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
@@ -45,7 +45,7 @@ public function getElementHtml()
         $html = '<table id="gallery" class="gallery" border="0" cellspacing="3" cellpadding="0">';
         $html .= '<thead id="gallery_thead" class="gallery"><tr class="gallery"><td class="gallery" valign="middle" align="center">Big Image</td><td class="gallery" valign="middle" align="center">Thumbnail</td><td class="gallery" valign="middle" align="center">Small Thumb</td><td class="gallery" valign="middle" align="center">Sort Order</td><td class="gallery" valign="middle" align="center">Delete</td></tr></thead>';
         $widgetButton = $this->getForm()->getParent()->getLayout();
-        $buttonHtml = $widgetButton->createBlock(
+        $buttonHtml = $widgetButton->createBlock(
              \Magento\Backend\Block\Widget\Button::class
         )->setData(
             ['label' => 'Add New Image', 'onclick' => 'addNewImg()', 'class' => 'add']
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Radios.php b/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
index 38f520403dc62..ad28f4b6744ca 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
@@ -110,6 +110,5 @@ protected function getRadioButtonAttributes($option)
             }
         }
         return $html;
-
     }
 }
diff --git a/lib/internal/Magento/Framework/DataObject.php b/lib/internal/Magento/Framework/DataObject.php
index 3c5209c579467..d711216ca587f 100644
--- a/lib/internal/Magento/Framework/DataObject.php
+++ b/lib/internal/Magento/Framework/DataObject.php
@@ -115,7 +115,6 @@ public function unsetData($key = null)
      * @param string|int $index
      * @return mixed
      */
-
     public function getData($key = '', $index = null)
     {
         if ('' === $key) {
diff --git a/lib/internal/Magento/Framework/DataObject/Copy.php b/lib/internal/Magento/Framework/DataObject/Copy.php
index 4f85c337fa284..5a194c46997d2 100644
--- a/lib/internal/Magento/Framework/DataObject/Copy.php
+++ b/lib/internal/Magento/Framework/DataObject/Copy.php
@@ -214,9 +214,9 @@ protected function _setFieldsetFieldValue($target, $targetCode, $value)
 
         if ($targetIsArray) {
             $target[$targetCode] = $value;
-        } else if ($target instanceof \Magento\Framework\DataObject) {
+        } elseif ($target instanceof \Magento\Framework\DataObject) {
             $target->setDataUsingMethod($targetCode, $value);
-        } else if ($target instanceof \Magento\Framework\Api\ExtensibleDataInterface) {
+        } elseif ($target instanceof \Magento\Framework\Api\ExtensibleDataInterface) {
             $this->setAttributeValueFromExtensibleDataObject($target, $targetCode, $value);
         } elseif ($target instanceof \Magento\Framework\Api\AbstractSimpleObject) {
             $target->setData($targetCode, $value);
diff --git a/lib/internal/Magento/Framework/EntityManager/CallbackHandler.php b/lib/internal/Magento/Framework/EntityManager/CallbackHandler.php
index 02cad0a9402c1..bcea6029debf8 100644
--- a/lib/internal/Magento/Framework/EntityManager/CallbackHandler.php
+++ b/lib/internal/Magento/Framework/EntityManager/CallbackHandler.php
@@ -58,7 +58,6 @@ public function process($entityType)
                 $this->logger->error($e->getMessage(), $e->getTrace());
                 throw $e;
             }
-
         }
     }
 
diff --git a/lib/internal/Magento/Framework/EntityManager/MetadataPool.php b/lib/internal/Magento/Framework/EntityManager/MetadataPool.php
index 188cf99007b34..08ecbb3f01eb8 100644
--- a/lib/internal/Magento/Framework/EntityManager/MetadataPool.php
+++ b/lib/internal/Magento/Framework/EntityManager/MetadataPool.php
@@ -90,7 +90,6 @@ public function getMetadata($entityType)
             throw new \Exception(sprintf('Unknown entity type: %s requested', $entityType));
         }
         if (!isset($this->registry[$entityType])) {
-
             $this->registry[$entityType] = $this->createMetadata($entityType);
         }
         return $this->registry[$entityType];
diff --git a/lib/internal/Magento/Framework/EntityManager/Observer/BeforeEntitySave.php b/lib/internal/Magento/Framework/EntityManager/Observer/BeforeEntitySave.php
index e624729c74382..79dac031eb116 100644
--- a/lib/internal/Magento/Framework/EntityManager/Observer/BeforeEntitySave.php
+++ b/lib/internal/Magento/Framework/EntityManager/Observer/BeforeEntitySave.php
@@ -16,7 +16,6 @@
  */
 class BeforeEntitySave implements ObserverInterface
 {
-
     /**
      * Apply model save operation
      *
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
index f3da87ef44e68..e2477e7d7adcf 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
@@ -205,7 +205,6 @@ public function readFile($path, $flag = null, $context = null)
     {
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
         return $this->driver->fileGetContents($absolutePath, $flag, $context);
-
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php
index 2741d8c25ff74..f4c162d6743c4 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/File/ExcludeFilterTest.php
@@ -39,7 +39,7 @@ public function testExclusion()
         $this->assertTrue(!in_array(BP . '/var/session/', $result), 'Filtered path should not be in array');
     }
 
-    private function getFilesIterator ()
+    private function getFilesIterator()
     {
         $files = [
             BP . '/var/',
diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
index 1bea535eeb574..2594916b599d6 100644
--- a/lib/internal/Magento/Framework/Filter/Template.php
+++ b/lib/internal/Magento/Framework/Filter/Template.php
@@ -318,8 +318,7 @@ protected function getVariable($value, $default = '{no_value_defined}')
             if ($i == 0 && isset($this->templateVars[$stackVars[$i]['name']])) {
                 // Getting of template value
                 $stackVars[$i]['variable'] = & $this->templateVars[$stackVars[$i]['name']];
-            } elseif (
-                    isset($stackVars[$i - 1]['variable'])
+            } elseif (isset($stackVars[$i - 1]['variable'])
                     && $stackVars[$i - 1]['variable'] instanceof \Magento\Framework\DataObject
             ) {
                 // If object calling methods or getting properties
@@ -333,8 +332,7 @@ protected function getVariable($value, $default = '{no_value_defined}')
                     );
                 } elseif ($stackVars[$i]['type'] == 'method') {
                     // Calling of object method
-                    if (
-                            method_exists($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])
+                    if (method_exists($stackVars[$i - 1]['variable'], $stackVars[$i]['name'])
                             || substr($stackVars[$i]['name'], 0, 3) == 'get'
                     ) {
                         $stackVars[$i]['args'] = $this->getStackArgs($stackVars[$i]['args']);
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php
index 227c6593235ee..66aafd11f7279 100644
--- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php
+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php
@@ -13,6 +13,9 @@
 use Zend\Uri\UriFactory;
 use Zend\Uri\UriInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ */
 class Request extends \Zend\Http\PhpEnvironment\Request
 {
     /**#@+
@@ -415,19 +418,18 @@ public function isSecure()
             return true;
         }
       
-        return $this->initialRequestSecure($this->SslOffloadHeader());
+        return $this->initialRequestSecure($this->getSslOffloadHeader());
     }
 
-    /***
+    /**
      * Get value of SSL offload http header from configuration - defaults to X-Forwarded-Proto
      *
      * @return string
      */
-    private function SslOffloadHeader()
+    private function getSslOffloadHeader()
     {
         // Lets read from db only one time okay.
         if ($this->sslOffloadHeader === null) {
-
             // @todo: Untangle Config dependence on Scope, so that this class can be instantiated even if app is not
             // installed MAGETWO-31756
             // Check if a proxy sent a header indicating an initial secure request
@@ -565,7 +567,6 @@ public function getPostValue($name = null, $default = null)
         return $post;
     }
 
-
     /**
      * Set POST parameters
      *
@@ -725,7 +726,7 @@ public function getClientIp($checkProxy = true)
     {
         if ($checkProxy && $this->getServer('HTTP_CLIENT_IP') != null) {
             $ip = $this->getServer('HTTP_CLIENT_IP');
-        } else if ($checkProxy && $this->getServer('HTTP_X_FORWARDED_FOR') != null) {
+        } elseif ($checkProxy && $this->getServer('HTTP_X_FORWARDED_FOR') != null) {
             $ip = $this->getServer('HTTP_X_FORWARDED_FOR');
         } else {
             $ip = $this->getServer('REMOTE_ADDR');
@@ -781,7 +782,6 @@ public function setRequestUri($requestUri = null)
         return $this;
     }
 
-
     /**
      * Get base url
      *
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
index 75fe57c923af7..460d4cec62163 100644
--- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
@@ -99,7 +99,7 @@ public function clearHeader($name)
 
     /**
      * Remove all headers
-     * 
+     *
      * @return $this
      */
     public function clearHeaders()
diff --git a/lib/internal/Magento/Framework/Image/Factory.php b/lib/internal/Magento/Framework/Image/Factory.php
index 438d62d2722c8..a8ca028e53c74 100644
--- a/lib/internal/Magento/Framework/Image/Factory.php
+++ b/lib/internal/Magento/Framework/Image/Factory.php
@@ -42,7 +42,7 @@ public function __construct(ObjectManagerInterface $objectManager, AdapterFactor
     public function create($fileName = null, $adapterName = null)
     {
         $adapter = $this->adapterFactory->create($adapterName);
-        return $this->objectManager->create(
+        return $this->objectManager->create(
             \Magento\Framework\Image::class, ['adapter' => $adapter, 'fileName' => $fileName]);
     }
 }
diff --git a/lib/internal/Magento/Framework/Indexer/GridStructure.php b/lib/internal/Magento/Framework/Indexer/GridStructure.php
index 084c7edeff38c..6a43730c1e46e 100644
--- a/lib/internal/Magento/Framework/Indexer/GridStructure.php
+++ b/lib/internal/Magento/Framework/Indexer/GridStructure.php
@@ -17,6 +17,7 @@ class GridStructure implements IndexStructureInterface
      * @var Resource
      */
     private $resource;
+
     /**
      * @var FlatScopeResolver
      */
diff --git a/lib/internal/Magento/Framework/Indexer/IndexStructure.php b/lib/internal/Magento/Framework/Indexer/IndexStructure.php
index 6d7df76fcdc6c..1cce2cb19ec09 100644
--- a/lib/internal/Magento/Framework/Indexer/IndexStructure.php
+++ b/lib/internal/Magento/Framework/Indexer/IndexStructure.php
@@ -19,10 +19,12 @@ class IndexStructure implements IndexStructureInterface
      * @var Resource
      */
     private $resource;
+
     /**
      * @var \Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver
      */
     private $indexScopeResolver;
+
     /**
      * @var FlatScopeResolver
      */
diff --git a/lib/internal/Magento/Framework/Indexer/ScopeResolver/FlatScopeResolver.php b/lib/internal/Magento/Framework/Indexer/ScopeResolver/FlatScopeResolver.php
index 1ba4bbe1c4a87..74e73a8837e44 100644
--- a/lib/internal/Magento/Framework/Indexer/ScopeResolver/FlatScopeResolver.php
+++ b/lib/internal/Magento/Framework/Indexer/ScopeResolver/FlatScopeResolver.php
@@ -12,6 +12,7 @@
 class FlatScopeResolver implements IndexScopeResolverInterface
 {
     const SUFFIX_FLAT = '_flat';
+
     /**
      * @var IndexScopeResolver
      */
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/XsdTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/XsdTest.php
index da5a09f24c9e0..579c4e29b225a 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/XsdTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/XsdTest.php
@@ -17,6 +17,7 @@ class XsdTest extends \PHPUnit_Framework_TestCase
      * @var \Magento\Framework\Config\Dom\UrnResolver
      */
     protected $urnResolver;
+
     /**
      * @var \Magento\Framework\TestFramework\Unit\Utility\XsdValidator
      */
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php
index 0c3940bbc7e7f..657ee641b4b30 100644
--- a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Compiled.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * ObjectManager config with interception processing
- * 
+ *
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/InterceptorTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/InterceptorTest.php
index 43ff5985ec383..96dd0e53b90b4 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/InterceptorTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/Code/Generator/InterceptorTest.php
@@ -23,7 +23,7 @@ class InterceptorTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->ioObjectMock = $this->getMock(\Magento\Framework\Code\Generator\Io::class, [], [], '', false);
-        $this->classGeneratorMock = $this->getMock(
+        $this->classGeneratorMock = $this->getMock(
             \Magento\Framework\Code\Generator\CodeGeneratorInterface::class,
             [],
             [],
@@ -35,7 +35,7 @@ protected function setUp()
     public function testGetDefaultResultClassName()
     {
         // resultClassName should be stdClass_Interceptor
-        $model = $this->getMock(
+        $model = $this->getMock(
             \Magento\Framework\Interception\Code\Generator\Interceptor::class,
             ['_validateData'],
             [
diff --git a/lib/internal/Magento/Framework/Locale/Resolver.php b/lib/internal/Magento/Framework/Locale/Resolver.php
index 4e97160714db7..ddaae67c13353 100644
--- a/lib/internal/Magento/Framework/Locale/Resolver.php
+++ b/lib/internal/Magento/Framework/Locale/Resolver.php
@@ -13,6 +13,7 @@ class Resolver implements ResolverInterface
      * Default locale
      */
     const DEFAULT_LOCALE = 'en_US';
+
     /**
      * Default locale code
      *
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/ConfigTest.php
index 4cb8d16cf8c93..4b978c65ea7f0 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/ConfigTest.php
@@ -91,7 +91,7 @@ public function testGetAllowedLocalesNoDataArray()
     public function testGetAllowedLocalesGivenDataArray()
     {
         $this->configObject = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
-            ->getObject(
+            ->getObject(
                 \Magento\Framework\Locale\Config::class,
                 [
                     'data' => [
@@ -117,7 +117,7 @@ public function testGetAllowedLocalesGivenDataArray()
     public function testGetAllowedLocalesGivenRedundantDataArray()
     {
         $this->configObject = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
-            ->getObject(
+            ->getObject(
                 \Magento\Framework\Locale\Config::class,
                 [
                     'data' => [
@@ -159,7 +159,7 @@ public function testGetAllowedCurrenciesNoDataArray()
     public function testGetAllowedCurrenciesGivenDataArray()
     {
         $this->configObject = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
-            ->getObject(
+            ->getObject(
                 \Magento\Framework\Locale\Config::class,
                 [
                     'data' => [
@@ -185,7 +185,7 @@ public function testGetAllowedCurrenciesGivenDataArray()
     public function testGetAllowedCurrenciesGivenRedundantDataArray()
     {
         $this->configObject = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
-            ->getObject(
+            ->getObject(
                 \Magento\Framework\Locale\Config::class,
                 [
                     'data' => [
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php
index 8e94d2c7d72af..54f32d8800a89 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php
@@ -58,7 +58,7 @@ protected function setUp()
             ->getMock();
 
         $this->testCurrencyObject = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
-            ->getObject(
+            ->getObject(
                 \Magento\Framework\Locale\Currency::class,
                 [
                     'eventManager'     => $this->mockEventManager,
diff --git a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
index 3a8625e8cac26..e2d7fc382f341 100644
--- a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
@@ -184,7 +184,7 @@ public function setData($key, $value = null)
     {
         if (is_array($key)) {
             $key = $this->filterCustomAttributes($key);
-        } else if ($key == self::CUSTOM_ATTRIBUTES) {
+        } elseif ($key == self::CUSTOM_ATTRIBUTES) {
             $filteredData = $this->filterCustomAttributes([self::CUSTOM_ATTRIBUTES => $value]);
             $value = $filteredData[self::CUSTOM_ATTRIBUTES];
         }
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/CreateEntityRow.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/CreateEntityRow.php
index cde1352f48101..8dc0120418ac9 100755
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/CreateEntityRow.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/CreateEntityRow.php
@@ -36,7 +36,6 @@ protected function prepareData(EntityMetadata $metadata, $data)
     {
         $output = [];
         foreach ($metadata->getEntityConnection()->describeTable($metadata->getEntityTable()) as $column) {
-
             if ($column['DEFAULT'] == 'CURRENT_TIMESTAMP' /*|| $column['IDENTITY']*/) {
                 continue;
             }
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/UpdateEntityRow.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/UpdateEntityRow.php
index baa98f6596e55..7f11469fbfb8d 100755
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/UpdateEntityRow.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/UpdateEntityRow.php
@@ -37,7 +37,6 @@ protected function prepareData(EntityMetadata $metadata, $data)
     {
         $output = [];
         foreach ($metadata->getEntityConnection()->describeTable($metadata->getEntityTable()) as $column) {
-
             if ($column['DEFAULT'] == 'CURRENT_TIMESTAMP' || $column['IDENTITY']) {
                 continue;
             }
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/AbstractModelTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/AbstractModelTest.php
index d041faa3b11c6..6b8f0a1a8bc2f 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/AbstractModelTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/AbstractModelTest.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\Model\Test\Unit;
 
-
 class AbstractModelTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -93,7 +92,6 @@ protected function setUp()
         $this->resourceMock->expects($this->any())
             ->method('getConnection')
             ->will($this->returnValue($this->connectionMock));
-
     }
 
     public function testDelete()
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php
index a6f3add797d16..83638ce1bb3b2 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/AbstractDbTest.php
@@ -573,7 +573,6 @@ public function testSaveNewObject($pkIncrement)
         $idFieldName = 'id_field_name';
         $model->expects($this->once())->method('_prepareDataForSave')->willReturn([$idFieldName => 'id',]);
 
-
         // Test expectations
         //      Only get object's id field name if not PK autoincrement
         $getIdFieldNameInvokedCount = $pkIncrement ? 1 : 0;
diff --git a/lib/internal/Magento/Framework/Module/DependencyChecker.php b/lib/internal/Magento/Framework/Module/DependencyChecker.php
index 7dfa8e16565c4..7ce8ccc45ae9d 100644
--- a/lib/internal/Magento/Framework/Module/DependencyChecker.php
+++ b/lib/internal/Magento/Framework/Module/DependencyChecker.php
@@ -106,7 +106,7 @@ private function checkDependencyGraph($isEnable, $moduleNames, $enabledModules)
                 if (isset($paths[$module])) {
                     if ($isEnable && !in_array($module, $enabledModules)) {
                         $dependenciesMissing[$module] = $paths[$module];
-                    } else if (!$isEnable && in_array($module, $enabledModules)) {
+                    } elseif (!$isEnable && in_array($module, $enabledModules)) {
                         $dependenciesMissing[$module] = array_reverse($paths[$module]);
                     }
                 }
diff --git a/lib/internal/Magento/Framework/Module/Status.php b/lib/internal/Magento/Framework/Module/Status.php
index 07db5347c564d..f4ae5400321c6 100644
--- a/lib/internal/Magento/Framework/Module/Status.php
+++ b/lib/internal/Magento/Framework/Module/Status.php
@@ -81,7 +81,7 @@ public function __construct(
      * @param string[] $modulesToBeChanged
      * @param string[] $currentlyEnabledModules
      * @param bool $prettyMessage
-     *  
+     *
      * @return string[]
      */
     public function checkConstraints(
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/ConfigTest.php
index d1812cf1d7f5f..773af89b9ecbf 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/ConfigTest.php
@@ -24,7 +24,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->dataMock = $this->getMock(
+        $this->dataMock = $this->getMock(
             \Magento\Framework\Mview\Config\Data::class, [], [], '', false
         );
         $this->model = new Config(
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
index 8767b32d47249..f72a5064e3c01 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
@@ -137,6 +137,7 @@ protected function _getCollectionFactoryClassName()
         return
             str_replace('Interface', '', $this->getSourceClassName()) . 'SearchResultInterfaceFactory';
     }
+
     /**
      * Returns source persistor class name
      *
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
index 7cce20381d717..b21894b78144f 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php
@@ -85,7 +85,7 @@ public function getArguments($type)
         if (array_key_exists($type, $this->arguments)) {
             if (is_string($this->arguments[$type])) {
                 $this->arguments[$type] = $this->getSerializer()->unserialize($this->arguments[$type]);
-            } else if ($this->arguments[$type] === null) {
+            } elseif ($this->arguments[$type] === null) {
                 $this->arguments[$type] = [];
             }
             return $this->arguments[$type];
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index 9266bf2d2b5f5..44ecdc9471794 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -145,15 +145,14 @@ protected function resolveArgument(&$argument, $paramType, $paramDefault, $param
             } else {
                 $argument = $this->objectManager->create($argumentType);
             }
-
-        } else if ($argument === (array)$argument) {
+        } elseif ($argument === (array)$argument) {
             if (isset($argument['argument'])) {
                 if (isset($this->globalArguments[$argument['argument']])) {
                     $argument = $this->globalArguments[$argument['argument']];
                 } else {
                     $argument = $paramDefault;
                 }
-            } else if (!empty($argument)) {
+            } elseif (!empty($argument)) {
                 $this->parseArray($argument);
             }
         }
@@ -182,7 +181,6 @@ protected function parseArray(&$array)
                     } else {
                         $array[$key] = $this->objectManager->create($item['instance']);
                     }
-
                 } elseif (isset($item['argument'])) {
                     if (isset($this->globalArguments[$item['argument']])) {
                         $array[$key] = $this->globalArguments[$item['argument']];
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php b/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php
index 845a2e60c5494..3f51ecc4c381c 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/Compiled.php
@@ -58,7 +58,7 @@ public function create($requestedType, array $arguments = [])
         if ($args === []) {
             // Case 1: no arguments required
             return new $type();
-        } else if ($args !== null) {
+        } elseif ($args !== null) {
             /**
              * Case 2: arguments retrieved from pre-compiled DI cache
              *
diff --git a/lib/internal/Magento/Framework/ObjectManager/TMap.php b/lib/internal/Magento/Framework/ObjectManager/TMap.php
index f644437cbcc29..3a56133f02ad5 100644
--- a/lib/internal/Magento/Framework/ObjectManager/TMap.php
+++ b/lib/internal/Magento/Framework/ObjectManager/TMap.php
@@ -98,8 +98,7 @@ private function assertValidTypeLazy($instanceName, $index = null)
             $this->configInterface->getPreference($instanceName)
         );
 
-        if (
-        !in_array(
+        if (!in_array(
             $this->type,
             array_unique(array_merge(class_parents($realType), class_implements($realType))),
             true
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/SchemaLocatorTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/SchemaLocatorTest.php
index 74926c27b4e0d..529a10a4d8de1 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/SchemaLocatorTest.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/SchemaLocatorTest.php
@@ -26,7 +26,6 @@ protected function setUp()
         $property = new \ReflectionProperty($this->model, 'urnResolver');
         $property->setAccessible(true);
         $property->setValue($this->model, $this->urnResolverMock);
-
     }
 
     public function testGetSchema()
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/Stub.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/Stub.php
index 85d39cb1e605a..6d51cc09a8565 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/Stub.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Price/Stub.php
@@ -6,7 +6,8 @@
 
 namespace Magento\Framework\Pricing\Test\Unit\Price;
 
-use  Magento\Framework\Pricing\Price\AbstractPrice;
+use Magento\Framework\Pricing\Price\AbstractPrice;
+
 /**
  * Class Stub for testing abstract class AbstractPrice
  *
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
index 0cad2180727e6..25394e7ceef3b 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Render/PriceBoxTest.php
@@ -133,7 +133,7 @@ public function toHtmlDataProvider()
                 'data' => ['css_classes' => 'some_css_class'],
                 'price_code' => 'test_price',
                 'css_classes' => 'some_css_class price-test_price'
-        ]];
+            ]];
     }
 
     public function testGetSaleableItem()
diff --git a/lib/internal/Magento/Framework/Reflection/TypeProcessor.php b/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
index 5c431ac9c6892..376edbb072b27 100644
--- a/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/TypeProcessor.php
@@ -259,7 +259,7 @@ public function getDescription(DocBlockReflection $doc)
      *
      * @param string $getterName
      * @return string
-     * 
+     *
      * @deprecated
      */
     public function dataObjectGetterNameToFieldName($getterName)
@@ -592,8 +592,8 @@ public function getParamDescription(ParameterReflection $param)
      * @param string $camelCaseProperty
      * @return string processed method name
      * @throws \Exception If $camelCaseProperty has no corresponding getter method
-     * 
-     * @deprecated 
+     *
+     * @deprecated
      */
     public function findGetterMethodName(ClassReflection $class, $camelCaseProperty)
     {
@@ -630,8 +630,8 @@ protected function setType(&$value, $type)
      * @param string $camelCaseProperty
      * @return string processed method name
      * @throws \Exception If $camelCaseProperty has no corresponding setter method
-     * 
-     * @deprecated 
+     *
+     * @deprecated
      */
     public function findSetterMethodName(ClassReflection $class, $camelCaseProperty)
     {
@@ -647,8 +647,8 @@ public function findSetterMethodName(ClassReflection $class, $camelCaseProperty)
      * @param bool $boolAccessorName
      * @return string processed method name
      * @throws \Exception If $camelCaseProperty has no corresponding setter method
-     * 
-     * @deprecated 
+     *
+     * @deprecated
      */
     protected function findAccessorMethodName(
         ClassReflection $class,
@@ -668,8 +668,8 @@ protected function findAccessorMethodName(
      * @param ClassReflection $class
      * @param string $methodName
      * @return bool
-     * 
-     * @deprecated 
+     *
+     * @deprecated
      */
     protected function classHasMethod(ClassReflection $class, $methodName)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
index 524046aa9eaaf..a2965e9fe5007 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php
@@ -14,6 +14,7 @@ class Interval implements IntervalInterface
      * Minimal possible value
      */
     const DELTA = 0.005;
+
     /**
      * @var Select
      */
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
index 275180dfd9f02..724f8c7bc46b1 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
@@ -12,6 +12,7 @@ class ConditionManager
 {
     const CONDITION_PATTERN_SIMPLE = '%s %s %s';
     const CONDITION_PATTERN_ARRAY = '%s %s (%s)';
+
     /**
      * @var AdapterInterface
      */
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php
index d0f07014e2890..2d673112f6bbd 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/Field.php
@@ -12,10 +12,12 @@ class Field implements FieldInterface
      * @var string
      */
     private $column;
+
     /**
      * @var int|null
      */
     private $attributeId;
+
     /**
      * @var int
      */
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php
index ebe6ff9418841..f85da18c185e2 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldFactory.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\Search\Adapter\Mysql\Field;
 
-
 class FieldFactory
 {
     /**
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php
index f65d840fba1e2..1abd9a10b498f 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Field/FieldInterface.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\Search\Adapter\Mysql\Field;
 
-
 interface FieldInterface
 {
     const TYPE_FLAT = 1;
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
index 412e4869b2af8..12a9cbc604be2 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\Search\Adapter\Mysql\Query;
 
-
 use Magento\Framework\Search\Request\QueryInterface;
 
 // @codeCoverageIgnore
@@ -17,6 +16,7 @@ class MatchContainer
      * @var QueryInterface
      */
     private $request;
+
     /**
      * @var string
      */
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php
index 685422da5e35c..a064f32b37081 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/QueryContainer.php
@@ -12,6 +12,7 @@
 class QueryContainer
 {
     const DERIVED_QUERY_PREFIX = 'derived_';
+
     /**
      * @var array
      */
diff --git a/lib/internal/Magento/Framework/Setup/SampleData/State.php b/lib/internal/Magento/Framework/Setup/SampleData/State.php
index 1cc3d98a439c5..e24f527be4e84 100644
--- a/lib/internal/Magento/Framework/Setup/SampleData/State.php
+++ b/lib/internal/Magento/Framework/Setup/SampleData/State.php
@@ -123,7 +123,6 @@ protected function openStream($mode = 'w')
             $stream = $directoryWrite->openFile($fileName, $mode);
         }
         return $stream;
-
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Shell/Driver.php b/lib/internal/Magento/Framework/Shell/Driver.php
index df89770a51b78..f9c658208eef9 100644
--- a/lib/internal/Magento/Framework/Shell/Driver.php
+++ b/lib/internal/Magento/Framework/Shell/Driver.php
@@ -31,7 +31,6 @@ public function __construct(CommandRendererInterface $commandRenderer)
      * @return Response
      * @throws LocalizedException
      */
-
     public function execute($command, $arguments)
     {
         $disabled = explode(',', str_replace(' ', ',', ini_get('disable_functions')));
diff --git a/lib/internal/Magento/Framework/Simplexml/Element.php b/lib/internal/Magento/Framework/Simplexml/Element.php
index 3eba74ebe6f52..b209beb1d1d57 100644
--- a/lib/internal/Magento/Framework/Simplexml/Element.php
+++ b/lib/internal/Magento/Framework/Simplexml/Element.php
@@ -304,7 +304,7 @@ public function innerXml($level = 0)
      */
     public function xmlentities($value = null)
     {
-        if (is_null($value)) {
+        if ($value === null) {
             $value = $this;
         }
         $value = (string)$value;
@@ -413,7 +413,7 @@ public function extendChild($source, $overwrite = false)
             $targetChild = $this->{$sourceName};
         }
 
-        if (is_null($targetChild)) {
+        if ($targetChild === null) {
             // if child target is not found create new and descend
             $targetChild = $this->addChild($sourceName);
             $targetChild->setParent($this);
diff --git a/lib/internal/Magento/Framework/Stdlib/BooleanUtils.php b/lib/internal/Magento/Framework/Stdlib/BooleanUtils.php
index 203650963d6a3..faaf7bb57ff49 100644
--- a/lib/internal/Magento/Framework/Stdlib/BooleanUtils.php
+++ b/lib/internal/Magento/Framework/Stdlib/BooleanUtils.php
@@ -38,6 +38,7 @@ public function __construct(
         $this->trueValues = $trueValues;
         $this->falseValues = $falseValues;
     }
+
     // @codingStandardsIgnoreEnd
 
     /**
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
index 1d3cf456028a6..92eb2520650c1 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
@@ -297,7 +297,7 @@ protected function createCookieScope($params = [])
      */
     public function createSensitiveMetadata($metadata = [])
     {
-        return $this->objectManager->getObject(
+        return $this->objectManager->getObject(
             \Magento\Framework\Stdlib\Cookie\SensitiveCookieMetadata::class,
             ['metadata' => $metadata, 'request' => $this->requestMock]
         );
@@ -311,7 +311,7 @@ public function createSensitiveMetadata($metadata = [])
      */
     public function createPublicMetadata($metadata = [])
     {
-        return $this->objectManager->getObject(
+        return $this->objectManager->getObject(
             \Magento\Framework\Stdlib\Cookie\PublicCookieMetadata::class,
             ['metadata' => $metadata]
         );
@@ -325,7 +325,7 @@ public function createPublicMetadata($metadata = [])
      */
     public function createCookieMetadata($metadata = [])
     {
-        return $this->objectManager->getObject(
+        return $this->objectManager->getObject(
             \Magento\Framework\Stdlib\Cookie\CookieMetadata::class,
             ['metadata' => $metadata]
         );
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
index bffe8117898ca..180d2099abc7c 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
@@ -33,7 +33,6 @@ protected function setUp()
      * @param StringUtils $expectedValue
      * @dataProvider getMethodData
      */
-
     public function testGetters($setMethodName, $getMethodName, $expectedValue)
     {
         $this->publicCookieMetadata->$setMethodName($expectedValue);
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
index c4c63c3559b7a..47bff97df3474 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
@@ -213,7 +213,6 @@ public function toArrayDataProvider()
      * @param StringUtils $expectedValue
      * @dataProvider getMethodData
      */
-
     public function testGetters($setMethodName, $getMethodName, $expectedValue)
     {
         $this->sensitiveCookieMetadata->$setMethodName($expectedValue);
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php
index bf10923950274..7f8ab37995275 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php
@@ -31,7 +31,6 @@ protected function setUp()
         $this->localeResolverMock->expects($this->any())
             ->method('getLocale')
             ->willReturn('fr-FR');
-
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Test/Unit/App/ResourceConnectionTest.php b/lib/internal/Magento/Framework/Test/Unit/App/ResourceConnectionTest.php
index 716cbed2f577d..57a05fc00cba6 100644
--- a/lib/internal/Magento/Framework/Test/Unit/App/ResourceConnectionTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/App/ResourceConnectionTest.php
@@ -92,6 +92,5 @@ public function testCloseConnection()
         $this->configMock->expects(self::once())->method('getConnectionName')->with('default');
 
         $this->unit->closeConnection('default');
-
     }
 }
diff --git a/lib/internal/Magento/Framework/Test/Unit/Message/PhraseFactoryTest.php b/lib/internal/Magento/Framework/Test/Unit/Message/PhraseFactoryTest.php
index a099abb9d01ac..65cf487d2b6dc 100644
--- a/lib/internal/Magento/Framework/Test/Unit/Message/PhraseFactoryTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/Message/PhraseFactoryTest.php
@@ -52,5 +52,4 @@ public function dataProvider()
             ],
         ];
     }
-
 }
diff --git a/lib/internal/Magento/Framework/Test/Unit/ValidatorFactoryTest.php b/lib/internal/Magento/Framework/Test/Unit/ValidatorFactoryTest.php
index 9474e72651fce..96bfd0f13b72d 100644
--- a/lib/internal/Magento/Framework/Test/Unit/ValidatorFactoryTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/ValidatorFactoryTest.php
@@ -24,7 +24,7 @@ protected function setUp()
     {
         $objectManager = new ObjectManager($this);
         $this->objectManagerMock = $this->getMock(\Magento\Framework\ObjectManagerInterface::class);
-        $this->model = $objectManager->getObject(
+        $this->model = $objectManager->getObject(
             \Magento\Framework\ValidatorFactory::class,
             ['objectManager' => $this->objectManagerMock]
         );
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/ExtensionGeneratorAutoloader.php b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/ExtensionGeneratorAutoloader.php
index 9f8cb85b76ecd..e166f29d3fa62 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/ExtensionGeneratorAutoloader.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Autoloader/ExtensionGeneratorAutoloader.php
@@ -57,7 +57,7 @@ public function load($className)
                 if ($this->isExtension($className)) {
                     $content = "namespace $namespace;\n\nclass $justTypeName implements "
                         . "{$justTypeName}Interface\n{\n\n}";
-                } else if ($this->isExtensionInterface($className)) {
+                } elseif ($this->isExtensionInterface($className)) {
                     $content = "namespace $namespace;\n\ninterface $justTypeName extends "
                         . "\\Magento\\Framework\\Api\\ExtensionAttributesInterface \n{\n\n}";
                 }
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Module/Config.php b/lib/internal/Magento/Framework/TestFramework/Unit/Module/Config.php
index ceed15e7e0aca..373083d8a659f 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Module/Config.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Module/Config.php
@@ -8,7 +8,7 @@
 class Config
 {
     /**
-     *
+     * @return void
      * @SuppressWarnings(PHPMD.ShortMethodName))
      */
     public function is()
diff --git a/lib/internal/Magento/Framework/View/Asset/LockerProcess.php b/lib/internal/Magento/Framework/View/Asset/LockerProcess.php
index baedbf5f37702..d28a169a6caf8 100644
--- a/lib/internal/Magento/Framework/View/Asset/LockerProcess.php
+++ b/lib/internal/Magento/Framework/View/Asset/LockerProcess.php
@@ -105,7 +105,6 @@ private function isProcessLocked()
                     return false;
                 }
             } catch (FileSystemException $e) {
-
                 return false;
             }
 
diff --git a/lib/internal/Magento/Framework/View/Asset/Minification.php b/lib/internal/Magento/Framework/View/Asset/Minification.php
index dcf9b8f66e997..c6c93f6d035a4 100644
--- a/lib/internal/Magento/Framework/View/Asset/Minification.php
+++ b/lib/internal/Magento/Framework/View/Asset/Minification.php
@@ -79,8 +79,7 @@ public function addMinifiedSign($filename)
     {
         $extension = pathinfo($filename, PATHINFO_EXTENSION);
 
-        if (
-            $this->isEnabled($extension) &&
+        if ($this->isEnabled($extension) &&
             !$this->isExcluded($filename) &&
             !$this->isMinifiedFilename($filename)
         ) {
@@ -99,8 +98,7 @@ public function removeMinifiedSign($filename)
     {
         $extension = pathinfo($filename, PATHINFO_EXTENSION);
 
-        if (
-            $this->isEnabled($extension) &&
+        if ($this->isEnabled($extension) &&
             !$this->isExcluded($filename) &&
             $this->isMinifiedFilename($filename)
         ) {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Chain.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Chain.php
index 220ff3fb736b6..6f6434906ea7e 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Chain.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Chain.php
@@ -188,7 +188,6 @@ public function assertValid()
     {
         if ($this->contentType !== $this->targetContentType
                 && empty($this->compatibleTypes[$this->targetContentType][$this->contentType])) {
-
             throw new \LogicException(
                 "The requested asset type was '{$this->targetContentType}', but ended up with '{$this->contentType}'"
             );
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Minify.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Minify.php
index af93667b0ad95..967db443b9140 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Minify.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Minify.php
@@ -43,8 +43,7 @@ public function __construct(AdapterInterface $adapter, Minification $minificatio
      */
     public function process(PreProcessor\Chain $chain)
     {
-        if (
-            $this->minification->isEnabled(pathinfo($chain->getTargetAssetPath(), PATHINFO_EXTENSION)) &&
+        if ($this->minification->isEnabled(pathinfo($chain->getTargetAssetPath(), PATHINFO_EXTENSION)) &&
             $this->minification->isMinifiedFilename($chain->getTargetAssetPath()) &&
             !$this->minification->isMinifiedFilename($chain->getOrigAssetPath())
         ) {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Image.php b/lib/internal/Magento/Framework/View/Design/Theme/Image.php
index 9093759526cf9..36a66538cbee5 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Image.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Image.php
@@ -112,6 +112,7 @@ public function __construct(
         $this->imageParams = $imageParams;
         $this->theme = $theme;
     }
+
     // @codingStandardsIgnoreEnd
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Element/Message/MessageConfigurationsPool.php b/lib/internal/Magento/Framework/View/Element/Message/MessageConfigurationsPool.php
index bb22a0b6c0ca1..3309c37a9f9f7 100644
--- a/lib/internal/Magento/Framework/View/Element/Message/MessageConfigurationsPool.php
+++ b/lib/internal/Magento/Framework/View/Element/Message/MessageConfigurationsPool.php
@@ -24,15 +24,13 @@ public function __construct(
         array_walk(
             $configurationsMap,
             function (array &$configuration) {
-                if (
-                    !isset($configuration['renderer'])
+                if (!isset($configuration['renderer'])
                     || !is_string($configuration['renderer'])
                 ) {
                     throw new \InvalidArgumentException('Renderer should be defined.');
                 }
 
-                if (
-                    isset($configuration['data'])
+                if (isset($configuration['data'])
                     && !is_array($configuration['data'])
                 ) {
                     throw new \InvalidArgumentException('Data should be of array type.');
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php
index 0abc05b776d1f..cd0eee3b5031f 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/DomMerger.php
@@ -208,7 +208,7 @@ protected function nestedMerge(\DOMXPath $rootDomXPath, \DOMNodeList $insertedNo
                             if ($this->isMergeContext($insertedXPath)) {
                                 if ($this->isTextNode($insertedItem) && $this->isTextNode($rootItem)) {
                                     $rootItem->nodeValue = $insertedItem->nodeValue;
-                                } else if (!$this->isContextXPath([$rootItemXPath, $insertedXPath])
+                                } elseif (!$this->isContextXPath([$rootItemXPath, $insertedXPath])
                                     && !$this->hasIdAttribute($rootItem)
                                     && !$this->hasIdAttribute($insertedItem)
                                 ) {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
index 8f0e6bb333adb..18faf583bfa6c 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Context.php
@@ -323,9 +323,9 @@ protected function setAcceptType()
         $rawAcceptType = $this->request->getHeader('Accept');
         if (strpos($rawAcceptType, 'json') !== false) {
             $this->acceptType = 'json';
-        } else if (strpos($rawAcceptType, 'html') !== false) {
+        } elseif (strpos($rawAcceptType, 'html') !== false) {
             $this->acceptType = 'html';
-        } else if (strpos($rawAcceptType, 'xml') !== false) {
+        } elseif (strpos($rawAcceptType, 'xml') !== false) {
             $this->acceptType = 'xml';
         }
     }
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Processor.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Processor.php
index 9aa023ae94916..15e689a25319a 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Processor.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Processor.php
@@ -29,7 +29,6 @@ class Processor implements PoolInterface, SubjectInterface
      */
     protected $observers = [];
 
-
     /**
      * @inheritDoc
      */
diff --git a/lib/internal/Magento/Framework/View/Layout.php b/lib/internal/Magento/Framework/View/Layout.php
index 07396304c1959..e64b9553f721e 100755
--- a/lib/internal/Magento/Framework/View/Layout.php
+++ b/lib/internal/Magento/Framework/View/Layout.php
@@ -512,7 +512,6 @@ protected function displayElement($name)
         $display = $this->structure->getAttribute($name, 'display');
         if ($display === '' || $display === false || $display === null
             || filter_var($display, FILTER_VALIDATE_BOOLEAN)) {
-
             return true;
         }
         return false;
diff --git a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Passthrough.php b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Passthrough.php
index 447830c83358d..ed40d375a67c0 100644
--- a/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Passthrough.php
+++ b/lib/internal/Magento/Framework/View/Layout/Argument/Interpreter/Passthrough.php
@@ -12,7 +12,6 @@
  */
 class Passthrough implements InterpreterInterface
 {
-
     /**
      * {@inheritdoc}
      * @return array
diff --git a/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php b/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
index b95678d6762b2..6d9f7aa20b2c6 100644
--- a/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
+++ b/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\View\Layout;
 
-
 /**
  * Pool of generators for structural elements
  */
@@ -156,8 +155,7 @@ protected function reorderElements(
                 $element[ScheduledStructure::ELEMENT_OFFSET_OR_SIBLING]
             );
 
-            if (
-                isset($siblingElement[ScheduledStructure::ELEMENT_NAME])
+            if (isset($siblingElement[ScheduledStructure::ELEMENT_NAME])
                     && $structure->hasElement($siblingElement[ScheduledStructure::ELEMENT_NAME])
             ) {
                 $this->reorderElements(
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
index bcfe27fa3e065..ffd3b72adb508 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Renderer.php
@@ -361,7 +361,7 @@ protected function renderAssetHtml(\Magento\Framework\View\Asset\PropertyGroup $
 
     /**
      * Get asset content type
-     * 
+     *
      * @param \Magento\Framework\View\Asset\AssetInterface $asset
      * @return string
      */
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Structure.php b/lib/internal/Magento/Framework/View/Page/Config/Structure.php
index 4419002fb5007..f276ef4921dfc 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Structure.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Structure.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\View\Page\Config;
 
-
 /**
  * Page config structure model
  */
diff --git a/lib/internal/Magento/Framework/View/Template/Html/MinifierInterface.php b/lib/internal/Magento/Framework/View/Template/Html/MinifierInterface.php
index 57c9be7f441f7..71866856672d3 100644
--- a/lib/internal/Magento/Framework/View/Template/Html/MinifierInterface.php
+++ b/lib/internal/Magento/Framework/View/Template/Html/MinifierInterface.php
@@ -33,6 +33,7 @@ public function getPathToMinified($file);
      * Minify template file
      *
      * @param string $file
+     * @return void
      */
     public function minify($file);
 }
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
index 7fa2ed26dc8d1..50cde656c62fa 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/Compiler.php
@@ -102,7 +102,7 @@ public function compile(\DOMNode $node, DataObject $processedObject, DataObject
                 $compiler = $this->getElementCompiler($node->nodeName);
                 if (null !== $compiler) {
                     $compiler->compile($this, $node, $processedObject, $context);
-                } else if ($node->hasChildNodes()) {
+                } elseif ($node->hasChildNodes()) {
                     foreach ($this->getChildNodes($node) as $child) {
                         $this->compile($child, $processedObject, $context);
                     }
diff --git a/lib/internal/Magento/Framework/View/TemplateEnginePool.php b/lib/internal/Magento/Framework/View/TemplateEnginePool.php
index 7c31abc95c552..72af6f9218d2b 100644
--- a/lib/internal/Magento/Framework/View/TemplateEnginePool.php
+++ b/lib/internal/Magento/Framework/View/TemplateEnginePool.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\View;
 
-
 class TemplateEnginePool
 {
     /**
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php
index 61fa39847a02a..7fd6976b71032 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/MinificationTest.php
@@ -53,7 +53,6 @@ protected function setUp()
      */
     public function testIsEnabled()
     {
-
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/FileSystemTest.php b/lib/internal/Magento/Framework/View/Test/Unit/FileSystemTest.php
index 77710b0d544a5..254c0473d33b3 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/FileSystemTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/FileSystemTest.php
@@ -50,23 +50,23 @@ class FileSystemTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_fileResolution = $this->getMock(
+        $this->_fileResolution = $this->getMock(
             \Magento\Framework\View\Design\FileResolution\Fallback\File::class, [],
             [], '', false
         );
-        $this->_templateFileResolution = $this->getMock(
+        $this->_templateFileResolution = $this->getMock(
             \Magento\Framework\View\Design\FileResolution\Fallback\TemplateFile::class, [], [], '', false
         );
-        $this->_localeFileResolution = $this->getMock(
+        $this->_localeFileResolution = $this->getMock(
             \Magento\Framework\View\Design\FileResolution\Fallback\LocaleFile::class, [], [], '', false
         );
-        $this->_staticFileResolution = $this->getMock(
+        $this->_staticFileResolution = $this->getMock(
             \Magento\Framework\View\Design\FileResolution\Fallback\StaticFile::class, [], [], '', false
         );
-        $this->_emailTemplateFileResolution = $this->getMock(
+        $this->_emailTemplateFileResolution = $this->getMock(
             \Magento\Framework\View\Design\FileResolution\Fallback\EmailTemplateFile::class, [], [], '', false
         );
-        $this->_assetRepo = $this->getMock(
+        $this->_assetRepo = $this->getMock(
             \Magento\Framework\View\Asset\Repository::class,
             ['extractScope', 'updateDesignParams', 'createAsset'], [], '', false
         );
@@ -85,7 +85,7 @@ public function testGetFilename()
     {
         $params = [
             'area' => 'some_area',
-            'themeModel' => $this->getMock(
+            'themeModel' => $this->getMock(
                 \Magento\Framework\View\Design\ThemeInterface::class, [], [], '', false, false
                 ),
             'module' => 'Some_Module',   //It should be set in \Magento\Framework\View\Asset\Repository::extractScope
@@ -112,7 +112,7 @@ public function testGetTemplateFileName()
     {
         $params = [
             'area'       => 'some_area',
-            'themeModel' => $this->getMock(
+            'themeModel' => $this->getMock(
                 \Magento\Framework\View\Design\ThemeInterface::class, [], [], '', false, false
                 ),
             'module'     => 'Some_Module', //It should be set in \Magento\Framework\View\Asset\Repository::extractScope
@@ -139,7 +139,7 @@ public function testGetLocaleFileName()
     {
         $params = [
             'area' => 'some_area',
-            'themeModel' => $this->getMock(
+            'themeModel' => $this->getMock(
                 \Magento\Framework\View\Design\ThemeInterface::class,
                 [],
                 [],
@@ -165,7 +165,7 @@ public function testGetViewFile()
     {
         $params = [
             'area' => 'some_area',
-            'themeModel' => $this->getMock(
+            'themeModel' => $this->getMock(
                 \Magento\Framework\View\Design\ThemeInterface::class,
                 [],
                 [],
@@ -263,7 +263,7 @@ public function testGetEmailTemplateFile()
         $locale = \Magento\Setup\Module\I18n\Locale::DEFAULT_SYSTEM_LOCALE;
         $params = [
             'area'       => 'some_area',
-            'themeModel' => $this->getMock(
+            'themeModel' => $this->getMock(
                 \Magento\Framework\View\Design\ThemeInterface::class, [], [], '', false, false
             ),
             'module'     => 'Some_Module',
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php
index b8dce89a8e249..5d629a8ca293d 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Result/LayoutTest.php
@@ -52,7 +52,7 @@ protected function setUp()
         $context->expects($this->any())->method('getEventManager')->will($this->returnValue($this->eventManager));
 
         $this->resultLayout = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
-            ->getObject(
+            ->getObject(
                 \Magento\Framework\View\Result\Layout::class,
                 ['context' => $context, 'translateInline' => $this->translateInline]
             );
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
index 0ab955a06f896..60d87142a6a2c 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
@@ -104,6 +104,7 @@ public function testGetPathToMinified()
     }
 
     // @codingStandardsIgnoreStart
+
     /**
      * Covered method minify and test regular expressions
      * @test
@@ -197,6 +198,7 @@ public function testMinify()
 
         $this->object->minify($file);
     }
+
     // @codingStandardsIgnoreEnd
 
     /**
diff --git a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
index f4fee9a6e0123..0d2b759e02e97 100644
--- a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
@@ -165,8 +165,7 @@ public function maskException(\Exception $exception)
      */
     public function renderException(\Exception $exception, $httpCode = self::DEFAULT_ERROR_HTTP_CODE)
     {
-        if (
-            $this->_appState->getMode() == State::MODE_DEVELOPER ||
+        if ($this->_appState->getMode() == State::MODE_DEVELOPER ||
             $exception instanceof \Magento\Framework\Webapi\Exception
         ) {
             $this->renderErrorMessage($exception->getMessage(), $exception->getTraceAsString(), $httpCode);
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Request.php b/lib/internal/Magento/Framework/Webapi/Rest/Request.php
index 1e911bbd729cf..8c7a86e40c9e3 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Request.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Request.php
@@ -130,7 +130,6 @@ public function getBodyParams()
             if ($this->getContent()) {
                 $this->_bodyParams = (array)$this->_getDeserializer()->deserialize((string)$this->getContent());
             }
-
         }
         return $this->_bodyParams;
     }
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php b/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php
index c2346f7c7ce19..96b196b7ec9d5 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php
@@ -15,7 +15,7 @@
  * invoked could have a signature of "getAddresses($customerId)", but in the webapi.xml, the $customerId parameter
  * would be forced to be the customer id of the current authenticated user.
  *
- * The forced override parameter configuration is in the webapi.xml. 
+ * The forced override parameter configuration is in the webapi.xml.
  *
  * <data>
  *   <parameter name="customer.id" force="true">%customer_id%</parameter>
diff --git a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
index 89629767649c9..3e88ffa294e6f 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
@@ -258,9 +258,9 @@ private function processCustomAttribute($customAttribute)
 
         if (!$customAttributeCode && !isset($customAttribute[AttributeValue::VALUE])) {
             throw new SerializationException(new Phrase('There is an empty custom attribute specified.'));
-        } else if (!$customAttributeCode) {
+        } elseif (!$customAttributeCode) {
             throw new SerializationException(new Phrase('A custom attribute is specified without an attribute code.'));
-        } else if (!isset($customAttribute[AttributeValue::VALUE])) {
+        } elseif (!isset($customAttribute[AttributeValue::VALUE])) {
             throw new SerializationException(
                 new Phrase('Value is not set for attribute code "' . $customAttributeCode . '"')
             );
diff --git a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/ResponseTest.php b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/ResponseTest.php
index 0284a111dd2f1..25dbaf28daa0d 100644
--- a/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/ResponseTest.php
+++ b/lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/ResponseTest.php
@@ -212,6 +212,7 @@ public function testHasExceptionOfType()
         $hasException = $this->responseRest->hasExceptionOfType('Exception');
         $this->assertTrue($hasException);
     }
+
     public function testHasExceptionOfTypeIfExceptionsIsEmpty()
     {
         $this->responseRest->setException(new \Exception());
diff --git a/lib/internal/Magento/Framework/Xml/Parser.php b/lib/internal/Magento/Framework/Xml/Parser.php
index 3cf4366b49c11..fc884a01c2164 100644
--- a/lib/internal/Magento/Framework/Xml/Parser.php
+++ b/lib/internal/Magento/Framework/Xml/Parser.php
@@ -111,8 +111,7 @@ protected function _xmlToArray($currentNode = false)
                         $value = ['_value' => $value, '_attribute' => $attributes];
                     }
                     if (isset($content[$node->nodeName])) {
-                        if (
-                            (is_string($content[$node->nodeName]) || !isset($content[$node->nodeName][0]))
+                        if ((is_string($content[$node->nodeName]) || !isset($content[$node->nodeName][0]))
                             || (is_array($value) && !is_array($content[$node->nodeName][0]))
                         ) {
                             $oldValue = $content[$node->nodeName];
diff --git a/phpserver/router.php b/phpserver/router.php
index f96748ae94d69..4c7a3cf435460 100644
--- a/phpserver/router.php
+++ b/phpserver/router.php
@@ -63,8 +63,7 @@
 
     $debug($route);
 
-    if (
-        strpos($route, 'media/') === 0 ||
+    if (strpos($route, 'media/') === 0 ||
         strpos($route, 'opt/') === 0 ||
         strpos($route, 'static/') === 0 ||
         strpos($route, 'errors/default/css/') === 0 ||
diff --git a/pub/cron.php b/pub/cron.php
index 6fd1f98fa3b12..225f496ed9563 100644
--- a/pub/cron.php
+++ b/pub/cron.php
@@ -11,7 +11,7 @@
 
 require dirname(__DIR__) . '/app/bootstrap.php';
 
-if (php_sapi_name() === 'cli'){
+if (php_sapi_name() === 'cli') {
     echo "You cannot run this from the command line." . PHP_EOL .
         "Run \"php bin/magento cron:run\" instead." . PHP_EOL;
     exit(1);
diff --git a/pub/errors/default/503.phtml b/pub/errors/default/503.phtml
index 1817a01f6f04e..1d92736c65bd8 100644
--- a/pub/errors/default/503.phtml
+++ b/pub/errors/default/503.phtml
@@ -6,4 +6,7 @@
 ?>
 
 <h1>Service Temporarily Unavailable</h1>
-<p>The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.</p>
+<p>
+    The server is temporarily unable to service your request due to maintenance downtime or capacity problems.
+    Please try again later.
+</p>
diff --git a/pub/errors/default/report.phtml b/pub/errors/default/report.phtml
index 620d4489da3be..13fb17dd69bc4 100644
--- a/pub/errors/default/report.phtml
+++ b/pub/errors/default/report.phtml
@@ -3,6 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// @codingStandardsIgnoreFile
 ?>
 
 <h1>There has been an error processing your request</h1>
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
index 8975e9c9d8783..bbbc7ae4ef3ce 100644
--- a/pub/errors/processor.php
+++ b/pub/errors/processor.php
@@ -4,10 +4,12 @@
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\Error;
+
 use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * Error processor
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class Processor
 {
@@ -20,42 +22,42 @@ class Processor
      * Page title
      *
      * @var string
-    */
+     */
     public $pageTitle;
 
     /**
      * Skin URL
      *
      * @var string
-    */
+     */
     public $skinUrl;
 
     /**
      * Base URL
      *
      * @var string
-    */
+     */
     public $baseUrl;
 
     /**
      * Post data
      *
      * @var array
-    */
+     */
     public $postData;
 
     /**
      * Report data
      *
      * @var array
-    */
+     */
     public $reportData;
 
     /**
      * Report action
      *
      * @var string
-    */
+     */
     public $reportAction;
 
     /**
@@ -69,28 +71,28 @@ class Processor
      * Report file
      *
      * @var string
-    */
+     */
     protected $_reportFile;
 
     /**
      * Show error message
      *
      * @var bool
-    */
+     */
     public $showErrorMsg;
 
     /**
      * Show message after sending email
      *
      * @var bool
-    */
+     */
     public $showSentMsg;
 
     /**
      * Show form for sending
      *
      * @var bool
-    */
+     */
     public $showSendForm;
 
     /**
@@ -102,21 +104,21 @@ class Processor
      * Server script name
      *
      * @var string
-    */
+     */
     protected $_scriptName;
 
     /**
      * Is root
      *
      * @var bool
-    */
+     */
     protected $_root;
 
     /**
      * Internal config object
      *
      * @var \stdClass
-    */
+     */
     protected $_config;
 
     /**
@@ -310,6 +312,8 @@ protected function _getIndexDir()
      * Prepare config data
      *
      * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function _prepareConfig()
     {
@@ -325,10 +329,10 @@ protected function _prepareConfig()
         $config->skin           = self::DEFAULT_SKIN;
 
         //combine xml data to one object
-        if (!is_null($design) && (string)$design->skin) {
+        if ($design === null && (string)$design->skin) {
             $this->_setSkin((string)$design->skin, $config);
         }
-        if (!is_null($local)) {
+        if ($local === null) {
             if ((string)$local->report->action) {
                 $config->action = $local->report->action;
             }
@@ -391,7 +395,7 @@ protected function _renderPage($template)
      */
     protected function _getFilePath($file, $directories = null)
     {
-        if (is_null($directories)) {
+        if ($directories === null) {
             $directories[] = $this->_errorDir;
         }
 
@@ -445,6 +449,7 @@ protected function _setReportData($reportData)
      *
      * @param array $reportData
      * @return void
+     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function saveReport($reportData)
     {
@@ -477,6 +482,7 @@ public function saveReport($reportData)
      *
      * @param int $reportId
      * @return void
+     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function loadReport($reportId)
     {
@@ -494,6 +500,8 @@ public function loadReport($reportId)
      * Send report
      *
      * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function sendReport()
     {
diff --git a/pub/health_check.php b/pub/health_check.php
index aa5757cfb2c67..ea37922389667 100644
--- a/pub/health_check.php
+++ b/pub/health_check.php
@@ -70,7 +70,7 @@
 function fatalErrorHandler()
 {
     $error = error_get_last();
-    if ($error !== NULL) {
+    if ($error !== null) {
         http_response_code(500);
     }
 }
diff --git a/setup/config/router.config.php b/setup/config/router.config.php
index c74dbef1fdd48..3b8c65c4353b4 100644
--- a/setup/config/router.config.php
+++ b/setup/config/router.config.php
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 return [
     'router' => [
         'routes' => [
diff --git a/setup/src/Magento/Setup/Console/Command/DependenciesShowFrameworkCommand.php b/setup/src/Magento/Setup/Console/Command/DependenciesShowFrameworkCommand.php
index 805f43949f552..5997fdac080bf 100644
--- a/setup/src/Magento/Setup/Console/Command/DependenciesShowFrameworkCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DependenciesShowFrameworkCommand.php
@@ -24,7 +24,7 @@ class DependenciesShowFrameworkCommand extends AbstractDependenciesCommand
 
     /**
      * Constructor
-     * 
+     *
      * @param ComponentRegistrarInterface $registrar
      * @param ObjectManagerProvider $objectManagerProvider
      */
diff --git a/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php b/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
index 74181bdbb05f3..2211bc905334d 100644
--- a/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/InfoLanguageListCommand.php
@@ -56,6 +56,5 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $table->render($output);
-
     }
 }
diff --git a/setup/src/Magento/Setup/Console/Command/RollbackCommand.php b/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
index bc675cc095698..218d025d5ae2f 100644
--- a/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
@@ -129,7 +129,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
             $this->doRollback($input, $output);
             $output->writeln('<info>Please set file permission of bin/magento to executable</info>');
-
         } catch (\Exception $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
             // we must have an exit code higher than zero to indicate something was wrong
diff --git a/setup/src/Magento/Setup/Controller/DataOption.php b/setup/src/Magento/Setup/Controller/DataOption.php
index 43a1d472ef24e..34ac13fad6b25 100644
--- a/setup/src/Magento/Setup/Controller/DataOption.php
+++ b/setup/src/Magento/Setup/Controller/DataOption.php
@@ -24,7 +24,7 @@ class DataOption extends AbstractActionController
 
     /**
      * Constructor
-     * 
+     *
      * @param UninstallCollector $uninstallCollector
      */
     public function __construct(UninstallCollector $uninstallCollector)
diff --git a/setup/src/Magento/Setup/Controller/DatabaseCheck.php b/setup/src/Magento/Setup/Controller/DatabaseCheck.php
index f951e627c9ca4..44de1d105b135 100644
--- a/setup/src/Magento/Setup/Controller/DatabaseCheck.php
+++ b/setup/src/Magento/Setup/Controller/DatabaseCheck.php
@@ -17,7 +17,6 @@ class DatabaseCheck extends AbstractActionController
      */
     private $dbValidator;
 
-
     /**
      * Constructor
      *
diff --git a/setup/src/Magento/Setup/Controller/DependencyCheck.php b/setup/src/Magento/Setup/Controller/DependencyCheck.php
index 5e81fadaa9438..b4439dd0b15e1 100644
--- a/setup/src/Magento/Setup/Controller/DependencyCheck.php
+++ b/setup/src/Magento/Setup/Controller/DependencyCheck.php
@@ -147,7 +147,6 @@ public function enableDisableDependencyCheckAction()
                     . implode("<br>", $constraints);
                 $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
             }
-
         } catch (\Exception $e) {
             $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
             $data['errorMessage'] = $e->getMessage();
diff --git a/setup/src/Magento/Setup/Controller/Environment.php b/setup/src/Magento/Setup/Controller/Environment.php
index 0f5d8f9163797..84d67549eb2da 100644
--- a/setup/src/Magento/Setup/Controller/Environment.php
+++ b/setup/src/Magento/Setup/Controller/Environment.php
@@ -223,7 +223,6 @@ public function cronScriptAction()
         if (!$updaterCheck['success']) {
             $responseType = ResponseTypeInterface::RESPONSE_TYPE_ERROR;
             $data['updaterErrorMessage'] = 'Error from Updater Application Cron Script:<br/>' . $updaterCheck['error'];
-
         }
         if (isset($setupCheck['notice'])) {
             $data['setupNoticeMessage'] = 'Notice from Setup Application Cron Script:<br/>' . $setupCheck['notice'];
diff --git a/setup/src/Magento/Setup/Controller/Session.php b/setup/src/Magento/Setup/Controller/Session.php
index dde08e2cc0039..59262f10c0942 100644
--- a/setup/src/Magento/Setup/Controller/Session.php
+++ b/setup/src/Magento/Setup/Controller/Session.php
@@ -31,7 +31,7 @@ public function __construct(
 
     /**
      * No index action, return 404 error page
-     * 
+     *
      * @return \Zend\View\Model\ViewModel|\Zend\Http\Response
      */
     public function indexAction()
diff --git a/setup/src/Magento/Setup/Fixtures/CatalogPriceRulesFixture.php b/setup/src/Magento/Setup/Fixtures/CatalogPriceRulesFixture.php
index b6c8f892a2a7b..17f034cfd58e2 100644
--- a/setup/src/Magento/Setup/Fixtures/CatalogPriceRulesFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/CatalogPriceRulesFixture.php
@@ -132,7 +132,6 @@ public function execute()
             $model->setUseAutoGeneration($useAutoGeneration);
             $model->save();
         }
-
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Fixtures/OrdersFixture.php b/setup/src/Magento/Setup/Fixtures/OrdersFixture.php
index 5d7ddb5b31c40..a3ca2b5f9a4a3 100644
--- a/setup/src/Magento/Setup/Fixtures/OrdersFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/OrdersFixture.php
@@ -247,7 +247,6 @@ public function execute()
                 ]),
                 $productsResult
             ];
-
         }
 
         $productStoreId = function ($index) use ($result) {
@@ -657,7 +656,6 @@ private function prepareConfigurableProducts(array $productIds = [])
                 'order' => $this->serializer->serialize($simpleBuyRequest),
                 'quote' => $this->serializer->serialize($quoteSimpleBuyRequest),
             ];
-
         }
         return $productsResult;
     }
diff --git a/setup/src/Magento/Setup/Fixtures/StoresFixture.php b/setup/src/Magento/Setup/Fixtures/StoresFixture.php
index 4103fdcafd534..df227b3c3312e 100644
--- a/setup/src/Magento/Setup/Fixtures/StoresFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/StoresFixture.php
@@ -185,8 +185,7 @@ public function execute()
         $this->storesCount = $this->fixtureModel->getValue('store_views', self::DEFAULT_STORE_VIEW_COUNT);
         $this->singleRootCategory = (bool)$this->fixtureModel->getValue('assign_entities_to_all_websites', false);
 
-        if (
-            $this->websitesCount <= self::DEFAULT_WEBSITE_COUNT
+        if ($this->websitesCount <= self::DEFAULT_WEBSITE_COUNT
             && $this->storeGroupsCount <= self::DEFAULT_STORE_COUNT
             && $this->storesCount <= self::DEFAULT_STORE_VIEW_COUNT
         ) {
diff --git a/setup/src/Magento/Setup/Fixtures/TaxRatesFixture.php b/setup/src/Magento/Setup/Fixtures/TaxRatesFixture.php
index baa5209ab952c..b4541b4da04d2 100644
--- a/setup/src/Magento/Setup/Fixtures/TaxRatesFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/TaxRatesFixture.php
@@ -53,7 +53,6 @@ public function execute()
         $importHandler = $this->fixtureModel->getObjectManager()
             ->create(\Magento\TaxImportExport\Model\Rate\CsvImportHandler::class);
         $importHandler->importFromCsvFile($file);
-
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList.php b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
index f6571010008f4..2b0bcfeb778fc 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
@@ -335,7 +335,6 @@ private function validateDbSettings(array $options, DeploymentConfig $deployment
             || $options[ConfigOptionsListConstants::INPUT_KEY_DB_PASSWORD] !== null
         ) {
             try {
-
                 $options = $this->getDbSettings($options, $deploymentConfig);
 
                 $this->dbValidator->checkDatabaseConnection(
diff --git a/setup/src/Magento/Setup/Model/Cron/JobModule.php b/setup/src/Magento/Setup/Model/Cron/JobModule.php
index a6b86551b0d76..a7c4b371647cc 100644
--- a/setup/src/Magento/Setup/Model/Cron/JobModule.php
+++ b/setup/src/Magento/Setup/Model/Cron/JobModule.php
@@ -90,7 +90,6 @@ public function execute()
 
             //perform the generated file cleanup
             $this->performCleanup();
-
         } catch (\Exception $e) {
             $this->status->toggleUpdateError(true);
             throw new \RuntimeException(
diff --git a/setup/src/Magento/Setup/Model/Cron/Status.php b/setup/src/Magento/Setup/Model/Cron/Status.php
index ea74b88af9cc0..2190a3c6662a4 100644
--- a/setup/src/Magento/Setup/Model/Cron/Status.php
+++ b/setup/src/Magento/Setup/Model/Cron/Status.php
@@ -215,7 +215,7 @@ protected function setFlagValue($pathToFlagFile, $value)
             } catch (FileSystemException $e) {
                 throw new \RuntimeException(sprintf('"%s" cannot be created.', $pathToFlagFile));
             }
-        } else if ($this->varReaderWriter->isExist($pathToFlagFile)) {
+        } elseif ($this->varReaderWriter->isExist($pathToFlagFile)) {
             $this->varReaderWriter->delete($pathToFlagFile);
         }
         return $this;
diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductTemplateGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductTemplateGenerator.php
index 71916c611e1fa..461df8518f8fe 100644
--- a/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductTemplateGenerator.php
+++ b/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductTemplateGenerator.php
@@ -6,7 +6,6 @@
 
 namespace Magento\Setup\Model\FixtureGenerator;
 
-
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
diff --git a/setup/src/Magento/Setup/Model/Grid/Extension.php b/setup/src/Magento/Setup/Model/Grid/Extension.php
index 8bb8ff8d22e51..6554461752f31 100644
--- a/setup/src/Magento/Setup/Model/Grid/Extension.php
+++ b/setup/src/Magento/Setup/Model/Grid/Extension.php
@@ -48,8 +48,7 @@ public function getList()
         foreach ($extensions as &$extension) {
             $extension['update'] = array_key_exists($extension['name'], $packagesForUpdate);
             $extension['uninstall'] = true;
-            if (
-                $extension['type'] === ComposerInformation::METAPACKAGE_PACKAGE_TYPE
+            if ($extension['type'] === ComposerInformation::METAPACKAGE_PACKAGE_TYPE
                 || !$this->composerInformation->isPackageInComposerJson($extension['name'])
             ) {
                 $extension['uninstall'] = false;
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index 088b40aa4decb..580daec0f9055 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -859,7 +859,7 @@ private function handleDBSchemaData($setup, $type)
         if ($type === 'schema') {
             $this->log->log('Schema post-updates:');
             $handlerType = 'schema-recurring';
-        } else if ($type === 'data') {
+        } elseif ($type === 'data') {
             $this->log->log('Data post-updates:');
             $handlerType = 'data-recurring';
         }
diff --git a/setup/src/Magento/Setup/Model/ModuleStatus.php b/setup/src/Magento/Setup/Model/ModuleStatus.php
index 6433de931b2d8..23755ecff67d6 100644
--- a/setup/src/Magento/Setup/Model/ModuleStatus.php
+++ b/setup/src/Magento/Setup/Model/ModuleStatus.php
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-
 namespace Magento\Setup\Model;
 
 use Magento\Framework\Module\ModuleList\Loader as ModuleLoader;
diff --git a/setup/src/Magento/Setup/Model/PackagesData.php b/setup/src/Magento/Setup/Model/PackagesData.php
index 5e776a8f7b9dd..139dc17cdd32b 100644
--- a/setup/src/Magento/Setup/Model/PackagesData.php
+++ b/setup/src/Magento/Setup/Model/PackagesData.php
@@ -479,8 +479,7 @@ private function getPackageAvailableVersions($package)
         $magentoRepositories = $this->composerInformation->getRootRepositories();
 
         // Check we have only one repo.magento.com repository
-        if (
-            count($magentoRepositories) === 1
+        if (count($magentoRepositories) === 1
             && strpos($magentoRepositories[0], $this->packagesAuth->getCredentialBaseUrl())
         ) {
             $packagesJson = $this->getPackagesJson();
diff --git a/setup/src/Magento/Setup/Model/PayloadValidator.php b/setup/src/Magento/Setup/Model/PayloadValidator.php
index 6cab630ca7716..144fa564230bd 100644
--- a/setup/src/Magento/Setup/Model/PayloadValidator.php
+++ b/setup/src/Magento/Setup/Model/PayloadValidator.php
@@ -34,7 +34,7 @@ public function validatePayload(array $postPayload)
     {
         $jobType = $postPayload[UpdaterTaskCreator::KEY_POST_JOB_TYPE];
         $errorMessage = '';
-        switch($jobType) {
+        switch ($jobType) {
             case 'uninstall':
                 $errorMessage = $this->validateUninstallPayload($postPayload);
                 break;
diff --git a/setup/src/Magento/Setup/Model/PhpReadinessCheck.php b/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
index c593059edd4a6..b3c6b821fd571 100644
--- a/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
+++ b/setup/src/Magento/Setup/Model/PhpReadinessCheck.php
@@ -194,8 +194,7 @@ public function checkMemoryLimit()
 
         $currentMemoryInteger = intval($currentMemoryLimit);
 
-        if (
-            $currentMemoryInteger > 0
+        if ($currentMemoryInteger > 0
             && $this->dataSize->convertSizeToBytes($currentMemoryLimit)
             < $this->dataSize->convertSizeToBytes($minimumRequiredMemoryLimit)
         ) {
@@ -209,8 +208,7 @@ public function checkMemoryLimit()
                 $currentMemoryLimit,
                 $minimumRequiredMemoryLimit
             );
-        } elseif (
-            $currentMemoryInteger > 0
+        } elseif ($currentMemoryInteger > 0
             && $this->dataSize->convertSizeToBytes($currentMemoryLimit)
             < $this->dataSize->convertSizeToBytes($recommendedForUpgradeMemoryLimit)
         ) {
@@ -246,7 +244,6 @@ private function checkXDebugNestedLevel()
 
         $currentExtensions = $this->phpInformation->getCurrent();
         if (in_array('xdebug', $currentExtensions)) {
-
             $currentXDebugNestingLevel = intval(ini_get('xdebug.max_nesting_level'));
             $minimumRequiredXDebugNestedLevel = $this->phpInformation->getRequiredMinimumXDebugNestedLevel();
 
diff --git a/setup/src/Magento/Setup/Model/SearchTermManager.php b/setup/src/Magento/Setup/Model/SearchTermManager.php
index 5ca68757c8934..ecdf76cd3073f 100644
--- a/setup/src/Magento/Setup/Model/SearchTermManager.php
+++ b/setup/src/Magento/Setup/Model/SearchTermManager.php
@@ -53,8 +53,7 @@ public function applySearchTermsToDescription(&$description, $currentProductInde
         }
 
         foreach ($this->searchTerms as &$searchTerm) {
-            if (
-                $this->searchTermsUseRate[$searchTerm['term']]['use_rate'] > 0
+            if ($this->searchTermsUseRate[$searchTerm['term']]['use_rate'] > 0
                 && $currentProductIndex % $this->searchTermsUseRate[$searchTerm['term']]['use_rate'] === 0
                 && $this->searchTermsUseRate[$searchTerm['term']]['used'] < $searchTerm['count']
             ) {
diff --git a/setup/src/Magento/Setup/Model/SystemPackage.php b/setup/src/Magento/Setup/Model/SystemPackage.php
index 3241cdf13a24c..2f0badec54b25 100755
--- a/setup/src/Magento/Setup/Model/SystemPackage.php
+++ b/setup/src/Magento/Setup/Model/SystemPackage.php
@@ -97,8 +97,7 @@ public function getPackageVersions()
             $result = array_merge($this->getAllowedEnterpriseVersions($currentCE), $result);
         }
 
-        if (
-            in_array(static::EDITION_ENTERPRISE, $systemPackages)
+        if (in_array(static::EDITION_ENTERPRISE, $systemPackages)
             && !in_array(static::EDITION_B2B, $systemPackages)
         ) {
             $result = array_merge($this->getAllowedB2BVersions($currentEE), $result);
diff --git a/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php b/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php
index ab4a87392d2ce..03946ab37a6a7 100644
--- a/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php
+++ b/setup/src/Magento/Setup/Model/UpdaterTaskCreator.php
@@ -159,7 +159,6 @@ public function createUpdaterTasks(array $postPayload)
                 [],
                 \Magento\Setup\Model\Cron\JobFactory::JOB_MAINTENANCE_MODE_DISABLE
             );
-
         }
 
         return $errorMessage;
@@ -177,7 +176,7 @@ public function createUpdaterTasks(array $postPayload)
     private function getCronTaskConfigInfo($jobType, $postPayload, &$additionalOptions, &$cronTaskType)
     {
         $additionalOptions = [];
-        switch($jobType) {
+        switch ($jobType) {
             case 'uninstall':
                 $additionalOptions = [
                     JobComponentUninstall::DATA_OPTION => $postPayload[self::KEY_POST_DATA_OPTION]
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Generator.php b/setup/src/Magento/Setup/Module/Di/Code/Generator.php
index 4cbb2090020cb..222fb792df778 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Generator.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Generator.php
@@ -40,7 +40,6 @@ public function __construct(
         $this->setObjectManager($objectManagerInterface);
     }
 
-
     /**
      * Create entity generator
      *
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScannerInterface.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScannerInterface.php
index 32ca8233d4da4..ba23a105c8ebc 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScannerInterface.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScannerInterface.php
@@ -12,7 +12,6 @@
  */
 interface ClassesScannerInterface
 {
-
     /**
      * Retrieves list of classes for given path
      *
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
index 66a3b5b4d916b..9684e9a61175e 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
@@ -83,7 +83,7 @@ protected function getSourceClassName($missingClassName, $entityType)
         ) {
             /** Process special cases for extension class and extension interface */
             return $sourceClassName . 'Interface';
-        } else if ($entityType == FactoryGenerator::ENTITY_TYPE) {
+        } elseif ($entityType == FactoryGenerator::ENTITY_TYPE) {
             $extensionAttributesSuffix = ucfirst(ExtensionAttributesGenerator::ENTITY_TYPE);
             if (substr($sourceClassName, -strlen($extensionAttributesSuffix)) == $extensionAttributesSuffix) {
                 /** Process special case for extension factories */
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/RepositoryScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/RepositoryScanner.php
index e82e69b44665e..f2d643d61bf38 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/RepositoryScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/RepositoryScanner.php
@@ -34,8 +34,7 @@ public function collectEntities(array $files)
             foreach ($xpath->query('//preference') as $node) {
                 $forType = $node->attributes->getNamedItem('for');
                 $replacementType = $node->attributes->getNamedItem('type');
-                if (
-                    $forType !== null
+                if ($forType !== null
                     && $replacementType !== null
                     && (substr($forType->nodeValue, -19) == 'RepositoryInterface')
                 ) {
diff --git a/setup/src/Magento/Setup/Module/Di/Compiler/Log/Log.php b/setup/src/Magento/Setup/Module/Di/Compiler/Log/Log.php
index ad29e8e0ea7e7..857f457d5241b 100644
--- a/setup/src/Magento/Setup/Module/Di/Compiler/Log/Log.php
+++ b/setup/src/Magento/Setup/Module/Di/Compiler/Log/Log.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Setup\Module\Di\Compiler\Log;
 
-
 class Log
 {
     const GENERATION_ERROR = 1;
diff --git a/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php b/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php
index ace9f46f3f566..b62fb758a5ca4 100644
--- a/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php
+++ b/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php
@@ -139,8 +139,7 @@ public function authPreDispatch($event)
                 /** @var \Magento\Backend\Model\Auth $auth */
                 $authentication = $objectManager->get(\Magento\Backend\Model\Auth::class);
 
-                if (
-                    !$authentication->isLoggedIn() ||
+                if (!$authentication->isLoggedIn() ||
                     !$adminSession->isAllowed('Magento_Backend::setup_wizard')
                 ) {
                     $adminSession->destroy();
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceAllowIpsCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceAllowIpsCommandTest.php
index 7e6cd17b2639b..f59ebf2a4146c 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceAllowIpsCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceAllowIpsCommandTest.php
@@ -64,7 +64,6 @@ public function testExecute(array $input, array $validatorMessages, $expectedMes
         $tester = new CommandTester($this->command);
         $tester->execute($input);
         $this->assertEquals($expectedMessage, $tester->getDisplay());
-
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceEnableCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceEnableCommandTest.php
index 1f04afba9a733..1b22d3d61ba12 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceEnableCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceEnableCommandTest.php
@@ -51,7 +51,6 @@ public function testExecute(array $input, array $validatorMessages, $expectedMes
         $tester = new CommandTester($this->command);
         $tester->execute($input);
         $this->assertEquals($expectedMessage, $tester->getDisplay());
-
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceStatusCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceStatusCommandTest.php
index 4cb236b9b0623..20e811b3597fa 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceStatusCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/MaintenanceStatusCommandTest.php
@@ -39,7 +39,6 @@ public function testExecute(array $maintenanceData, $expectedMessage)
         $tester = new CommandTester($this->command);
         $tester->execute([]);
         $this->assertEquals($expectedMessage, $tester->getDisplay());
-
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleUninstallCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleUninstallCommandTest.php
index 80124605dc760..07e747e6709d6 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleUninstallCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/ModuleUninstallCommandTest.php
@@ -399,7 +399,6 @@ private function setUpExecute()
             ->willReturn(['Magento_A' => [], 'Magento_B' => []]);
         $this->cache->expects($this->once())->method('clean');
         $this->cleanupFiles->expects($this->once())->method('clearCodeGeneratedClasses');
-
     }
 
     public function testExecute()
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/EnvironmentTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/EnvironmentTest.php
index 923ac6e46ef12..a5dff8d24a436 100644
--- a/setup/src/Magento/Setup/Test/Unit/Controller/EnvironmentTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Controller/EnvironmentTest.php
@@ -230,6 +230,7 @@ public function testCronScriptActionSetupFailed()
         );
         $this->assertEquals($expected, $this->environment->cronScriptAction());
     }
+
     public function testCronScriptActionUpdaterFailed()
     {
         $this->cronScriptReadinessCheck->expects($this->once())->method('checkSetup')->willReturn(['success' => true]);
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php
index 3dabe362560fe..8632db36980a6 100644
--- a/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php
@@ -98,7 +98,7 @@ public function setUp()
     public function testIndexAction()
     {
         $viewModel = $this->controller->indexAction();
-        $this->assertInstanceOf('Zend\View\Model\ViewModel', $viewModel);
+        $this->assertInstanceOf(\Zend\View\Model\ViewModel::class, $viewModel);
         $this->assertTrue($viewModel->terminate());
     }
 
@@ -120,7 +120,7 @@ public function testExtensionsAction()
              );
 
         $jsonModel = $this->controller->extensionsAction();
-        $this->assertInstanceOf('Zend\View\Model\JsonModel', $jsonModel);
+        $this->assertInstanceOf(\Zend\View\Model\JsonModel::class, $jsonModel);
         $variables = $jsonModel->getVariables();
         $this->assertArrayHasKey('success', $variables);
         $this->assertTrue($variables['success']);
@@ -148,7 +148,7 @@ public function testSyncAction()
             );
 
         $jsonModel = $this->controller->syncAction();
-        $this->assertInstanceOf('Zend\View\Model\JsonModel', $jsonModel);
+        $this->assertInstanceOf(\Zend\View\Model\JsonModel::class, $jsonModel);
         $variables = $jsonModel->getVariables();
         $this->assertArrayHasKey('success', $variables);
         $this->assertTrue($variables['success']);
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/InstallTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/InstallTest.php
index 0a96220e33d67..cbbbf44b79b61 100644
--- a/setup/src/Magento/Setup/Test/Unit/Controller/InstallTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Controller/InstallTest.php
@@ -107,6 +107,7 @@ public function testStartActionPriorInstallException()
         $this->assertArrayHasKey('messages', $variables);
         $this->assertFalse($variables['success']);
     }
+
     public function testStartActionInstallException()
     {
         $this->webLogger->expects($this->once())->method('clear');
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/ModuleGridTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/ModuleGridTest.php
index 452f546b4ae68..6028fe1986a25 100644
--- a/setup/src/Magento/Setup/Test/Unit/Controller/ModuleGridTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Controller/ModuleGridTest.php
@@ -40,7 +40,7 @@ public function setUp()
     public function testIndexAction()
     {
         $viewModel = $this->controller->indexAction();
-        $this->assertInstanceOf('Zend\View\Model\ViewModel', $viewModel);
+        $this->assertInstanceOf(\Zend\View\Model\ViewModel::class, $viewModel);
         $this->assertTrue($viewModel->terminate());
     }
 
@@ -72,7 +72,7 @@ public function testModulesAction()
             ->willReturn($moduleList);
 
         $jsonModel = $this->controller->modulesAction();
-        $this->assertInstanceOf('Zend\View\Model\JsonModel', $jsonModel);
+        $this->assertInstanceOf(\Zend\View\Model\JsonModel::class, $jsonModel);
         $variables = $jsonModel->getVariables();
         $this->assertArrayHasKey('success', $variables);
         $this->assertTrue($variables['success']);
diff --git a/setup/src/Magento/Setup/Test/Unit/Fixtures/ConfigsApplyFixtureTest.php b/setup/src/Magento/Setup/Test/Unit/Fixtures/ConfigsApplyFixtureTest.php
index c917188fff2e2..a3b5aa4423002 100644
--- a/setup/src/Magento/Setup/Test/Unit/Fixtures/ConfigsApplyFixtureTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Fixtures/ConfigsApplyFixtureTest.php
@@ -27,6 +27,7 @@ public function setUp()
 
         $this->model = new ConfigsApplyFixture($this->fixtureModelMock);
     }
+
     public function testExecute()
     {
         $cacheMock = $this->getMock(\Magento\Framework\App\Cache::class, [], [], '', false);
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
index 9a6945952e998..158984be4d042 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ConfigOptionsListTest.php
@@ -164,7 +164,6 @@ public function testValidateCacheHosts($hosts, $expectedError)
         } else {
             $this->assertCount(0, $result);
         }
-
     }
 
     public function validateCacheHostsDataProvider()
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobFactoryTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobFactoryTest.php
index a5a3078ec1179..e57679606a6aa 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobFactoryTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Cron/JobFactoryTest.php
@@ -203,7 +203,6 @@ public function testMaintenanceModeDisable()
     }
 }
 
-
 // functions to override native php functions
 namespace Magento\Setup\Model\Cron;
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/Cron/StatusTest.php b/setup/src/Magento/Setup/Test/Unit/Model/Cron/StatusTest.php
index 2cb93a3f4f0c3..ff4b3eaf0b5ae 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/Cron/StatusTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/Cron/StatusTest.php
@@ -108,6 +108,7 @@ public function testToggleUpdateInProgressFalseFlagExist()
         $this->varReaderWriter->expects($this->at(1))->method('delete');
         $this->status->toggleUpdateInProgress(false);
     }
+
     public function testToggleUpdateInProgressFalseFlagNotExist()
     {
         $this->varReaderWriter->expects($this->at(0))->method('isExist')->willReturn(false);
@@ -139,6 +140,7 @@ public function testToggleUpdateErrorFalseFlagExist()
         $this->varReaderWriter->expects($this->at(1))->method('delete');
         $this->status->toggleUpdateError(false);
     }
+
     public function testToggleUpdateErrorFalseFlagNotExist()
     {
         $this->varReaderWriter->expects($this->at(0))->method('isExist')->willReturn(false);
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/UninstallCollectorTest.php b/setup/src/Magento/Setup/Test/Unit/Model/UninstallCollectorTest.php
index b94babf9be296..69fdbf8c60398 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/UninstallCollectorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/UninstallCollectorTest.php
@@ -72,7 +72,6 @@ public function testUninstallCollector()
             ['Magento_A' => 'Uninstall Class A', 'Magento_B' => 'Uninstall Class B'],
             $this->collector->collectUninstall()
         );
-
     }
 
     public function testUninstallCollectorWithInput()
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
index b8f716ab5a55c..6f51fdba6681e 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
@@ -75,5 +75,4 @@ public function aliasesDataProvider()
             [OperationFactory::INTERCEPTION_CACHE, 1, \Magento\Setup\Module\Di\App\Task\Operation\InterceptionCache::class],
         ];
     }
-
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php
index bb031cc7f1339..83809f1b543d9 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/ParserTest.php
@@ -27,7 +27,6 @@ class ParserTest extends \PHPUnit_Framework_TestCase
      */
     protected $factory;
 
-
     protected function setUp()
     {
         $this->filesCollector = $this->getMock(\Magento\Setup\Module\I18n\FilesCollector::class);
diff --git a/setup/view/magento/setup/license.phtml b/setup/view/magento/setup/license.phtml
index 4bc7af3f639c7..ea798242b7ca6 100644
--- a/setup/view/magento/setup/license.phtml
+++ b/setup/view/magento/setup/license.phtml
@@ -3,6 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+// @codingStandardsIgnoreFile
 ?>
 <div class="row page-license">
     <div class="col-m-offset-2 col-m-8 col-xs-12">