Merge pull request #144 from Satsume/master

Added the ability to clear the output buffer before setting the response

Author: RWOverdijk

config/module.config.php

@@ -22,6 +22,7 @@
         ),
     ),
     'asset_manager' => array(
+        'clear_output_buffer' => true,
         'resolvers' => array(
             'AssetManager\Resolver\MapResolver'                 => 3000,
             'AssetManager\Resolver\ConcatResolver'              => 2500,

src/AssetManager/Service/AssetManager.php

@@ -155,6 +155,14 @@ public function setAssetOnResponse(ResponseInterface $response)
         }
         // @codeCoverageIgnoreEnd
 
+        if (!empty($this->config['clear_output_buffer']) && $this->config['clear_output_buffer']) {
+            // Only clean the output buffer if it's turned on and something
+            // has been buffered.
+            if (ob_get_length() > 0) {
+                ob_clean();
+            }
+        }
+
         $response->getHeaders()
                  ->addHeaderLine('Content-Transfer-Encoding', 'binary')
                  ->addHeaderLine('Content-Type', $mimeType)

tests/AssetManagerTest/Service/AssetManagerTest.php

@@ -423,6 +423,29 @@ public function testResolvesToAssetNotFound()
         $this->assertFalse($resolvesToAsset);
     }
 
+    public function testClearOutputBufferInSetAssetOnResponse()
+    {
+        $this->expectOutputString(file_get_contents(__FILE__));
+
+        echo "This string would definately break any image source.\n";
+        echo "This one would make it even worse.\n";
+        echo "They all should be gone soon...\n";
+
+        $assetFilterManager = new AssetFilterManager();
+        $assetCacheManager  = $this->getAssetCacheManagerMock();
+        $mimeResolver       = new MimeResolver;
+        $assetManager       = new AssetManager($this->getResolver(), array('clear_output_buffer' => true));
+
+        $assetFilterManager->setMimeResolver($mimeResolver);
+        $assetManager->setAssetFilterManager($assetFilterManager);
+        $assetManager->setAssetCacheManager($assetCacheManager);
+        $assetManager->resolvesToAsset($this->getRequest());
+
+        $response = $assetManager->setAssetOnResponse(new Response);
+
+        echo $response->getContent();
+    }
+
     /**
      * @return string
      */