merge master, resolve conflicts in "solr.html.twig"

floriansemm · Nov 12, 2018 · 677cea5 · 677cea5
2 parents 1d2cfa3 + 28b4342
commit 677cea5
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 12 deletions.
diff --git a/DataCollector/RequestCollector.php b/DataCollector/RequestCollector.php
@@ -104,4 +104,14 @@ public function getName()
     {
         return 'solr';
     }
-}
+
+    /**
+     * {@inheritdoc}
+     */
+    public function reset()
+    {
+        $this->data = [
+            'queries' => [],
+        ];
+    }
+}
diff --git a/Query/QueryBuilder.php b/Query/QueryBuilder.php
@@ -257,7 +257,7 @@ public function expression($value)
 
         return $this;
     }
-
+    
     /**
      * {@inheritdoc}
      */
@@ -268,6 +268,15 @@ public function greaterThanEqual($value)
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function greaterThan($value)
+    {
+        $this->criteria = $this->criteria->greaterThan($value);
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -278,6 +287,15 @@ public function lessThanEqual($value)
         return $this;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function lessThan($value)
+    {
+        $this->criteria = $this->criteria->lessThan($value);
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -311,4 +329,4 @@ public function getCriteria()
     {
         return $this->criteria;
     }
-}
+}
diff --git a/Query/QueryBuilderInterface.php b/Query/QueryBuilderInterface.php
@@ -161,17 +161,31 @@ public function getQuery();
      */
     public function greaterThanEqual($value);
 
+    /**
+     * @param string $value
+     *
+     * @return QueryBuilderInterface
+     */
+    public function greaterThan($value);
+
     /**
      * @param string $value
      *
      * @return QueryBuilderInterface
      */
     public function lessThanEqual($value);
 
+    /**
+     * @param string $value
+     *
+     * @return QueryBuilderInterface
+     */
+    public function lessThan($value);
+
     /**
      * @param float $value
      *
      * @return QueryBuilderInterface
      */
     public function boost($value);
-}
+}
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -9,7 +9,7 @@
     </parameters>
 
     <services>
-        <service id="solr.client" class="%solr.class%">
+        <service id="solr.client" class="%solr.class%" public="true">
             <argument type="service" id="solr.client.adapter"/>
             <argument type="service" id="event_dispatcher"/>
             <argument type="service" id="solr.meta.information.factory"/>
@@ -36,7 +36,7 @@
         <service id="solr.data_collector" class="FS\SolrBundle\DataCollector\RequestCollector" public="false">
             <argument type="service" id="solr.client.logger.debug" />
 
-            <tag name="data_collector" template="FSSolrBundle:Profiler:solr" id="solr" />
+            <tag name="data_collector" template="@FSSolr/Profiler/solr.html.twig" id="solr" />
         </service>
 
         <service id="solr.debug.client_debugger" class="FS\SolrBundle\Client\Solarium\Plugin\RequestDebugger">
@@ -46,11 +46,11 @@
             <tag name="kernel.event_listener" event="solarium.core.preExecuteRequest" method="preExecuteRequest" />
         </service>
 
-        <service id="solr.meta.information.factory" class="FS\SolrBundle\Doctrine\Mapper\MetaInformationFactory">
+        <service id="solr.meta.information.factory" class="FS\SolrBundle\Doctrine\Mapper\MetaInformationFactory" public="true">
             <argument type="service" id="solr.doctrine.annotation.annotation_reader" />
         </service>
 
-        <service id="solr.doctrine.classnameresolver.known_entity_namespaces" class="FS\SolrBundle\Doctrine\ClassnameResolver\KnownNamespaceAliases"/>
+        <service id="solr.doctrine.classnameresolver.known_entity_namespaces" class="FS\SolrBundle\Doctrine\ClassnameResolver\KnownNamespaceAliases" public="true"/>
 
         <service id="solr.doctrine.classnameresolver" class="FS\SolrBundle\Doctrine\ClassnameResolver\ClassnameResolver" public="false">
             <argument type="service" id="solr.doctrine.classnameresolver.known_entity_namespaces"/>
@@ -78,7 +78,7 @@
         <service id="solr.doctrine.hydration.no_database_value_hydrator" class="FS\SolrBundle\Doctrine\Hydration\NoDatabaseValueHydrator">
         </service>
 
-        <service id="solr.doctrine.hydration.doctrine_value_hydrator" class="FS\SolrBundle\Doctrine\Hydration\DoctrineValueHydrator">
+        <service id="solr.doctrine.hydration.doctrine_value_hydrator" class="FS\SolrBundle\Doctrine\Hydration\DoctrineValueHydrator" public="true">
         </service>
 
         <service id="solr.doctrine.hydration.index_hydrator" class="FS\SolrBundle\Doctrine\Hydration\IndexHydrator">
@@ -89,5 +89,16 @@
             <argument id="annotation_reader" type="service"/>
         </service>
 
+        <service id="solr.command.clear_index_command" class="FS\SolrBundle\Command\ClearIndexCommand">
+            <tag name="console.command"/>
+        </service>
+
+        <service id="solr.command.show_schema_command" class="FS\SolrBundle\Command\ShowSchemaCommand">
+            <tag name="console.command"/>
+        </service>
+
+        <service id="solr.command.synchronize_index_command" class="FS\SolrBundle\Command\SynchronizeIndexCommand">
+            <tag name="console.command"/>
+        </service>
     </services>
 </container>
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "floriansemm/solr-bundle",
   "type": "symfony-bundle",
-  "description": "Symfony2 Solr integration bundle",
+  "description": "Symfony Solr integration bundle",
   "keywords": [
     "search",
     "index",
@@ -12,7 +12,7 @@
   "license": "MIT",
   "require": {
     "php": "^7.0",
-    "solarium/solarium": "^3.6",
+    "solarium/solarium": "^4.0",
     "symfony/dependency-injection": "^2.3|^3.0|^4.0",
     "symfony/http-kernel": "^2.3|^3.0|^4.0",
     "symfony/config": "^2.3|^3.0|^4.0",
@@ -28,7 +28,7 @@
     "doctrine/orm": "^2.3",
     "phpunit/phpunit": "^5.4"
   },
-  "minimum-stability": "beta",
+  "minimum-stability": "RC",
   "autoload": {
     "psr-0": {
       "FS\\SolrBundle": ""