Skip to content

Commit 5ffaeb6

Browse files
committed
better handling of spies
Signed-off-by: Robert Landers <landers.robert@gmail.com>
1 parent 6b19f59 commit 5ffaeb6

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

cli/cli.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -547,14 +547,16 @@ func main() {
547547
rol = append(rol, auth.Role(role))
548548
}
549549

550-
claims := strings.Split(options["claims"], ";")
551550
extraClaims := make(map[string]string)
552-
for _, claim := range claims {
553-
kv := strings.Split(claim, ":")
554-
if len(kv) != 2 {
555-
panic(fmt.Errorf("invalid claim: %s", claim))
551+
if options["claims"] != "" {
552+
claims := strings.Split(options["claims"], ";")
553+
for _, claim := range claims {
554+
kv := strings.Split(claim, ":")
555+
if len(kv) != 2 {
556+
panic(fmt.Errorf("invalid claim: %s", claim))
557+
}
558+
extraClaims[kv[0]] = kv[1]
556559
}
557-
extraClaims[kv[0]] = kv[1]
558560
}
559561

560562
user, err := auth.CreateUser(auth.UserId(args[0]), rol, extraClaims, cfg)

src/RemoteEntityClient.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,19 @@ public function signal(EntityId|string $entityId, Closure $signal): void
8181
throw new Exception("Interface {$interfaceName} does not exist");
8282
}
8383
$spy = $this->spyProxy->define($interfaceName);
84-
$operationName = '';
85-
$arguments = [];
84+
$operationName = null;
85+
$arguments = null;
8686
try {
8787
$class = new $spy($operationName, $arguments);
8888
$signal($class);
8989
} catch (SpyException) {
9090
// we have completed the spy
9191
}
92+
93+
if ($operationName === null || $arguments === null) {
94+
return;
95+
}
96+
9297
$this->signalEntity(
9398
is_string($entityId) ? EntityId($interfaceName, $entityId) : $entityId,
9499
$operationName,

0 commit comments

Comments
 (0)