Commit 977c0a70 authored by Bas de Nooijer's avatar Bas de Nooijer

Fix for incompatible build method (issue #65)

parent 47db7e22
...@@ -90,7 +90,7 @@ class Solarium_Client_RequestBuilder_Select extends Solarium_Client_RequestBuild ...@@ -90,7 +90,7 @@ class Solarium_Client_RequestBuilder_Select extends Solarium_Client_RequestBuild
$componentBuilderClass = $types[$component->getType()]['requestbuilder']; $componentBuilderClass = $types[$component->getType()]['requestbuilder'];
if (!empty($componentBuilderClass)) { if (!empty($componentBuilderClass)) {
$componentBuilder = new $componentBuilderClass; $componentBuilder = new $componentBuilderClass;
$request = $componentBuilder->build($component, $request); $request = $componentBuilder->buildComponent($component, $request);
} }
} }
......
...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_Debug ...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_Debug
* @param Solarium_Client_Request $request * @param Solarium_Client_Request $request
* @return Solarium_Client_Request * @return Solarium_Client_Request
*/ */
public function build($component, $request) public function buildComponent($component, $request)
{ {
$request->addParam('debugQuery', 'true'); $request->addParam('debugQuery', 'true');
$request->addParam('debug.explain.structured', 'true'); $request->addParam('debug.explain.structured', 'true');
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
*/ */
class Solarium_Client_RequestBuilder_Select_Component_DisMax class Solarium_Client_RequestBuilder_Select_Component_DisMax
{ {
/** /**
* Add request settings for Dismax * Add request settings for Dismax
* *
...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_DisMax ...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_DisMax
* @param Solarium_Client_Request $request * @param Solarium_Client_Request $request
* @return Solarium_Client_Request * @return Solarium_Client_Request
*/ */
public function build($component, $request) public function buildComponent($component, $request)
{ {
// enable dismax // enable dismax
$request->addParam('defType', $component->getQueryParser()); $request->addParam('defType', $component->getQueryParser());
......
...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_DistributedSearch ...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_DistributedSearch
* @param Solarium_Client_Request $request * @param Solarium_Client_Request $request
* @return Solarium_Client_Request * @return Solarium_Client_Request
*/ */
public function build($component, $request) public function buildComponent($component, $request)
{ {
// add shard fields to request // add shard fields to request
$shards = array_values($component->getShards()); $shards = array_values($component->getShards());
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
*/ */
class Solarium_Client_RequestBuilder_Select_Component_FacetSet extends Solarium_Client_RequestBuilder class Solarium_Client_RequestBuilder_Select_Component_FacetSet extends Solarium_Client_RequestBuilder
{ {
/** /**
* Add request settings for FacetSet * Add request settings for FacetSet
* *
...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_FacetSet extends Solarium_ ...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_FacetSet extends Solarium_
* @param Solarium_Client_Request $request * @param Solarium_Client_Request $request
* @return Solarium_Client_Request * @return Solarium_Client_Request
*/ */
public function build($component, $request) public function buildComponent($component, $request)
{ {
$facets = $component->getFacets(); $facets = $component->getFacets();
if (count($facets) !== 0) { if (count($facets) !== 0) {
......
...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_Grouping ...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_Grouping
* @param Solarium_Client_Request $request * @param Solarium_Client_Request $request
* @return Solarium_Client_Request * @return Solarium_Client_Request
*/ */
public function build($component, $request) public function buildComponent($component, $request)
{ {
// enable grouping // enable grouping
$request->addParam('group', 'true'); $request->addParam('group', 'true');
......
...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_Highlighting ...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_Highlighting
* @param Solarium_Client_Request $request * @param Solarium_Client_Request $request
* @return Solarium_Client_Request * @return Solarium_Client_Request
*/ */
public function build(Solarium_Query_Select_Component_Highlighting $component, Solarium_Client_Request $request) public function buildComponent(Solarium_Query_Select_Component_Highlighting $component, Solarium_Client_Request $request)
{ {
// enable highlighting // enable highlighting
$request->addParam('hl', 'true'); $request->addParam('hl', 'true');
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
*/ */
class Solarium_Client_RequestBuilder_Select_Component_MoreLikeThis class Solarium_Client_RequestBuilder_Select_Component_MoreLikeThis
{ {
/** /**
* Add request settings for morelikethis * Add request settings for morelikethis
* *
...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_MoreLikeThis ...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_MoreLikeThis
* @param Solarium_Client_Request $request * @param Solarium_Client_Request $request
* @return Solarium_Client_Request * @return Solarium_Client_Request
*/ */
public function build($component, $request) public function buildComponent($component, $request)
{ {
// enable morelikethis // enable morelikethis
$request->addParam('mlt', 'true'); $request->addParam('mlt', 'true');
......
...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_Spellcheck ...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_Spellcheck
* @param Solarium_Client_Request $request * @param Solarium_Client_Request $request
* @return Solarium_Client_Request * @return Solarium_Client_Request
*/ */
public function build($component, $request) public function buildComponent($component, $request)
{ {
// enable spellcheck // enable spellcheck
$request->addParam('spellcheck', 'true'); $request->addParam('spellcheck', 'true');
......
...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_Stats ...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_Stats
* @param Solarium_Client_Request $request * @param Solarium_Client_Request $request
* @return Solarium_Client_Request * @return Solarium_Client_Request
*/ */
public function build($component, $request) public function buildComponent($component, $request)
{ {
// enable stats // enable stats
$request->addParam('stats', 'true'); $request->addParam('stats', 'true');
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
class Solarium_Client_RequestBuilder_Select_Component_DebugTest extends PHPUnit_Framework_TestCase class Solarium_Client_RequestBuilder_Select_Component_DebugTest extends PHPUnit_Framework_TestCase
{ {
public function testBuild() public function testBuildComponent()
{ {
$builder = new Solarium_Client_RequestBuilder_Select_Component_Debug(); $builder = new Solarium_Client_RequestBuilder_Select_Component_Debug();
$request = new Solarium_Client_Request(); $request = new Solarium_Client_Request();
...@@ -40,7 +40,7 @@ class Solarium_Client_RequestBuilder_Select_Component_DebugTest extends PHPUnit_ ...@@ -40,7 +40,7 @@ class Solarium_Client_RequestBuilder_Select_Component_DebugTest extends PHPUnit_
$component = new Solarium_Query_Select_Component_Debug(); $component = new Solarium_Query_Select_Component_Debug();
$component->setExplainOther('id:45'); $component->setExplainOther('id:45');
$request = $builder->build($component, $request); $request = $builder->buildComponent($component, $request);
$this->assertEquals( $this->assertEquals(
array( array(
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
class Solarium_Client_RequestBuilder_Select_Component_DisMaxTest extends PHPUnit_Framework_TestCase class Solarium_Client_RequestBuilder_Select_Component_DisMaxTest extends PHPUnit_Framework_TestCase
{ {
public function testBuild() public function testBuildComponent()
{ {
$builder = new Solarium_Client_RequestBuilder_Select_Component_DisMax; $builder = new Solarium_Client_RequestBuilder_Select_Component_DisMax;
$request = new Solarium_Client_Request(); $request = new Solarium_Client_Request();
...@@ -48,9 +48,9 @@ class Solarium_Client_RequestBuilder_Select_Component_DisMaxTest extends PHPUnit ...@@ -48,9 +48,9 @@ class Solarium_Client_RequestBuilder_Select_Component_DisMaxTest extends PHPUnit
$component->setTie(0.5); $component->setTie(0.5);
$component->setBoostQuery('cat:1'); $component->setBoostQuery('cat:1');
$component->setBoostFunctions('functionX(price)'); $component->setBoostFunctions('functionX(price)');
$request = $builder->build($component, $request); $request = $builder->buildComponent($component, $request);
$this->assertEquals( $this->assertEquals(
array( array(
'defType' => 'dummyparser', 'defType' => 'dummyparser',
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
class Solarium_Client_RequestBuilder_Select_Component_DistributedSearchTest extends PHPUnit_Framework_TestCase class Solarium_Client_RequestBuilder_Select_Component_DistributedSearchTest extends PHPUnit_Framework_TestCase
{ {
public function testBuild() public function testBuildComponent()
{ {
$builder = new Solarium_Client_RequestBuilder_Select_Component_DistributedSearch; $builder = new Solarium_Client_RequestBuilder_Select_Component_DistributedSearch;
$request = new Solarium_Client_Request(); $request = new Solarium_Client_Request();
...@@ -45,7 +45,7 @@ class Solarium_Client_RequestBuilder_Select_Component_DistributedSearchTest exte ...@@ -45,7 +45,7 @@ class Solarium_Client_RequestBuilder_Select_Component_DistributedSearchTest exte
)); ));
$component->setShardRequestHandler('dummy'); $component->setShardRequestHandler('dummy');
$request = $builder->build($component, $request); $request = $builder->buildComponent($component, $request);
$this->assertEquals( $this->assertEquals(
array( array(
......
...@@ -57,8 +57,8 @@ class Solarium_Client_RequestBuilder_Select_Component_FacetSetTest extends PHPUn ...@@ -57,8 +57,8 @@ class Solarium_Client_RequestBuilder_Select_Component_FacetSetTest extends PHPUn
public function testBuildEmptyFacetSet() public function testBuildEmptyFacetSet()
{ {
$request = $this->_builder->build($this->_component, $this->_request); $request = $this->_builder->buildComponent($this->_component, $this->_request);
$this->assertEquals( $this->assertEquals(
array(), array(),
$request->getParams() $request->getParams()
...@@ -71,7 +71,7 @@ class Solarium_Client_RequestBuilder_Select_Component_FacetSetTest extends PHPUn ...@@ -71,7 +71,7 @@ class Solarium_Client_RequestBuilder_Select_Component_FacetSetTest extends PHPUn
$this->_component->addFacet(new Solarium_Query_Select_Component_Facet_Field(array('key' => 'f1', 'field' => 'owner'))); $this->_component->addFacet(new Solarium_Query_Select_Component_Facet_Field(array('key' => 'f1', 'field' => 'owner')));
$this->_component->addFacet(new Solarium_Query_Select_Component_Facet_Query(array('key' => 'f2', 'query' => 'category:23'))); $this->_component->addFacet(new Solarium_Query_Select_Component_Facet_Query(array('key' => 'f2', 'query' => 'category:23')));
$this->_component->addFacet(new Solarium_Query_Select_Component_Facet_MultiQuery(array('key' => 'f3', 'query' => array('f4' => array('query' => 'category:40'))))); $this->_component->addFacet(new Solarium_Query_Select_Component_Facet_MultiQuery(array('key' => 'f3', 'query' => array('f4' => array('query' => 'category:40')))));
$request = $this->_builder->build($this->_component, $this->_request); $request = $this->_builder->buildComponent($this->_component, $this->_request);
$this->assertEquals( $this->assertEquals(
null, null,
...@@ -98,7 +98,7 @@ class Solarium_Client_RequestBuilder_Select_Component_FacetSetTest extends PHPUn ...@@ -98,7 +98,7 @@ class Solarium_Client_RequestBuilder_Select_Component_FacetSetTest extends PHPUn
) )
)); ));
$request = $this->_builder->build($this->_component, $this->_request); $request = $this->_builder->buildComponent($this->_component, $this->_request);
$this->assertEquals( $this->assertEquals(
null, null,
...@@ -118,7 +118,7 @@ class Solarium_Client_RequestBuilder_Select_Component_FacetSetTest extends PHPUn ...@@ -118,7 +118,7 @@ class Solarium_Client_RequestBuilder_Select_Component_FacetSetTest extends PHPUn
$this->_component->addFacet(new Solarium_Query_Select_Component_Facet_Field(array('key' => 'f1', 'field' => 'owner'))); $this->_component->addFacet(new Solarium_Query_Select_Component_Facet_Field(array('key' => 'f1', 'field' => 'owner')));
$this->_component->addFacet(new Solarium_Query_Select_Component_Facet_Query(array('key' => 'f2', 'query' => 'category:23'))); $this->_component->addFacet(new Solarium_Query_Select_Component_Facet_Query(array('key' => 'f2', 'query' => 'category:23')));
$this->_component->addFacet(new Solarium_Query_Select_Component_Facet_MultiQuery(array('key' => 'f3', 'query' => array('f4' =>array('query' => 'category:40'))))); $this->_component->addFacet(new Solarium_Query_Select_Component_Facet_MultiQuery(array('key' => 'f3', 'query' => array('f4' =>array('query' => 'category:40')))));
$request = $this->_builder->build($this->_component, $this->_request); $request = $this->_builder->buildComponent($this->_component, $this->_request);
$this->assertEquals( $this->assertEquals(
null, null,
...@@ -135,7 +135,7 @@ class Solarium_Client_RequestBuilder_Select_Component_FacetSetTest extends PHPUn ...@@ -135,7 +135,7 @@ class Solarium_Client_RequestBuilder_Select_Component_FacetSetTest extends PHPUn
{ {
$this->_component->addFacet(new UnknownFacet(array('key' => 'f1', 'field' => 'owner'))); $this->_component->addFacet(new UnknownFacet(array('key' => 'f1', 'field' => 'owner')));
$this->setExpectedException('Solarium_Exception'); $this->setExpectedException('Solarium_Exception');
$request = $this->_builder->build($this->_component, $this->_request); $request = $this->_builder->buildComponent($this->_component, $this->_request);
$request->getUri(); $request->getUri();
} }
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
class Solarium_Client_RequestBuilder_Select_Component_GroupingTest extends PHPUnit_Framework_TestCase class Solarium_Client_RequestBuilder_Select_Component_GroupingTest extends PHPUnit_Framework_TestCase
{ {
public function testBuild() public function testBuildComponent()
{ {
$builder = new Solarium_Client_RequestBuilder_Select_Component_Grouping; $builder = new Solarium_Client_RequestBuilder_Select_Component_Grouping;
$request = new Solarium_Client_Request(); $request = new Solarium_Client_Request();
...@@ -48,7 +48,7 @@ class Solarium_Client_RequestBuilder_Select_Component_GroupingTest extends PHPUn ...@@ -48,7 +48,7 @@ class Solarium_Client_RequestBuilder_Select_Component_GroupingTest extends PHPUn
$component->setCachePercentage(50); $component->setCachePercentage(50);
$component->setTruncate(true); $component->setTruncate(true);
$request = $builder->build($component, $request); $request = $builder->buildComponent($component, $request);
$this->assertEquals( $this->assertEquals(
array( array(
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
class Solarium_Client_RequestBuilder_Select_Component_HighlightingTest extends PHPUnit_Framework_TestCase class Solarium_Client_RequestBuilder_Select_Component_HighlightingTest extends PHPUnit_Framework_TestCase
{ {
public function testBuild() public function testBuildComponent()
{ {
$builder = new Solarium_Client_RequestBuilder_Select_Component_Highlighting; $builder = new Solarium_Client_RequestBuilder_Select_Component_Highlighting;
$request = new Solarium_Client_Request(); $request = new Solarium_Client_Request();
...@@ -73,7 +73,7 @@ class Solarium_Client_RequestBuilder_Select_Component_HighlightingTest extends P ...@@ -73,7 +73,7 @@ class Solarium_Client_RequestBuilder_Select_Component_HighlightingTest extends P
$component->setQuery('text:myvalue'); $component->setQuery('text:myvalue');
$component->setPhraseLimit(40); $component->setPhraseLimit(40);
$request = $builder->build($component, $request); $request = $builder->buildComponent($component, $request);
$this->assertEquals( $this->assertEquals(
array( array(
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
class Solarium_Client_RequestBuilder_Select_Component_MoreLikeThisTest extends PHPUnit_Framework_TestCase class Solarium_Client_RequestBuilder_Select_Component_MoreLikeThisTest extends PHPUnit_Framework_TestCase
{ {
public function testBuild() public function testBuildComponent()
{ {
$builder = new Solarium_Client_RequestBuilder_Select_Component_MoreLikeThis; $builder = new Solarium_Client_RequestBuilder_Select_Component_MoreLikeThis;
$request = new Solarium_Client_Request(); $request = new Solarium_Client_Request();
...@@ -48,9 +48,9 @@ class Solarium_Client_RequestBuilder_Select_Component_MoreLikeThisTest extends P ...@@ -48,9 +48,9 @@ class Solarium_Client_RequestBuilder_Select_Component_MoreLikeThisTest extends P
$component->setBoost(true); $component->setBoost(true);
$component->setQueryFields('description'); $component->setQueryFields('description');
$component->setCount(6); $component->setCount(6);
$request = $builder->build($component, $request); $request = $builder->buildComponent($component, $request);
$this->assertEquals( $this->assertEquals(
array( array(
'mlt' => 'true', 'mlt' => 'true',
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
class Solarium_Client_RequestBuilder_Select_Component_SpellcheckTest extends PHPUnit_Framework_TestCase class Solarium_Client_RequestBuilder_Select_Component_SpellcheckTest extends PHPUnit_Framework_TestCase
{ {
public function testBuild() public function testBuildComponent()
{ {
$builder = new Solarium_Client_RequestBuilder_Select_Component_Spellcheck(); $builder = new Solarium_Client_RequestBuilder_Select_Component_Spellcheck();
$request = new Solarium_Client_Request(); $request = new Solarium_Client_Request();
...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_SpellcheckTest extends PHP ...@@ -52,7 +52,7 @@ class Solarium_Client_RequestBuilder_Select_Component_SpellcheckTest extends PHP
$component->setCollateExtendedResults(true); $component->setCollateExtendedResults(true);
$component->setAccuracy(.2); $component->setAccuracy(.2);
$request = $builder->build($component, $request); $request = $builder->buildComponent($component, $request);
$this->assertEquals( $this->assertEquals(
array( array(
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
class Solarium_Client_RequestBuilder_Select_Component_StatsTest extends PHPUnit_Framework_TestCase class Solarium_Client_RequestBuilder_Select_Component_StatsTest extends PHPUnit_Framework_TestCase
{ {
public function testBuild() public function testBuildComponent()
{ {
$builder = new Solarium_Client_RequestBuilder_Select_Component_Stats(); $builder = new Solarium_Client_RequestBuilder_Select_Component_Stats();
$request = new Solarium_Client_Request(); $request = new Solarium_Client_Request();
...@@ -42,7 +42,7 @@ class Solarium_Client_RequestBuilder_Select_Component_StatsTest extends PHPUnit_ ...@@ -42,7 +42,7 @@ class Solarium_Client_RequestBuilder_Select_Component_StatsTest extends PHPUnit_
$component->createField('fieldB'); $component->createField('fieldB');
$component->addFacets(array('facetA', 'facetB')); $component->addFacets(array('facetA', 'facetB'));
$request = $builder->build($component, $request); $request = $builder->buildComponent($component, $request);
$this->assertEquals( $this->assertEquals(
array( array(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment