Merge branch 'MAGETWO-36897' into BUGS

Author: okarpenko

app/code/Magento/Sendfriend/Block/Plugin/Catalog/Product/View.php renamed to app/code/Magento/SendFriend/Block/Plugin/Catalog/Product/View.php

@@ -4,20 +4,20 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Sendfriend\Block\Plugin\Catalog\Product;
+namespace Magento\SendFriend\Block\Plugin\Catalog\Product;
 
 class View
 {
     /**
-     * @var \Magento\Sendfriend\Model\Sendfriend
+     * @var \Magento\SendFriend\Model\SendFriend
      */
     protected $_sendfriend;
 
     /**
-     * @param \Magento\Sendfriend\Model\Sendfriend $sendfriend
+     * @param \Magento\SendFriend\Model\SendFriend $sendfriend
      */
     public function __construct(
-        \Magento\Sendfriend\Model\Sendfriend $sendfriend
+        \Magento\SendFriend\Model\SendFriend $sendfriend
     ) {
         $this->_sendfriend = $sendfriend;
     }

app/code/Magento/Sendfriend/Block/Send.php renamed to app/code/Magento/SendFriend/Block/Send.php

@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sendfriend\Block;
+namespace Magento\SendFriend\Block;
 
 use Magento\Customer\Model\Context;
 
@@ -15,9 +15,9 @@
 class Send extends \Magento\Framework\View\Element\Template
 {
     /**
-     * Sendfriend data
+     * SendFriend data
      *
-     * @var \Magento\Sendfriend\Helper\Data
+     * @var \Magento\SendFriend\Helper\Data
      */
     protected $_sendfriendData = null;
 
@@ -44,28 +44,28 @@ class Send extends \Magento\Framework\View\Element\Template
     protected $_customerViewHelper;
 
     /**
-     * @var \Magento\Sendfriend\Model\Sendfriend
+     * @var \Magento\SendFriend\Model\SendFriend
      */
     protected $sendfriend;
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Sendfriend\Helper\Data $sendfriendData
+     * @param \Magento\SendFriend\Helper\Data $sendfriendData
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Customer\Helper\View $customerViewHelper
      * @param \Magento\Framework\App\Http\Context $httpContext
-     * @param \Magento\Sendfriend\Model\Sendfriend $sendfriend
+     * @param \Magento\SendFriend\Model\SendFriend $sendfriend
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Customer\Model\Session $customerSession,
-        \Magento\Sendfriend\Helper\Data $sendfriendData,
+        \Magento\SendFriend\Helper\Data $sendfriendData,
         \Magento\Framework\Registry $registry,
         \Magento\Customer\Helper\View $customerViewHelper,
         \Magento\Framework\App\Http\Context $httpContext,
-        \Magento\Sendfriend\Model\Sendfriend $sendfriend,
+        \Magento\SendFriend\Model\SendFriend $sendfriend,
         array $data = []
     ) {
         $this->_customerSession = $customerSession;

app/code/Magento/Sendfriend/Controller/Product.php renamed to app/code/Magento/SendFriend/Controller/Product.php

@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sendfriend\Controller;
+namespace Magento\SendFriend\Controller;
 
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\App\RequestInterface;
@@ -29,7 +29,7 @@ class Product extends \Magento\Framework\App\Action\Action
     protected $_formKeyValidator;
 
     /**
-     * @var \Magento\Sendfriend\Model\Sendfriend
+     * @var \Magento\SendFriend\Model\SendFriend
      */
     protected $sendFriend;
 
@@ -40,14 +40,14 @@ class Product extends \Magento\Framework\App\Action\Action
      * @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\SendFriend\Model\SendFriend $sendFriend
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      */
     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\SendFriend\Model\SendFriend $sendFriend,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
     ) {
         parent::__construct($context);
@@ -67,8 +67,8 @@ public function __construct(
      */
     public function dispatch(RequestInterface $request)
     {
-        /* @var $helper \Magento\Sendfriend\Helper\Data */
-        $helper = $this->_objectManager->get('Magento\Sendfriend\Helper\Data');
+        /* @var $helper \Magento\SendFriend\Helper\Data */
+        $helper = $this->_objectManager->get('Magento\SendFriend\Helper\Data');
         /* @var $session \Magento\Customer\Model\Session */
         $session = $this->_objectManager->get('Magento\Customer\Model\Session');
 

app/code/Magento/Sendfriend/Controller/Product/Send.php renamed to app/code/Magento/SendFriend/Controller/Product/Send.php

@@ -3,11 +3,11 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sendfriend\Controller\Product;
+namespace Magento\SendFriend\Controller\Product;
 
 use Magento\Framework\Controller\ResultFactory;
 
-class Send extends \Magento\Sendfriend\Controller\Product
+class Send extends \Magento\SendFriend\Controller\Product
 {
     /**
      * Show Send to a Friend Form

app/code/Magento/Sendfriend/Controller/Product/Sendmail.php renamed to app/code/Magento/SendFriend/Controller/Product/Sendmail.php

@@ -6,12 +6,12 @@
 
 // @codingStandardsIgnoreFile
 
-namespace Magento\Sendfriend\Controller\Product;
+namespace Magento\SendFriend\Controller\Product;
 
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
 
-class Sendmail extends \Magento\Sendfriend\Controller\Product
+class Sendmail extends \Magento\SendFriend\Controller\Product
 {
     /** @var  \Magento\Catalog\Api\CategoryRepositoryInterface */
     protected $categoryRepository;
@@ -20,15 +20,15 @@ class Sendmail extends \Magento\Sendfriend\Controller\Product
      * @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\SendFriend\Model\SendFriend $sendFriend
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
      */
     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\SendFriend\Model\SendFriend $sendFriend,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository
     ) {

app/code/Magento/Sendfriend/Helper/Data.php renamed to app/code/Magento/SendFriend/Helper/Data.php

@@ -6,10 +6,10 @@
 
 // @codingStandardsIgnoreFile
 
-namespace Magento\Sendfriend\Helper;
+namespace Magento\SendFriend\Helper;
 
 /**
- * Sendfriend Data Helper
+ * SendFriend Data Helper
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */

app/code/Magento/Sendfriend/LICENSE.txt renamed to app/code/Magento/SendFriend/LICENSE.txt

@@ -3,14 +3,14 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sendfriend\Model\Resource;
+namespace Magento\SendFriend\Model\Resource;
 
 /**
  * SendFriend Log Resource Model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Sendfriend extends \Magento\Framework\Model\Resource\Db\AbstractDb
+class SendFriend extends \Magento\Framework\Model\Resource\Db\AbstractDb
 {
     /**
      * Initialize connection and table
@@ -25,7 +25,7 @@ protected function _construct()
     /**
      * Retrieve Sended Emails By Ip
      *
-     * @param \Magento\Sendfriend\Model\Sendfriend $object
+     * @param \Magento\SendFriend\Model\SendFriend $object
      * @param int $ip
      * @param int $startTime
      * @param int $websiteId

app/code/Magento/Sendfriend/LICENSE_AFL.txt renamed to app/code/Magento/SendFriend/LICENSE_AFL.txt

@@ -3,10 +3,10 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Sendfriend\Model\Resource\Sendfriend;
+namespace Magento\SendFriend\Model\Resource\SendFriend;
 
 /**
- * Sendfriend log resource collection
+ * SendFriend log resource collection
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
@@ -19,6 +19,6 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      */
     protected function _construct()
     {
-        $this->_init('Magento\Sendfriend\Model\Sendfriend', 'Magento\Sendfriend\Model\Resource\Sendfriend');
+        $this->_init('Magento\SendFriend\Model\SendFriend', 'Magento\SendFriend\Model\Resource\SendFriend');
     }
 }