Skip to content

Commit c75e86b

Browse files
author
Yuri Kovsher
committed
Merge remote-tracking branch 'tango-ce/MAGETWO-36729' into MAGETWO-34590
2 parents df841df + 20bb9dd commit c75e86b

32 files changed

+801
-617
lines changed

‎app/code/Magento/Review/Controller/Adminhtml/Product.php

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55
*/
66
namespace Magento\Review\Controller\Adminhtml;
77

8+
use Magento\Backend\App\Action;
9+
use Magento\Backend\App\Action\Context;
10+
use Magento\Framework\Registry;
11+
use Magento\Review\Model\ReviewFactory;
12+
use Magento\Review\Model\RatingFactory;
13+
814
/**
915
* Reviews admin controller
1016
*/
11-
class Product extends \Magento\Backend\App\Action
17+
class Product extends Action
1218
{
1319
/**
1420
* Array of actions which can be processed without secret key validation
@@ -22,21 +28,21 @@ class Product extends \Magento\Backend\App\Action
2228
*
2329
* @var \Magento\Framework\Registry
2430
*/
25-
protected $_coreRegistry = null;
31+
protected $coreRegistry = null;
2632

2733
/**
2834
* Review model factory
2935
*
3036
* @var \Magento\Review\Model\ReviewFactory
3137
*/
32-
protected $_reviewFactory;
38+
protected $reviewFactory;
3339

3440
/**
3541
* Rating model factory
3642
*
3743
* @var \Magento\Review\Model\RatingFactory
3844
*/
39-
protected $_ratingFactory;
45+
protected $ratingFactory;
4046

4147
/**
4248
* @param \Magento\Backend\App\Action\Context $context
@@ -45,14 +51,14 @@ class Product extends \Magento\Backend\App\Action
4551
* @param \Magento\Review\Model\RatingFactory $ratingFactory
4652
*/
4753
public function __construct(
48-
\Magento\Backend\App\Action\Context $context,
49-
\Magento\Framework\Registry $coreRegistry,
50-
\Magento\Review\Model\ReviewFactory $reviewFactory,
51-
\Magento\Review\Model\RatingFactory $ratingFactory
54+
Context $context,
55+
Registry $coreRegistry,
56+
ReviewFactory $reviewFactory,
57+
RatingFactory $ratingFactory
5258
) {
53-
$this->_coreRegistry = $coreRegistry;
54-
$this->_reviewFactory = $reviewFactory;
55-
$this->_ratingFactory = $ratingFactory;
59+
$this->coreRegistry = $coreRegistry;
60+
$this->reviewFactory = $reviewFactory;
61+
$this->ratingFactory = $ratingFactory;
5662
parent::__construct($context);
5763
}
5864

‎app/code/Magento/Review/Controller/Adminhtml/Product/Delete.php

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Review\Controller\Adminhtml\Product;
87

9-
class Delete extends \Magento\Review\Controller\Adminhtml\Product
8+
use Magento\Review\Controller\Adminhtml\Product as ProductController;
9+
use Magento\Framework\Controller\ResultFactory;
10+
11+
class Delete extends ProductController
1012
{
1113
/**
12-
* @return void
14+
* @return \Magento\Backend\Model\View\Result\Redirect
1315
*/
1416
public function execute()
1517
{
1618
$reviewId = $this->getRequest()->getParam('id', false);
17-
$this->_reviewFactory->create()->setId($reviewId)->aggregate()->delete();
18-
19+
$this->reviewFactory->create()->setId($reviewId)->aggregate()->delete();
1920
$this->messageManager->addSuccess(__('The review has been deleted.'));
21+
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
22+
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
2023
if ($this->getRequest()->getParam('ret') == 'pending') {
21-
$this->getResponse()->setRedirect($this->getUrl('review/*/pending'));
24+
$resultRedirect->setPath('review/*/pending');
2225
} else {
23-
$this->getResponse()->setRedirect($this->getUrl('review/*/'));
26+
$resultRedirect->setPath('review/*/');
2427
}
28+
return $resultRedirect;
2529
}
2630

2731
/**
@@ -31,7 +35,9 @@ public function execute()
3135
*/
3236
public function getDefaultResult()
3337
{
34-
$resultRedirect = $this->resultRedirectFactory->create();
35-
return $resultRedirect->setPath('review/*/edit/', ['id' => $this->getRequest()->getParam('id', false)]);
38+
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
39+
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
40+
$resultRedirect->setPath('review/*/edit/', ['id' => $this->getRequest()->getParam('id', false)]);
41+
return $resultRedirect;
3642
}
3743
}

‎app/code/Magento/Review/Controller/Adminhtml/Product/Edit.php

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Review\Controller\Adminhtml\Product;
87

9-
class Edit extends \Magento\Review\Controller\Adminhtml\Product
8+
use Magento\Review\Controller\Adminhtml\Product as ProductController;
9+
use Magento\Framework\Controller\ResultFactory;
10+
11+
class Edit extends ProductController
1012
{
1113
/**
12-
* @return void
14+
* @return \Magento\Backend\Model\View\Result\Page
1315
*/
1416
public function execute()
1517
{
16-
$this->_view->loadLayout();
17-
$this->_setActiveMenu('Magento_Review::catalog_reviews_ratings_reviews_all');
18-
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Customer Reviews'));
19-
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Edit Review'));
20-
21-
$this->_addContent($this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Edit'));
22-
23-
$this->_view->renderLayout();
18+
/** @var \Magento\Backend\Model\View\Result\Page $resultPage */
19+
$resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
20+
$resultPage->setActiveMenu('Magento_Review::catalog_reviews_ratings_reviews_all');
21+
$resultPage->getConfig()->getTitle()->prepend(__('Customer Reviews'));
22+
$resultPage->getConfig()->getTitle()->prepend(__('Edit Review'));
23+
$resultPage->addContent($resultPage->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Edit'));
24+
return $resultPage;
2425
}
2526
}

‎app/code/Magento/Review/Controller/Adminhtml/Product/Index.php

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,32 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Review\Controller\Adminhtml\Product;
87

9-
class Index extends \Magento\Review\Controller\Adminhtml\Product
8+
use Magento\Review\Controller\Adminhtml\Product as ProductController;
9+
use Magento\Framework\Controller\ResultFactory;
10+
11+
class Index extends ProductController
1012
{
1113
/**
12-
* @return void
14+
* @return \Magento\Framework\Controller\ResultInterface
1315
*/
1416
public function execute()
1517
{
1618
if ($this->getRequest()->getParam('ajax')) {
17-
return $this->_forward('reviewGrid');
19+
/** @var \Magento\Backend\Model\View\Result\Forward $resultForward */
20+
$resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
21+
$resultForward->forward('reviewGrid');
22+
return $resultForward;
1823
}
19-
20-
$this->_view->loadLayout();
21-
$this->_setActiveMenu('Magento_Review::catalog_reviews_ratings_reviews_all');
22-
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Customer Reviews'));
23-
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Reviews'));
24-
25-
$this->_addContent($this->_view->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Main'));
26-
27-
$this->_view->renderLayout();
24+
/** @var \Magento\Backend\Model\View\Result\Page $resultPage */
25+
$resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
26+
$resultPage->setActiveMenu('Magento_Review::catalog_reviews_ratings_reviews_all');
27+
$resultPage->getConfig()->getTitle()->prepend(__('Customer Reviews'));
28+
$resultPage->getConfig()->getTitle()->prepend(__('Reviews'));
29+
$resultPage->addContent($resultPage->getLayout()->createBlock('Magento\Review\Block\Adminhtml\Main'));
30+
return $resultPage;
2831
}
2932
}

‎app/code/Magento/Review/Controller/Adminhtml/Product/JsonProductInfo.php

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Review\Controller\Adminhtml\Product;
87

9-
class JsonProductInfo extends \Magento\Review\Controller\Adminhtml\Product
8+
use Magento\Review\Controller\Adminhtml\Product as ProductController;
9+
use Magento\Backend\App\Action\Context;
10+
use Magento\Framework\Registry;
11+
use Magento\Review\Model\ReviewFactory;
12+
use Magento\Review\Model\RatingFactory;
13+
use Magento\Catalog\Api\ProductRepositoryInterface;
14+
use Magento\Framework\Object;
15+
use Magento\Framework\Controller\ResultFactory;
16+
17+
class JsonProductInfo extends ProductController
1018
{
11-
/** @var \Magento\Catalog\Api\ProductRepositoryInterface */
19+
/**
20+
* @var \Magento\Catalog\Api\ProductRepositoryInterface
21+
*/
1222
protected $productRepository;
1323

1424
/**
@@ -19,33 +29,35 @@ class JsonProductInfo extends \Magento\Review\Controller\Adminhtml\Product
1929
* @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
2030
*/
2131
public function __construct(
22-
\Magento\Backend\App\Action\Context $context,
23-
\Magento\Framework\Registry $coreRegistry,
24-
\Magento\Review\Model\ReviewFactory $reviewFactory,
25-
\Magento\Review\Model\RatingFactory $ratingFactory,
26-
\Magento\Catalog\Api\ProductRepositoryInterface $productRepository
32+
Context $context,
33+
Registry $coreRegistry,
34+
ReviewFactory $reviewFactory,
35+
RatingFactory $ratingFactory,
36+
ProductRepositoryInterface $productRepository
2737
) {
28-
parent::__construct($context, $coreRegistry, $reviewFactory, $ratingFactory);
2938
$this->productRepository = $productRepository;
39+
parent::__construct($context, $coreRegistry, $reviewFactory, $ratingFactory);
3040
}
3141

3242
/**
33-
* @return void
43+
* @return \Magento\Framework\Controller\Result\Json
3444
*/
3545
public function execute()
3646
{
37-
$response = new \Magento\Framework\Object();
47+
$response = new Object();
3848
$id = $this->getRequest()->getParam('id');
3949
if (intval($id) > 0) {
4050
$product = $this->productRepository->getById($id);
41-
4251
$response->setId($id);
4352
$response->addData($product->getData());
4453
$response->setError(0);
4554
} else {
4655
$response->setError(1);
4756
$response->setMessage(__('We can\'t get the product ID.'));
4857
}
49-
$this->getResponse()->representJson($response->toJSON());
58+
/** @var \Magento\Framework\Controller\Result\Json $resultJson */
59+
$resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
60+
$resultJson->setData($response->toArray());
61+
return $resultJson;
5062
}
5163
}

‎app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,42 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Review\Controller\Adminhtml\Product;
87

9-
class MassDelete extends \Magento\Review\Controller\Adminhtml\Product
8+
use Magento\Review\Controller\Adminhtml\Product as ProductController;
9+
use Magento\Framework\Exception\LocalizedException;
10+
use Magento\Framework\Controller\ResultFactory;
11+
12+
class MassDelete extends ProductController
1013
{
1114
/**
12-
* @return void
15+
* @return \Magento\Backend\Model\View\Result\Redirect
1316
*/
1417
public function execute()
1518
{
1619
$reviewsIds = $this->getRequest()->getParam('reviews');
17-
1820
if (!is_array($reviewsIds)) {
1921
$this->messageManager->addError(__('Please select review(s).'));
2022
} else {
2123
try {
2224
foreach ($reviewsIds as $reviewId) {
23-
$model = $this->_reviewFactory->create()->load($reviewId);
25+
$model = $this->reviewFactory->create()->load($reviewId);
2426
$model->delete();
2527
}
2628
$this->messageManager->addSuccess(
2729
__('A total of %1 record(s) have been deleted.', count($reviewsIds))
2830
);
29-
} catch (\Magento\Framework\Exception\LocalizedException $e) {
31+
} catch (LocalizedException $e) {
3032
$this->messageManager->addError($e->getMessage());
3133
} catch (\Exception $e) {
3234
$this->messageManager->addException($e, __('An error occurred while deleting record(s).'));
3335
}
3436
}
35-
36-
$this->_redirect('review/*/' . $this->getRequest()->getParam('ret', 'index'));
37+
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
38+
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
39+
$resultRedirect->setPath('review/*/' . $this->getRequest()->getParam('ret', 'index'));
40+
return $resultRedirect;
3741
}
3842
}

‎app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Review\Controller\Adminhtml\Product;
87

9-
class MassUpdateStatus extends \Magento\Review\Controller\Adminhtml\Product
8+
use Magento\Review\Controller\Adminhtml\Product as ProductController;
9+
use Magento\Framework\Exception\LocalizedException;
10+
use Magento\Framework\Controller\ResultFactory;
11+
12+
class MassUpdateStatus extends ProductController
1013
{
1114
/**
12-
* @return void
15+
* @return \Magento\Backend\Model\View\Result\Redirect
1316
*/
1417
public function execute()
1518
{
@@ -20,13 +23,13 @@ public function execute()
2023
try {
2124
$status = $this->getRequest()->getParam('status');
2225
foreach ($reviewsIds as $reviewId) {
23-
$model = $this->_reviewFactory->create()->load($reviewId);
26+
$model = $this->reviewFactory->create()->load($reviewId);
2427
$model->setStatusId($status)->save()->aggregate();
2528
}
2629
$this->messageManager->addSuccess(
2730
__('A total of %1 record(s) have been updated.', count($reviewsIds))
2831
);
29-
} catch (\Magento\Framework\Exception\LocalizedException $e) {
32+
} catch (LocalizedException $e) {
3033
$this->messageManager->addError($e->getMessage());
3134
} catch (\Exception $e) {
3235
$this->messageManager->addException(
@@ -35,7 +38,9 @@ public function execute()
3538
);
3639
}
3740
}
38-
39-
$this->_redirect('review/*/' . $this->getRequest()->getParam('ret', 'index'));
41+
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
42+
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
43+
$resultRedirect->setPath('review/*/' . $this->getRequest()->getParam('ret', 'index'));
44+
return $resultRedirect;
4045
}
4146
}

0 commit comments

Comments
 (0)