Merge remote-tracking branch 'mainline/develop' into MAGETWO-36972

Author: AndriyNasinnyk

Diff for: .gitignore

@@ -10,6 +10,7 @@ atlassian*
 /.gitattributes
 /app/config_sandbox
 /app/etc/config.php
+/app/etc/env.php
 /app/code/Magento/TestModule*
 /lib/internal/flex/uploader/.actionScriptProperties
 /lib/internal/flex/uploader/.flexProperties
@@ -37,6 +38,7 @@ atlassian*
 !/pub/media/wysiwyg/.htaccess
 /pub/media/tmp/*
 !/pub/media/tmp/.htaccess
+/pub/media/captcha/*
 /pub/static/*
 !/pub/static/.htaccess
 

Diff for: .htaccess

@@ -188,4 +188,4 @@
 ## If running in cluster environment, uncomment this
 ## http://developer.yahoo.com/performance/rules.html#etags
 
-    #FileETag none
+    #FileETag none

Diff for: .php_cs

@@ -15,7 +15,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->exclude('dev/tests/functional/vendor')
     ->exclude('dev/tests/integration/tmp')
     ->exclude('dev/tests/integration/var')
-    ->exclude('lib/internal/CardinalCommerce')
     ->exclude('lib/internal/Cm')
     ->exclude('lib/internal/Credis')
     ->exclude('lib/internal/JSMin')

Diff for: CHANGELOG.md

@@ -23,17 +23,17 @@ module.exports = function (grunt) {
     require('load-grunt-config')(grunt, {
         configPath: path.join(__dirname, configDir),
         init: true,
-        loadGruntTasks: {
-            pattern: [
-                'grunt-*'
-            ]
+        jitGrunt: {
+            staticMappings: {
+                usebanner: 'grunt-banner'
+            }
         }
     });
 
     _.each({
         /**
          * Assembling tasks.
-         * ToDo UI: define default tasks.
+         * ToDo: define default tasks.
          */
         default: function () {
             grunt.log.subhead('I\'m default task and at the moment I\'m empty, sorry :/');
@@ -43,17 +43,19 @@ module.exports = function (grunt) {
          * Production preparation task.
          */
         prod: function (component) {
-            if (component === 'setup') {
-                grunt.task.run([
-                    'less:' + component,
-                    'autoprefixer:' + component,
-                    'cssmin:' + component,
-                    'usebanner:' + component
-                ]);
-            }
+            var tasks = [
+                'less',
+                'autoprefixer',
+                'cssmin',
+                'usebanner'
+            ].map(function(task){
+                return task + ':' + component;
+            });
 
             if (typeof component === 'undefined') {
                 grunt.log.subhead('Tip: Please make sure that u specify prod subtask. By default prod task do nothing');
+            } else {
+                grunt.task.run(tasks);
             }
         },
 

Diff for: Gruntfile.js

@@ -123,6 +123,7 @@ public function getSystemMessageDialogJson()
                     'autoOpen' => false,
                     'width' => '75%',
                     'modal' => true,
+                    'minHeight' => '0',
                     'dialogClass' => 'ui-dialog-active ui-popup-message',
                     'ajaxUrl' => $this->_getMessagesUrl()
                 ],

Diff for: app/code/Magento/AdminNotification/Block/System/Messages.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\AdminNotification\Model;
 
-use Magento\Framework\Config\ConfigOptionsList;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 
 /**
  * AdminNotification Feed model
@@ -137,7 +137,7 @@ public function checkUpdate()
 
         $feedXml = $this->getFeedData();
 
-        $installDate = strtotime($this->_deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE));
+        $installDate = strtotime($this->_deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE));
 
         if ($feedXml && $feedXml->channel && $feedXml->channel->item) {
             foreach ($feedXml->channel->item as $item) {
@@ -239,6 +239,8 @@ public function getFeedData()
     }
 
     /**
+     * Retrieve feed as XML element
+     *
      * @return \SimpleXMLElement
      */
     public function getFeedXml()

Diff for: app/code/Magento/AdminNotification/Model/Feed.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\Notification\MessageInterface;
 use Magento\Framework\Notification\NotifierInterface;
+use Magento\AdminNotification\Model\InboxInterface;
 
 /**
  * AdminNotification Inbox model
@@ -30,7 +31,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface
+class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
 {
     /**
      * @return void
@@ -41,10 +42,7 @@ protected function _construct()
     }
 
     /**
-     * Retrieve Severity collection array
-     *
-     * @param int|null $severity
-     * @return array|string|null
+     * {@inheritdoc}
      */
     public function getSeverities($severity = null)
     {
@@ -66,9 +64,7 @@ public function getSeverities($severity = null)
     }
 
     /**
-     * Retrieve Latest Notice
-     *
-     * @return $this
+     * {@inheritdoc}
      */
     public function loadLatestNotice()
     {
@@ -78,9 +74,7 @@ public function loadLatestNotice()
     }
 
     /**
-     * Retrieve notice statuses
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function getNoticeStatus()
     {

Diff for: app/code/Magento/AdminNotification/Model/Inbox.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdminNotification\Model;
+
+/**
+ * AdminNotification Inbox interface
+ *
+ * @author Magento Core Team <core@magentocommerce.com>
+ */
+interface InboxInterface
+{
+    /**
+     * Retrieve Severity collection array
+     *
+     * @param int|null $severity
+     * @return array|string|null
+     * @api
+     */
+    public function getSeverities($severity = null);
+
+    /**
+     * Retrieve Latest Notice
+     *
+     * @return $this
+     * @api
+     */
+    public function loadLatestNotice();
+
+    /**
+     * Retrieve notice statuses
+     *
+     * @return array
+     * @api
+     */
+    public function getNoticeStatus();
+}

Diff for: app/code/Magento/AdminNotification/Model/InboxInterface.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\AdminNotification\Model\System\Message;
 
 use Magento\Store\Model\Store;
@@ -121,7 +119,9 @@ public function isDisplayed()
     public function getText()
     {
         return __(
-            '{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure URL / Base Secure URL. It is highly recommended to change this value in your Magento <a href="%1">configuration</a>.',
+            '{{base_url}} is not recommended to use in a production environment to declare the Base Unsecure '
+            . 'URL / Base Secure URL. It is highly recommended to change this value in your Magento '
+            . '<a href="%1">configuration</a>.',
             $this->_getConfigUrl()
         );
     }

Diff for: app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
 
 class Error extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
@@ -36,7 +34,8 @@ protected function _shouldBeDisplayed()
     public function getText()
     {
         return __(
-            'One or more media files failed to be synchronized during the media storages synchronization process. Refer to the log file for details.'
+            'One or more media files failed to be synchronized during the media storages synchronization process. '
+            . 'Refer to the log file for details.'
         );
     }
 }

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

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\AdminNotification\Model\System\Message;
 
 use Magento\Store\Model\Store;
