Commit 230ec57

committed

FIX include line breaks in readLine

1 parent 96ec78e commit 230ec57Copy full SHA for 230ec57

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function readLine($eol = "\n")`
`104`	`104`	`while (!$this->stream->eof()) {`
`105`	`105`	`$pos = strpos($this->lastLine, $eol);`
`106`	`106`	`if ($pos !== false) {`
`107`		`- $line = substr($this->lastLine, 0, $pos);`
	`107`	`+ $line = substr($this->lastLine, 0, $pos + $eolLen);`
`108`	`108`	`$this->lastLine = substr($this->lastLine, $pos + $eolLen);`
`109`	`109`	`return $line;`
`110`	`110`	`}`
`@@ -113,7 +113,7 @@ public function readLine($eol = "\n")`
`113`	`113`
`114`	`114`	`$pos = strpos($this->lastLine, $eol);`
`115`	`115`	`if ($pos !== false) {`
`116`		`- $line = substr($this->lastLine, 0, $pos);`
	`116`	`+ $line = substr($this->lastLine, 0, $pos + $eolLen);`
`117`	`117`	`$this->lastLine = substr($this->lastLine, $pos + $eolLen);`
`118`	`118`	`return $line;`
`119`	`119`	`}`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,9 @@ public function testReadLine()`
`22`	`22`	`);`
`23`	`23`	`$wrapper = new StreamWrapper($stream);`
`24`	`24`
`25`		`- $this->assertEquals('Reading the contents.', $wrapper->readLine());`
`26`		`- $this->assertEquals('From the file', $wrapper->readLine());`
`27`		`- $this->assertEquals('Until end.', $wrapper->readLine());`
	`25`	`+ $this->assertEquals("Reading the contents.\n", $wrapper->readLine());`
	`26`	`+ $this->assertEquals("From the file\n", $wrapper->readLine());`
	`27`	`+ $this->assertEquals("Until end.", $wrapper->readLine());`
`28`	`28`	`$this->assertEquals('', $wrapper->readLine());`
`29`	`29`
`30`	`30`	`}`

Comments

(0)