Merge remote-tracking branch 'mainline/develop' into MAGETWO-37728-lost-option-in-generator

Author: Olga Kopylova

CHANGELOG.md

@@ -9,7 +9,7 @@
     * Refactored controller actions in the Product area
     * Moved commands cache.php, indexer.php, log.php, test.php, compiler.php, singletenant\_compiler.php, generator.php, pack.php, deploy.php and file\_assembler.php to the new bin/magento CLI framework
 * Data Migration Tool
-    * The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce, "Data Migration Tool repository")
+    * The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
 * Fixed bugs
     * Fixed an issue where error appeared during placing order with virtual product
     * Fixed an issue where billing and shipping sections didn't contain address information on order print

app/code/Magento/Bundle/CustomerData/BundleItem.php

@@ -18,7 +18,6 @@
         "magento/framework": "0.74.0-beta9",
         "magento/module-quote": "0.74.0-beta9",
         "magento/module-media-storage": "0.74.0-beta9",
-        "magento/module-msrp": "0.74.0-beta9",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {

app/code/Magento/Bundle/composer.json

@@ -16,11 +16,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Checkout\CustomerData\ItemPoolInterface">
-        <arguments>
-            <argument name="itemMap" xsi:type="array">
-                <item name="bundle" xsi:type="string">Magento\Bundle\CustomerData\BundleItem</item>
-            </argument>
-        </arguments>
-    </type>
 </config>

app/code/Magento/Bundle/etc/frontend/di.xml

@@ -79,7 +79,7 @@ protected function _toHtml()
     /**
      * Returns captcha model
      *
-     * @return \Magento\Captcha\Model\ModelInterface
+     * @return \Magento\Captcha\Model\CaptchaInterface
      */
     public function getCaptchaModel()
     {

app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php

@@ -81,7 +81,7 @@ public function __construct(
      * Get Captcha
      *
      * @param string $formId
-     * @return \Magento\Captcha\Model\ModelInterface
+     * @return \Magento\Captcha\Model\CaptchaInterface
      */
     public function getCaptcha($formId)
     {

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

@@ -27,17 +27,17 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
      *
      * @param string $captchaType
      * @param string $formId
-     * @return \Magento\Captcha\Model\ModelInterface
+     * @return \Magento\Captcha\Model\CaptchaInterface
      * @throws \InvalidArgumentException
      */
     public function create($captchaType, $formId)
     {
         $className = 'Magento\Captcha\Model\\' . ucfirst($captchaType);
 
         $instance = $this->_objectManager->create($className, ['formId' => $formId]);
-        if (!$instance instanceof \Magento\Captcha\Model\ModelInterface) {
+        if (!$instance instanceof \Magento\Captcha\Model\CaptchaInterface) {
             throw new \InvalidArgumentException(
-                $className . ' does not implement \Magento\Captcha\Model\ModelInterface'
+                $className . ' does not implement \Magento\Captcha\Model\CaptchaInterface'
             );
         }
         return $instance;

app/code/Magento/Captcha/Model/CaptchaFactory.php

@@ -7,7 +7,12 @@
  */
 namespace Magento\Captcha\Model;
 
-interface ModelInterface
+/**
+ * Captcha Model Interface
+ *
+ * @api
+ */
+interface CaptchaInterface
 {
     /**
      * Generates captcha

app/code/Magento/Captcha/Model/ModelInterface.php renamed to app/code/Magento/Captcha/Model/CaptchaInterface.php

@@ -119,7 +119,7 @@ protected function isRequired($formId)
      * Return captcha model for specified form
      *
      * @param string $formId
-     * @return \Magento\Captcha\Model\ModelInterface
+     * @return \Magento\Captcha\Model\CaptchaInterface
      */
     protected function getCaptchaModel($formId)
     {

app/code/Magento/Captcha/Model/Checkout/ConfigProvider.php

@@ -10,7 +10,7 @@
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
-class DefaultModel extends \Zend_Captcha_Image implements \Magento\Captcha\Model\ModelInterface
+class DefaultModel extends \Zend_Captcha_Image implements \Magento\Captcha\Model\CaptchaInterface
 {
     /**
      * Key in session for captcha code