Merge 16bbf9d into MAGETWO-63641

Author: Magento CICD

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