Update Whoops handling.

taylorotwell · taylorotwell · commit 6cc7e1bec97b · 2013-07-08T21:13:04.000-05:00
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         "classpreloader/classpreloader": "1.0.*",
         "doctrine/dbal": "2.4.x",
         "ircmaxell/password-compat": "1.0.*",
-        "filp/whoops": "1.0.6",
+        "filp/whoops": "1.0.7",
         "monolog/monolog": "1.5.*",
         "nesbot/carbon": "1.*",
         "patchwork/utf8": "1.1.*",
diff --git a/src/Illuminate/Exception/composer.json b/src/Illuminate/Exception/composer.json
@@ -9,7 +9,7 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "filp/whoops": "1.0.6",
+        "filp/whoops": "1.0.7",
         "illuminate/support": "4.0.x",
         "symfony/http-foundation": "2.3.x",
         "symfony/http-kernel": "2.3.*"
diff --git a/src/Illuminate/Exception/resources/pretty-page.css b/src/Illuminate/Exception/resources/pretty-page.css
@@ -9,6 +9,7 @@ body {
 }
   a {
     text-decoration: none;
+    color: #FE8A59;
   }
 
 .container{
@@ -17,6 +18,8 @@ body {
     position: fixed;
     margin: 0;
     padding: 0;
+    left: 0;
+    top: 0;
 }
 
 .branding {
@@ -93,10 +96,15 @@ header {
       background: #F0E5DF;
     }
 
-    .frame-class, .frame-function {
+    .frame-class, .frame-function, .frame-index {
       font-weight: bold;
     }
 
+    .frame-index {
+      font-size: 11px;
+      color: #BDBDBD;
+    }
+
     .frame-class {
       color: #ED591A;
     }
@@ -287,11 +295,15 @@ pre.prettyprint, code.prettyprint {
     text-decoration:none;
   }
 
+  .linenums li {
+    color: #A5A5A5;
+  }
+
   .linenums li.current{
     background: rgba(255, 255, 255, .05);
     padding-top: 4px;
     padding-left: 1px;
   }
     .linenums li.current.active {
       background: rgba(255, 255, 255, .1);
-    }
+    }
diff --git a/src/Illuminate/Exception/resources/pretty-template.php b/src/Illuminate/Exception/resources/pretty-template.php
@@ -26,7 +26,8 @@
                    for that particular frame */ ?>
           <?php foreach($v->frames as $i => $frame): ?>
             <div class="frame <?php echo ($i == 0 ? 'active' : '') ?>" id="frame-line-<?php echo $i ?>">
-                <div class="frame-method-info">
+    <div class="frame-method-info">
+      <span class="frame-index"><?php echo (count($v->frames) - $i - 1) ?>.</span>
                   <span class="frame-class"><?php echo $e($frame->getClass() ?: '') ?></span>
                   <span class="frame-function"><?php echo $e($frame->getFunction() ?: '') ?></span>
                 </div>
@@ -81,7 +82,8 @@
                     if($line !== null):
 
                     // the $line is 1-indexed, we nab -1 where needed to account for this
-                    $range = $frame->getFileLines($line - 8, 10);
+        $range = $frame->getFileLines($line - 8, 10);
+        $range = array_map(function($line){ return empty($line) ? ' ' : $line;}, $range);
                     $start = key($range) + 1;
                     $code  = join("\n", $range);
                   ?>
@@ -97,7 +99,7 @@
                       <?php extract($comment) ?>
                       <div class="frame-comment" id="comment-<?php echo $i . '-' . $commentNo ?>">
                         <span class="frame-comment-context"><?php echo $e($context) ?></span>
-                        <?php echo $e($comment) ?>
+                        <?php echo $e($comment, true) ?>
                       </div>
                     <?php endforeach ?>
                   </div>
@@ -199,4 +201,4 @@
       });
     </script>
   </body>
-</html>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ body {`
`9`	`9`	`}`
`10`	`10`	`a {`
`11`	`11`	`text-decoration: none;`
	`12`	`+ color: #FE8A59;`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`.container{`
`@@ -17,6 +18,8 @@ body {`
`17`	`18`	`position: fixed;`
`18`	`19`	`margin: 0;`
`19`	`20`	`padding: 0;`
	`21`	`+ left: 0;`
	`22`	`+ top: 0;`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`.branding {`
`@@ -93,10 +96,15 @@ header {`
`93`	`96`	`background: #F0E5DF;`
`94`	`97`	`}`
`95`	`98`
`96`		`- .frame-class, .frame-function {`
	`99`	`+ .frame-class, .frame-function, .frame-index {`
`97`	`100`	`font-weight: bold;`
`98`	`101`	`}`
`99`	`102`
	`103`	`+ .frame-index {`
	`104`	`+ font-size: 11px;`
	`105`	`+ color: #BDBDBD;`
	`106`	`+ }`
	`107`	`+`
`100`	`108`	`.frame-class {`
`101`	`109`	`color: #ED591A;`
`102`	`110`	`}`
`@@ -287,11 +295,15 @@ pre.prettyprint, code.prettyprint {`
`287`	`295`	`text-decoration:none;`
`288`	`296`	`}`
`289`	`297`
	`298`	`+ .linenums li {`
	`299`	`+ color: #A5A5A5;`
	`300`	`+ }`
	`301`	`+`
`290`	`302`	`.linenums li.current{`
`291`	`303`	`background: rgba(255, 255, 255, .05);`
`292`	`304`	`padding-top: 4px;`
`293`	`305`	`padding-left: 1px;`
`294`	`306`	`}`
`295`	`307`	`.linenums li.current.active {`
`296`	`308`	`background: rgba(255, 255, 255, .1);`
`297`		`- }`
	`309`	`+ }`