geckon01/whoops
1
0
Fork 0
mirror of https://github.com/filp/whoops.git synced 2026-09-03 14:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify signature for Frame::getFileLines when using ranges

Browse Source
This commit is contained in:
filp
2013-03-13 13:51:31 +00:00
parent c99fd486c7
commit 8338e58274
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Damnit/Exception/Frame.php
+14 -14
View File
@@ -83,39 +83,39 @@ class Frame
/**
* Returns the contents of the file for this frame as an
* array of lines, and optionally as clamped range of lines.
* array of lines, and optionally as a clamped range of lines.
*
* NOTE: lines are 0-indexed
*
* @example
* Get all lines for this file
* $frame->getFileLines(); // => array( 0 => '<?php', 1 => '...', ...)
* @example
* $frame->getFileLines(10, 15); // array( 10 => '...', 11 => '...', ...)
* Get one line for this file, starting at line 10 (zero-indexed, remember!)
* $frame->getFileLines(9, 1); // array( 10 => '...', 11 => '...')
*
* @param int $start
* @param int $end
* @param int $length
* @return array|null
*/
public function getFileLines($start = 0, $end = null)
public function getFileLines($start = 0, $length = null)
{
if(null !== ($contents = $this->getFileContents())) {
$lines = explode("\n", $contents);
// Get a subset of lines from $start to $end
if($end !== null)
if($length !== null)
{
$start = (int) $start;
$end = (int) $end;
$start = (int) $start;
$length = (int) $length;
if($end <= $start) {
if($length <= 0) {
throw new InvalidArgumentException(
"\$end($end) cannot be lower or equal to \$start($start)"
"\$length($length) cannot be lower or equal to 0"
);
}
// Clamp the range to the number of lines:
$start = max(0, $start);
$end = min(count($lines)-1, $end);
$lines = array_slice($lines, $start, $end - $start, true);
$lines = array_slice($lines, $start, $length, true);
}
return $lines;
tests/Damnit/Exception/FrameTest.php
+2 -2
View File
@@ -123,10 +123,10 @@ class FrameTest extends TestCase
$data = $this->getFrameData();
$frame = $this->getFrameInstance($data);
$lines = $frame->getFileLines(1, 3);
$lines = $frame->getFileLines(0, 3);
$this->assertEquals($lines[0], '<?php');
$this->assertEquals($lines[1], '// Line 2');
$this->assertEquals($lines[2], '// Line 3');
$this->assertEquals($lines[3], '// Line 4');
}
}