Merge pull request #930 from magento-engcom/MAGETWO-65199-PR-8685

Public Pull Request: #8685

.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

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/FileRecorder.php

@@ -78,7 +78,6 @@ public function recordNewFile(EncodedContext $encodedContext)
         $this->removeOldFile($fileInfo, $directory);
 
         return true;
-
     }
 
     /**

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

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

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

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

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

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

@@ -76,7 +76,6 @@ public function testAfterSave()
             Value::class,
             $this->collectionTime->afterSave()
         );
-
     }
 
     /**

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

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/Block/Dashboard/Sales.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Backend\Block\Dashboard;
 
-
 /**
  * Adminhtml dashboard sales statistics bar
  *

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

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

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

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

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/Model/View/Layout/Reader/Block.php

@@ -13,6 +13,15 @@
  */
 class Block extends Layout\Reader\Block
 {
+    /**
+     * Initialize dependencies.
+     *
+     * @param Layout\ScheduledStructure\Helper $helper
+     * @param Layout\Argument\Parser $argumentParser
+     * @param Layout\ReaderPool $readerPool
+     * @param InterpreterInterface $argumentInterpreter
+     * @param string|null $scopeType
+     */
     public function __construct(
         Layout\ScheduledStructure\Helper $helper,
         Layout\Argument\Parser $argumentParser,

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

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/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,]
         );

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

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/Block/Customer/PayPal/VaultTokenRenderer.php

@@ -21,6 +21,13 @@ class VaultTokenRenderer extends AbstractTokenRenderer
      */
     private $config;
 
+    /**
+     * Initialize dependencies.
+     *
+     * @param Template\Context $context
+     * @param Config $config
+     * @param array $data
+     */
     public function __construct(
         Template\Context $context,
         Config $config,

app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetNonce.php

@@ -5,7 +5,6 @@
  */
 namespace Magento\Braintree\Controller\Adminhtml\Payment;
 
-
 /**
  * Class GetNonce
  */

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/Gateway/Config/PayPal/Config.php

@@ -35,6 +35,14 @@ class Config extends \Magento\Payment\Gateway\Config\Config
      */
     private $icon = [];
 
+    /**
+     * Initialize dependencies.
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     * @param CcConfig $ccConfig
+     * @param null $methodCode
+     * @param string $pathPattern
+     */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         CcConfig $ccConfig,