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

Author: Ivan Gavryshko

app/code/Magento/Backend/Controller/Adminhtml/Cache/MassDisable.php

@@ -26,11 +26,11 @@ public function execute()
             }
             $this->_validateTypes($types);
             foreach ($types as $code) {
+                $this->_cacheTypeList->cleanType($code);
                 if ($this->_cacheState->isEnabled($code)) {
                     $this->_cacheState->setEnabled($code, false);
                     $updatedTypes++;
                 }
-                $this->_cacheTypeList->cleanType($code);
             }
             if ($updatedTypes > 0) {
                 $this->_cacheState->persist();

app/code/Magento/Backend/Controller/Adminhtml/Cache/MassRefresh.php

@@ -27,7 +27,6 @@ public function execute()
             $this->_validateTypes($types);
             foreach ($types as $type) {
                 $this->_cacheTypeList->cleanType($type);
-                $this->_eventManager->dispatch('adminhtml_cache_refresh_type', ['type' => $type]);
                 $updatedTypes++;
             }
             if ($updatedTypes > 0) {

app/code/Magento/PageCache/Model/Cache/Type.php

@@ -19,11 +19,33 @@ class Type extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
      */
     const CACHE_TAG = 'FPC';
 
+    /**
+     * @var \Magento\Framework\Event\ManagerInterface
+     */
+    private $eventManager;
+
     /**
      * @param \Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool
+     * @param \Magento\Framework\Event\ManagerInterface $eventManager
      */
-    public function __construct(\Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool)
-    {
+    public function __construct(
+        \Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool,
+        \Magento\Framework\Event\ManagerInterface $eventManager
+    ) {
         parent::__construct($cacheFrontendPool->get(self::TYPE_IDENTIFIER), self::CACHE_TAG);
+        $this->eventManager = $eventManager;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @param string $mode
+     * @param array $tags
+     * @return bool
+     */
+    public function clean($mode = \Zend_Cache::CLEANING_MODE_ALL, array $tags = [])
+    {
+        $this->eventManager->dispatch('adminhtml_cache_refresh_type');
+        return parent::clean($mode, $tags);
     }
 }

app/code/Magento/PageCache/Test/Unit/Model/Cache/TypeTest.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\PageCache\Test\Unit\Model\Cache;
+
+class TypeTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var \Magento\PageCache\Model\Cache\Type */
+    protected $model;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Event\ManagerInterface */
+    protected $eventManagerMock;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\App\Cache\Type\FrontendPool */
+    protected $cacheFrontendPoolMock;
+
+    public function setUp()
+    {
+        $this->eventManagerMock = $this->getMockBuilder('Magento\Framework\Event\ManagerInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->cacheFrontendPoolMock = $this->getMockBuilder('Magento\Framework\App\Cache\Type\FrontendPool')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $cacheFrontend = $this->getMockBuilder('Magento\Framework\Cache\FrontendInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->cacheFrontendPoolMock->expects($this->once())
+            ->method('get')
+            ->willReturn($cacheFrontend);
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->model = $objectManager->getObject(
+            'Magento\PageCache\Model\Cache\Type',
+            [
+                'eventManager' => $this->eventManagerMock,
+                'cacheFrontendPool' => $this->cacheFrontendPoolMock,
+            ]
+        );
+    }
+
+    public function testClean()
+    {
+        $this->eventManagerMock->expects($this->once())
+            ->method('dispatch')
+            ->with('adminhtml_cache_refresh_type');
+
+        $this->model->clean();
+    }
+}

app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php

@@ -171,7 +171,8 @@ public function collect(
                     $total->setBaseTotalAmount($this->getCode(), $rate->getPrice());
                     $shippingDescription = $rate->getCarrierTitle() . ' - ' . $rate->getMethodTitle();
                     $address->setShippingDescription(trim($shippingDescription, ' -'));
-                    $total->setShippingAmount($rate->getPrice());
+                    $total->setBaseShippingAmount($rate->getPrice());
+                    $total->setShippingAmount($amountPrice);
                     $total->setShippingDescription($address->getShippingDescription());
                     break;
                 }

app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php

@@ -70,6 +70,7 @@ protected function setUp()
             'Magento\Quote\Model\Quote\Address\Total',
             [
                 'setShippingAmount',
+                'setBaseShippingAmount',
                 'setBaseTotalAmount',
                 'setTotalAmount',
                 'setShippingDescription',
@@ -229,9 +230,12 @@ public function testCollect()
         $this->priceCurrency->expects($this->once())
             ->method('convert')
             ->with(5, $this->store)
-            ->willReturn(5);
+            ->willReturn(10);
         $this->total->expects($this->once())
             ->method('setShippingAmount')
+            ->with(10);
+        $this->total->expects($this->once())
+            ->method('setBaseShippingAmount')
             ->with(5);
         $this->rate->expects($this->once())
             ->method('getCarrierTitle')

setup/src/Magento/Setup/Model/Installer.php

@@ -956,8 +956,8 @@ public function uninstall()
     {
         $this->log->log('Starting Magento uninstallation:');
 
-        $this->cleanupDb();
         $this->cleanCaches();
+        $this->cleanupDb();
 
         $this->log->log('File system cleanup:');
         $messages = $this->cleanupFiles->clearAllFiles();

setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php

@@ -390,7 +390,7 @@ public function testUninstall()
             ]));
         $this->logger->expects($this->at(0))->method('log')->with('Starting Magento uninstallation:');
         $this->logger
-            ->expects($this->at(1))
+            ->expects($this->at(2))
             ->method('log')
             ->with('No database connection defined - skipping database cleanup');
         $cacheManager = $this->getMock('Magento\Framework\App\Cache\Manager', [], [], '', false);
@@ -400,7 +400,7 @@ public function testUninstall()
             ->method('get')
             ->with('Magento\Framework\App\Cache\Manager')
             ->willReturn($cacheManager);
-        $this->logger->expects($this->at(2))->method('log')->with('Cache cleared successfully');
+        $this->logger->expects($this->at(1))->method('log')->with('Cache cleared successfully');
         $this->logger->expects($this->at(3))->method('log')->with('File system cleanup:');
         $this->logger
             ->expects($this->at(4))
@@ -494,7 +494,7 @@ private function prepareForUpdateModulesTests()
 
 /**
  * Mocking autoload function
- * 
+ *
  * @returns array
  */
 function spl_autoload_functions()