Merge pull request #3243 from magento-tsg-csl3/2.2-develop-pr4

[TSG-CSL3] Backporting 2.2 (pr4)

Author: viktym

app/code/Magento/Checkout/Controller/Cart/Delete.php

@@ -22,7 +22,12 @@ public function execute()
         $id = (int)$this->getRequest()->getParam('id');
         if ($id) {
             try {
-                $this->cart->removeItem($id)->save();
+                $this->cart->removeItem($id);
+                // We should set Totals to be recollected once more because of Cart model as usually is loading
+                // before action executing and in case when triggerRecollect setted as true recollecting will
+                // executed and the flag will be true already.
+                $this->cart->getQuote()->setTotalsCollectedFlag(false);
+                $this->cart->save();
             } catch (\Exception $e) {
                 $this->messageManager->addError(__('We can\'t remove the item.'));
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php

@@ -217,6 +217,11 @@ public function getAddressCollectionJson()
      */
     protected function _prepareForm()
     {
+        $storeId = $this->getCreateOrderModel()
+            ->getSession()
+            ->getStoreId();
+        $this->_storeManager->setCurrentStore($storeId);
+
         $fieldset = $this->_form->addFieldset('main', ['no_container' => true]);
 
         $addressForm = $this->_customerFormFactory->create('customer_address', 'adminhtml_customer_address');

app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/Address/FormTest.php

@@ -20,6 +20,8 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Address;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Backend\Model\Session\Quote as QuoteSession;
+use Magento\Sales\Model\AdminOrder\Create;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -51,6 +53,16 @@ class FormTest extends \PHPUnit\Framework\TestCase
      */
     private $countriesCollection;
 
+    /**
+     * @var Create|MockObject
+     */
+    private $orderCreate;
+
+    /**
+     * @var QuoteSession|MockObject
+     */
+    private $sessionQuote;
+
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -61,6 +73,15 @@ protected function setUp()
         $this->countriesCollection = $this->createMock(
             Collection::class
         );
+        $this->sessionQuote = $this->getMockBuilder(QuoteSession::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStoreId', 'getStore'])
+            ->getMock();
+        $this->orderCreate = $this->getMockBuilder(Create::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->orderCreate->method('getSession')
+            ->willReturn($this->sessionQuote);
 
         $this->addressBlock = $objectManager->getObject(
             Form::class,
@@ -69,6 +90,8 @@ protected function setUp()
                 '_customerFormFactory' => $this->customerFormFactory,
                 '_coreRegistry' => $this->coreRegistry,
                 'countriesCollection' => $this->countriesCollection,
+                'sessionQuote' => $this->sessionQuote,
+                '_orderCreate' => $this->orderCreate
             ]
         );
     }
@@ -108,6 +131,8 @@ public function testGetForm()
             ->willReturn($order);
         $order->method('getStoreId')
             ->willReturn($storeId);
+        $this->sessionQuote->method('getStoreId')
+            ->willReturn($storeId);
         $this->countriesCollection->method('loadByStore')
             ->with($storeId)
             ->willReturn($this->countriesCollection);

dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php

@@ -9,23 +9,29 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 class FileTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\Filesystem\Driver\File
+     * @var File
      */
-    protected $driver;
+    private $driver;
 
     /**
-     * @var string
+     * @var String
      */
-    protected $absolutePath;
+    private $absolutePath;
 
     /**
-     * get relative path for test
+     * @var String
+     */
+    private $generatedPath;
+
+    /**
+     * Returns relative path for the test.
      *
      * @param $relativePath
      * @return string
@@ -36,16 +42,26 @@ protected function getTestPath($relativePath)
     }
 
     /**
-     * Set up
+     * @inheritdoc
      */
     public function setUp()
     {
-        $this->driver = new \Magento\Framework\Filesystem\Driver\File();
+        $this->driver = new File();
         $this->absolutePath = dirname(__DIR__) . '/_files/';
+        $this->generatedPath = $this->getTestPath('generated');
+        $this->removeGeneratedDirectory();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->removeGeneratedDirectory();
     }
 
     /**
-     * test read recursively read
+     * Tests directory recursive read.
      */
     public function testReadDirectoryRecursively()
     {
@@ -63,7 +79,7 @@ public function testReadDirectoryRecursively()
     }
 
     /**
-     * test exception
+     * Tests directory reading exception.
      *
      * @expectedException \Magento\Framework\Exception\FileSystemException
      */
@@ -72,6 +88,11 @@ public function testReadDirectoryRecursivelyFailure()
         $this->driver->readDirectoryRecursively($this->getTestPath('not-existing-directory'));
     }
 
+    /**
+     * Tests of directory creating.
+     *
+     * @throws FileSystemException
+     */
     public function testCreateDirectory()
     {
         $generatedPath = $this->getTestPath('generated/roo/bar/baz/foo');
@@ -123,4 +144,39 @@ public function createFileDataProvider()
             ]
         ];
     }
