Skip to content

Commit 66a6269

Browse files
authored
Fix empty ini handling (composer#105)
* add `scan-empty.ini` empty file Fixture * add `scan-empty.ini` to fail tests * fix `file_get_contents` failure handling
1 parent 191c19a commit 66a6269

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

src/XdebugHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ private function writeTmpIni(array $iniFiles, $tmpDir, &$error)
333333

334334
foreach ($iniFiles as $file) {
335335
// Check for inaccessible ini files
336-
if (!$data = @file_get_contents($file)) {
336+
if (($data = @file_get_contents($file)) === false) {
337337
$error = 'Unable to read ini: '.$file;
338338
return false;
339339
}

tests/Fixtures/scandir/scan-empty.ini

Whitespace-only changes.

tests/Helpers/IniHelper.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public function setScannedInis()
6060
'',
6161
$this->scanDir.DIRECTORY_SEPARATOR.'scan-one.ini',
6262
$this->scanDir.DIRECTORY_SEPARATOR.'scan-two.ini',
63+
$this->scanDir.DIRECTORY_SEPARATOR.'scan-empty.ini',
6364
);
6465

6566
$this->setEnvironment();
@@ -71,6 +72,7 @@ public function setAllInis()
7172
$this->loadedIni,
7273
$this->scanDir.DIRECTORY_SEPARATOR.'scan-one.ini',
7374
$this->scanDir.DIRECTORY_SEPARATOR.'scan-two.ini',
75+
$this->scanDir.DIRECTORY_SEPARATOR.'scan-empty.ini',
7476
);
7577

7678
$this->setEnvironment();

0 commit comments

Comments
 (0)