From 07208fc925c080f2b605325237e1758f904ef30a Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Wed, 23 Sep 2015 12:49:21 +0300
Subject: [PATCH] MAGETWO-37891: Not user-friendly message appears if Customer
moves Product from Shopping Cart to Wishlist
---
app/code/Magento/Wishlist/Controller/Index/Fromcart.php | 8 ++++----
.../Wishlist/Test/Unit/Controller/Index/FromcartTest.php | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
index d8862563991..bcf8b278e2d 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
@@ -6,7 +6,7 @@
namespace Magento\Wishlist\Controller\Index;
use Magento\Checkout\Helper\Cart as CartHelper;
-use Magento\Checkout\Model\Cart;
+use Magento\Checkout\Model\Cart as CheckoutCart;
use Magento\Customer\Model\Session;
use Magento\Framework\App\Action;
use Magento\Framework\Escaper;
@@ -33,7 +33,7 @@ class Fromcart extends Action\Action implements IndexInterface
protected $wishlistHelper;
/**
- * @var Cart
+ * @var CheckoutCart
*/
protected $cart;
@@ -51,7 +51,7 @@ class Fromcart extends Action\Action implements IndexInterface
* @param Action\Context $context
* @param WishlistProviderInterface $wishlistProvider
* @param WishlistHelper $wishlistHelper
- * @param Cart $cart
+ * @param CheckoutCart $cart
* @param CartHelper $cartHelper
* @param Escaper $escaper
*/
@@ -59,7 +59,7 @@ class Fromcart extends Action\Action implements IndexInterface
Action\Context $context,
WishlistProviderInterface $wishlistProvider,
WishlistHelper $wishlistHelper,
- Cart $cart,
+ CheckoutCart $cart,
CartHelper $cartHelper,
Escaper $escaper
) {
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php
index 7ef0847c15c..d492dcced8d 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/FromcartTest.php
@@ -6,7 +6,7 @@
namespace Magento\Wishlist\Test\Unit\Controller\Index;
use Magento\Checkout\Helper\Cart as CartHelper;
-use Magento\Checkout\Model\Cart;
+use Magento\Checkout\Model\Cart as CheckoutCart;
use Magento\Framework\App\Action\Context;
use Magento\Framework\App\Request\Http;
use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
@@ -44,7 +44,7 @@ class FromcartTest extends \PHPUnit_Framework_TestCase
protected $wishlistHelper;
/**
- * @var Cart | \PHPUnit_Framework_MockObject_MockObject
+ * @var CheckoutCart | \PHPUnit_Framework_MockObject_MockObject
*/
protected $cart;
--
GitLab