+
+    /**
+     * Tests creation and removing of symlinks.
+     *
+     * @throws FileSystemException
+     * @return void
+     */
+    public function testSymlinks()
+    {
+        $sourceDirectory = $this->generatedPath . '/source';
+        $destinationDirectory = $this->generatedPath . '/destination';
+
+        $this->driver->createDirectory($sourceDirectory);
+        $this->driver->createDirectory($destinationDirectory);
+
+        $linkName = $destinationDirectory . '/link';
+
+        self::assertTrue($this->driver->isWritable($destinationDirectory));
+        self::assertTrue($this->driver->symlink($sourceDirectory, $linkName));
+        self::assertTrue($this->driver->isExists($linkName));
+        self::assertTrue($this->driver->deleteDirectory($linkName));
+    }
+
+    /**
+     * Remove generated directories.
+     *
+     * @throws FileSystemException
+     * @return void
+     */
+    private function removeGeneratedDirectory()
+    {
+        if (is_dir($this->generatedPath)) {
+            $this->driver->deleteDirectory($this->generatedPath);
+        }
+    }
 }

lib/internal/Magento/Framework/Filesystem/Driver/File.php

@@ -13,6 +13,7 @@
 
 /**
  * Class File
+ *
  * @package Magento\Framework\Filesystem\Driver
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
@@ -405,7 +406,14 @@ public function deleteDirectory($path)
                 $this->deleteFile($entity->getPathname());
             }
         }
-        $result = @rmdir($this->getScheme() . $path);
+
+        $fullPath = $this->getScheme() . $path;
+        if (is_link($fullPath)) {
+            $result = @unlink($fullPath);
+        } else {
+            $result = @rmdir($fullPath);
+        }
+
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
@@ -836,6 +844,8 @@ public function fileUnlock($resource)
     }
 
     /**
+     * Returns an absolute path for the given one.
+     *
      * @param string $basePath
      * @param string $path
      * @param string|null $scheme
@@ -872,7 +882,8 @@ public function getRelativePath($basePath, $path = null)
     }
 
     /**
-     * Fixes path separator
+     * Fixes path separator.
+     *
      * Utility method.
      *
      * @param string $path

lib/web/fotorama/fotorama.js

@@ -2562,7 +2562,7 @@ fotoramaVersion = '4.6.4';
                     thisData.t > rightLimit : thisData.l > rightLimit;
                 specialMeasures.w = thisData.w;
 
-                if (thisData.l + thisData.w < leftLimit
+                if ((opts.navdir !== 'vertical' && thisData.l + thisData.w < leftLimit)
                     || exceedLimit
                     || callFit(thisData.$img, specialMeasures)) return;
 

lib/web/magnifier/magnifier.js

@@ -554,6 +554,15 @@
             thumbObj.src = thumb.src;
         }
 
+        /**
+         * Hide magnifier when mouse exceeds image bounds.
+         */
+        function onMouseLeave() {
+            onThumbLeave();
+            isOverThumb = false;
+            $magnifierPreview.addClass(MagnifyCls.magnifyHidden);
+        }
+
         function onMousemove(e) {
             pos.x = e.clientX;
             pos.y = e.clientY;
@@ -564,15 +573,9 @@
                 isOverThumb = inBounds;
             }
 
-            if (inBounds && isOverThumb) {
-                if(gMode === 'outside'){
-                    $magnifierPreview.removeClass(MagnifyCls.magnifyHidden);
-                }
+            if (inBounds && isOverThumb && gMode === 'outside') {
+                $magnifierPreview.removeClass(MagnifyCls.magnifyHidden);
                 move();
-            } else {
-                onThumbLeave();
-                isOverThumb = false;
-                $magnifierPreview.addClass(MagnifyCls.magnifyHidden);
             }
         }
 
@@ -589,6 +592,8 @@
         });
 
         $box.on('mousemove', onMousemove);
+        $box.on('mouseleave', onMouseLeave);
+
         _init($box, customUserOptions);
     }
 }(jQuery));