Skip to content

Identity conflict: verify connection is usable #153

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
sirn-se merged 2 commits into from
May 15, 2026
Merged

Identity conflict: verify connection is usable #153

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
f33f438
Identity conflict: verify connection is usable
sirn-se May 14, 2026
6fc31f2
Merge branch 'v3.7-main' into identity-conflict
sirn-se May 14, 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
6 changes: 5 additions & 1 deletion src/Runtime/Runner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ public function __construct(StreamFactory $streamFactory)
public function attach(StreamContainerInterface $streamContainer, Closure $onSelect, string $identity): void
{
if (array_key_exists($identity, $this->containers)) {
throw new RunnerException("Stream container with identity {$identity} already attached");
// On repeated identity, check if actually readable (detach if not)
if ($this->containers[$identity]->stream->isReadable()) {
throw new RunnerException("Stream container with identity {$identity} already attached");
}
$this->detach($identity);
}
$stream = $streamContainer->getStream();
$this->streamCollection->attach($stream, $identity);
Expand Down
34 changes: 34 additions & 0 deletions tests/suites/runtime/RunnerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,36 @@ public function testHandling(): void
$runner->detach($streamContainer->getIdentity());
}

public function testIdentityConflictResolvable(): void
{
$this->expectStreamFactory();
$factory = new StreamFactory();
$this->expectStreamFactoryCreateStreamCollection();
$this->expectStreamCollection();
$runner = new Runner($factory);

$this->expectStreamFactoryCreateStream();
$this->expectStreamFactoryCreateStreamFromResource();
$this->expectStream();
$this->expectStreamGetMetadata();
$this->expectContext();
$streamContainer = new MockStreamContainer($factory);

$this->expectStreamCollectionAttach();
$runner->attach($streamContainer, function () {
// ignore
}, $streamContainer->getIdentity());

$this->expectStreamIsReadable()->setReturn(function () {
return false;
});
$this->expectStreamCollectionDetach();
$this->expectStreamCollectionAttach();
$runner->attach($streamContainer, function () {
// ignore
}, $streamContainer->getIdentity());
}

public function testIdentityConflict(): void
{
$this->expectStreamFactory();
Expand All @@ -81,6 +111,10 @@ public function testIdentityConflict(): void
$runner->attach($streamContainer, function () {
// ignore
}, $streamContainer->getIdentity());

$this->expectStreamIsReadable()->setReturn(function () {
return true;
});
$this->expectException(RunnerException::class);
$this->expectExceptionMessage('Stream container with identity mock-stream-container already attached');
$runner->attach($streamContainer, function () {
Expand Down