Merge remote-tracking branch 'mainline/develop' into BUGS

Author: sevos1984

.travis.yml

@@ -4,7 +4,8 @@ php:
   - 5.6
 env:
   - TEST_SUITE=unit
-  - TEST_SUITE=integration
+  - TEST_SUITE=integration_part_1
+  - TEST_SUITE=integration_part_2
   - TEST_SUITE=integration_integrity
   - TEST_SUITE=static_phpcs
   - TEST_SUITE=static_annotation
@@ -32,7 +33,7 @@ before_script:
   - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
   # Install MySQL 5.6, create DB for integration tests
   - >
-      sh -c "if [ '$TEST_SUITE' = 'integration' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
+      sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
       sudo apt-get remove --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
       sudo apt-get autoremove;
       sudo apt-get autoclean;
@@ -50,10 +51,12 @@ script:
   # Unit tests
   - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
   # Integration tests
-  - sh -c "if [ '$TEST_SUITE' = 'integration' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; bash IntegationTestsForTravis.sh 2; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis1; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis2; fi"
   # Integration integrity tests
   - sh -c "if [ '$TEST_SUITE' = 'integration_integrity' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity; fi"
   # Static tests [Code Style]
   - sh -c "if [ '$TEST_SUITE' = 'static_phpcs' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testCodeStyle'; fi"
   # Static tests [Code Style]
-  - sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"

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

@@ -455,28 +455,14 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
             }
 
             $id = $this->getJsId($menuItem->getId());
-            if (count($menu) > 1 || $level != 1) {
-                $output .= '<li ' . $this->getUiId(
-                        $menuItem->getId()
-                    ) . ' class="item-' . $itemClass . ' ' . $this->_renderItemCssClass(
-                        $menuItem,
-                        $level
-                    ) . ($level == 0 ? '" id="' . $id . '" aria-haspopup="true' : '')
-                    . '" role="menu-item">' . $this->_renderAnchor(
-                        $menuItem,
-                        $level
-                    ) . $this->_addSubMenu(
-                        $menuItem,
-                        $level,
-                        $limit,
-                        $id
-                    ) . '</li>';
+            $subMenu = $this->_addSubMenu($menuItem, $level, $limit, $id);
+            if (count($menu) > 1 || $level != 1 || $menuItem->getUrl() !== '#') {
+                $output .= '<li ' . $this->getUiId($menuItem->getId())
+                    . ' class="item-' . $itemClass . ' ' . $this->_renderItemCssClass($menuItem, $level)
+                    . ($level == 0 ? '" id="' . $id . '" aria-haspopup="true' : '')
+                    . '" role="menu-item">' . $this->_renderAnchor($menuItem, $level) . $subMenu . '</li>';
             } else {
-                $output .= $this->_addSubMenu(
-                    $menuItem,
-                    $level,
-                    $limit,
-                    $id);
+                $output .= $subMenu;
             }
 
             $itemPosition++;

app/code/Magento/Backend/Block/Widget/Button/Item.php

@@ -16,4 +16,25 @@
  */
 class Item extends \Magento\Framework\Object
 {
+    /**
+     * Object delete flag
+     *
+     * @var bool
+     */
+    protected $_isDeleted = false;
+
+    /**
+     * Set _isDeleted flag value (if $isDeleted parameter is defined) and return current flag value
+     *
+     * @param boolean $isDeleted
+     * @return bool
+     */
+    public function isDeleted($isDeleted = null)
+    {
+        $result = $this->_isDeleted;
+        if ($isDeleted !== null) {
+            $this->_isDeleted = $isDeleted;
+        }
+        return $result;
+    }
 }

app/code/Magento/Backup/Model/Resource/Db.php

@@ -124,7 +124,6 @@ public function getTableStatus($tableName)
 
         if ($row) {
             $statusObject = new \Magento\Framework\Object();
-            $statusObject->setIdFieldName('name');
             foreach ($row as $field => $value) {
                 $statusObject->setData(strtolower($field), $value);
             }

app/code/Magento/Bundle/Model/Option.php

@@ -53,7 +53,10 @@ protected function _construct()
      */
     public function addSelection(\Magento\Catalog\Model\Product $selection)
     {
-        $selections = $this->getDataSetDefault('selections', []);
+        if (!$this->hasData('selections')) {
+            $this->setData('selections', []);
+        }
+        $selections = $this->getData('selections');
         $selections[] = $selection;
         $this->setSelections($selections);
     }

app/code/Magento/Catalog/Model/Product/Visibility.php

@@ -49,7 +49,6 @@ public function __construct(
     ) {
         $this->_eavEntityAttribute = $eavEntityAttribute;
         parent::__construct($data);
-        $this->setIdFieldName('visibility_id');
     }
 
     /**

app/code/Magento/Catalog/Model/Resource/Product/Action.php

@@ -40,7 +40,7 @@ protected function _construct()
     public function updateAttributes($entityIds, $attrData, $storeId)
     {
         $object = new \Magento\Framework\Object();
-        $object->setIdFieldName('entity_id')->setStoreId($storeId);
+        $object->setStoreId($storeId);
 
         $this->_getWriteAdapter()->beginTransaction();
         try {
@@ -54,6 +54,7 @@ public function updateAttributes($entityIds, $attrData, $storeId)
                 foreach ($entityIds as $entityId) {
                     $i++;
                     $object->setId($entityId);
+                    $object->setEntityId($entityId);
                     // collect data for save
                     $this->_saveAttributeValue($object, $attribute, $value);
                     // save collected data every 1000 rows

app/code/Magento/Catalog/Model/Resource/Url.php

@@ -432,7 +432,8 @@ protected function _getCategories($categoryIds, $storeId = null, $path = null)
             }
 
             $category = new \Magento\Framework\Object($row);
-            $category->setIdFieldName('entity_id');
+            $category->setId($row['entity_id']);
+            $category->setEntityId($row['entity_id']);
             $category->setStoreId($storeId);
             $this->_prepareCategoryParentId($category);
 
@@ -535,7 +536,8 @@ protected function _getProducts($productIds, $storeId, $entityId, &$lastEntityId
         $rowSet = $adapter->fetchAll($select, $bind);
         foreach ($rowSet as $row) {
             $product = new \Magento\Framework\Object($row);
-            $product->setIdFieldName('entity_id');
+            $product->setId($row['entity_id']);
+            $product->setEntityId($row['entity_id']);
             $product->setCategoryIds([]);
             $product->setStoreId($storeId);
             $products[$product->getId()] = $product;

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php

@@ -627,7 +627,7 @@ protected function getProductEmulator($typeId)
     {
         if (!isset($this->productEmulators[$typeId])) {
             $productEmulator = new \Magento\Framework\Object();
-            $productEmulator->setIdFieldName('entity_id')->setTypeId($typeId);
+            $productEmulator->setTypeId($typeId);
             $this->productEmulators[$typeId] = $productEmulator;
         }
         return $this->productEmulators[$typeId];

app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php

@@ -56,7 +56,7 @@ public function __construct(
     /**
      * Build category URL path
      *
-     * @param \Magento\Catalog\Api\Data\CategoryInterface|\Magento\Framework\Object $category
+     * @param \Magento\Catalog\Api\Data\CategoryInterface|\Magento\Framework\Model\AbstractModel $category
      * @return string
      */
     public function getUrlPath($category)