Skip to content

Commit 8168247

Browse files
committed
Fix UndefinedPropertyFetch and MixedAssignment psalm errors
1 parent 677939c commit 8168247

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/Formatter/Specialised/BoltOGMTranslator.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ private function makeFromBoltNode(BoltNode $node): Node
104104

105105
/** @var string|null $elementId */
106106
if (property_exists($node, 'element_id')) {
107+
/** @var string|null $elementIdValue */
107108
$elementIdValue = $node->element_id ?? null;
108109
$elementId = is_string($elementIdValue) ? $elementIdValue : (string) $node->id;
109110
} else {
@@ -183,22 +184,23 @@ private function makeFromBoltRelationship(BoltRelationship $rel): Relationship
183184

184185
/** @var string|null $elementId */
185186
if (property_exists($rel, 'element_id')) {
187+
/** @var string|null $elementIdValue */
186188
$elementIdValue = $rel->element_id ?? null;
187189
$elementId = is_string($elementIdValue) ? $elementIdValue : (string) $rel->id;
188190
} else {
189191
$elementId = (string) $rel->id;
190192
}
191193

192-
// For Neo4j 5+, try to get actual element IDs if available
193-
// For Neo4j 4, fallback to string representation of integer IDs
194194
if (property_exists($rel, 'startNodeElementId')) {
195+
/** @var string|null $startNodeElementIdValue */
195196
$startNodeElementIdValue = $rel->startNodeElementId ?? null;
196197
$startNodeElementId = is_string($startNodeElementIdValue) ? $startNodeElementIdValue : (string) $rel->startNodeId;
197198
} else {
198199
$startNodeElementId = (string) $rel->startNodeId;
199200
}
200201

201202
if (property_exists($rel, 'endNodeElementId')) {
203+
/** @var string|null $endNodeElementIdValue */
202204
$endNodeElementIdValue = $rel->endNodeElementId ?? null;
203205
$endNodeElementId = is_string($endNodeElementIdValue) ? $endNodeElementIdValue : (string) $rel->endNodeId;
204206
} else {
@@ -231,6 +233,7 @@ private function makeFromBoltUnboundRelationship(BoltUnboundRelationship $rel):
231233

232234
/** @var string|null $elementId */
233235
if (property_exists($rel, 'element_id')) {
236+
/** @var string|null $elementIdValue */
234237
$elementIdValue = $rel->element_id ?? null;
235238
$elementId = is_string($elementIdValue) ? $elementIdValue : (string) $rel->id;
236239
} else {

tests/Unit/NoAuthTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ protected function setUp(): void
3636
$logger = $this->createMock(Neo4jLogger::class);
3737
$this->auth = new NoAuth($logger);
3838
}
39+
3940
public function testAuthenticateBoltSuccessV5(): void
4041
{
4142
$userAgent = 'neo4j-client/1.0';

0 commit comments

Comments
 (0)