Merge branch '2.0' into MAGETWO-55441

Author: magento-services-vantiv-deploy

CHANGELOG.md

@@ -1,3 +1,15 @@
+2.0.8
+=============
+* Fixed bugs:
+    * Fixed exception when merchant resets "Product Attributes mass update" Admin form.
+    * Fixed fatal error in CLI command after compilation on some environments.
+    * Fixed duplicate URL keys on creating configurable product.
+    * Fixed issue with Magento sending emails from Admin using default configuration instead of a store-specific email address.
+    * Fixed issue with delayed session messages.
+* GitHub requests:
+    * [#3490](https://github.com/magento/magento2/pull/3490) -- Fix support for GLOB_BRACE on non-GNU Linux systems
+    * [#3018](https://github.com/magento/magento2/issues/3018) -- Magento\Sales\Model\OrderRepository::getList() is incomplete
+
 2.0.7
 =============
 * GitHub requests:

app/code/Magento/Catalog/Setup/CategorySetup.php

@@ -67,6 +67,7 @@ public function getDefaultEntities()
     {
         return [
             'catalog_category' => [
+                'entity_type_id' => 3,
                 'entity_model' => 'Magento\Catalog\Model\ResourceModel\Category',
                 'attribute_model' => 'Magento\Catalog\Model\ResourceModel\Eav\Attribute',
                 'table' => 'catalog_category_entity',
@@ -335,6 +336,7 @@ public function getDefaultEntities()
                 ],
             ],
             'catalog_product' => [
+                'entity_type_id' => 4,
                 'entity_model' => 'Magento\Catalog\Model\ResourceModel\Product',
                 'attribute_model' => 'Magento\Catalog\Model\ResourceModel\Eav\Attribute',
                 'table' => 'catalog_product_entity',

app/code/Magento/Catalog/composer.json

@@ -34,7 +34,7 @@
         "magento/module-catalog-sample-data": "Sample Data version:100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.7",
+    "version": "100.0.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogImportExport/composer.json

@@ -16,7 +16,7 @@
         "ext-ctype": "*"
     },
     "type": "magento2-module",
-    "version": "100.0.6",
+    "version": "100.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogUrlRewrite/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Checkout/composer.json

@@ -27,7 +27,7 @@
         "magento/module-cookie": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.6",
+    "version": "100.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Customer/Setup/CustomerSetup.php

@@ -126,6 +126,7 @@ public function getDefaultEntities()
     {
         $entities = [
             'customer' => [
+                'entity_type_id' => \Magento\Customer\Api\CustomerMetadataInterface::ATTRIBUTE_SET_ID_CUSTOMER,
                 'entity_model' => 'Magento\Customer\Model\ResourceModel\Customer',
                 'attribute_model' => 'Magento\Customer\Model\Attribute',
                 'table' => 'customer_entity',
@@ -338,6 +339,7 @@ public function getDefaultEntities()
                 ],
             ],
             'customer_address' => [
+                'entity_type_id' => \Magento\Customer\Api\AddressMetadataInterface::ATTRIBUTE_SET_ID_ADDRESS,
                 'entity_model' => 'Magento\Customer\Model\ResourceModel\Address',
                 'attribute_model' => 'Magento\Customer\Model\Attribute',
                 'table' => 'customer_address_entity',

app/code/Magento/Customer/composer.json

@@ -29,7 +29,7 @@
         "magento/module-customer-sample-data": "Sample Data version:100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.6",
+    "version": "100.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Eav/Model/Entity/Attribute/Source/Table.php

@@ -66,7 +66,7 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
         }
         $options = $defaultValues ? $this->_optionsDefault[$storeId] : $this->_options[$storeId];
         if ($withEmpty) {
-            array_unshift($options, ['label' => '', 'value' => '']);
+            $options = $this->addEmptyOption($options);
         }
 
         return $options;
@@ -89,11 +89,21 @@ public function getSpecificOptions($ids, $withEmpty = true)
             ->load()
             ->toOptionArray();
         if ($withEmpty) {
-            array_unshift($options, ['label' => '', 'value' => '']);
+            $options = $this->addEmptyOption($options);
         }
         return $options;
     }
 
+    /**
+     * @param array $options
+     * @return array
+     */
+    private function addEmptyOption(array $options)
+    {
+        array_unshift($options, ['label' => $this->getAttribute()->getIsRequired() ? '' : ' ', 'value' => '']);
+        return $options;
+    }
+
     /**
      * Get a text for option value
      *

app/code/Magento/Eav/Setup/EavSetup.php

@@ -192,14 +192,21 @@ public function addEntityType($code, array $params)
             'additional_attribute_table' => $this->_getValue($params, 'additional_attribute_table'),
             'entity_attribute_collection' => $this->_getValue($params, 'entity_attribute_collection'),
         ];
+        if (isset($params['entity_type_id'])) {
+            $data['entity_type_id'] = $params['entity_type_id'];
+        }
 
         if ($this->getEntityType($code, 'entity_type_id')) {
             $this->updateEntityType($code, $data);
         } else {
             $this->setup->getConnection()->insert($this->setup->getTable('eav_entity_type'), $data);
         }
 
-        $this->addAttributeSet($code, $this->_defaultAttributeSetName);
+        if (isset($params['entity_type_id'])) {
+            $this->addAttributeSet($code, $this->_defaultAttributeSetName, null, $params['entity_type_id']);
+        } else {
+            $this->addAttributeSet($code, $this->_defaultAttributeSetName);
+        }
         $this->addAttributeGroup($code, $this->_defaultGroupName, $this->_generalGroupName);
 
         return $this;
@@ -310,16 +317,21 @@ public function getAttributeSetSortOrder($entityTypeId, $sortOrder = null)
      * @param int|string $entityTypeId
      * @param string $name
      * @param int $sortOrder
+     * @param int $setId
      * @return $this
      */
-    public function addAttributeSet($entityTypeId, $name, $sortOrder = null)
+    public function addAttributeSet($entityTypeId, $name, $sortOrder = null, $setId = null)
     {
         $data = [
             'entity_type_id' => $this->getEntityTypeId($entityTypeId),
             'attribute_set_name' => $name,
             'sort_order' => $this->getAttributeSetSortOrder($entityTypeId, $sortOrder),
         ];
 
+        if ($setId !== null) {
+            $data['attribute_set_id'] = $setId;
+        }
+
         $setId = $this->getAttributeSet($entityTypeId, $name, 'attribute_set_id');
         if ($setId) {
             $this->updateAttributeSet($entityTypeId, $setId, $data);