Add filename to ViewCollector

barryvdh · barryvdh · commit 878d280c19a2 · 2014-12-23T16:05:54.000+01:00
diff --git a/src/DataCollector/IlluminateRouteCollector.php b/src/DataCollector/IlluminateRouteCollector.php
@@ -70,7 +70,7 @@ protected function getRouteInformation($route)
         }
 
         if (isset($reflector)) {
-            $filename = str_replace(base_path(), '', $reflector->getFileName());
+            $filename = ltrim(str_replace(base_path(), '', $reflector->getFileName()), '/');
             $result['file'] = $filename . ':' . $reflector->getStartLine() . '-' . $reflector->getEndLine();
         }
 		
diff --git a/src/DataCollector/ViewCollector.php b/src/DataCollector/ViewCollector.php
@@ -53,7 +53,13 @@ public function getWidgets()
     public function addView(View $view)
     {
         $name = $view->getName();
-        $type = pathinfo($view->getPath(), PATHINFO_EXTENSION);
+        $filename = ltrim(str_replace(base_path(), '', realpath($view->getPath())), '/');
+
+        if (substr($filename, -10) == '.blade.php') {
+            $type = 'blade';
+        } else {
+            $type = pathinfo($view->getPath(), PATHINFO_EXTENSION);
+        }
 
         if (!$this->collect_data) {
             $params = array_keys($view->getData());
@@ -67,8 +73,9 @@ public function addView(View $view)
             }
             $params = $data;
         }
+
         $this->templates[] = array(
-            'name' => $name,
+            'name' => sprintf('%s (%s)', $name, $filename),
             'param_count' => count($params),
             'params' => $params,
             'type' => $type,

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ protected function getRouteInformation($route)`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`if (isset($reflector)) {`
`73`		`- $filename = str_replace(base_path(), '', $reflector->getFileName());`
	`73`	`+ $filename = ltrim(str_replace(base_path(), '', $reflector->getFileName()), '/');`
`74`	`74`	`$result['file'] = $filename . ':' . $reflector->getStartLine() . '-' . $reflector->getEndLine();`
`75`	`75`	`}`
`76`	`76`