From 74fbb738d62183ccf840b49afd037a6665cbdfa6 Mon Sep 17 00:00:00 2001
From: Vlad Veselov <vlad.veselov@gmail.com>
Date: Sun, 26 Feb 2017 22:58:18 +0200
Subject: [PATCH] [PSR-2 Compliance] Fix #8612: Hundreds of PHPCS-based static
 tests violations in mainline

- apply manual fixes to make PHPCS and PHPMD happy
- some phtml templates marked as ignored for now as PHPCS 1.5.3 version produces false-positives on them (PHPCS 2.8.0 treats them fine)
---
 .../Block/Widget/Grid/Column/Filter/Store.php |  1 +
 .../Model/View/Layout/Reader/Block.php        |  7 ++
 .../Customer/PayPal/VaultTokenRenderer.php    |  5 ++
 .../Gateway/Config/PayPal/Config.php          |  6 ++
 .../Model/Ui/PayPal/ConfigProvider.php        |  7 ++
 .../Report/Filters/Type/DateRangeTest.php     |  1 +
 .../templates/paypal/vault_token.phtml        |  3 +-
 .../Model/Layer/Filter/Dynamic/Improved.php   |  1 +
 .../Model/Import/Product/StoreResolver.php    |  1 +
 .../Model/Adapter/Mysql/Field/Resolver.php    |  1 +
 .../Search/FilterMapper/FilterContext.php     |  1 +
 .../frontend/templates/cart/noItems.phtml     |  2 +-
 .../CustomerData/Plugin/SessionChecker.php    |  1 +
 app/code/Magento/Customer/Model/Context.php   |  1 +
 .../Model/Plugin/CustomerNotification.php     |  3 +-
 .../templates/product/grouped/list.phtml      |  1 +
 .../Response/Validator/AVSResponse.php        |  8 +-
 .../Service/Response/Validator/CVV2Match.php  |  8 +-
 .../view/frontend/templates/hss/info.phtml    |  4 +-
 .../Magento/ProductVideo/Helper/Media.php     |  1 +
 .../Quote/Address/CollectTotalsObserver.php   |  5 +-
 .../templates/report/grid/container.phtml     |  4 +-
 .../Sales/Api/Data/OrderAddressInterface.php  | 75 ++++++++++++-------
 .../Sales/Model/ResourceModel/Attribute.php   |  1 +
 .../Shipping/Model/Simplexml/Element.php      |  4 +-
 .../Magento/Store/Model/Config/StoreView.php  |  2 +
 app/code/Magento/Store/Model/PathConfig.php   |  2 +
 .../templates/product/view/renderer.phtml     |  1 +
 .../Config/SearchRobots/ResetButton.php       |  1 +
 .../Controller/Adminhtml/Bookmark/Delete.php  |  1 +
 .../Api/Data/PaymentTokenInterfaceFactory.php |  1 +
 .../Vault/Block/Customer/PaymentTokens.php    |  2 +-
 .../Webapi/Model/Rest/Swagger/Generator.php   |  1 +
 .../Webapi/Adapter/Rest/CurlClient.php        |  1 +
 .../Test/TestStep/UpdateTermEntityStep.php    |  1 +
 .../Vault/Test/Block/StoredPayments.php       |  6 +-
 .../TestFramework/Annotation/DbIsolation.php  |  1 +
 .../Magento/Tax/Model/TaxCalculationTest.php  |  1 +
 dev/tests/unit/framework/bootstrap.php        |  4 +-
 .../Framework/Cache/Backend/MongoDb.php       | 13 +---
 .../DB/Test/Unit/Adapter/Pdo/MysqlTest.php    |  7 +-
 .../Framework/HTTP/PhpEnvironment/Request.php |  9 ++-
 .../Framework/Indexer/GridStructure.php       |  1 +
 .../Framework/Indexer/IndexStructure.php      |  2 +
 .../ScopeResolver/FlatScopeResolver.php       |  1 +
 .../Framework/Indexer/Test/Unit/XsdTest.php   |  1 +
 .../Magento/Framework/Locale/Resolver.php     |  1 +
 .../Adapter/Mysql/Aggregation/Interval.php    |  1 +
 .../Search/Adapter/Mysql/ConditionManager.php |  1 +
 .../Search/Adapter/Mysql/Field/Field.php      |  2 +
 .../Adapter/Mysql/Query/MatchContainer.php    |  1 +
 .../Adapter/Mysql/Query/QueryContainer.php    |  1 +
 .../Magento/Framework/Simplexml/Element.php   |  4 +-
 .../TestFramework/Unit/Module/Config.php      |  2 +-
 .../View/Template/Html/MinifierInterface.php  |  1 +
 pub/errors/default/503.phtml                  |  5 +-
 pub/errors/default/report.phtml               |  1 +
 pub/errors/processor.php                      | 39 ++++++----
 .../Unit/Controller/ExtensionGridTest.php     |  6 +-
 .../Test/Unit/Controller/ModuleGridTest.php   |  4 +-
 setup/view/magento/setup/license.phtml        |  1 +
 61 files changed, 190 insertions(+), 91 deletions(-)

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/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/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/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/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/Ui/Component/Report/Filters/Type/DateRangeTest.php b/app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php
index 479651b90de69..56045c8bfe4b7 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
@@ -81,6 +81,7 @@ protected function setUp()
      * @param array|null $expectedCondition
      * @dataProvider getPrepareDataProvider
      * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function testPrepare($name, $filterData, $expectedCondition)
     {
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/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/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/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/Search/FilterMapper/FilterContext.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php
index d8d3efc65e782..1ebc2e5141ff9 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php
@@ -14,6 +14,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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/Theme/Ui/Component/Design/Config/SearchRobots/ResetButton.php b/app/code/Magento/Theme/Ui/Component/Design/Config/SearchRobots/ResetButton.php
index dac04d1697d96..ba2eec7582b0a 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
@@ -54,6 +54,7 @@ private function getRobotsDefaultCustomInstructions()
     /**
      * Add js listener to reset button
      *
+     * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function prepare()
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Delete.php
index 9b62d1123f6f5..a1c5ddbcb4244 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
      */
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/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
index bee6af8aeb144..fe7ef775aa60a 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
 {
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/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/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/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/testsuite/Magento/Tax/Model/TaxCalculationTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/TaxCalculationTest.php
index d08d470a8cca6..6ed9d08a00901 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
 {
diff --git a/dev/tests/unit/framework/bootstrap.php b/dev/tests/unit/framework/bootstrap.php
index 2988c71ff8289..5af59a88207d4 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(
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/DB/Test/Unit/Adapter/Pdo/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
index 7e7c00e01189a..3c5438e159aad 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
 {
     /**
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php
index 227c6593235ee..98e2570b54344 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,15 +418,15 @@ 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) {
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/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/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/Query/MatchContainer.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
index 412e4869b2af8..acc108e681642 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/MatchContainer.php
@@ -17,6 +17,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/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/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/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/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..8779e09a7a2f1 100644
--- a/pub/errors/processor.php
+++ b/pub/errors/processor.php
@@ -8,6 +8,7 @@
 
 /**
  * Error processor
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class Processor
 {
@@ -20,42 +21,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 +70,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 +103,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 +311,8 @@ protected function _getIndexDir()
      * Prepare config data
      *
      * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function _prepareConfig()
     {
@@ -325,10 +328,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 +394,7 @@ protected function _renderPage($template)
      */
     protected function _getFilePath($file, $directories = null)
     {
-        if (is_null($directories)) {
+        if ($directories === null) {
             $directories[] = $this->_errorDir;
         }
 
@@ -445,6 +448,7 @@ protected function _setReportData($reportData)
      *
      * @param array $reportData
      * @return void
+     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function saveReport($reportData)
     {
@@ -477,6 +481,7 @@ public function saveReport($reportData)
      *
      * @param int $reportId
      * @return void
+     * @SuppressWarnings(PHPMD.ExitExpression)
      */
     public function loadReport($reportId)
     {
@@ -494,6 +499,8 @@ public function loadReport($reportId)
      * Send report
      *
      * @return void
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function sendReport()
     {
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/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/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">