MAGETWO-65026: Prepare code base for 2.0.15

Author: duhon

app/code/Magento/Authorizenet/Controller/Directpost/Payment/BackendResponse.php

@@ -6,16 +6,6 @@
  */
 namespace Magento\Authorizenet\Controller\Directpost\Payment;
 
-class BackendResponse extends \Magento\Authorizenet\Controller\Directpost\Payment
+class BackendResponse extends \Magento\Authorizenet\Controller\Directpost\Payment\Response
 {
-    /**
-     * Response action.
-     * Action for Authorize.net SIM Relay Request.
-     *
-     * @return void
-     */
-    public function execute()
-    {
-        $this->_responseAction('adminhtml');
-    }
 }

app/code/Magento/Authorizenet/Model/Source/Cctype.php

@@ -17,6 +17,6 @@ class Cctype extends PaymentCctype
      */
     public function getAllowedTypes()
     {
-        return ['VI', 'MC', 'AE', 'DI', 'OT'];
+        return ['VI', 'MC', 'AE', 'DI'];
     }
 }

app/code/Magento/Authorizenet/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.8",
+    "version": "100.0.9",
     "license": [
         "proprietary"
     ],

app/code/Magento/Authorizenet/view/frontend/layout/authorizenet_directpost_payment_backendresponse.xml

@@ -7,6 +7,6 @@
 -->
 <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <container name="root">
-        <block class="Magento\Payment\Block\Transparent\Iframe" name="authorizenet_directpost_iframe" template="Magento_Payment::transparent/iframe.phtml"/>
+        <block class="Magento\Payment\Block\Transparent\Iframe" name="authorizenet_directpost_iframe" template="Magento_Payment::transparent/backend-iframe.phtml"/>
     </container>
 </layout>

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -151,7 +151,7 @@ public function initialize(\Magento\Catalog\Model\Product $product)
             foreach ($options as &$customOptionData) {
                 if (isset($customOptionData['values'])) {
                     $customOptionData['values'] = array_filter($customOptionData['values'], function ($valueData) {
-                        return !($valueData['option_type_id'] == '-1' && !empty($valueData['is_delete']));
+                        return !((!isset($valueData['option_type_id']) || $valueData['option_type_id'] == '-1') && !empty($valueData['is_delete']));
                     });
                 }
             }

app/code/Magento/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php

@@ -19,6 +19,6 @@ class SalableResolver implements SalableResolverInterface
      */
     public function isSalable(\Magento\Framework\Pricing\SaleableInterface $salableItem)
     {
-        return $salableItem->getCanShowPrice() !== false && $salableItem->isSalable();
+        return $salableItem->getCanShowPrice() !== false;
     }
 }

app/code/Magento/Catalog/Test/Unit/Model/Product/Pricing/Renderer/SalableResolverTest.php

@@ -22,7 +22,7 @@ protected function setUp()
     {
         $this->product = $this->getMock(
             'Magento\Catalog\Model\Product',
-            ['__wakeup', 'getCanShowPrice', 'isSalable'],
+            ['__wakeup', 'getCanShowPrice'],
             [],
             '',
             false
@@ -40,8 +40,6 @@ public function testSalableItem()
             ->method('getCanShowPrice')
             ->willReturn(true);
 
-        $this->product->expects($this->any())->method('isSalable')->willReturn(true);
-
         $result = $this->object->isSalable($this->product);
         $this->assertTrue($result);
     }
@@ -50,9 +48,7 @@ public function testNotSalableItem()
     {
         $this->product->expects($this->any())
             ->method('getCanShowPrice')
-            ->willReturn(true);
-
-        $this->product->expects($this->any())->method('isSalable')->willReturn(false);
+            ->willReturn(false);
 
         $result = $this->object->isSalable($this->product);
         $this->assertFalse($result);

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.13",
+    "version": "100.0.14",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml

@@ -12,6 +12,7 @@
             <item name="deps" xsi:type="string">product_listing.product_listing_data_source</item>
         </item>
         <item name="spinner" xsi:type="string">product_columns</item>
+        <item name="acl" xsi:type="string">Magento_Catalog::products</item>
     </argument>
     <dataSource name="product_listing_data_source">
         <argument name="dataProvider" xsi:type="configurableObject">

app/code/Magento/Catalog/view/adminhtml/web/catalog/apply-to-type-switcher.js

@@ -4,13 +4,22 @@
  */
 define([
     'jquery',
+    'uiRegistry',
     'Magento_Catalog/js/product/weight-handler',
     'Magento_Catalog/catalog/type-events'
-], function ($, weight, productType) {
+], function ($, registry, weight, productType) {
     'use strict';
 
     return {
 
+        /**
+         * Init
+         */
+        init: function () {
+            this.bindAll();
+            this._switchToTypeByApplyAttr();
+        },
+
         /**
          * Bind event
          */
@@ -32,8 +41,7 @@ define([
          * Constructor component
          */
         'Magento_Catalog/catalog/apply-to-type-switcher': function () {
-            this.bindAll();
-            this._switchToTypeByApplyAttr();
+            registry.get('typeSwitcher', this.init.bind(this));
         },
 
         /**