Merge branch 'develop' into zend-mail-2

Author: Oleksii Korshenko

.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
@@ -65,3 +66,4 @@ atlassian*
 !/vendor/.htaccess
 /generated/*
 !/generated/.htaccess
+.DS_Store

.travis.yml

@@ -1,27 +1,48 @@
 sudo: required
 dist: trusty
+group: edge
 addons:
   apt:
     packages:
     - mysql-server-5.6
     - mysql-client-core-5.6
     - mysql-client-5.6
     - postfix
+  firefox: "46.0"
+  hosts:
+      - magento2.travis
 language: php
 php:
   - 7.0
+  - 7.1
 env:
   global:
     - COMPOSER_BIN_DIR=~/bin
     - INTEGRATION_SETS=3
     - NODE_JS_VERSION=6
+    - MAGENTO_HOST_NAME="magento2.travis"
   matrix:
     - TEST_SUITE=unit
+    - TEST_SUITE=static
+    - TEST_SUITE=js GRUNT_COMMAND=spec
+    - TEST_SUITE=js GRUNT_COMMAND=static
     - 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 GRUNT_COMMAND=spec
+    - php: 7.0
+      env: TEST_SUITE=js GRUNT_COMMAND=static
+    - php: 7.0
+      env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
+    - php: 7.0
+      env: TEST_SUITE=functional ACCEPTANCE_INDEX=2
 cache:
   apt: true
   directories:
@@ -33,6 +54,10 @@ before_install: ./dev/travis/before_install.sh
 install: composer install --no-interaction --prefer-dist
 before_script: ./dev/travis/before_script.sh
 script:
+  # Set arguments for variants of phpunit based tests; '|| true' prevents failing script when leading test fails
   - test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
+  - test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true
+
+  # The scripts for grunt/phpunit type tests
   - if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
-  - if [ $TEST_SUITE == "js" ]; then grunt spec; fi
+  - if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi

CONTRIBUTING.md

@@ -29,3 +29,8 @@ If you are a new GitHub user, we recommend that you create your own [free github
 3. Create and test your work.
 4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
 5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
+
+## Code of Conduct
+
+Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project.
+The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).

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

@@ -11,14 +11,14 @@
 #ini_set('display_errors', 1);
 
 /* PHP version validation */
-if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID >= 50605 && PHP_VERSION_ID < 50700 || PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
+if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
     if (PHP_SAPI == 'cli') {
-        echo 'Magento supports PHP 5.6.5, 7.0.2, 7.0.4, and 7.0.6 or later. ' .
+        echo 'Magento supports 7.0.2, 7.0.4, and 7.0.6 or later. ' .
             'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
     } else {
         echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
-    <p>Magento supports PHP 5.6.5, 7.0.2, 7.0.4, and 7.0.6 or later. Please read
+    <p>Magento supports PHP 7.0.2, 7.0.4, and 7.0.6 or later. Please read
     <a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
     Magento System Requirements</a>.
 </div>
@@ -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/Inbox.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\AdminNotification\Block;
 
+/**
+ * @api
+ */
 class Inbox extends \Magento\Backend\Block\Widget\Grid\Container
 {
     /**

app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

@@ -7,6 +7,9 @@
 
 use Magento\Framework\Notification\MessageInterface;
 
+/**
+ * @api
+ */
 class UnreadMessagePopup extends \Magento\Backend\Block\Template
 {
     /**

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

@@ -4,13 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\AdminNotification\Block;
 
 /**
  * Toolbar entry that shows latest notifications
  *
+ * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 class ToolbarEntry extends \Magento\Backend\Block\Template

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

@@ -7,6 +7,9 @@
  */
 namespace Magento\AdminNotification\Block;
 
+/**
+ * @api
+ */
 class Window extends \Magento\Backend\Block\Template
 {
     /**