Skip to content

Fix secure server test#128

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

Closed
the-eater wants to merge 2 commits into from
Closed

Fix secure server test #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a25e3d
Fix test being wrong
the-eater Oct 12, 2017
30ed819
Make sure tls:// is *always* prefixed
the-eater Oct 12, 2017
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
9 changes: 8 additions & 1 deletion src/SecureServer.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,14 @@ public function __construct(ServerInterface $tcp, LoopInterface $loop, array $co

public function getAddress()
{
return str_replace('tcp://' , 'tls://', $this->tcp->getAddress());
$tcpAddress = $this->tcp->getAddress();
$schemePos = strpos($tcpAddress, '://');

if ($schemePos === false) {
return 'tls://' . $tcpAddress;
}

return 'tls' . substr($tcpAddress, $schemePos);

@clueclueOct 12, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this PR is fixing an issue that doesn't exist :-) The TcpServer will always prepend a tcp:// scheme as documented in the README. I understand that the tests is misleading (and probably a small oversight from #98), maybe simply adjust this there?

@kelunikkelunikOct 12, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, that's an issue with the mock.

}

public function pause()
Expand Down
2 changes: 1 addition & 1 deletion tests/SecureServerTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ public function testGetAddressWillBePassedThroughToTcpServer()

$server = new SecureServer($tcp, $loop, array());

$this->assertEquals('127.0.0.1:1234', $server->getAddress());
$this->assertEquals('tls://127.0.0.1:1234', $server->getAddress());
}

public function testPauseWillBePassedThroughToTcpServer()
Expand Down