Skip to content

Ignore whitespace from hosts file #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clue merged 1 commit into from
Aug 24, 2017
Merged

Ignore whitespace from hosts file #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Config/HostsFile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public static function loadFromPathBlocking($path = null)
public function __construct($contents)
{
// remove all comments from the contents
$contents = preg_replace('/ *#.*/', '', strtolower($contents));
$contents = preg_replace('/[ \t]*#.*/', '', strtolower($contents));

$this->contents = $contents;
}
Expand Down Expand Up @@ -131,7 +131,7 @@ public function getHostsForIp($ip)

$names = array();
foreach (preg_split('/\r?\n/', $this->contents) as $line) {
$parts = preg_split('/\s+/', $line);
$parts = preg_split('/\s+/', $line, null, PREG_SPLIT_NO_EMPTY);
$addr = array_shift($parts);

// remove IPv6 zone ID (`fe80::1%lo0` => `fe80:1`)
Expand Down
9 changes: 9 additions & 0 deletions tests/Config/HostsFileTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,15 @@ public function testReverseLookup()
$this->assertEquals(array(), $hosts->getHostsForIp('192.168.1.1'));
}

public function testReverseSkipsComments()
{
$hosts = new HostsFile("# start\n#127.0.0.1 localhosted\n127.0.0.2\tlocalhost\t# example.com\n\t127.0.0.3\t\texample.org\t\t");

$this->assertEquals(array(), $hosts->getHostsForIp('127.0.0.1'));
$this->assertEquals(array('localhost'), $hosts->getHostsForIp('127.0.0.2'));
$this->assertEquals(array('example.org'), $hosts->getHostsForIp('127.0.0.3'));
}

public function testReverseNonIpReturnsNothing()
{
$hosts = new HostsFile('127.0.0.1 localhost');
Expand Down