Skip to content

Commit 0758eea

Browse files
author
Yuri Kovsher
committed
Merge remote-tracking branch 'tango-ce/MAGETWO-36731' into MAGETWO-34590
2 parents b7318ff + 1dd46ab commit 0758eea

File tree

14 files changed

+207
-199
lines changed

14 files changed

+207
-199
lines changed

‎app/code/Magento/Search/Controller/Adminhtml/Term.php

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,17 @@
66
namespace Magento\Search\Controller\Adminhtml;
77

88
use Magento\Backend\App\Action;
9+
use Magento\Framework\Controller\ResultFactory;
910

10-
class Term extends \Magento\Backend\App\Action
11+
class Term extends Action
1112
{
12-
/**
13-
* @var \Magento\Framework\View\Result\PageFactory
14-
*/
15-
protected $resultPageFactory;
16-
17-
/**
18-
* @param Action\Context $context
19-
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
20-
*/
21-
public function __construct(
22-
\Magento\Backend\App\Action\Context $context,
23-
\Magento\Framework\View\Result\PageFactory $resultPageFactory
24-
) {
25-
parent::__construct($context);
26-
$this->resultPageFactory = $resultPageFactory;
27-
}
28-
2913
/**
3014
* @return \Magento\Backend\Model\View\Result\Page
3115
*/
3216
protected function createPage()
3317
{
3418
/** @var \Magento\Backend\Model\View\Result\Page $resultPage */
35-
$resultPage = $this->resultPageFactory->create();
19+
$resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
3620
$resultPage->setActiveMenu('Magento_Search::search_term')
3721
->addBreadcrumb(__('Search'), __('Search'));
3822
return $resultPage;

‎app/code/Magento/Search/Controller/Adminhtml/Term/Delete.php

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

9-
class Delete extends \Magento\Search\Controller\Adminhtml\Term
8+
use Magento\Search\Controller\Adminhtml\Term as TermController;
9+
use Magento\Framework\Controller\ResultFactory;
10+
11+
class Delete extends TermController
1012
{
1113
/**
1214
* @return \Magento\Backend\Model\View\Result\Redirect
@@ -15,20 +17,23 @@ public function execute()
1517
{
1618
$id = $this->getRequest()->getParam('id');
1719
/** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
18-
$redirectResult = $this->resultRedirectFactory->create();
20+
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
1921
if ($id) {
2022
try {
2123
$model = $this->_objectManager->create('Magento\Search\Model\Query');
2224
$model->setId($id);
2325
$model->delete();
2426
$this->messageManager->addSuccess(__('You deleted the search.'));
25-
return $redirectResult->setPath('search/*/');
27+
$resultRedirect->setPath('search/*/');
28+
return $resultRedirect;
2629
} catch (\Exception $e) {
2730
$this->messageManager->addError($e->getMessage());
28-
return $redirectResult->setPath('search/*/edit', ['id' => $this->getRequest()->getParam('id')]);
31+
$resultRedirect->setPath('search/*/edit', ['id' => $this->getRequest()->getParam('id')]);
32+
return $resultRedirect;
2933
}
3034
}
3135
$this->messageManager->addError(__('We can\'t find a search term to delete.'));
32-
return $redirectResult->setPath('search/*/');
36+
$resultRedirect->setPath('search/*/');
37+
return $resultRedirect;
3338
}
3439
}

‎app/code/Magento/Search/Controller/Adminhtml/Term/Edit.php

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

9-
use Magento\Search\Controller\Adminhtml\Search;
8+
use Magento\Search\Controller\Adminhtml\Term as TermController;
9+
use Magento\Backend\App\Action\Context;
10+
use Magento\Framework\Registry;
11+
use Magento\Framework\Controller\ResultFactory;
1012

