Merge commit '3fc0b564' into develop

Conflicts:
	library/Solarium/QueryType/Select/ResponseParser/Component/FacetSet.php
	library/Solarium/QueryType/Select/Result/Facet/Range.php
	tests/Solarium/Tests/QueryType/Select/Result/Facet/RangeTest.php

library/Solarium/QueryType/Select/ResponseParser/Component/FacetSet.php

@@ -179,12 +179,15 @@ class FacetSet extends ResponseParserAbstract
             $before = (isset($data['before'])) ? $data['before'] : null;
             $after = (isset($data['after'])) ? $data['after'] : null;
             $between = (isset($data['between'])) ? $data['between'] : null;
+            $start = (isset($data['start'])) ? $data['start'] : null;
+            $end = (isset($data['end'])) ? $data['end'] : null;
+            $gap = (isset($data['gap'])) ? $data['gap'] : null;
 
             if ($query->getResponseWriter() == $query::WT_JSON) {
                 $data['counts'] = $this->convertToKeyValueArray($data['counts']);
             }
 
-            return new ResultFacet\Range($data['counts'], $before, $after, $between);
+            return new ResultFacet\Range($data['counts'], $before, $after, $between, $start, $end, $gap);
         }
     }
 

library/Solarium/QueryType/Select/Result/Facet/Range.php

@@ -72,6 +72,27 @@ class Range extends Field
      */
     protected $between;
 
+    /**
+     * The lower bound of the ranges
+     *
+     * @var string
+     */
+    protected $start;
+
+    /**
+     * The upper bound of all ranges
+     *
+     * @var string
+     */
+    protected $end;
+
+    /**
+     * The gap between each range
+     *
+     * @var string
+     */
+    protected $gap;
+
     /**
      * Constructor
      *
@@ -79,14 +100,20 @@ class Range extends Field
      * @param  int   $before
      * @param  int   $after
      * @param  int   $between
+     * @param  int   $start
+     * @param  int   $end
+     * @param  int   $gap
      * @return void
      */
-    public function __construct($values, $before, $after, $between)
+    public function __construct($values, $before, $after, $between, $start, $end, $gap)
     {
         $this->values = $values;
         $this->before = $before;
         $this->after = $after;
         $this->between = $between;
+        $this->start = $start;
+        $this->end = $end;
+        $this->gap = $gap;
     }
 
     /**
@@ -128,4 +155,40 @@ class Range extends Field
         return $this->between;
     }
 
+    /**
+     * Get 'start' value of the ranges
+     *
+     * The start value specified in the query facet.
+     *
+     * @return string
+     */
+    public function getStart()
+    {
+        return $this->start;
+    }
+
+    /**
+     * Get 'end' value of the ranges
+     *
+     * The end value specified in the query facet
+     *
+     * @return string
+     */
+    public function getEnd()
+    {
+        return $this->end;
+    }
+
+    /**
+     * Get 'gap' between the start and end of each range
+     *
+     * Get the gap specified in the query facet
+     *
+     * @return string
+     */
+    public function getGap()
+    {
+        return $this->gap;
+    }
+
 }

tests/Solarium/Tests/QueryType/Select/Result/Facet/RangeTest.php

@@ -40,7 +40,8 @@ class RangeTest extends \PHPUnit_Framework_TestCase
      */
     protected $facet;
 
-    protected $values, $before, $after, $between;
+    protected $values, $before, $after, $between, $start, $end, $gap;
+
 
     public function setUp()
     {
@@ -49,11 +50,15 @@ class RangeTest extends \PHPUnit_Framework_TestCase
             '20.0' => 5,
             '30.0' => 3,
         );
+
         $this->before = 2;
         $this->after = 4;
         $this->between = 3;
+        $this->start = '10.0';
+        $this->end = '40.0';
+        $this->gap = '10.0';
 
-        $this->facet = new Range($this->values, $this->before, $this->after, $this->between);
+        $this->facet = new Range($this->values, $this->before, $this->after, $this->between, $this->start, $this->end, $this->gap);
     }
 
     public function testGetValues()
@@ -91,4 +96,18 @@ class RangeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($this->between, $this->facet->getBetween());
     }
 
+    public function testGetStart()
+    {
+        $this->assertEquals($this->start, $this->facet->getStart());
+    }
+
+    public function testGetEnd()
+    {
+        $this->assertEquals($this->end, $this->facet->getEnd());
+    }
+
+    public function testGetGap()
+    {
+        $this->assertEquals($this->gap, $this->facet->getGap());
+    }
 }