Merge branch 'develop_mainline' into MAGETWO-49633-php-fork-in-cron

Author: Eddie Lau

.gitignore

@@ -46,5 +46,5 @@ atlassian*
 
 /var/*
 !/var/.htaccess
-/vendor
+/vendor/*
 !/vendor/.htaccess

.htaccess.sample

@@ -1,5 +1,6 @@
 ############################################
-## uncomment the line below to enable developer mode
+## overrides deployment configuration mode value
+## use command bin/magento deploy:mode:set to switch modes
 
 #   SetEnv MAGE_MODE developer
 
@@ -57,6 +58,32 @@
 
 </IfModule>
 
+<IfModule mod_php7.c>
+
+############################################
+## adjust memory limit
+
+    php_value memory_limit 768M
+    php_value max_execution_time 18000
+
+############################################
+## disable automatic session start
+## before autoload was initialized
+
+    php_flag session.auto_start off
+
+############################################
+## enable resulting html compression
+
+    #php_flag zlib.output_compression on
+
+###########################################
+## disable user agent verification to not break multiple image upload
+
+    php_flag suhosin.session.cryptua off
+
+</IfModule>
+
 <IfModule mod_security.c>
 ###########################################
 ## disable POST processing to not break multiple image upload
@@ -102,6 +129,13 @@
 
 </IfModule>
 
+############################################
+## workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
+## Please, set it on virtual host configuration level
+
+##    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
+############################################
+
 <IfModule mod_rewrite.c>
 
 ############################################

ISSUE_TEMPLATE.md

@@ -0,0 +1,16 @@
+Steps to reproduce
+--
+1. Install Magento from `develop` branch.
+2. [Example] Add Configurable Product to the cart.
+3. ...
+
+Expected result
+--
+1. [Example] Configurable product added to the shopping cart.
+2. ...
+
+Actual result
+--
+1. [Example] Error message appears: "Cannot save quote".
+2. [Screenshot, logs]
+3. ...

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

@@ -41,14 +41,14 @@ public function render(\Magento\Framework\DataObject $row)
     {
         $readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
             'Read Details'
-        ) . '</a>' : '';
+        ) . '</a> | ' : '';
 
         $markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(
             '*/*/markAsRead/',
             ['_current' => true, 'id' => $row->getId()]
         ) . '">' . __(
             'Mark as Read'
-        ) . '</a>' : '';
+        ) . '</a> | ' : '';
 
         $encodedUrl = $this->_urlHelper->getEncodedUrl();
         return sprintf(

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php

@@ -10,10 +10,7 @@
 abstract class Notification extends \Magento\Backend\App\AbstractAction
 {
     /**
-     * @return bool
+     * Authorization level of a basic admin session
      */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_AdminNotification::show_list');
-    }
+    const ADMIN_RESOURCE = 'Magento_AdminNotification::show_list';
 }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php

@@ -8,6 +8,13 @@
 
 class MarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_AdminNotification::mark_as_read';
+
     /**
      * @return void
      */
@@ -36,12 +43,4 @@ public function execute()
         }
         $this->_redirect('adminhtml/*/');
     }
-
-    /**
-     * @return bool
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_AdminNotification::mark_as_read');
-    }
 }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php

@@ -8,6 +8,14 @@
 
 class MassMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
+
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_AdminNotification::mark_as_read';
+
     /**
      * @return void
      */
@@ -38,12 +46,4 @@ public function execute()
         }
         $this->_redirect('adminhtml/*/');
     }
-
-    /**
-     * @return bool
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_AdminNotification::mark_as_read');
-    }
 }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

@@ -8,6 +8,14 @@
 
 class MassRemove extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
+
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_AdminNotification::adminnotification_remove';
+
     /**
      * @return void
      */
@@ -33,12 +41,4 @@ public function execute()
         }
         $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
     }
-
-    /**
-     * @return bool
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_AdminNotification::adminnotification_remove');
-    }
 }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php

@@ -8,6 +8,14 @@
 
 class Remove extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
+
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_AdminNotification::adminnotification_remove';
+
     /**
      * @return void
      */
