Skip to content

Fix networkConnect() and networkDisconnect() to send valid options #102

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 2 commits into from
Oct 18, 2026
Merged

Fix networkConnect() and networkDisconnect() to send valid options #102

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
43e033f
Fix `networkDisconnect()` to force disconnect if `$force` is true
clue Oct 11, 2026
9b9782d
Fix `networkConnect()` to send `$endpointConfig` as JSON object
clue Oct 11, 2026
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/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@ public function networkConnect($network, $container, $endpointConfig = array())
),
array(
'Container' => $container,
'EndpointConfig' => $endpointConfig ? json_encode($endpointConfig) : null
'EndpointConfig' => $endpointConfig ? $endpointConfig : null
)
)->then(array($this->parser, 'expectJson'));
}
Expand All @@ -1567,7 +1567,7 @@ public function networkDisconnect($network, $container, $force = false)
),
array(
'Container' => $container,
'Force' => $this->boolArg($force)
'Force' => (bool) $force
)
)->then(array($this->parser, 'expectEmpty'));
}
Expand Down
21 changes: 19 additions & 2 deletions tests/ClientTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,14 +770,31 @@ public function testNetworkConnect()
$this->expectPromiseResolveWith($json, $this->client->networkConnect(123, $config));
}

public function testNetworkDisconnect()
public function testNetworkConnectWithEndpointConfig()
{
$json = array();
$this->expectRequestFlow('post', 'networks/123/disconnect', $this->createResponse(), 'expectEmpty');
$this->browser->expects($this->once())->method('post')->with('networks/123/connect', $this->anything(), '{"Container":"abc","EndpointConfig":{"Aliases":["foo"]}}')->willReturn(\React\Promise\resolve($this->createResponseJson($json)));
$this->parser->expects($this->once())->method('expectJson')->willReturn($json);

$this->expectPromiseResolveWith($json, $this->client->networkConnect(123, 'abc', array('Aliases' => array('foo'))));
}

public function testNetworkDisconnect()
{
$this->browser->expects($this->once())->method('post')->with('networks/123/disconnect', $this->anything(), '{"Container":"abc","Force":false}')->willReturn(\React\Promise\resolve($this->createResponse()));
$this->parser->expects($this->once())->method('expectEmpty')->willReturn('');

$this->expectPromiseResolveWith('', $this->client->networkDisconnect(123, 'abc'));
}

public function testNetworkDisconnectForce()
{
$this->browser->expects($this->once())->method('post')->with('networks/123/disconnect', $this->anything(), '{"Container":"abc","Force":true}')->willReturn(\React\Promise\resolve($this->createResponse()));
$this->parser->expects($this->once())->method('expectEmpty')->willReturn('');

$this->expectPromiseResolveWith('', $this->client->networkDisconnect(123, 'abc', true));
}

public function testNetworkPrune()
{
$json = array();
Expand Down
4 changes: 2 additions & 2 deletions tests/FunctionalClientTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,12 +453,12 @@ public function testCreateConnectDisconnectAndRemoveNetwork()
$this->assertNotNull($network['Id']);
$this->assertEquals('', $network['Warning']);

$promise = $this->client->networkConnect($network['Id'], $container['Id']);
$promise = $this->client->networkConnect($network['Id'], $container['Id'], array('Aliases' => array('foo')));
$ret = \React\Async\await($promise);

$this->assertEquals('', $ret);

$promise = $this->client->networkDisconnect($network['Id'], $container['Id'], false);
$promise = $this->client->networkDisconnect($network['Id'], $container['Id'], true);
$ret = \React\Async\await($promise);

$this->assertEquals('', $ret);
Expand Down