Merge remote-tracking branch 'tango-ce/result_factory' into MAGETWO-36105

Author: Yuri Kovsher

app/code/Magento/Backend/App/Action/Context.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\App\Action;
 
+use Magento\Framework\Controller\ResultFactory;
+
 /**
  * Backend Controller context
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -62,6 +64,7 @@ class Context extends \Magento\Framework\App\Action\Context
      * @param \Magento\Framework\App\ViewInterface $view
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+     * @param \Magento\Framework\Controller\ResultFactory $resultFactory
      * @param \Magento\Backend\Model\Session $session
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param \Magento\Backend\Model\Auth $auth
@@ -83,6 +86,7 @@ public function __construct(
         \Magento\Framework\App\ViewInterface $view,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
+        ResultFactory $resultFactory,
         \Magento\Backend\Model\Session $session,
         \Magento\Framework\AuthorizationInterface $authorization,
         \Magento\Backend\Model\Auth $auth,
@@ -102,7 +106,8 @@ public function __construct(
             $actionFlag,
             $view,
             $messageManager,
-            $resultRedirectFactory
+            $resultRedirectFactory,
+            $resultFactory
         );
 
         $this->_session = $session;

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() .
                     '_' .

app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js

@@ -195,7 +195,7 @@ ProductConfigure.prototype = {
             return false;
         }
 
-        this._initWindowElements();
+        this.initialize();
         this.current.listType = listType;
         this.current.itemId = itemId;
         this.confirmedCurrentId = this._getConfirmedBlockId(listType, itemId);

app/code/Magento/Cms/Api/BlockRepositoryInterface.php

@@ -9,6 +9,7 @@
 
 /**
  * CMS block CRUD interface.
+ * @api
  */
 interface BlockRepositoryInterface
 {

app/code/Magento/Cms/Api/Data/BlockInterface.php

@@ -7,6 +7,7 @@
 
 /**
  * CMS block interface.
+ * @api
  */
 interface BlockInterface
 {

app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php

@@ -9,6 +9,7 @@
 
 /**
  * Interface for cms block search results.
+ * @api
  */
 interface BlockSearchResultsInterface extends SearchResultsInterface
 {

app/code/Magento/Cms/Api/Data/PageInterface.php

@@ -7,6 +7,7 @@
 
 /**
  * CMS page interface.
+ * @api
  */
 interface PageInterface
 {

app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php

@@ -9,6 +9,7 @@
 
 /**
  * Interface for cms page search results.
+ * @api
  */
 interface PageSearchResultsInterface extends SearchResultsInterface
 {

app/code/Magento/Cms/Api/PageRepositoryInterface.php

@@ -9,6 +9,7 @@
 
 /**
  * CMS page CRUD interface.
+ * @api
  */
 interface PageRepositoryInterface
 {

app/code/Magento/Customer/Model/AccountManagement.php

@@ -420,10 +420,12 @@ public function initiatePasswordReset($email, $template, $websiteId = null)
                         )
                     );
             }
+            return true;
         } catch (MailException $e) {
             // If we are not able to send a reset password email, this should be ignored
             $this->logger->critical($e);
         }
+        return false;
     }
 
     /**