Skip to content

Fix BC in WorkerFactory constructor #541

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
roxblnfk merged 2 commits into from
Dec 24, 2024
Merged

Fix BC in WorkerFactory constructor #541

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
1fe2987
Fix BC in WorkerFactory constructor
roxblnfk Dec 24, 2024
ffd472c
Suppress psalm issues
roxblnfk Dec 24, 2024
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
5 changes: 4 additions & 1 deletion psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1443,6 +1443,9 @@
<DeprecatedClass>
<code><![CDATA[new AnnotationReader()]]></code>
</DeprecatedClass>
<ImpureMethodCall>
<code><![CDATA[create]]></code>
</ImpureMethodCall>
<InternalClass>
<code><![CDATA[new Client($this->responses)]]></code>
</InternalClass>
Expand Down Expand Up @@ -1477,7 +1480,7 @@
<code><![CDATA[new static(
$converter ?? DataConverter::createDefault(),
$rpc ?? Goridge::create(),
$credentials ?? ServiceCredentials::create(),
$credentials,
)]]></code>
</UnsafeInstantiation>
</file>
Expand Down
6 changes: 3 additions & 3 deletions src/WorkerFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ class WorkerFactory implements WorkerFactoryInterface, LoopInterface
public function __construct(
DataConverterInterface $dataConverter,
protected RPCConnectionInterface $rpc,
ServiceCredentials $credentials,
?ServiceCredentials $credentials = null,
) {
$this->converter = $dataConverter;
$this->boot($credentials);
$this->boot($credentials ?? ServiceCredentials::create());
}

public static function create(
Expand All @@ -119,7 +119,7 @@ public static function create(
return new static(
$converter ?? DataConverter::createDefault(),
$rpc ?? Goridge::create(),
$credentials ?? ServiceCredentials::create(),
$credentials,
);
}

Expand Down
6 changes: 3 additions & 3 deletions testing/src/WorkerFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ public function __construct(
DataConverterInterface $dataConverter,
RPCConnectionInterface $rpc,
ActivityInvocationCacheInterface $activityCache,
ServiceCredentials $credentials,
?ServiceCredentials $credentials = null,
) {
$this->activityCache = $activityCache;

parent::__construct($dataConverter, $rpc, $credentials);
parent::__construct($dataConverter, $rpc, $credentials ?? ServiceCredentials::create());
}

public static function create(
Expand All @@ -45,7 +45,7 @@ public static function create(
$converter ?? DataConverter::createDefault(),
$rpc ?? Goridge::create(),
$activityCache ?? RoadRunnerActivityInvocationCache::create($converter),
$credentials ?? ServiceCredentials::create(),
$credentials,
);
}

Expand Down
Loading