Skip to content

Commit 5331902

Browse files
committed
MAGETWO-44333: Move Search API to Framework to Make Grid Component work through them
- Moved Search response builder
1 parent 97c9733 commit 5331902

File tree

6 files changed

+10
-28
lines changed

6 files changed

+10
-28
lines changed

app/code/Magento/Search/etc/di.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
10-
<preference for="Magento\Framework\Search\SearchResponseBuilderInterface" type="Magento\Search\Model\SearchResponseBuilder"/>
1110
<type name="Magento\Framework\Module\Setup\Migration">
1211
<arguments>
1312
<argument name="compositeModules" xsi:type="array">

lib/internal/Magento/Framework/Search/Search.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@ class Search implements SearchInterface
2828
private $searchEngine;
2929

3030
/**
31-
* @var SearchResponseBuilderInterface
31+
* @var SearchResponseBuilder
3232
*/
3333
private $searchResponseBuilder;
3434

3535
/**
3636
* @param Builder $requestBuilder
3737
* @param ScopeResolverInterface $scopeResolver
3838
* @param SearchEngineInterface $searchEngine
39-
* @param SearchResponseBuilderInterface $searchResponseBuilder
39+
* @param SearchResponseBuilder $searchResponseBuilder
4040
*/
4141
public function __construct(
4242
Builder $requestBuilder,
4343
ScopeResolverInterface $scopeResolver,
4444
SearchEngineInterface $searchEngine,
45-
SearchResponseBuilderInterface $searchResponseBuilder
45+
SearchResponseBuilder $searchResponseBuilder
4646
) {
4747
$this->requestBuilder = $requestBuilder;
4848
$this->scopeResolver = $scopeResolver;

app/code/Magento/Search/Model/SearchResponseBuilder.php renamed to lib/internal/Magento/Framework/Search/SearchResponseBuilder.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
* Copyright © 2015 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Search\Model;
6+
namespace Magento\Framework\Search;
77

88
use Magento\Framework\Api\Search\SearchResultInterface;
99
use Magento\Framework\Api\Search\DocumentFactory;
1010
use Magento\Framework\Api\Search\SearchResultFactory;
11-
use Magento\Framework\Search\ResponseInterface;
12-
use Magento\Framework\Search\SearchResponseBuilderInterface;
1311

14-
class SearchResponseBuilder implements SearchResponseBuilderInterface
12+
class SearchResponseBuilder
1513
{
1614
/**
1715
* @var DocumentFactory

lib/internal/Magento/Framework/Search/SearchResponseBuilderInterface.php

Lines changed: 0 additions & 15 deletions
This file was deleted.

app/code/Magento/Search/Test/Unit/Model/SearchResponseBuilderTest.php renamed to lib/internal/Magento/Framework/Search/Test/Unit/SearchResponseBuilderTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © 2015 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Search\Test\Unit\Model;
6+
namespace Magento\Framework\Search\Test\Unit;
77

88
use Magento\Framework\Api\Search\SearchResultInterface;
99
use Magento\Framework\Search\Response\QueryResponse;
@@ -12,7 +12,7 @@
1212
class SearchResponseBuilderTest extends \PHPUnit_Framework_TestCase
1313
{
1414
/**
15-
* @var \Magento\Search\Model\SearchResponseBuilder
15+
* @var \Magento\Framework\Search\SearchResponseBuilder
1616
*/
1717
private $model;
1818

@@ -36,7 +36,7 @@ protected function setUp()
3636
->disableOriginalConstructor()
3737
->getMock();
3838

39-
$this->model = (new ObjectManager($this))->getObject('Magento\Search\Model\SearchResponseBuilder', [
39+
$this->model = (new ObjectManager($this))->getObject('Magento\Framework\Search\SearchResponseBuilder', [
4040
'documentFactory' => $this->documentFactory,
4141
'searchResultFactory' => $this->searchResultFactory,
4242
]);

lib/internal/Magento/Framework/Search/Test/Unit/SearchTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class SearchTest extends \PHPUnit_Framework_TestCase
2525
protected $searchEngine;
2626

2727
/**
28-
* @var \Magento\Framework\Search\SearchResponseBuilderInterface|\PHPUnit_Framework_MockObject_MockObject
28+
* @var \Magento\Framework\Search\SearchResponseBuilder|\PHPUnit_Framework_MockObject_MockObject
2929
*/
3030
protected $searchResponseBuilder;
3131

@@ -46,7 +46,7 @@ protected function setUp()
4646
->disableOriginalConstructor()
4747
->getMock();
4848

49-
$this->searchResponseBuilder = $this->getMockBuilder('Magento\Framework\Search\SearchResponseBuilderInterface')
49+
$this->searchResponseBuilder = $this->getMockBuilder('Magento\Framework\Search\SearchResponseBuilder')
5050
->disableOriginalConstructor()
5151
->getMock();
5252

0 commit comments

Comments
 (0)