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

Author: vpelipenko

app/code/Magento/Authorization/Setup/InstallSchema.php

@@ -138,7 +138,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'role_id',
                 $installer->getTable('authorization_role'),
                 'role_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
                 \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
             )->setComment(
                 'Admin Rule Table'

app/code/Magento/Bundle/Setup/InstallSchema.php

@@ -79,7 +79,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'parent_id',
                 $installer->getTable('catalog_product_entity'),
                 'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
                 \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
             )
             ->setComment('Catalog Product Bundle Option');
@@ -138,7 +137,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'option_id',
                 $installer->getTable('catalog_product_bundle_option'),
                 'option_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
                 \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
             )
             ->setComment('Catalog Product Bundle Option Value');
@@ -238,7 +236,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'option_id',
                 $installer->getTable('catalog_product_bundle_option'),
                 'option_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
                 \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
             )
             ->addForeignKey(
@@ -251,7 +248,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'product_id',
                 $installer->getTable('catalog_product_entity'),
                 'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
                 \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
             )
             ->setComment('Catalog Product Bundle Selection');
@@ -305,7 +301,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'website_id',
                 $installer->getTable('store_website'),
                 'website_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
                 \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
             )
             ->addForeignKey(
@@ -318,7 +313,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'selection_id',
                 $installer->getTable('catalog_product_bundle_selection'),
                 'selection_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
                 \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
             )
             ->setComment('Catalog Product Bundle Selection Price');
@@ -383,7 +377,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'customer_group_id',
                 $installer->getTable('customer_group'),
                 'customer_group_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
                 \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
             )
             ->addForeignKey(
@@ -396,7 +389,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'entity_id',
                 $installer->getTable('catalog_product_entity'),
                 'entity_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
                 \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
             )
             ->addForeignKey(
@@ -409,7 +401,6 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 'website_id',
                 $installer->getTable('store_website'),
                 'website_id',
-                \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
                 \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
             )
             ->setComment('Catalog Product Bundle Price Index');

app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php

@@ -46,7 +46,7 @@ public function getValuesHtml()
             if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DROP_DOWN) {
                 $select->setName('options[' . $_option->getid() . ']')->addOption('', __('-- Please Select --'));
             } else {
-                $select->setName('options[' . $_option->getid() . '][]');
+                $select->setName('options[' . $_option->getid() . ']');
                 $select->setClass('multiselect admin__control-multiselect' . $require . ' product-custom-option');
             }
             foreach ($_option->getValues() as $_value) {
@@ -141,7 +141,7 @@ public function getValuesHtml()
                     ' name="options[' .
                     $_option->getId() .
                     ']' .
-                    $arraySign .
+                    (!empty($arraySign) ? '[' . $htmlValue . ']' : '') .
                     '" id="options_' .
                     $_option->getId() .
                     '_' .