Skip to content

Commit 046c602

Browse files
committed
Merge branch 'feature/lookup-check-empty' into feature/multiple-parameters
2 parents b5f38e0 + 1f4b3b3 commit 046c602

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/Builder/AlternativeLookup.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,14 @@ public function getNode(): Node
127127
...array_filter(
128128
[
129129
$this->getAlternativeLookupNode(),
130-
$this->merge?->getNode(),
130+
new Node\Stmt\If_(
131+
cond: new Node\Expr\Variable('lookup'),
132+
subNodes: [
133+
'stmts' => [
134+
$this->merge?->getNode(),
135+
],
136+
]
137+
),
131138
new Node\Stmt\Return_(
132139
new Node\Expr\Variable('output')
133140
),

src/Builder/ConditionalLookup.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use Kiboko\Contract\Configurator\StepBuilderInterface;
88
use Kiboko\Contract\Mapping\CompiledMapperInterface;
99
use PhpParser\Node;
10-
use Psr\Log\LoggerInterface;
1110
use Psr\Log\NullLogger;
1211

1312
final class ConditionalLookup implements StepBuilderInterface
@@ -188,7 +187,8 @@ class: new Node\Name\FullyQualified(NullLogger::class)
188187
default: new Node\Expr\ConstFetch(
189188
name: new Node\Name(name: 'null'),
190189
),
191-
type: new Node\Name\FullyQualified(LoggerInterface::class)
190+
type: new Node\NullableType(\Psr\Log\LoggerInterface::class),
191+
flags: Node\Stmt\Class_::MODIFIER_PRIVATE
192192
),
193193
],
194194
],

0 commit comments

Comments
 (0)