[PSR-2 Compliance] Fix magento#8612: Hundreds of PHPCS-based static t…

…ests violations in mainline

- apply automatic PHPCBF fixes to make PHPCS happy
- Step 0. Install phpcs globally: composer global require squizlabs/php_codesniffer:2.8.0
- Step 1. Execute tool to fix PSR-2 violations in PHP files: ~/.composer/vendor/bin/phpcbf --standard=PSR2 --extensions=php --ignore=generated/*,vendor/*,var/* .

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
 {

app/code/Magento/AdminNotification/Setup/InstallSchema.php

@@ -120,6 +120,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }

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

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);
-
     }
 
     /**

app/code/Magento/Analytics/Model/ReportWriter.php

@@ -84,7 +84,6 @@ public function write(WriteInterface $directory, $path)
                 if (!$headers) {
                     $headers = array_keys($row);
                     $stream->writeCsv($headers);
-
                 }
                 $stream->writeCsv($row);
             }

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;
     }

app/code/Magento/Analytics/ReportXml/DB/ColumnsResolver.php

@@ -61,7 +61,6 @@ public function getColumns(SelectBuilder $selectBuilder, $entityConfig)
             if (isset($attributeData['group'])) {
                 $group[$columnAlias] = $expression;
             }
-
         }
         $selectBuilder->setGroup(array_merge($selectBuilder->getGroup(), $group));
         return $columns;

app/code/Magento/Analytics/ReportXml/Query.php

@@ -25,7 +25,7 @@ class Query implements \JsonSerializable
     private $selectHydrator;
 
     /**
-     * @var string 
+     * @var string
      */
     private $connectionName;
 

app/code/Magento/Analytics/ReportXml/ReportProvider.php

@@ -52,6 +52,5 @@ public function getReport($name, SearchCriteria $criteria = null)
         $connection = $this->connectionFactory->getConnection($query->getConnectionName());
         $statement = $connection->query($query->getSelect());
         return new \IteratorIterator($statement);
-
     }
 }

app/code/Magento/Analytics/Test/Unit/Model/Config/Backend/Enabled/SubscriptionHandlerTest.php

@@ -98,7 +98,7 @@ protected function setUp()
     /**
      * @param int|null $value null means that $value was not changed
      * @param bool $isTokenExist
-     * 
+     *
      * @dataProvider processDataProvider
      */
     public function testProcess($value, $isTokenExist)

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();

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')
             );

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
      */

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(

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" />

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
  *

app/code/Magento/Backend/Model/View/Layout/FilterInterface.php

@@ -23,7 +23,7 @@
  *         </argument>
  *     </arguments>
  * </type>
- * 
+ *
  */
 interface FilterInterface
 {

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 {

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

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
      */

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()

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);

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()

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);

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;

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;

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;

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);

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

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()

app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php

@@ -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)

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();
-
     }
 
     /**

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
                 ) {

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'],

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)));
             }
-
         }
     }
 

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;

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')];