Merge remote-tracking branch 'mainline/develop' into MAGETWO-31834-origin

Author: Dale Sikkema

Gruntfile.js

@@ -60,7 +60,14 @@ module.exports = function (grunt) {
             'less:luma',
             'less:backend'
         ],
-
+        /**
+         * Styles for backend theme
+         */
+        backend: [
+            'less:backend',
+            'replace:escapeCalc',
+            'less:override'
+        ],
         /**
          * Documentation
          */

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

@@ -114,7 +114,7 @@ protected function _construct()
     public function getFeedUrl()
     {
         $httpPath = $this->_backendConfig->isSetFlag(self::XML_USE_HTTPS_PATH) ? 'https://' : 'http://';
-        if (is_null($this->_feedUrl)) {
+        if ($this->_feedUrl === null) {
             $this->_feedUrl = $httpPath . $this->_backendConfig->getValue(self::XML_FEED_URL_PATH);
         }
         return $this->_feedUrl;

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

@@ -55,7 +55,7 @@ public function getSeverities($severity = null)
             MessageInterface::SEVERITY_NOTICE => __('notice'),
         ];
 
-        if (!is_null($severity)) {
+        if ($severity !== null) {
             if (isset($severities[$severity])) {
                 return $severities[$severity];
             }

app/code/Magento/Authorization/Model/CompositeUserContext.php

@@ -72,15 +72,15 @@ public function getUserType()
      */
     protected function getUserContext()
     {
-        if (is_null($this->chosenUserContext)) {
+        if ($this->chosenUserContext === null) {
             /** @var UserContextInterface $userContext */
             foreach ($this->userContexts as $userContext) {
-                if ($userContext->getUserType() && !is_null($userContext->getUserId())) {
+                if ($userContext->getUserType() && $userContext->getUserId() !== null) {
                     $this->chosenUserContext = $userContext;
                     break;
                 }
             }
-            if (is_null($this->chosenUserContext)) {
+            if ($this->chosenUserContext === null) {
                 $this->chosenUserContext = false;
             }
         }

app/code/Magento/Authorization/Test/Unit/Model/CompositeUserContextTest.php

@@ -161,7 +161,7 @@ protected function createUserContextMock($userId = null, $userType = null)
     {
         $useContextMock = $this->getMockBuilder('Magento\Authorization\Model\CompositeUserContext')
             ->disableOriginalConstructor()->setMethods(['getUserId', 'getUserType'])->getMock();
-        if (!is_null($userId) && !is_null($userType)) {
+        if ($userId !== null && $userType !== null) {
             $useContextMock->expects($this->any())->method('getUserId')->will($this->returnValue($userId));
             $useContextMock->expects($this->any())->method('getUserType')->will($this->returnValue($userType));
         }

app/code/Magento/Backend/App/AbstractAction.php

@@ -289,7 +289,7 @@ protected function _processLocaleSettings()
             $this->_getSession()->setSessionLocale($forceLocale);
         }
 
-        if (is_null($this->_getSession()->getLocale())) {
+        if ($this->_getSession()->getLocale() === null) {
             $this->_getSession()->setLocale($this->_localeResolver->getLocale());
         }
 

app/code/Magento/Backend/Block/Dashboard/Bar.php

@@ -84,7 +84,7 @@ public function setCurrency($currency)
      */
     public function getCurrency()
     {
-        if (is_null($this->_currentCurrencyCode)) {
+        if ($this->_currentCurrencyCode === null) {
             if ($this->getRequest()->getParam('store')) {
                 $this->_currentCurrencyCode = $this->_storeManager->getStore(
                     $this->getRequest()->getParam('store')

app/code/Magento/Backend/Block/Dashboard/Graph.php

@@ -545,7 +545,7 @@ public function setDataHelper(\Magento\Backend\Helper\Dashboard\AbstractDashboar
      */
     protected function _prepareData()
     {
-        if (!is_null($this->_dataHelper)) {
+        if ($this->_dataHelper !== null) {
             $availablePeriods = array_keys($this->_dashboardData->getDatePeriods());
             $period = $this->getRequest()->getParam('period');
             $this->getDataHelper()->setParam(

app/code/Magento/Backend/Block/Menu.php

@@ -410,7 +410,7 @@ protected function _addSubMenu($menuItem, $level, $limit)
         if ($level == 0 && $limit) {
             $colStops = $this->_columnBrake($menuItem->getChildren(), $limit);
             $output .= '<strong class="submenu-title">' . $this->_getAnchorLabel($menuItem) . '</strong>';
-            $output .= '<button class="submenu-close _close"></button>';
+            $output .= '<a href="#" class="submenu-close _close" data-role="close-submenu"></a>';
         }
 
         $output .= $this->renderNavigation($menuItem->getChildren(), $level + 1, $limit, $colStops);

app/code/Magento/Backend/Block/Store/Switcher.php

@@ -139,7 +139,7 @@ public function getWebsiteCollection()
         $collection = $this->_websiteFactory->create()->getResourceCollection();
 
         $websiteIds = $this->getWebsiteIds();
-        if (!is_null($websiteIds)) {
+        if ($websiteIds !== null) {
             $collection->addIdFilter($this->getWebsiteIds());
         }