Merge pull request #27 from stevelacey/html-check

Assert response is html before injecting alert or console outputs

Author: mpociot

src/Outputs/Alert.php

@@ -9,7 +9,7 @@ class Alert implements Output
 {
     public function output(Collection $detectedQueries, Response $response)
     {
-        if ($response->isRedirection()) {
+        if (stripos($response->headers->get('Content-Type'), 'text/html') !== 0 || $response->isRedirection()) {
             return;
         }
 

src/Outputs/Console.php

@@ -1,27 +1,36 @@
 <?php
+
 namespace BeyondCode\QueryDetector\Outputs;
+
 use Illuminate\Support\Collection;
 use Symfony\Component\HttpFoundation\Response;
 
 class Console implements Output
 {
     public function output(Collection $detectedQueries, Response $response)
     {
-        if ($response->isRedirection()) {
+        if (stripos($response->headers->get('Content-Type'), 'text/html') !== 0 || $response->isRedirection()) {
             return;
         }
+
         $content = $response->getContent();
+
         $outputContent = $this->getOutputContent($detectedQueries);
+
         $pos = strripos($content, '</body>');
+
         if (false !== $pos) {
             $content = substr($content, 0, $pos) . $outputContent . substr($content, $pos);
         } else {
             $content = $content . $outputContent;
         }
+
         // Update the new content and reset the content length
         $response->setContent($content);
+
         $response->headers->remove('Content-Length');
     }
+
     protected function getOutputContent(Collection $detectedQueries)
     {
         $output = '<script type="text/javascript">';
@@ -33,6 +42,7 @@ protected function getOutputContent(Collection $detectedQueries)
         }
         $output .= "')";
         $output .= '</script>';
+
         return $output;
     }
 }