MAGETWO-69690: Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-69690-PR-9690

Author: ishakhsuvarov

.gitignore

@@ -48,6 +48,7 @@ atlassian*
 /pub/media/favicon/*
 /pub/media/import/*
 !/pub/media/import/.htaccess
+/pub/media/logo/*
 /pub/media/theme/*
 /pub/media/theme_customization/*
 !/pub/media/theme_customization/.htaccess

.travis.yml

@@ -7,6 +7,9 @@ addons:
     - mysql-client-core-5.6
     - mysql-client-5.6
     - postfix
+  firefox: "46.0"
+  hosts:
+      - magento2.travis
 language: php
 php:
   - 7.0
@@ -16,19 +19,26 @@ env:
     - COMPOSER_BIN_DIR=~/bin
     - INTEGRATION_SETS=3
     - NODE_JS_VERSION=6
+    - MAGENTO_HOST_NAME="magento2.travis"
   matrix:
     - TEST_SUITE=unit
     - TEST_SUITE=integration INTEGRATION_INDEX=1
     - TEST_SUITE=integration INTEGRATION_INDEX=2
     - TEST_SUITE=integration INTEGRATION_INDEX=3
     - TEST_SUITE=static
     - TEST_SUITE=js
+    - TEST_SUITE=functional ACCEPTANCE_INDEX=1
+    - TEST_SUITE=functional ACCEPTANCE_INDEX=2
 matrix:
   exclude:
     - php: 7.0
       env: TEST_SUITE=static
     - php: 7.0
       env: TEST_SUITE=js
+    - php: 7.0
+      env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
+    - php: 7.0
+      env: TEST_SUITE=functional ACCEPTANCE_INDEX=2
 cache:
   apt: true
   directories:

app/autoload.php

@@ -35,6 +35,3 @@
 }
 
 AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));
-
-// Sets default autoload mappings, may be overridden in Bootstrap::create
-\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);

app/bootstrap.php

@@ -28,6 +28,9 @@
 }
 
 require_once __DIR__ . '/autoload.php';
+// Sets default autoload mappings, may be overridden in Bootstrap::create
+\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);
+
 require_once BP . '/app/functions.php';
 
 /* Custom umask value may be provided in optional mage_umask file in root */

app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

@@ -6,8 +6,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\AdminNotification\Block\Grid\Renderer;
 
 class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
@@ -39,9 +37,8 @@ public function __construct(
      */
     public function render(\Magento\Framework\DataObject $row)
     {
-        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
-            'Read Details'
-        ) . '</a>' : '';
+        $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' .
+            __('Read Details') . '</a>' : '';
 
         $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
             '*/*/markAsRead/',

app/code/Magento/AdminNotification/Block/ToolbarEntry.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\AdminNotification\Block;
 
 /**

app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * AdminNotification Inbox model
  *
@@ -18,7 +16,7 @@ class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Co
     /**
      * Add remove filter
      *
-     * @return \Magento\AdminNotification\Model\ResourceModel\Grid\Collection|\Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+     * @return Collection|\Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
      */
     protected function _initSelect()
     {

app/code/Magento/AdminNotification/Test/Unit/Block/ToolbarEntryTest.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 /**
  * Test class for \Magento\AdminNotification\Block\ToolbarEntry
  */
@@ -53,7 +51,8 @@ public function testGetLatestUnreadNotifications()
 
         // 1. Create mocks
         $notificationList = $this->getMockBuilder(
-            \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread::class)
+            \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection\Unread::class
+        )
             ->disableOriginalConstructor()
             ->getMock();
 

app/code/Magento/Braintree/Gateway/Config/Config.php

@@ -72,9 +72,12 @@ public function __construct(
      */
     public function getCountrySpecificCardTypeConfig()
     {
-        $countriesCardTypes = $this->serializer->unserialize($this->getValue(self::KEY_COUNTRY_CREDIT_CARD));
-
-        return is_array($countriesCardTypes) ? $countriesCardTypes : [];
+        $countryCardTypes = $this->getValue(self::KEY_COUNTRY_CREDIT_CARD);
+        if (!$countryCardTypes) {
+            return [];
+        }
+        $countryCardTypes = $this->serializer->unserialize($countryCardTypes);
+        return is_array($countryCardTypes) ? $countryCardTypes : [];
     }
 
     /**

app/code/Magento/Braintree/Model/Adminhtml/System/Config/CountryCreditCard.php

@@ -89,10 +89,11 @@ public function beforeSave()
      */
     public function afterLoad()
     {
-        $value = $this->serializer->unserialize($this->getValue());
-        if (is_array($value)) {
-            $value = $this->encodeArrayFieldValue($value);
-            $this->setValue($value);
+        if ($this->getValue()) {
+            $value = $this->serializer->unserialize($this->getValue());
+            if (is_array($value)) {
+                $this->setValue($this->encodeArrayFieldValue($value));
+            }
         }
         return $this;
     }