Merge remote-tracking branch 'origin/MAGETWO-66050' into MAGETWO-66039

Author: rganin

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

@@ -13,6 +13,7 @@
  *
  * @method \Magento\Backend\Block\Menu setAdditionalCacheKeyInfo(array $cacheKeyInfo)
  * @method array getAdditionalCacheKeyInfo()
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Menu extends \Magento\Backend\Block\Template
 {
@@ -381,7 +382,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
             $itemName = substr($menuId, strrpos($menuId, '::') + 2);
             $itemClass = str_replace('_', '-', strtolower($itemName));
 
-            if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake']) {
+            if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake'] && $itemPosition != 1) {
                 $output .= '</ul></li><li class="column"><ul role="menu">';
             }
 

app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml

@@ -11,7 +11,8 @@
 <?php
 $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
 /** @var \Magento\Bundle\Pricing\Render\FinalPriceBox $block */
-$productId = $block->getSaleableItem()->getId();
+
+
 /** @var \Magento\Bundle\Pricing\Price\FinalPrice $finalPriceModel */
 $finalPriceModel = $block->getPrice();
 $minimalPrice = $finalPriceModel->getMinimalPrice();

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -863,6 +863,7 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
      * Filter Product by Categories
      *
      * @param array $categoriesFilter
+     * @return $this
      */
     public function addCategoriesFilter(array $categoriesFilter)
     {
@@ -876,6 +877,7 @@ public function addCategoriesFilter(array $categoriesFilter)
             ];
             $this->getSelect()->where($this->getConnection()->prepareSqlCondition('e.entity_id' , $selectCondition));
         }
+        return $this;
     }
 
     /**

app/code/Magento/Integration/Helper/Data.php

@@ -21,7 +21,7 @@ public function mapResources(array $resources)
         foreach ($resources as $resource) {
             $item = [];
             $item['attr']['data-id'] = $resource['id'];
-            $item['data'] = $resource['title'];
+            $item['data'] = __($resource['title']);
             $item['children'] = [];
             if (isset($resource['children'])) {
                 $item['state'] = 'open';

app/code/Magento/Rule/Model/Condition/AbstractCondition.php

@@ -441,6 +441,8 @@ public function getValueName()
         }
         if (!empty($valueArr)) {
             $value = implode(', ', $valueArr);
+        } elseif (is_array($value)) {
+            $value = implode(', ', $value);
         }
         return $value;
     }

lib/internal/Magento/Framework/Filesystem/Io/Sftp.php

@@ -20,7 +20,7 @@ class Sftp extends AbstractIo
     const SSH2_PORT = 22;
 
     /**
-     * @var \Net_SFTP $_connection
+     * @var \phpseclib\Net\SFTP $_connection
      */
     protected $_connection = null;
 
@@ -184,7 +184,7 @@ public function read($filename, $destination = null)
      */
     public function write($filename, $source, $mode = null)
     {
-        $mode = is_readable($source) ? NET_SFTP_LOCAL_FILE : NET_SFTP_STRING;
+        $mode = is_readable($source) ? \phpseclib\Net\SFTP::SOURCE_LOCAL_FILE : \phpseclib\Net\SFTP::SOURCE_STRING;
         return $this->_connection->put($filename, $source, $mode);
     }
 

lib/internal/Magento/Framework/Locale/Config.php

@@ -31,6 +31,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
         'de_AT', /*German (Austria)*/
         'de_CH', /*German (Switzerland)*/
         'de_DE', /*German (Germany)*/
+        'de_LU', /*German (Luxembourg)*/
         'el_GR', /*Greek (Greece)*/
         'en_AU', /*English (Australian)*/
         'en_CA', /*English (Canadian)*/
@@ -54,6 +55,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
         'fr_CA', /*French (Canada)*/
         'fr_CH', /*French (Switzerland)*/
         'fr_FR', /*French (France)*/
+        'fr_LU', /*French (Luxembourg)*/
         'gu_IN', /*Gujarati (India)*/
         'he_IL', /*Hebrew (Israel)*/
         'hi_IN', /*Hindi (India)*/

lib/internal/Magento/Framework/View/Element/Messages.php

@@ -334,7 +334,7 @@ public function setSecondLevelTagName($tagName)
      */
     public function getCacheKeyInfo()
     {
-        return ['storage_types' => serialize($this->usedStorageTypes)];
+        return ['storage_types' => implode('|', $this->usedStorageTypes)];
     }
 
     /**

lib/internal/Magento/Framework/View/Element/Template/File/Resolver.php

@@ -44,7 +44,7 @@ public function __construct(\Magento\Framework\View\FileSystem $viewFileSystem)
      */
     public function getTemplateFileName($template, $params = [])
     {
-        $key = $template . '_' . serialize($params);
+        $key = $template . '_' . json_encode($params);
         if (!isset($this->_templateFilesMap[$key])) {
             $this->_templateFilesMap[$key] = $this->_viewFileSystem->getTemplateFileName($template, $params);
         }

lib/internal/Magento/Framework/View/Test/Unit/Element/MessagesTest.php

@@ -240,10 +240,10 @@ public function testGetMessageTypes()
 
     public function testGetCacheKeyInfo()
     {
-        $emptyMessagesCacheKey = ['storage_types' => 'a:0:{}'];
+        $emptyMessagesCacheKey = ['storage_types' => ''];
         $this->assertEquals($emptyMessagesCacheKey, $this->messages->getCacheKeyInfo());
 
-        $messagesCacheKey = ['storage_types' => 'a:1:{i:0;s:7:"default";}'];
+        $messagesCacheKey = ['storage_types' => 'default'];
         $this->messages->addStorageType(Manager::DEFAULT_GROUP);
         $this->assertEquals($messagesCacheKey, $this->messages->getCacheKeyInfo());
     }