@@ -9,7 +9,6 @@ |
||
| 9 | 9 | use eZ\Publish\API\Repository\Values\Content\Query\Criterion; |
| 10 | 10 | use eZ\Publish\API\Repository\Values\Content\Query\SortClause; |
| 11 | 11 | use Kaliop\EzFindSearchEngineBundle\API\Repository\Values\Content\Query as KQuery; |
| 12 | -use Kaliop\EzFindSearchEngineBundle\API\Repository\Values\Content\Query\SortClause as KSortClause; |
|
| 13 | 12 | use Kaliop\EzFindSearchEngineBundle\API\Repository\Values\Content\Query\Criterion as KCriterion; |
| 14 | 13 | |
| 15 | 14 | class TestCommand extends ContainerAwareCommand |
@@ -3,11 +3,8 @@ |
||
| 3 | 3 | namespace Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriterionHandler; |
| 4 | 4 | |
| 5 | 5 | use eZ\Publish\API\Repository\Values\Content\Query\Criterion; |
| 6 | -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; |
|
| 7 | 6 | use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriteriaConverter; |
| 8 | 7 | use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriterionHandler; |
| 9 | -use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitor; |
|
| 10 | -use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitorDispatcher; |
|
| 11 | 8 | |
| 12 | 9 | /// @deprecated |
| 13 | 10 | class FieldIn extends FieldBase |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * @param CriteriaConverter $converter |
| 18 | - * @param SelectQuery $query |
|
| 19 | 18 | * @param Criterion $criterion |
| 20 | 19 | * @return string|string[] |
| 21 | 20 | */ |
@@ -5,8 +5,6 @@ |
||
| 5 | 5 | use eZ\Publish\API\Repository\Values\Content\Query\Criterion; |
| 6 | 6 | use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriteriaConverter; |
| 7 | 7 | use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriterionHandler; |
| 8 | -use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitor; |
|
| 9 | -use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitorDispatcher as Dispatcher; |
|
| 10 | 8 | |
| 11 | 9 | class LogicalAnd extends CriterionHandler |
| 12 | 10 | { |
@@ -2,14 +2,10 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriterionHandler; |
| 4 | 4 | |
| 5 | -use eZ\Publish\API\Repository\Values\Content\Query; |
|
| 6 | 5 | use eZ\Publish\API\Repository\Values\Content\Query\Criterion; |
| 7 | -use eZ\Publish\Core\Persistence\Database\SelectQuery; |
|
| 8 | 6 | use Kaliop\EzFindSearchEngineBundle\Core\Base\Exceptions\InvalidCriterionException; |
| 9 | 7 | use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriteriaConverter; |
| 10 | 8 | use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriterionHandler; |
| 11 | -use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitor; |
|
| 12 | -use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitorDispatcher as Dispatcher; |
|
| 13 | 9 | |
| 14 | 10 | class LogicalNot extends CriterionHandler |
| 15 | 11 | { |
@@ -4,8 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use eZ\Publish\API\Repository\Values\Content\Query\Criterion; |
| 6 | 6 | use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriteriaConverter; |
| 7 | -use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitor; |
|
| 8 | -use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitorDispatcher as Dispatcher; |
|
| 9 | 7 | use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriterionHandler; |
| 10 | 8 | |
| 11 | 9 | class LogicalOr extends CriterionHandler |
@@ -15,7 +15,6 @@ |
||
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * @param CriteriaConverter $converter |
| 18 | - * @param SelectQuery $query |
|
| 19 | 18 | * @param Criterion $criterion |
| 20 | 19 | * @return string|string[] |
| 21 | 20 | * |
@@ -345,6 +345,9 @@ discard block |
||
| 345 | 345 | return $searchParameters; |
| 346 | 346 | } |
| 347 | 347 | |
| 348 | + /** |
|
| 349 | + * @param string $paramName |
|
| 350 | + */ |
|
| 348 | 351 | protected function extractLegacyParameter($paramName, Query $query) |
| 349 | 352 | { |
| 350 | 353 | switch ($paramName) { |
@@ -422,6 +425,9 @@ discard block |
||
| 422 | 425 | return $facets; |
| 423 | 426 | } |
| 424 | 427 | |
| 428 | + /** |
|
| 429 | + * @param Query\SortClause[] $sortClauses |
|
| 430 | + */ |
|
| 425 | 431 | protected function extractSort($sortClauses) |
| 426 | 432 | { |
| 427 | 433 | $result = []; |