Merge pull request #443 from magento-south/BUGS

[South] Code coverage and bug

Author: vpelipenko

app/code/Magento/SendFriend/Controller/Product/Send.php

@@ -9,6 +9,37 @@
 
 class Send extends \Magento\SendFriend\Controller\Product
 {
+    /**
+     * @var \Magento\Catalog\Model\Session
+     */
+    protected $catalogSession;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
+     * @param \Magento\SendFriend\Model\SendFriend $sendFriend
+     * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+     * @param \Magento\Catalog\Model\Session $catalogSession
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
+        \Magento\SendFriend\Model\SendFriend $sendFriend,
+        \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
+        \Magento\Catalog\Model\Session $catalogSession
+    ) {
+        $this->catalogSession = $catalogSession;
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $formKeyValidator,
+            $sendFriend,
+            $productRepository
+        );
+    }
+
     /**
      * Show Send to a Friend Form
      *
@@ -24,8 +55,6 @@ public function execute()
             $resultForward->forward('noroute');
             return $resultForward;
         }
-        /* @var $session \Magento\Catalog\Model\Session */
-        $catalogSession = $this->_objectManager->get('Magento\Catalog\Model\Session');
 
         if ($this->sendFriend->getMaxSendsToFriend() && $this->sendFriend->isExceedLimit()) {
             $this->messageManager->addNotice(
@@ -37,11 +66,12 @@ public function execute()
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
 
         $this->_eventManager->dispatch('sendfriend_product', ['product' => $product]);
-        $data = $catalogSession->getSendfriendFormData();
+        $data = $this->catalogSession->getSendfriendFormData();
         if ($data) {
-            $catalogSession->setSendfriendFormData(true);
+            $this->catalogSession->setSendfriendFormData(true);
             $block = $resultPage->getLayout()->getBlock('sendfriend.send');
             if ($block) {
+                /** @var \Magento\SendFriend\Block\Send $block */
                 $block->setFormData($data);
             }
         }

app/code/Magento/SendFriend/Controller/Product/Sendmail.php

@@ -16,24 +16,32 @@ class Sendmail extends \Magento\SendFriend\Controller\Product
     /** @var  \Magento\Catalog\Api\CategoryRepositoryInterface */
     protected $categoryRepository;
 
+    /**
+     * @var \Magento\Catalog\Model\Session
+     */
+    protected $catalogSession;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\SendFriend\Model\SendFriend $sendFriend
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
+     * @param \Magento\Catalog\Model\Session $catalogSession
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\SendFriend\Model\SendFriend $sendFriend,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
-        \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
+        \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository,
+        \Magento\Catalog\Model\Session $catalogSession
     ) {
         parent::__construct($context, $coreRegistry, $formKeyValidator, $sendFriend, $productRepository);
         $this->categoryRepository = $categoryRepository;
+        $this->catalogSession = $catalogSession;
     }
 
     /**
@@ -79,8 +87,6 @@ public function execute()
         $this->sendFriend->setRecipients($this->getRequest()->getPost('recipients'));
         $this->sendFriend->setProduct($product);
 
-        /* @var $session \Magento\Catalog\Model\Session */
-        $catalogSession = $this->_objectManager->get('Magento\Catalog\Model\Session');
         try {
             $validate = $this->sendFriend->validate();
             if ($validate === true) {
@@ -105,7 +111,7 @@ public function execute()
         }
 
         // save form data
-        $catalogSession->setSendfriendFormData($data);
+        $this->catalogSession->setSendfriendFormData($data);
 
         $url = $this->_url->getUrl('sendfriend/product/send', ['_current' => true]);
         $resultRedirect->setUrl($this->_redirect->error($url));