11-
class Edit extends \Magento\Search\Controller\Adminhtml\Term
13+
class Edit extends TermController
1214
{
1315
/**
1416
* Core registry
1517
*
1618
* @var \Magento\Framework\Registry
1719
*/
18-
protected $_coreRegistry = null;
20+
protected $coreRegistry;
1921

2022
/**
2123
* @param \Magento\Backend\App\Action\Context $context
22-
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
2324
* @param \Magento\Framework\Registry $coreRegistry
2425
*/
2526
public function __construct(
26-
\Magento\Backend\App\Action\Context $context,
27-
\Magento\Framework\View\Result\PageFactory $resultPageFactory,
28-
\Magento\Framework\Registry $coreRegistry
27+
Context $context,
28+
Registry $coreRegistry
2929
) {
30-
parent::__construct($context, $resultPageFactory);
31-
$this->_coreRegistry = $coreRegistry;
30+
$this->coreRegistry = $coreRegistry;
31+
parent::__construct($context);
3232
}
3333

3434
/**
35-
* @return \Magento\Backend\Model\View\Result\Page
35+
* @return \Magento\Framework\Controller\ResultInterface
3636
* @SuppressWarnings(PHPMD.NPathComplexity)
3737
*/
3838
public function execute()
@@ -44,8 +44,10 @@ public function execute()
4444
$model->load($id);
4545
if (!$model->getId()) {
4646
$this->messageManager->addError(__('This search no longer exists.'));
47-
$this->_redirect('search/*');
48-
return;
47+
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
48+
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
49+
$resultRedirect->setPath('search/*');
50+
return $resultRedirect;
4951
}
5052
}
5153

@@ -55,20 +57,17 @@ public function execute()
5557
$model->addData($data);
5658
}
5759

58-
$this->_coreRegistry->register('current_catalog_search', $model);
60+
$this->coreRegistry->register('current_catalog_search', $model);
5961

6062
$resultPage = $this->createPage();
6163
$resultPage->getConfig()->getTitle()->prepend(__('Search Terms'));
6264
$resultPage->getConfig()->getTitle()->prepend($id ? $model->getQueryText() : __('New Search'));
63-
6465
$resultPage->getLayout()->getBlock('adminhtml.search.term.edit')
6566
->setData('action', $this->getUrl('search/term/save'));
66-
6767
$resultPage->addBreadcrumb(
6868
$id ? __('Edit Search') : __('New Search'),
6969
$id ? __('Edit Search') : __('New Search')
7070
);
71-
7271
return $resultPage;
7372
}
7473
}

‎app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchCsv.php

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

9-
use Magento\Framework\App\Filesystem\DirectoryList;
10-
use Magento\Framework\App\ResponseInterface;
8+
use Magento\Search\Controller\Adminhtml\Term as TermController;
119
use Magento\Backend\App\Action\Context;
12-
use Magento\Framework\View\Result\PageFactory;
1310
use Magento\Framework\App\Response\Http\FileFactory;
11+
use Magento\Framework\Controller\ResultFactory;
12+
use Magento\Framework\App\Filesystem\DirectoryList;
1413

