Merge branch 'develop' into fix-configurable-lowest-price-provider

.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,5 +1,6 @@
 sudo: required
 dist: trusty
+group: edge
 addons:
   apt:
     packages:
@@ -22,19 +23,22 @@ env:
     - 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
+      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
@@ -49,4 +53,11 @@ cache:
 before_install: ./dev/travis/before_install.sh
 install: composer install --no-interaction --prefer-dist
 before_script: ./dev/travis/before_script.sh
-script: ./dev/travis/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 $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

@@ -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/Controller/Adminhtml/Notification.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml;
 
+/**
+ * @api
+ */
 abstract class Notification extends \Magento\Backend\App\AbstractAction
 {
     /**

app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php

@@ -9,6 +9,7 @@
  * AdminNotification update frequency source
  *
  * @codeCoverageIgnore
+ * @api
  */
 class Frequency implements \Magento\Framework\Option\ArrayInterface
 {

app/code/Magento/AdminNotification/Model/Feed.php

@@ -12,6 +12,7 @@
  *
  * @author      Magento Core Team <[email protected]>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @api
  */
 class Feed extends \Magento\Framework\Model\AbstractModel
 {

app/code/Magento/AdminNotification/Model/Inbox.php

@@ -29,7 +29,7 @@
  * @method int getIsRemove()
  * @method \Magento\AdminNotification\Model\Inbox setIsRemove(int $value)
  *
- * @author      Magento Core Team <[email protected]>
+ * @api
  */
 class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
 {

app/code/Magento/AdminNotification/Model/InboxInterface.php

@@ -9,6 +9,7 @@
  * AdminNotification Inbox interface
  *
  * @author Magento Core Team <[email protected]>
+ * @api
  */
 interface InboxInterface
 {

app/code/Magento/AdminNotification/Model/NotificationService.php

@@ -9,6 +9,7 @@
  * Notification service model
  *
  * @author      Magento Core Team <[email protected]>
+ * @api
  */
 class NotificationService
 {

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

@@ -11,6 +11,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Grid;
 
+/**
+ * @api
+ */
 class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
 {
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php

@@ -6,9 +6,7 @@
 namespace Magento\AdminNotification\Model\ResourceModel;
 
 /**
- * AdminNotification Inbox model
- *
- * @author      Magento Core Team <[email protected]>
+ * @api
  */
 class Inbox extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {

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

@@ -10,6 +10,7 @@
  *
  * @api
  * @author      Magento Core Team <[email protected]>
+ * @api
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php

@@ -7,6 +7,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
 
+/**
+ * @api
+ */
 class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php

@@ -11,6 +11,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
 
+/**
+ * @api
+ */
 class Unread extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
 {
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\System;
 
+/**
+ * @api
+ */
 class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\System\Message;
 
+/**
+ * @api
+ */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
     /**

app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\ResourceModel\System\Message\Collection;
 
+/**
+ * @api
+ */
 class Synchronized extends \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
 {
     /**

app/code/Magento/AdminNotification/Model/System/Message.php

@@ -7,6 +7,7 @@
 
 /**
  * @codeCoverageIgnore
+ * @api
  */
 class Message extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\Notification\MessageInterface
 {

app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\System\Message;
 
+/**
+ * @api
+ */
 class CacheOutdated implements \Magento\Framework\Notification\MessageInterface
 {
     /**

app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\System\Message\Media;
 
+/**
+ * @api
+ */
 abstract class AbstractSynchronization implements \Magento\Framework\Notification\MessageInterface
 {
     /**

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

@@ -6,6 +6,9 @@
 
 namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
 
+/**
+ * @api
+ */
 class Error extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
 {
     /**

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
 
+/**
+ * @api
+ */
 class Success extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
 {
     /**

app/code/Magento/AdminNotification/Model/System/Message/Security.php

@@ -8,6 +8,9 @@
 
 use Magento\Store\Model\Store;
 
+/**
+ * @api
+ */
 class Security implements \Magento\Framework\Notification\MessageInterface
 {
     /**

app/code/Magento/AdminNotification/Ui/Component/DataProvider/DataProvider.php

@@ -9,7 +9,7 @@
 use Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\SynchronizedFactory;
 
 /**
- * Class DataProvider
+ * @api
  */
 class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
 {

app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

@@ -19,11 +19,11 @@
             "autoOpen": true,
             "buttons": false,
             "modalClass": "modal-system-messages",
-            "title": "<?php /* @escapeNotVerified */ echo $block->getHeaderText(); ?>"
+            "title": "<?= /* @escapeNotVerified */ $block->getHeaderText() ?>"
         }
     }'>
     <li class="message message-warning warning">
-        <?php /* @escapeNotVerified */ echo $block->getNoticeMessageText(); ?><br/>
-        <a href="<?php /* @escapeNotVerified */ echo $block->getNoticeMessageUrl(); ?>"><?php /* @escapeNotVerified */ echo $block->getReadDetailsText(); ?></a>
+        <?= /* @escapeNotVerified */ $block->getNoticeMessageText() ?><br/>
+        <a href="<?= /* @escapeNotVerified */ $block->getNoticeMessageUrl() ?>"><?= /* @escapeNotVerified */ $block->getReadDetailsText() ?></a>
     </li>
 </ul>

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml

@@ -15,31 +15,31 @@
         <?php if ($lastCritical): ?>
             <ul class="message-system-list">
                 <li class="message message-warning error">
-                    <?php /* @escapeNotVerified */ echo $lastCritical->getText();?>
+                    <?= /* @escapeNotVerified */ $lastCritical->getText() ?>
                 </li>
             </ul>
         <?php endif; ?>
         <div class="message-system-short">
             <span class="message-system-short-label">
-                <?php /* @escapeNotVerified */ echo __('System Messages:')?>
+                <?= /* @escapeNotVerified */ __('System Messages:') ?>
             </span>
 
             <?php if ($block->getCriticalCount()): ?>
                 <div class="message message-warning error">
-                    <a class="message-link" href="#" title="<?php echo $block->escapeHtml(__('Critical System Messages'));?>">
-                        <?php /* @escapeNotVerified */ echo $block->getCriticalCount();?>
+                    <a class="message-link" href="#" title="<?= $block->escapeHtml(__('Critical System Messages')) ?>">
+                        <?= /* @escapeNotVerified */ $block->getCriticalCount() ?>
                     </a>
                 </div>
             <?php endif;?>
 
             <?php if ($block->getMajorCount()): ?>
                <div class="message message-warning warning">
-                   <a class="message-link" href="#" title="<?php echo $block->escapeHtml(__('Major System Messages'));?>">
-                       <?php /* @escapeNotVerified */ echo $block->getMajorCount();?>
+                   <a class="message-link" href="#" title="<?= $block->escapeHtml(__('Major System Messages')) ?>">
+                       <?= /* @escapeNotVerified */ $block->getMajorCount() ?>
                    </a>
                </div>
             <?php endif;?>
         </div>
-        <div id="message-system-all" title="<?php echo $block->escapeHtml(__('System messages'));?>" data-mage-init='<?php echo $block->escapeHtml($block->getSystemMessageDialogJson());?>'></div>
+        <div id="message-system-all" title="<?= $block->escapeHtml(__('System messages')) ?>" data-mage-init='<?= $block->escapeHtml($block->getSystemMessageDialogJson()) ?>'></div>
     </div>
 </div>

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

@@ -9,11 +9,11 @@
 ?>
 <?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
 
-<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
+<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?= $block->escapeHtml($block->getPopupTitle()) ?>">
     <ul class="message-system-list messages">
         <?php foreach ($block->getUnreadMessages() as $message): ?>
-            <li class="message message-warning <?php /* @escapeNotVerified */ echo $block->getItemClass($message);?>">
-                <?php /* @escapeNotVerified */ echo $message->getText();?>
+            <li class="message message-warning <?= /* @escapeNotVerified */ $block->getItemClass($message) ?>">
+                <?= /* @escapeNotVerified */ $message->getText() ?>
             </li>
         <?php endforeach;?>
     </ul>