Explicityly check for laravel/framework and debugbar

barryvdh · web-flow · commit e1ee861ebaab · 2017-03-03T09:36:40.000+01:00
To avoid missing 3rd party package traces
diff --git a/src/DataCollector/QueryCollector.php b/src/DataCollector/QueryCollector.php
@@ -201,7 +201,7 @@ protected function findSource()
      *
      * @param  int    $index
      * @param  array  $trace
-     * @return array|bool
+     * @return object|bool
      */
     protected function parseTrace($index, array $trace)
     {
@@ -220,7 +220,10 @@ protected function parseTrace($index, array $trace)
 
         if (isset($trace['class']) && isset($trace['file']) && strpos(
                 $trace['file'],
-                DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR
+                DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'laravel' . DIRECTORY_SEPARATOR . 'framework'
+            ) === false && strpos(
+                $trace['file'],
+                DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'barryvdh' . DIRECTORY_SEPARATOR . 'laravel-debugbar'
             ) === false
         ) {
             $file = $trace['file'];
