kaliop-uk / ezfindsearchenginebundle

Command/TestCommand.php

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
 use eZ\Publish\API\Repository\Values\Content\Query\SortClause;
 use Kaliop\EzFindSearchEngineBundle\API\Repository\Values\Content\Query as KQuery;
-use Kaliop\EzFindSearchEngineBundle\API\Repository\Values\Content\Query\SortClause as KSortClause;
 use Kaliop\EzFindSearchEngineBundle\API\Repository\Values\Content\Query\Criterion as KCriterion;
 
 class TestCommand extends ContainerAwareCommand

Spacing +4 added lines, -4 removed lines

@@ -28,11 +28,11 @@ 
         $legacyKernelClosure = $this->getContainer()->get('ezpublish_legacy.kernel');
         $legacyKernel = $legacyKernelClosure();
         $legacyKernel->runCallback(
-            function ()  {
+            function() {
                 $moduleRepositories = \eZModule::activeModuleRepositories(true);
                 $moduleRepositories[] = 'extension/ezfind/modules';
                 //var_dump($moduleRepositories);
-                \eZModule::setGlobalPathList( $moduleRepositories );
+                \eZModule::setGlobalPathList($moduleRepositories);
             },
             false
         );
@@ -82,12 +82,12 @@ 
         echo "count: "; var_dump(count($results->searchHits));
         echo "totalCount: "; var_dump($results->totalCount);
         echo "time (ms): "; var_dump($results->time);
-        echo "maxScore: ";  var_dump($results->maxScore);
+        echo "maxScore: "; var_dump($results->maxScore);
         echo "q: "; var_dump($results->searchExtras->attribute('responseHeader')['params']['q']);
         echo "fq: "; var_dump($results->searchExtras->attribute('responseHeader')['params']['fq']);
         echo "sort: "; var_dump($results->searchExtras->attribute('responseHeader')['params']['sort']);
 
-        foreach($results->searchHits as $i => $searchHit) {
+        foreach ($results->searchHits as $i => $searchHit) {
             /** @var Content $content */
             $content = $searchHit->valueObject;
             $score = $searchHit->score;

Core/Persistence/eZFind/Content/Search/Common/Gateway/CriterionHandler/FieldIn.php

Unused Use Statements -3 removed lines

@@ -3,11 +3,8 @@
 namespace Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriterionHandler;
 
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator;
 use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriteriaConverter;
 use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriterionHandler;
-use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitor;
-use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitorDispatcher;
 
 /// @deprecated
 class FieldIn extends FieldBase

Core/Persistence/eZFind/Content/Search/Common/Gateway/CriterionHandler/LocationId.php

Doc Comments -1 removed lines

@@ -15,7 +15,6 @@
 
     /**
      * @param CriteriaConverter $converter
-     * @param SelectQuery $query
      * @param Criterion $criterion
      * @return string|string[]
      */

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 
 class LocationId extends CriterionHandler
 {
-    public function accept( Criterion $criterion )
+    public function accept(Criterion $criterion)
     {
         return $criterion instanceof Criterion\LocationId;
     }
@@ -19,7 +19,7 @@ 
      * @param Criterion $criterion
      * @return string|string[]
      */
-    public function handle( CriteriaConverter $converter, Criterion $criterion )
+    public function handle(CriteriaConverter $converter, Criterion $criterion)
     {
         $result = [];
 

Core/Persistence/eZFind/Content/Search/Common/Gateway/CriterionHandler/LogicalAnd.php

Unused Use Statements -2 removed lines

@@ -5,8 +5,6 @@
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
 use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriteriaConverter;
 use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriterionHandler;
-use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitor;
-use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitorDispatcher as Dispatcher;
 
 class LogicalAnd extends CriterionHandler
 {

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         return array_merge(
             array('AND'),
             array_map(
-                function ($value) use ($converter) {
+                function($value) use ($converter) {
                     return $converter->handle($value);
                 },
                 $criterion->criteria

Core/Persistence/eZFind/Content/Search/Common/Gateway/CriterionHandler/LogicalNot.php

Unused Use Statements -4 removed lines

@@ -2,14 +2,10 @@
 
 namespace Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriterionHandler;
 
-use eZ\Publish\API\Repository\Values\Content\Query;
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
-use eZ\Publish\Core\Persistence\Database\SelectQuery;
 use Kaliop\EzFindSearchEngineBundle\Core\Base\Exceptions\InvalidCriterionException;
 use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriteriaConverter;
 use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriterionHandler;
-use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitor;
-use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitorDispatcher as Dispatcher;
 
 class LogicalNot extends CriterionHandler
 {

Core/Persistence/eZFind/Content/Search/Common/Gateway/CriterionHandler/LogicalOr.php

Unused Use Statements -2 removed lines

@@ -4,8 +4,6 @@
 
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
 use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriteriaConverter;
-use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitor;
-use Kaliop\EzFindSearchEngineBundle\Persistence\Solr\Content\Search\CriterionVisitorDispatcher as Dispatcher;
 use Kaliop\EzFindSearchEngineBundle\Core\Persistence\eZFind\Content\Search\Common\Gateway\CriterionHandler;
 
 class LogicalOr extends CriterionHandler

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         return array_merge(
             array('OR'),
             array_map(
-                function ($value) use ($converter) {
+                function($value) use ($converter) {
                     return $converter->handle($value);
                 },
                 $criterion->criteria

Core/Persistence/eZFind/Content/Search/Common/Gateway/CriterionHandler/ObjectStateId.php

Doc Comments -1 removed lines

@@ -15,7 +15,6 @@
 
     /**
      * @param CriteriaConverter $converter
-     * @param SelectQuery $query
      * @param Criterion $criterion
      * @return string|string[]
      *

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 
 class ObjectStateId extends CriterionHandler
 {
-    public function accept( Criterion $criterion )
+    public function accept(Criterion $criterion)
     {
         return $criterion instanceof Criterion\ObjectStateId;
     }
@@ -21,7 +21,7 @@ 
      *
      * @todo verify if handling of multiple states via OR is correct
      */
-    public function handle( CriteriaConverter $converter, Criterion $criterion )
+    public function handle(CriteriaConverter $converter, Criterion $criterion)
     {
         $result = [];
 

Core/Repository/SearchService.php

Doc Comments +6 added lines

@@ -345,6 +345,9 @@ 
         return $searchParameters;
     }
 
+    /**
+     * @param string $paramName
+     */
     protected function extractLegacyParameter($paramName, Query $query)
     {
         switch ($paramName) {
@@ -422,6 +425,9 @@ 
         return $facets;
     }
 
+    /**
+     * @param Query\SortClause[] $sortClauses
+     */
     protected function extractSort($sortClauses)
     {
         $result = [];

Spacing +11 added lines, -11 removed lines

@@ -133,7 +133,7 @@ 
 
             // trick to access data from a protected member of ezfSearchResultInfo
             // @see http://blag.kazeno.net/development/access-private-protected-properties
-            $propGetter = Closure::bind(function($prop){return $this->$prop;}, $extras, $extras);
+            $propGetter = Closure::bind(function($prop) {return $this->$prop; }, $extras, $extras);
             $resultArray = $propGetter('ResultArray');
 
             if (isset($resultArray['response']['maxScore'])) {
@@ -143,7 +143,7 @@ 
             // optimize: remove from SearchExtras 'response' to save memory using the 'Closure::bind' hack
             /// @todo (!important) make the cutover limit configurable
             if ($result['SearchCount'] > 100) {
-                $resultsCleaner = Closure::bind(function(){unset($this->ResultArray['response']['docs']);}, $extras, $extras);
+                $resultsCleaner = Closure::bind(function() {unset($this->ResultArray['response']['docs']); }, $extras, $extras);
                 $resultsCleaner();
             }
         }
@@ -244,7 +244,7 @@ 
 //var_dump($searchParameters);
         /** @var array $searchResult */
         $searchResult = $this->getLegacyKernel()->runCallback(
-            function () use ($searchParameters) {
+            function() use ($searchParameters) {
                 return \eZFunctionHandler::execute($this->ezFindModule, $this->ezFindFunction, $searchParameters);
             },
             false
@@ -520,7 +520,7 @@ 
 
             // trick to access data from a protected member of ezfSearchResultInfo
             // @see http://blag.kazeno.net/development/access-private-protected-properties
-            $propGetter = Closure::bind(function($prop){return $this->$prop;}, $extras, $extras);
+            $propGetter = Closure::bind(function($prop) {return $this->$prop; }, $extras, $extras);
             $resultArray = $propGetter('ResultArray');
             $searchResults = $resultArray['response']['docs'];
         }
@@ -532,16 +532,16 @@ 
         $results = array();
 
         foreach ($searchResults as $index => $result) {
-            switch($returnType) {
+            switch ($returnType) {
 
                 case KaliopQuery::RETURN_CONTENTS:
                     try {
                         $results[$index] = new SearchHit(
                             [
                                 'valueObject' => $this->contentService->loadContent($result['id']),
-                                'score' => isset($result['score'])? $result['score'] : null,
-                                'highlight' => isset($result['highlight'])? $result['highlight'] : null,
-                                'elevated' => isset($result['elevated'])? $result['elevated'] : null,
+                                'score' => isset($result['score']) ? $result['score'] : null,
+                                'highlight' => isset($result['highlight']) ? $result['highlight'] : null,
+                                'elevated' => isset($result['elevated']) ? $result['elevated'] : null,
                                 /// @todo decide what is the correct value for 'index': guid, installation_id/guid ?
                                 //'index' => isset($result['guid'])? $result['guid'] : null,
                             ]
@@ -582,9 +582,9 @@ 
                     $results[$index] = new SearchHit(
                         [
                             'valueObject' => $result,
-                            'score' => isset($result['score'])? $result['score'] : null,
-                            'highlight' => isset($result['highlight'])? $result['highlight'] : null,
-                            'elevated' => isset($result['elevated'])? $result['elevated'] : null,
+                            'score' => isset($result['score']) ? $result['score'] : null,
+                            'highlight' => isset($result['highlight']) ? $result['highlight'] : null,
+                            'elevated' => isset($result['elevated']) ? $result['elevated'] : null,
                             /// @todo decide what is the correct value for 'index': guid, installation_id/guid ?
                             //'index' => isset($result['guid'])? $result['guid'] : null,
                         ]

DependencyInjection/KaliopEzFindSearchEngineExtension.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
     protected function loadInternal(array $mergedConfig, ContainerBuilder $container)
     {
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.yml');
 
         if (self::$loadTestConfig != false) {