Merge branch '4.x' of github.com:solariumphp/solarium into 4.x

library/Solarium/QueryType/Suggester/RequestBuilder.php

@@ -59,12 +59,10 @@ class RequestBuilder extends BaseRequestBuilder
     public function build(QueryInterface $query)
     {
         $request = parent::build($query);
-        $request->addParam('spellcheck', 'true');
-        $request->addParam('q', $query->getQuery());
-        $request->addParam('spellcheck.dictionary', $query->getDictionary());
-        $request->addParam('spellcheck.count', $query->getCount());
-        $request->addParam('spellcheck.onlyMorePopular', $query->getOnlyMorePopular());
-        $request->addParam('spellcheck.collate', $query->getCollate());
+        $request->addParam('suggest', 'true');
+        $request->addParam('suggest.q', $query->getQuery());
+        $request->addParam('suggest.dictionary', $query->getDictionary());
+        $request->addParam('suggest.count', $query->getCount());
 
         return $request;
     }

tests/Solarium/Tests/QueryType/Suggester/RequestBuilderTest.php

@@ -55,22 +55,18 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
 
     public function testBuildParams()
     {
-        $this->query->setCollate(true);
         $this->query->setCount(13);
         $this->query->setDictionary('suggest');
         $this->query->setQuery('ap ip');
-        $this->query->setOnlyMorePopular(true);
 
         $request = $this->builder->build($this->query);
 
         $this->assertEquals(
             array(
-                'spellcheck' => 'true',
-                'q' => 'ap ip',
-                'spellcheck.dictionary' => 'suggest',
-                'spellcheck.count' => 13,
-                'spellcheck.onlyMorePopular' => 'true',
-                'spellcheck.collate' => 'true',
+                'suggest' => 'true',
+                'suggest.q' => 'ap ip',
+                'suggest.dictionary' => 'suggest',
+                'suggest.count' => 13,
                 'wt' => 'json',
                 'json.nl' => 'flat',
                 'omitHeader' => 'true',