Commit 067d309f authored by Bas de Nooijer's avatar Bas de Nooijer

- moved methods below vars

- fixed namespaces in testcases
- made morelikethis query test independent of select query test
parent b9eec0bb
......@@ -61,6 +61,24 @@ use Solarium\Query\MoreLikeThis\RequestBuilder as RequestBuilder;
class Query extends SelectQuery
{
/**
* Default options
*
* @var array
*/
protected $options = array(
'handler' => 'mlt',
'resultclass' => 'Solarium\Query\MoreLikeThis\Result',
'documentclass' => 'Solarium\Query\Select\Result\Document',
'query' => '*:*',
'start' => 0,
'rows' => 10,
'fields' => '*,score',
'interestingTerms' => 'none',
'matchinclude' => false,
'stream' => false
);
/**
* Get type for this query
*
......@@ -91,24 +109,6 @@ class Query extends SelectQuery
return new ResponseParser;
}
/**
* Default options
*
* @var array
*/
protected $options = array(
'handler' => 'mlt',
'resultclass' => 'Solarium\Query\MoreLikeThis\Result',
'documentclass' => 'Solarium\Query\Select\Result\Document',
'query' => '*:*',
'start' => 0,
'rows' => 10,
'fields' => '*,score',
'interestingTerms' => 'none',
'matchinclude' => false,
'stream' => false
);
/**
* Set query stream option
*
......
......@@ -47,7 +47,7 @@ use Solarium\Query\Select\Result\Result;
* Parse select response data
*
* @package Solarium
* @subpackage QueryType
* @subpackage Query
*/
class ResponseParser extends BaseResponseParser
{
......
......@@ -56,6 +56,17 @@ use Solarium\Query\Suggester\ResponseParser;
class Query extends BaseQuery
{
/**
* Default options
*
* @var array
*/
protected $options = array(
'handler' => 'suggest',
'resultclass' => 'Solarium\Query\Suggester\Result\Result',
'termclass' => 'Solarium\Query\Suggester\Result\Term',
);
/**
* Get type for this query
*
......@@ -86,17 +97,6 @@ class Query extends BaseQuery
return new ResponseParser;
}
/**
* Default options
*
* @var array
*/
protected $options = array(
'handler' => 'suggest',
'resultclass' => 'Solarium\Query\Suggester\Result\Result',
'termclass' => 'Solarium\Query\Suggester\Result\Term',
);
/**
* Set query option
*
......
......@@ -59,6 +59,16 @@ use Solarium\Query\Terms\ResponseParser;
class Query extends BaseQuery
{
/**
* Default options
*
* @var array
*/
protected $options = array(
'resultclass' => 'Solarium\Query\Terms\Result',
'handler' => 'terms',
);
/**
* Get type for this query
*
......@@ -89,16 +99,6 @@ class Query extends BaseQuery
return new ResponseParser;
}
/**
* Default options
*
* @var array
*/
protected $options = array(
'resultclass' => 'Solarium\Query\Terms\Result',
'handler' => 'terms',
);
/**
* Set the field name(s) to get the terms from
*
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
use Solarium\Query\Select\RequestBuilder\Component\DisMax as RequestBuilder;
use Solarium\Query\Select\Query\Component\DisMax as Component;
use Solarium\Core\Client\Request;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
use Solarium\Query\Select\RequestBuilder\Component\DistributedSearch as RequestBuilder;
use Solarium\Query\Select\Query\Component\DistributedSearch as Component;
use Solarium\Core\Client\Request;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
use Solarium\Query\Select\RequestBuilder\Component\FacetSet as RequestBuilder;
use Solarium\Query\Select\Query\Component\FacetSet as Component;
use Solarium\Core\Client\Request;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
use Solarium\Query\Select\RequestBuilder\Component\Grouping as RequestBuilder;
use Solarium\Query\Select\Query\Component\Grouping as Component;
use Solarium\Core\Client\Request;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
use Solarium\Query\Select\RequestBuilder\Component\Highlighting as RequestBuilder;
use Solarium\Query\Select\Query\Component\Highlighting\Highlighting as Component;
use Solarium\Core\Client\Request;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
use Solarium\Query\Select\RequestBuilder\Component\MoreLikeThis as RequestBuilder;
use Solarium\Query\Select\Query\Component\MoreLikeThis as Component;
use Solarium\Core\Client\Request;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
use Solarium\Query\Select\RequestBuilder\Component\Spellcheck as RequestBuilder;
use Solarium\Query\Select\Query\Component\Spellcheck as Component;
use Solarium\Core\Client\Request;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\RequestBuilder\Component;
namespace Solarium\Tests\Query\Select\RequestBuilder\Component;
use Solarium\Query\Select\RequestBuilder\Component\Stats as RequestBuilder;
use Solarium\Query\Select\Query\Component\Stats\Stats as Component;
use Solarium\Core\Client\Request;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\RequestBuilder;
namespace Solarium\Tests\Query\Select\RequestBuilder;
use Solarium\Core\Client\Request;
use Solarium\Query\Select\Query\Query;
use Solarium\Query\Select\Query\FilterQuery;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
namespace Solarium\Tests\Query\Select\ResponseParser\Component;
use Solarium\Query\Select\ResponseParser\Component\Debug as Parser;
use Solarium\Query\Select\Result\Debug\Detail;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
namespace Solarium\Tests\Query\Select\ResponseParser\Component;
use Solarium\Query\Select\ResponseParser\Component\FacetSet as Parser;
use Solarium\Query\Select\Query\Component\FacetSet;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
namespace Solarium\Tests\Query\Select\ResponseParser\Component;
use Solarium\Query\Select\Query\Component\Grouping as Component;
use Solarium\Query\Select\Result\Grouping\Result as Result;
use Solarium\Query\Select\ResponseParser\Component\Grouping as Parser;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
namespace Solarium\Tests\Query\Select\ResponseParser\Component;
use Solarium\Query\Select\ResponseParser\Component\Highlighting as Parser;
use Solarium\Query\Select\Result\Highlighting\Result;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
namespace Solarium\Tests\Query\Select\ResponseParser\Component;
use Solarium\Query\Select\ResponseParser\Component\MoreLikeThis as Parser;
use Solarium\Query\Select\Query\Query;
use Solarium\Query\Select\Result\Document;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
namespace Solarium\Tests\Query\Select\ResponseParser\Component;
use Solarium\Query\Select\ResponseParser\Component\Spellcheck as Parser;
class SpellcheckTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\ResponseParser\Component;
namespace Solarium\Tests\Query\Select\ResponseParser\Component;
use Solarium\Query\Select\ResponseParser\Component\Stats as Parser;
class StatsTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\ResponseParser;
namespace Solarium\Tests\Query\Select\ResponseParser;
use Solarium\Query\Select\Query\Query;
use Solarium\Query\Select\Result\FacetSet;
use Solarium\Query\Select\ResponseParser\ResponseParser;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Debug;
namespace Solarium\Tests\Query\Select\Result\Debug;
use Solarium\Query\Select\Result\Debug\Result;
class DebugTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Debug;
namespace Solarium\Tests\Query\Select\Result\Debug;
use Solarium\Query\Select\Result\Debug\Detail;
class DetailTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Debug;
namespace Solarium\Tests\Query\Select\Result\Debug;
use Solarium\Query\Select\Result\Debug\DocumentSet;
class DocumentSetTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Debug;
namespace Solarium\Tests\Query\Select\Result\Debug;
use Solarium\Query\Select\Result\Debug\Document;
class DocumentTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Debug;
namespace Solarium\Tests\Query\Select\Result\Debug;
use Solarium\Query\Select\Result\Debug\TimingPhase;
class TimingPhaseTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Debug;
namespace Solarium\Tests\Query\Select\Result\Debug;
use Solarium\Query\Select\Result\Debug\Timing;
class TimingTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Facet;
namespace Solarium\Tests\Query\Select\Result\Facet;
use Solarium\Query\Select\Result\Facet\Field;
class FieldTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Facet;
namespace Solarium\Tests\Query\Select\Result\Facet;
use Solarium\Query\Select\Result\Facet\MultiQuery;
class MultiQueryTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Facet;
namespace Solarium\Tests\Query\Select\Result\Facet;
use Solarium\Query\Select\Result\Facet\Query;
class QueryTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Facet;
namespace Solarium\Tests\Query\Select\Result\Facet;
use Solarium\Query\Select\Result\Facet\Range;
class RangeTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result;
namespace Solarium\Tests\Query\Select\Result;
use Solarium\Query\Select\Result\FacetSet;
class FacetSetTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Grouping;
namespace Solarium\Tests\Query\Select\Result\Grouping;
use Solarium\Query\Select\Result\Grouping\FieldGroup;
class FieldGroupTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Grouping;
namespace Solarium\Tests\Query\Select\Result\Grouping;
use Solarium\Query\Select\Result\Grouping\Result;
class GroupingTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Grouping;
namespace Solarium\Tests\Query\Select\Result\Grouping;
use Solarium\Query\Select\Result\Grouping\QueryGroup;
class QueryGroupTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Grouping;
namespace Solarium\Tests\Query\Select\Result\Grouping;
use Solarium\Query\Select\Result\Grouping\ValueGroup;
class ValueGroupTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Highlighting;
namespace Solarium\Tests\Query\Select\Result\Highlighting;
use Solarium\Query\Select\Result\Highlighting\Highlighting;
class HighlightingTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Highlighting;
namespace Solarium\Tests\Query\Select\Result\Highlighting;
use Solarium\Query\Select\Result\Highlighting\Result;
class ResultTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\MoreLikeThis;
namespace Solarium\Tests\Query\Select\Result\MoreLikeThis;
use Solarium\Query\Select\Result\Document;
use Solarium\Query\Select\Result\MoreLikeThis\Result;
use Solarium\Query\Select\Result\MoreLikeThis\MoreLikeThis;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\MoreLikeThis;
namespace Solarium\Tests\Query\Select\Result\MoreLikeThis;
use Solarium\Query\Select\Result\Document;
use Solarium\Query\Select\Result\MoreLikeThis\Result;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result;
namespace Solarium\Tests\Query\Select\Result;
use Solarium\Query\Select\Result\Document;
use Solarium\Query\Select\Query\Query;
use Solarium\Query\Select\Result\Result;
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Spellcheck;
namespace Solarium\Tests\Query\Select\Result\Spellcheck;
use Solarium\Query\Select\Result\Spellcheck\Collation;
class CollationTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Spellcheck;
namespace Solarium\Tests\Query\Select\Result\Spellcheck;
use Solarium\Query\Select\Result\Spellcheck\Result;
class SpellcheckTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Spellcheck;
namespace Solarium\Tests\Query\Select\Result\Spellcheck;
use Solarium\Query\Select\Result\Spellcheck\Suggestion;
class SuggestionTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Stats;
namespace Solarium\Tests\Query\Select\Result\Stats;
use Solarium\Query\Select\Result\Stats\FacetValue;
class FacetValueTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Stats;
namespace Solarium\Tests\Query\Select\Result\Stats;
use Solarium\Query\Select\Result\Stats\Result;
class ResultTest extends \PHPUnit_Framework_TestCase
......
......@@ -29,7 +29,7 @@
* policies, either expressed or implied, of the copyright holder.
*/
namespace Solarium\Tests\Query\Select\Query\Result\Stats;
namespace Solarium\Tests\Query\Select\Result\Stats;
use Solarium\Query\Select\Result\Stats\Stats;
class StatsTest extends \PHPUnit_Framework_TestCase
......
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