15-
class ExportSearchCsv extends \Magento\Search\Controller\Adminhtml\Term
14+
class ExportSearchCsv extends TermController
1615
{
1716
/**
1817
* @var \Magento\Framework\App\Response\Http\FileFactory
1918
*/
20-
protected $_httpFileFactory;
19+
protected $fileFactory;
2120

2221
/**
2322
* @param \Magento\Backend\App\Action\Context $context
24-
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
2523
* @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
2624
*/
27-
public function __construct(Context $context, PageFactory $resultPageFactory, FileFactory $fileFactory)
28-
{
29-
$this->_httpFileFactory = $fileFactory;
30-
parent::__construct($context, $resultPageFactory);
25+
public function __construct(
26+
Context $context,
27+
FileFactory $fileFactory
28+
) {
29+
$this->fileFactory = $fileFactory;
30+
parent::__construct($context);
3131
}
3232

3333
/**
3434
* Export search report grid to CSV format
3535
*
36-
* @return ResponseInterface
36+
* @return \Magento\Framework\App\ResponseInterface
3737
*/
3838
public function execute()
3939
{
40-
$this->_view->loadLayout(false);
41-
$content = $this->_view->getLayout()->getChildBlock('adminhtml.report.search.grid', 'grid.export');
42-
return $this->_httpFileFactory->create('search.csv', $content->getCsvFile(), DirectoryList::VAR_DIR);
40+
/** @var \Magento\Framework\View\Result\Layout $resultLayout */
41+
$resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
42+
$content = $resultLayout->getLayout()->getChildBlock('adminhtml.report.search.grid', 'grid.export');
43+
return $this->fileFactory->create('search.csv', $content->getCsvFile(), DirectoryList::VAR_DIR);
4344
}
4445
}

‎app/code/Magento/Search/Controller/Adminhtml/Term/ExportSearchExcel.php

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

8+
use Magento\Search\Controller\Adminhtml\Term as TermController;
9+
use Magento\Backend\App\Action\Context;
10+
use Magento\Framework\App\Response\Http\FileFactory;
11+
use Magento\Framework\Controller\ResultFactory;
912
use Magento\Framework\App\Filesystem\DirectoryList;
10-
use Magento\Framework\App\ResponseInterface;
1113

12-
class ExportSearchExcel extends \Magento\Search\Controller\Adminhtml\Term
14+
class ExportSearchExcel extends TermController
1315
{
1416
/**
1517
* @var \Magento\Framework\App\Response\Http\FileFactory
1618
*/
17-
protected $_fileFactory;
19+
protected $fileFactory;
1820

1921
/**
2022
* @param \Magento\Backend\App\Action\Context $context
21-
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
2223
* @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
2324
*/
2425
public function __construct(
25-
\Magento\Backend\App\Action\Context $context,
26-
\Magento\Framework\View\Result\PageFactory $resultPageFactory,
27-
\Magento\Framework\App\Response\Http\FileFactory $fileFactory
26+
Context $context,
27+
FileFactory $fileFactory
2828
) {
29-
parent::__construct($context, $resultPageFactory);
30-
$this->_fileFactory = $fileFactory;
29+
$this->fileFactory = $fileFactory;
30+
parent::__construct($context);
3131
}
3232

3333
/**
3434
* Export search report to Excel XML format
3535
*
36-
* @return ResponseInterface
36+
* @return \Magento\Framework\App\ResponseInterface
3737
*/
3838
public function execute()
3939
{
40-
$this->_view->loadLayout(false);
41-
$content = $this->_view->getLayout()->getChildBlock('adminhtml.report.search.grid', 'grid.export');
42-
return $this->_fileFactory->create('search.xml', $content->getExcelFile(), DirectoryList::VAR_DIR);
40+
/** @var \Magento\Framework\View\Result\Layout $resultLayout */
41+
$resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
42+
$content = $resultLayout->getLayout()->getChildBlock('adminhtml.report.search.grid', 'grid.export');
43+
return $this->fileFactory->create('search.xml', $content->getExcelFile(), DirectoryList::VAR_DIR);
4344
}
4445
}

‎app/code/Magento/Search/Controller/Adminhtml/Term/Index.php

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

9-
class Index extends \Magento\Search\Controller\Adminhtml\Term
8+
use Magento\Search\Controller\Adminhtml\Term as TermController;
9+
10+
class Index extends TermController
1011
{
1112
/**
1213
* @return \Magento\Backend\Model\View\Result\Page

‎app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php

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

9-
class MassDelete extends \Magento\Search\Controller\Adminhtml\Term
8+
use Magento\Search\Controller\Adminhtml\Term as TermController;
9+
use Magento\Framework\Controller\ResultFactory;
10+
11+
class MassDelete extends TermController
1012
{
1113
/**
1214
* @return \Magento\Backend\Model\View\Result\Redirect
@@ -27,8 +29,9 @@ public function execute()
2729
$this->messageManager->addError($e->getMessage());
2830
}
2931
}
30-
/** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
31-
$redirectResult = $this->resultRedirectFactory->create();
32-
return $redirectResult->setPath('search/*/');
32+
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
33+
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
34+
$resultRedirect->setPath('search/*/');
35+
return $resultRedirect;
3336
}
3437
}

‎app/code/Magento/Search/Controller/Adminhtml/Term/NewAction.php

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

9-
class NewAction extends \Magento\Search\Controller\Adminhtml\Term
10-
{
11-
/**
12-
* @var \Magento\Backend\Model\View\Result\ForwardFactory
13-
*/
14-
protected $resultForwardFactory;
15-
16-
/**
17-
* @param \Magento\Backend\App\Action\Context $context
18-
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
19-
* @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
20-
*/
21-
public function __construct(
22-
\Magento\Backend\App\Action\Context $context,
23-
\Magento\Framework\View\Result\PageFactory $resultPageFactory,
24-
\Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
25-
) {
26-
parent::__construct($context, $resultPageFactory);
27-
$this->resultForwardFactory = $resultForwardFactory;
28-
}
8+
use Magento\Search\Controller\Adminhtml\Term as TermController;
9+
use Magento\Framework\Controller\ResultFactory;
2910

11+
class NewAction extends TermController
12+
{
3013
/**
3114
* @return \Magento\Backend\Model\View\Result\Forward
3215
*/
3316
public function execute()
3417
{
3518
/** @var \Magento\Backend\Model\View\Result\Forward $resultForward */
36-
$resultForward = $this->resultForwardFactory->create();
19+
$resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
3720
return $resultForward->forward('edit');
3821
}
3922
}

0 commit comments

Comments
 (0)