@@ -26,6 +24,7 @@ class Security implements \Magento\Framework\Notification\MessageInterface
 
     /**
      * Time out for HTTP verification request
+     *
      * @var int
      */
     private $_verificationTimeOut = 2;
@@ -136,7 +135,8 @@ public function isDisplayed()
     public function getText()
     {
         return __(
-            'Your web server is configured incorrectly. As a result, configuration files with sensitive information are accessible from the outside. Please contact your hosting provider.'
+            'Your web server is configured incorrectly. As a result, configuration files '
+            . ' with sensitive information are accessible from the outside. Please contact your hosting provider.'
         );
     }
 

Diff for: app/code/Magento/AdminNotification/Model/System/Message/Security.php

@@ -7,7 +7,7 @@
 namespace Magento\AdminNotification\Test\Unit\Model;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\Config\ConfigOptionsList;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -141,7 +141,7 @@ public function testCheckUpdate($callInbox, $curlRequest)
         $this->backendConfig->expects($this->at(1))->method('getValue')
             ->will($this->returnValue('http://feed.magento.com'));
         $this->deploymentConfig->expects($this->once())->method('get')
-            ->with(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE)
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE)
             ->will($this->returnValue('Sat, 6 Sep 2014 16:46:11 UTC'));
         if ($callInbox) {
             $this->inboxFactory->expects($this->once())->method('create')

Diff for: app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta5",
-        "magento/module-backend": "0.74.0-beta5",
-        "magento/module-media-storage": "0.74.0-beta5",
-        "magento/framework": "0.74.0-beta5",
+        "magento/module-store": "0.74.0-beta10",
+        "magento/module-backend": "0.74.0-beta10",
+        "magento/module-media-storage": "0.74.0-beta10",
+        "magento/framework": "0.74.0-beta10",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta5",
+    "version": "0.74.0-beta10",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

Diff for: app/code/Magento/AdminNotification/composer.json

@@ -31,6 +31,7 @@ require([
             resizable: false,
             width: '75%',
             modal: true,
+            minHeight: '0',
             dialogClass: 'ui-popup-message',
             position: {
                 my: 'left+12.5% top',

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

@@ -14,12 +14,12 @@
 ?>
 <div
     data-mage-init='{"toolbarEntry": {}}'
-    class="notifications-wrapper"
+    class="notifications-wrapper admin__action-dropdown-wrap"
     data-notification-count="<?php echo $notificationCount; ?>">
     <?php if ($notificationCount > 0) : ?>
         <a
             href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>"
-            class="notifications-action"
+            class="notifications-action admin__action-dropdown"
             data-mage-init='{"dropdown":{}}'
             title="<?php echo __('Notifications'); ?>"
             data-toggle="dropdown">
@@ -28,7 +28,7 @@
             </span>
         </a>
         <ul
-            class="notifications-list"
+            class="admin__action-dropdown-menu"
             data-mark-as-read-url="<?php echo $block->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
             <?php foreach ($block->getLatestUnreadNotifications() as $notification) : ?>
             <?php /** @var $notification \Magento\AdminNotification\Model\Inbox*/ ?>
@@ -76,7 +76,7 @@
         </ul>
     <?php else : ?>
         <a
-            class="notifications-action"
+            class="notifications-action admin__action-dropdown"
             href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>"
             title="<?php echo __('Notifications'); ?>">
         </a>

Diff for: app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml

@@ -11,7 +11,7 @@ define([
 
     // Mark notification as read via AJAX call
     var markNotificationAsRead = function (notificationId) {
-            var requestUrl = $('.notifications-wrapper .notifications-list').attr('data-mark-as-read-url');
+            var requestUrl = $('.notifications-wrapper .admin__action-dropdown-menu').attr('data-mark-as-read-url');
             $.ajax({
                 url: requestUrl,
                 type: 'POST',
@@ -33,7 +33,7 @@ define([
 
             if (notificationCount == 0) {
                 // Change appearance of the bubble and its behavior when the last notification is removed
-                $('.notifications-wrapper .notifications-list').remove();
+                $('.notifications-wrapper .admin__action-dropdown-menu').remove();
                 var notificationIcon = $('.notifications-wrapper .notifications-icon');
                 notificationIcon.removeAttr('data-toggle');
                 notificationIcon.off('click.dropdown');
@@ -45,7 +45,7 @@ define([
                 }
                 $('.notifications-entry-last .notifications-counter').text(notificationCount);
                 // Modify caption of the 'See All' link
-                var actionElement = $('.notifications-wrapper .notifications-list .last .action-more');
+                var actionElement = $('.notifications-wrapper .admin__action-dropdown-menu .last .action-more');
                 actionElement.text(actionElement.text().replace(/\d+/, notificationCount));
             }
         },
@@ -65,7 +65,7 @@ define([
         };
 
     // Show notification description when corresponding item is clicked
-    $('.notifications-wrapper .notifications-list .notifications-entry').on('click.showNotification', function (event) {
+    $('.notifications-wrapper .admin__action-dropdown-menu .notifications-entry').on('click.showNotification', function (event) {
         // hide notification dropdown
         $('.notifications-wrapper .notifications-icon').trigger('click.dropdown');