adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverting change made in [7cde309]. Readding trim() to fix issues on windows. Updating tests so they continue to pass on macos. Fixes #769

Browse source
This commit is contained in:
mark_story 2010-05-30 11:16:40 -04:00
parent 907af961c8
commit 07948a733d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/file.php
View file

@ -192,7 +192,7 @@ class File extends Object {
if ($bytes === false) {
$this->close();
}
return $data;
return trim($data);
}
/**

2
cake/tests/cases/libs/file.test.php
View file

@ -115,7 +115,7 @@ class FileTest extends CakeTestCase {
$this->File->lock = true;
$result = $this->File->read();
$expecting = file_get_contents(__FILE__);
$this->assertEqual($result, $expecting);
$this->assertEqual($result, trim($expecting));
$this->File->lock = null;
$data = $expecting;