@@ -35,12 +43,4 @@ public function execute()
         }
         $this->_redirect('adminhtml/*/');
     }
-
-    /**
-     * @return bool
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_AdminNotification::adminnotification_remove');
-    }
 }

app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html

@@ -29,7 +29,7 @@
                 allowtransparency="true"
                 frameborder="0"
                 name="iframeTransparent"
-                style="display:none;width:100%;background-color:transparent">
+                class="payment-method-iframe">
 
         </iframe>
         <form class="form" id="co-transparent-form" action="#" method="post" data-bind="mageInit: {

app/code/Magento/Backend/Controller/Adminhtml/Cache.php

@@ -10,6 +10,13 @@
 
 abstract class Cache extends Action
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::cache';
+
     /**
      * @var \Magento\Framework\App\Cache\TypeListInterface
      */
@@ -69,14 +76,4 @@ protected function _validateTypes(array $types)
             throw new LocalizedException(__('Specified cache type(s) don\'t exist: %1', join(', ', $invalidTypes)));
         }
     }
-
-    /**
-     * Check if cache management is allowed
-     *
-     * @return bool
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_Backend::cache');
-    }
 }

app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php

@@ -14,10 +14,9 @@
 abstract class Dashboard extends \Magento\Backend\App\Action
 {
     /**
-     * @return bool
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
      */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_Backend::dashboard');
-    }
+    const ADMIN_RESOURCE = 'Magento_Backend::dashboard';
 }

app/code/Magento/Backend/Controller/Adminhtml/System.php

@@ -15,10 +15,9 @@
 abstract class System extends AbstractAction
 {
     /**
-     * @return bool
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
      */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_Backend::system');
-    }
+    const ADMIN_RESOURCE = 'Magento_Backend::system';
 }

app/code/Magento/Backend/Controller/Adminhtml/System/Account.php

@@ -15,10 +15,9 @@
 abstract class Account extends Action
 {
     /**
-     * @return bool
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
      */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_Backend::myaccount');
-    }
+    const ADMIN_RESOURCE = 'Magento_Backend::myaccount';
 }

app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

@@ -67,11 +67,16 @@ public function execute()
                 $user->setPassword($password);
                 $user->setPasswordConfirmation($passwordConfirmation);
             }
-            $user->save();
-
-            $user->sendNotificationEmailsIfRequired();
-
-            $this->messageManager->addSuccess(__('You saved the account.'));
+            $errors = $user->validate();
+            if ($errors !== true && !empty($errors)) {
+                foreach ($errors as $error) {
+                    $this->messageManager->addError($error);
+                }
+            } else {
+                $user->save();
+                $user->sendNotificationEmailsIfRequired();
+                $this->messageManager->addSuccess(__('You saved the account.'));
+            }
         } catch (UserLockedException $e) {
             $this->_auth->logout();
             $this->securityCookieHelper->setLogoutReasonCookie(

app/code/Magento/Backend/Controller/Adminhtml/System/Design.php

@@ -9,6 +9,13 @@
 
 abstract class Design extends Action
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::design';
+
     /**
      * Core registry
      *
@@ -59,12 +66,4 @@ public function __construct(
         $this->resultPageFactory = $resultPageFactory;
         $this->resultLayoutFactory = $resultLayoutFactory;
     }
-
-    /**
-     * @return bool
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_Backend::design');
-    }
 }

app/code/Magento/Backend/Controller/Adminhtml/System/Store.php

@@ -19,6 +19,13 @@
  */
 abstract class Store extends Action
 {
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::store';
+
     /**
      * Core registry
      *
@@ -77,14 +84,6 @@ protected function createPage()
         return $resultPage;
     }
 
-    /**
-     * @return bool
-     */
-    protected function _isAllowed()
-    {
-        return $this->_authorization->isAllowed('Magento_Backend::store');
-    }
-
     /**
      * Backup database
      *