Removed sending of other and include options for facet ranges if they…

… are not set
yooper · Apr 3, 2012 · 28fd082 · 28fd082
1 parent 72ffa05
commit 28fd082
Showing 2 changed files with 35 additions and 6 deletions.
diff --git a/library/Solarium/Client/RequestBuilder/Select/Component/FacetSet.php b/library/Solarium/Client/RequestBuilder/Select/Component/FacetSet.php
@@ -175,14 +175,18 @@ public function addFacetRange($request, $facet)
         $request->addParam("f.$field.facet.range.gap", $facet->getGap());
         $request->addParam("f.$field.facet.range.hardend", $facet->getHardend());
 
-        $other = explode(',', $facet->getOther());
-        foreach ($other AS $otherValue) {
-            $request->addParam("f.$field.facet.range.other", trim($otherValue));
+        if (null !== $facet->getOther()) {
+            $other = explode(',', $facet->getOther());
+            foreach ($other AS $otherValue) {
+                $request->addParam("f.$field.facet.range.other", trim($otherValue));
+            }
         }
 
-        $include = explode(',', $facet->getInclude());
-        foreach ($include AS $includeValue) {
-            $request->addParam("f.$field.facet.range.include", trim($includeValue));
+        if (null !== $facet->getOther()) {
+            $include = explode(',', $facet->getInclude());
+            foreach ($include AS $includeValue) {
+                $request->addParam("f.$field.facet.range.include", trim($includeValue));
+            }
         }
     }
 }
diff --git a/tests/Solarium/Client/RequestBuilder/Select/Component/FacetSetTest.php b/tests/Solarium/Client/RequestBuilder/Select/Component/FacetSetTest.php
@@ -111,6 +111,31 @@ public function testBuildWithRangeFacet()
         );
     }
 
+    public function testBuildWithRangeFacetExcludingOptionalParams()
+    {
+        $this->_component->addFacet(new Solarium_Query_Select_Component_Facet_Range(
+            array(
+                'key' => 'f1',
+                'field' => 'price',
+                'start' => '1',
+                'end' => 100,
+                'gap' => 10,
+            )
+        ));
+
+        $request = $this->_builder->buildComponent($this->_component, $this->_request);
+
+        $this->assertEquals(
+            null,
+            $request->getRawData()
+        );
+
+        $this->assertEquals(
+            '?facet=true&facet.range={!key=f1}price&f.price.facet.range.start=1&f.price.facet.range.end=100&f.price.facet.range.gap=10',
+            urldecode($request->getUri())
+        );
+    }
+
     public function testBuildWithFacetsAndGlobalFacetSettings()
     {
         $this->_component->setMissing(true);