Merge remote-tracking branch 'mainline/develop' into MAGETWO-63626

Author: Mykola Palamar

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::class,
-            ['__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/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php

@@ -22,11 +22,11 @@ class ThemeId implements \Magento\Framework\Option\ArrayInterface
     protected $_resourceModel;
 
     /**
-     * @param \Magento\Theme\Model\ResourceModel\Theme\Collection $widgetResourceModel
+     * @param \Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $widgetResourceModel
      */
-    public function __construct(\Magento\Theme\Model\ResourceModel\Theme\Collection $widgetResourceModel)
+    public function __construct(\Magento\Theme\Model\ResourceModel\Theme\CollectionFactory $widgetResourceModel)
     {
-        $this->_resourceModel = $widgetResourceModel;
+        $this->_resourceModel = $widgetResourceModel->create();
     }
 
     /**

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Totals.php

@@ -22,11 +22,51 @@ class Totals extends Block
      */
     protected $submitOrder = '.order-totals-actions button';
 
+    /**
+     * Order Totals rows locator.
+     *
+     * @var string
+     */
+    private $totalsRowsLocator = '.data-table tr';
+
+    /**
+     * Order Totals Item label locator.
+     *
+     * @var string
+     */
+    private $totalsRowKeyLocator = '.admin__total-mark';
+
+    /**
+     * Order Totals Item amount locator.
+     *
+     * @var string
+     */
+    private $totalsRowValueLocator = '.price';
+
     /**
      * Click 'Submit Order' button
      */
     public function submitOrder()
     {
         $this->_rootElement->find($this->submitOrder)->click();
     }
+
+    /**
+     * Get Order totals.
+     *
+     * @return array
+     */
+    public function getOrderTotals()
+    {
+        $totals = [];
+        $elements = $this->_rootElement->getElements($this->totalsRowsLocator);
+        foreach ($elements as $row) {
+            if ($row->isVisible()) {
+                $key = trim($row->find($this->totalsRowKeyLocator)->getText());
+                $value = $row->find($this->totalsRowValueLocator)->getText();
+                $totals[$key] = $value;
+            }
+        }
+        return $totals;
+    }
 }

dev/tests/functional/tests/app/Magento/Sales/Test/Page/Adminhtml/OrderCreateIndex.xml

@@ -15,5 +15,6 @@
     <block name="customerActivitiesBlock" class="Magento\Sales\Test\Block\Adminhtml\Order\Create\CustomerActivities" locator=".customer-current-activity" strategy="css selector"/>
     <block name="configureProductBlock" class="Magento\Catalog\Test\Block\Adminhtml\Product\Composite\Configure" locator="//*[@data-role='modal' and .//*[@id='product_composite_configure'] and contains(@class,'_show')]" strategy="xpath"/>
     <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
+    <block name="totalsBlock" class="Magento\Sales\Test\Block\Adminhtml\Order\Create\Totals" locator="#order-totals" strategy="css selector"/>
   </page>
 </config>

dev/tests/functional/tests/app/Magento/Tax/Test/Repository/ConfigData.xml

@@ -888,5 +888,23 @@
                 <item name="value" xsi:type="number">1</item>
             </field>
         </dataset>
+
+        <dataset name="tax_cart_display_full_summary">
+            <field name="tax/cart_display/full_summary" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">Yes</item>
+                <item name="value" xsi:type="number">1</item>
+            </field>
+        </dataset>
+
+        <dataset name="tax_cart_display_full_summary_rollback">
+            <field name="tax/cart_display/full_summary" xsi:type="array">
+                <item name="scope" xsi:type="string">tax</item>
+                <item name="scope_id" xsi:type="number">1</item>
+                <item name="label" xsi:type="string">No</item>
+                <item name="value" xsi:type="number">0</item>
+            </field>
+        </dataset>
     </repository>
 </config>

lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php

@@ -25,7 +25,7 @@ public function getConstructorArguments(\ReflectionClass $class, $groupByPositio
         /**
          * Skip native PHP types, classes without constructor
          */
-        if (!$class->getFileName() || false == $class->hasMethod(
+        if ($class->isInterface() || !$class->getFileName() || false == $class->hasMethod(
             '__construct'
         ) || !$inherited && $class->getConstructor()->class != $class->getName()
         ) {

setup/src/Magento/Setup/Module/I18n/Dictionary/Writer/Csv.php

@@ -59,14 +59,18 @@ public function write(Phrase $phrase)
      */
     public function __destructor()
     {
-        fclose($this->_fileHandler);
+        if (is_resource($this->_fileHandler)) {
+            fclose($this->_fileHandler);
+        }
     }
 
     /**
      * Destructor for closing file handler
      */
     public function __destruct()
     {
-        fclose($this->_fileHandler);
+        if (is_resource($this->_fileHandler)) {
+            fclose($this->_fileHandler);
+        }
     }
 }