removed file context from error messages.

This commit is contained in:
Taylor Otwell 2011-07-10 23:08:14 -05:00
parent 46b0a7d8ad
commit 063cde50c0
2 changed files with 1 additions and 45 deletions

View File

@ -51,6 +51,7 @@ public static function handle($e)
$file = $e->getFile(); $file = $e->getFile();
} }
// Trim the period off the error message since we will be formatting it oursevles.
$message = rtrim($e->getMessage(), '.'); $message = rtrim($e->getMessage(), '.');
if (Config::get('error.log')) if (Config::get('error.log'))
@ -66,7 +67,6 @@ public static function handle($e)
->bind('file', $file) ->bind('file', $file)
->bind('line', $e->getLine()) ->bind('line', $e->getLine())
->bind('trace', $e->getTraceAsString()) ->bind('trace', $e->getTraceAsString())
->bind('contexts', static::context($file, $e->getLine()));
Response::make($view, 500)->send(); Response::make($view, 500)->send();
} }
@ -78,34 +78,4 @@ public static function handle($e)
exit(1); exit(1);
} }
/**
* Get the file context of an exception.
*
* @param string $path
* @param int $line
* @param int $padding
* @return array
*/
private static function context($path, $line, $padding = 5)
{
if (file_exists($path))
{
$file = file($path, FILE_IGNORE_NEW_LINES);
array_unshift($file, '');
// Calculate the starting position of the file context.
$start = $line - $padding;
$start = ($start < 0) ? 0 : $start;
// Calculate the context length.
$length = ($line - $start) + $padding + 1;
$length = (($start + $length) > count($file) - 1) ? null : $length;
return array_slice($file, $start, $length, true);
}
return array();
}
} }

View File

@ -60,20 +60,6 @@
<pre><?php echo $trace; ?></pre> <pre><?php echo $trace; ?></pre>
</div> </div>
<div class="content">
<h3>Context:</h3>
<?php if (count($contexts) > 0) { ?>
<?php foreach ($contexts as $num => $context) { ?>
<pre><?php echo htmlentities($num.' '.$context); ?></pre>
<?php } ?>
<?php } else { ?>
Context unavailable.
<?php } ?>
</div>
</div> </div>
</body> </body>
</html> </html>