Merge branch 'fix-pivot-extra-params' of github.com:FredM/solarium into develop

Conflicts:
	tests/Solarium/Tests/QueryType/Select/RequestBuilder/Component/FacetSetTest.php

tests/Solarium/Tests/QueryType/Select/RequestBuilder/Component/FacetSetTest.php

@@ -188,15 +188,15 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
 
     public function testBuildWithPivotFacet()
     {
-        $this->component->addFacet(
-            new FacetPivot(
-                array(
-                    'key' => 'f1',
-                    'fields' => 'cat,inStock',
-                    'mincount' => 123,
-                )
+        $facet = new FacetPivot(
+            array(
+                'key' => 'f1',
+                'fields' => 'cat,inStock',
+                'mincount' => 123
             )
         );
+        $facet->addExclude('owner');
+        $this->component->addFacet($facet);
 
         $request = $this->builder->buildComponent($this->component, $this->request);
 
@@ -206,7 +206,7 @@ class FacetSetTest extends \PHPUnit_Framework_TestCase
         );
 
         $this->assertEquals(
-            '?facet=true&facet.pivot=cat,inStock&facet.pivot.mincount=123',
+            '?facet=true&facet.pivot={!key=f1 ex=owner}cat,inStock&facet.pivot.mincount=123',
             urldecode($request->getUri())
         );
     }