Fix for issue #158

library/Solarium/Core/Query/RequestBuilder.php

@@ -59,7 +59,12 @@ abstract class RequestBuilder implements RequestBuilderInterface
         $request->setHandler($query->getHandler());
         $request->addParam('omitHeader', $query->getOmitHeader());
         $request->addParams($query->getParams());
+
         $request->addParam('wt', $query->getResponseWriter());
+        if ($query->getResponseWriter() == $query::WT_JSON) {
+            // only one JSON format is supported
+            $request->addParam('json.nl', 'flat');
+        }
 
         return $request;
     }

tests/Solarium/Tests/Core/Query/RequestBuilderTest.php

@@ -68,7 +68,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
         $request = $this->builder->build($query);
 
         $this->assertEquals(
-            'select?omitHeader=false&p1=v1&p2=v2&wt=json',
+            'select?omitHeader=false&p1=v1&p2=v2&wt=json&json.nl=flat',
              urldecode($request->getUri())
         );
     }

tests/Solarium/Tests/QueryType/Analysis/RequestBuilder/RequestBuilderTest.php

@@ -68,6 +68,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
                 'wt' => 'json',
                 'analysis.query' => $query,
                 'analysis.showmatch' => 'true',
+                'json.nl' => 'flat',
                 'omitHeader' => 'true',
             ),
             $request->getParams()

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

@@ -79,7 +79,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
     {
         $request = $this->builder->build($this->query);
         $this->assertEquals(
-            'update/extract?omitHeader=true&param1=value1&wt=json&fmap.from-field=to-field&resource.name=RequestBuilderTest.php',
+            'update/extract?omitHeader=true&param1=value1&wt=json&json.nl=flat&fmap.from-field=to-field&resource.name=RequestBuilderTest.php',
             $request->getUri()
         );
     }
@@ -103,6 +103,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
                 'param1' => 'value1',
                 'resource.name' => 'RequestBuilderTest.php',
                 'wt' => 'json',
+                'json.nl' => 'flat',
             ),
             $request->getParams()
         );

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

@@ -90,6 +90,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
                 'start' => 12,
                 'wt' => 'json',
                 'omitHeader' => 'true',
+                'json.nl' => 'flat',
             ),
             $request->getParams()
         );

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

@@ -43,7 +43,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
         $request = $builder->build(new Query);
 
         $this->assertEquals(
-            'admin/ping?omitHeader=true&wt=json',
+            'admin/ping?omitHeader=true&wt=json&json.nl=flat',
             $request->getUri()
         );
 

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

@@ -50,7 +50,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
         );
 
         $this->assertEquals(
-            'get?omitHeader=true&wt=json&ids=123',
+            'get?omitHeader=true&wt=json&json.nl=flat&ids=123',
             urldecode($request->getUri())
         );
     }
@@ -68,7 +68,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
             );
 
             $this->assertEquals(
-                'get?omitHeader=true&wt=json&ids=123,456',
+                'get?omitHeader=true&wt=json&json.nl=flat&ids=123,456',
                 urldecode($request->getUri())
             );
         }

tests/Solarium/Tests/QueryType/Select/RequestBuilder/RequestBuilderTest.php

@@ -74,7 +74,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
         );
 
         $this->assertEquals(
-            'select?omitHeader=true&wt=json&q=*:*&start=0&rows=10&fl=*,score',
+            'select?omitHeader=true&wt=json&json.nl=flat&q=*:*&start=0&rows=10&fl=*,score',
             urldecode($request->getUri())
         );
     }
@@ -91,7 +91,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
         );
 
         $this->assertEquals(
-            'select?omitHeader=true&wt=json&q=*:*&start=0&rows=10&fl=*,score&sort=id asc,name desc',
+            'select?omitHeader=true&wt=json&json.nl=flat&q=*:*&start=0&rows=10&fl=*,score&sort=id asc,name desc',
             urldecode($request->getUri())
         );
     }
@@ -108,7 +108,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
         );
 
         $this->assertEquals(
-            'select?omitHeader=true&wt=json&q=*:*&start=0&rows=10&fl=*,score&q.op=AND&df=mydefault',
+            'select?omitHeader=true&wt=json&json.nl=flat&q=*:*&start=0&rows=10&fl=*,score&q.op=AND&df=mydefault',
             urldecode($request->getUri())
         );
     }
@@ -127,7 +127,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
         );
 
         $this->assertEquals(
-            'select?omitHeader=true&wt=json&q=*:*&start=0&rows=10&fl=*,score&sort=id asc,name desc&fq=published:true&fq={!tag=t1,t2}category:23',
+            'select?omitHeader=true&wt=json&json.nl=flat&q=*:*&start=0&rows=10&fl=*,score&sort=id asc,name desc&fq=published:true&fq={!tag=t1,t2}category:23',
             urldecode($request->getUri())
         );
     }

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

@@ -72,6 +72,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
                 'spellcheck.onlyMorePopular' => 'true',
                 'spellcheck.collate' => 'true',
                 'wt' => 'json',
+                'json.nl' => 'flat',
                 'omitHeader' => 'true',
             ),
             $request->getParams()

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

@@ -94,6 +94,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
                 'terms.upper' => 'x',
                 'terms.upper.incl' => 'false',
                 'wt' => 'json',
+                'json.nl' => 'flat',
                 'omitHeader' => 'true',
             ),
             $request->getParams()

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

@@ -72,7 +72,7 @@ class RequestBuilderTest extends \PHPUnit_Framework_TestCase
     {
         $request = $this->builder->build($this->query);
         $this->assertEquals(
-            'update?omitHeader=false&wt=json',
+            'update?omitHeader=false&wt=json&json.nl=flat',
             $request->getUri()
         );
     }