Skip to content

Commit f6de2a5

Browse files
moufmoufmoufmouf
committed
Improving code following PR comments
1 parent 917b674 commit f6de2a5

File tree

7 files changed

+40
-40
lines changed

7 files changed

+40
-40
lines changed

‎src/SQLParser/Node/AbstractManyInstancesOperator.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ public function walk(VisitorInterface $visitor) {
8989
}
9090
if ($result !== NodeTraverser::DONT_TRAVERSE_CHILDREN) {
9191
foreach ($this->operands as $key => $operand) {
92-
$result = $operand->walk($visitor);
93-
if ($result == NodeTraverser::REMOVE_NODE) {
92+
$result2 = $operand->walk($visitor);
93+
if ($result2 === NodeTraverser::REMOVE_NODE) {
9494
unset($this->operands[$key]);
95-
} elseif ($result instanceof NodeInterface) {
96-
$this->operands[$key] = $result;
95+
} elseif ($result2 instanceof NodeInterface) {
96+
$this->operands[$key] = $result2;
9797
}
9898
}
9999
}

‎src/SQLParser/Node/AbstractTwoOperandsOperator.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,18 +139,18 @@ public function walk(VisitorInterface $visitor) {
139139
$node = $result;
140140
}
141141
if ($result !== NodeTraverser::DONT_TRAVERSE_CHILDREN) {
142-
$result = $this->leftOperand->walk($visitor);
143-
if ($result == NodeTraverser::REMOVE_NODE) {
142+
$result2 = $this->leftOperand->walk($visitor);
143+
if ($result2 === NodeTraverser::REMOVE_NODE) {
144144
return NodeTraverser::REMOVE_NODE;
145-
} elseif ($result instanceof NodeInterface) {
146-
$this->leftOperand = $result;
145+
} elseif ($result2 instanceof NodeInterface) {
146+
$this->leftOperand = $result2;
147147
}
148148

149-
$result = $this->rightOperand->walk($visitor);
150-
if ($result == NodeTraverser::REMOVE_NODE) {
149+
$result2 = $this->rightOperand->walk($visitor);
150+
if ($result2 === NodeTraverser::REMOVE_NODE) {
151151
return NodeTraverser::REMOVE_NODE;
152-
} elseif ($result instanceof NodeInterface) {
153-
$this->rightOperand = $result;
152+
} elseif ($result2 instanceof NodeInterface) {
153+
$this->rightOperand = $result2;
154154
}
155155
}
156156
return $visitor->leaveNode($node);

‎src/SQLParser/Node/AggregateFunction.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ public function walk(VisitorInterface $visitor) {
166166
}
167167
if ($result !== NodeTraverser::DONT_TRAVERSE_CHILDREN) {
168168
foreach ($this->subTree as $key => $operand) {
169-
$result = $operand->walk($visitor);
170-
if ($result == NodeTraverser::REMOVE_NODE) {
169+
$result2 = $operand->walk($visitor);
170+
if ($result2 === NodeTraverser::REMOVE_NODE) {
171171
unset($this->subTree[$key]);
172-
} elseif ($result instanceof NodeInterface) {
173-
$this->subTree[$key] = $result;
172+
} elseif ($result2 instanceof NodeInterface) {
173+
$this->subTree[$key] = $result2;
174174
}
175175
}
176176
}

‎src/SQLParser/Node/Expression.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,11 @@ public function walk(VisitorInterface $visitor) {
207207
}
208208
if ($result !== NodeTraverser::DONT_TRAVERSE_CHILDREN) {
209209
foreach ($this->subTree as $key => $operand) {
210-
$result = $operand->walk($visitor);
211-
if ($result == NodeTraverser::REMOVE_NODE) {
210+
$result2 = $operand->walk($visitor);
211+
if ($result2 === NodeTraverser::REMOVE_NODE) {
212212
unset($this->subTree[$key]);
213-
} elseif ($result instanceof NodeInterface) {
214-
$this->subTree[$key] = $result;
213+
} elseif ($result2 instanceof NodeInterface) {
214+
$this->subTree[$key] = $result2;
215215
}
216216
}
217217
}

‎src/SQLParser/Node/SubQuery.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ public function walk(VisitorInterface $visitor) {
166166
$node = $result;
167167
}
168168
if ($result !== NodeTraverser::DONT_TRAVERSE_CHILDREN) {
169-
$result = $this->subQuery->walk($visitor);
170-
if ($result == NodeTraverser::REMOVE_NODE) {
169+
$result2 = $this->subQuery->walk($visitor);
170+
if ($result2 === NodeTraverser::REMOVE_NODE) {
171171
return NodeTraverser::REMOVE_NODE;
172-
} elseif ($result instanceof NodeInterface) {
173-
$this->subQuery = $result;
172+
} elseif ($result2 instanceof NodeInterface) {
173+
$this->subQuery = $result2;
174174
}
175175
}
176176
return $visitor->leaveNode($node);

‎src/SQLParser/Node/Table.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -202,19 +202,19 @@ public function walk(VisitorInterface $visitor) {
202202
if ($result !== NodeTraverser::DONT_TRAVERSE_CHILDREN) {
203203
if (is_array($this->refClause)) {
204204
foreach ($this->refClause as $key => $operand) {
205-
$result = $operand->walk($visitor);
206-
if ($result == NodeTraverser::REMOVE_NODE) {
205+
$result2 = $operand->walk($visitor);
206+
if ($result2 === NodeTraverser::REMOVE_NODE) {
207207
unset($this->refClause[$key]);
208-
} elseif ($result instanceof NodeInterface) {
209-
$this->refClause[$key] = $result;
208+
} elseif ($result2 instanceof NodeInterface) {
209+
$this->refClause[$key] = $result2;
210210
}
211211
}
212212
} elseif ($this->refClause) {
213-
$result = $this->refClause->walk($visitor);
214-
if ($result == NodeTraverser::REMOVE_NODE) {
213+
$result2 = $this->refClause->walk($visitor);
214+
if ($result2 === NodeTraverser::REMOVE_NODE) {
215215
$this->refClause = null;
216-
} elseif ($result instanceof NodeInterface) {
217-
$this->refClause = $result;
216+
} elseif ($result2 instanceof NodeInterface) {
217+
$this->refClause = $result2;
218218
}
219219
}
220220
}

‎src/SQLParser/Query/Select.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -360,19 +360,19 @@ private function walkChildren(&$children, VisitorInterface $visitor) {
360360
if ($children) {
361361
if (is_array($children)) {
362362
foreach ($children as $key => $operand) {
363-
$result = $operand->walk($visitor);
364-
if ($result == NodeTraverser::REMOVE_NODE) {
363+
$result2 = $operand->walk($visitor);
364+
if ($result2 === NodeTraverser::REMOVE_NODE) {
365365
unset($children[$key]);
366-
} elseif ($result instanceof NodeInterface) {
367-
$children[$key] = $result;
366+
} elseif ($result2 instanceof NodeInterface) {
367+
$children[$key] = $result2;
368368
}
369369
}
370370
} else {
371-
$result = $children->walk($visitor);
372-
if ($result == NodeTraverser::REMOVE_NODE) {
371+
$result2 = $children->walk($visitor);
372+
if ($result2 === NodeTraverser::REMOVE_NODE) {
373373
$children = null;
374-
} elseif ($result instanceof NodeInterface) {
375-
$children = $result;
374+
} elseif ($result2 instanceof NodeInterface) {
375+
$children = $result2;
376376
}
377377
}
378378
}

0 commit comments

Comments
 (0)