@@ -1540,7 +1540,10 @@ discard block |
||
1540 | 1540 | }, |
1541 | 1541 | 183 => function ($stackPos) { |
1542 | 1542 | $startAttributes = $this->startAttributeStack[$stackPos-(1-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $this->semValue = null; }; |
1543 | - if ($this->semValue === null) $this->semValue = array(); /* means: no statement */ |
|
1543 | + if ($this->semValue === null) { |
|
1544 | + $this->semValue = array(); |
|
1545 | + } |
|
1546 | + /* means: no statement */ |
|
1544 | 1547 | }, |
1545 | 1548 | 184 => function ($stackPos) { |
1546 | 1549 | $this->semValue = array(); |
@@ -2707,7 +2710,9 @@ discard block |
||
2707 | 2710 | $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); |
2708 | 2711 | }, |
2709 | 2712 | 566 => function ($stackPos) { |
2710 | - $this->semValue = $this->semStack[$stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) array_pop($this->semValue); |
|
2713 | + $this->semValue = $this->semStack[$stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) { |
|
2714 | + array_pop($this->semValue); |
|
2715 | + } |
|
2711 | 2716 | }, |
2712 | 2717 | 567 => function ($stackPos) { |
2713 | 2718 | $this->semValue = $this->semStack[$stackPos]; |
@@ -1450,7 +1450,10 @@ |
||
1450 | 1450 | }, |
1451 | 1451 | 163 => function ($stackPos) { |
1452 | 1452 | $startAttributes = $this->startAttributeStack[$stackPos-(1-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $this->semValue = null; }; |
1453 | - if ($this->semValue === null) $this->semValue = array(); /* means: no statement */ |
|
1453 | + if ($this->semValue === null) { |
|
1454 | + $this->semValue = array(); |
|
1455 | + } |
|
1456 | + /* means: no statement */ |
|
1454 | 1457 | }, |
1455 | 1458 | 164 => function ($stackPos) { |
1456 | 1459 | $this->semValue = array(); |
@@ -1122,7 +1122,9 @@ discard block |
||
1122 | 1122 | * The label char map determines whether a certain character may occur in a label. |
1123 | 1123 | */ |
1124 | 1124 | protected function initializeLabelCharMap() { |
1125 | - if ($this->labelCharMap) return; |
|
1125 | + if ($this->labelCharMap) { |
|
1126 | + return; |
|
1127 | + } |
|
1126 | 1128 | |
1127 | 1129 | $this->labelCharMap = []; |
1128 | 1130 | for ($i = 0; $i < 256; $i++) { |
@@ -1139,7 +1141,9 @@ discard block |
||
1139 | 1141 | * The node list differ is used to determine differences between two array subnodes. |
1140 | 1142 | */ |
1141 | 1143 | protected function initializeNodeListDiffer() { |
1142 | - if ($this->nodeListDiffer) return; |
|
1144 | + if ($this->nodeListDiffer) { |
|
1145 | + return; |
|
1146 | + } |
|
1143 | 1147 | |
1144 | 1148 | $this->nodeListDiffer = new Internal\Differ(function ($a, $b) { |
1145 | 1149 | if ($a instanceof Node && $b instanceof Node) { |
@@ -1157,7 +1161,9 @@ discard block |
||
1157 | 1161 | * some kind of "fixup" operation, e.g. the addition of parenthesis or braces. |
1158 | 1162 | */ |
1159 | 1163 | protected function initializeFixupMap() { |
1160 | - if ($this->fixupMap) return; |
|
1164 | + if ($this->fixupMap) { |
|
1165 | + return; |
|
1166 | + } |
|
1161 | 1167 | |
1162 | 1168 | $this->fixupMap = [ |
1163 | 1169 | Expr\PreInc::class => ['var' => self::FIXUP_PREC_RIGHT], |
@@ -1252,7 +1258,9 @@ discard block |
||
1252 | 1258 | * certain node is replaced by null. |
1253 | 1259 | */ |
1254 | 1260 | protected function initializeRemovalMap() { |
1255 | - if ($this->removalMap) return; |
|
1261 | + if ($this->removalMap) { |
|
1262 | + return; |
|
1263 | + } |
|
1256 | 1264 | |
1257 | 1265 | $stripBoth = ['left' => \T_WHITESPACE, 'right' => \T_WHITESPACE]; |
1258 | 1266 | $stripLeft = ['left' => \T_WHITESPACE]; |
@@ -1297,7 +1305,9 @@ discard block |
||
1297 | 1305 | } |
1298 | 1306 | |
1299 | 1307 | protected function initializeInsertionMap() { |
1300 | - if ($this->insertionMap) return; |
|
1308 | + if ($this->insertionMap) { |
|
1309 | + return; |
|
1310 | + } |
|
1301 | 1311 | |
1302 | 1312 | // TODO: "yield" where both key and value are inserted doesn't work |
1303 | 1313 | // [$find, $beforeToken, $extraLeft, $extraRight] |
@@ -1339,7 +1349,9 @@ discard block |
||
1339 | 1349 | } |
1340 | 1350 | |
1341 | 1351 | protected function initializeListInsertionMap() { |
1342 | - if ($this->listInsertionMap) return; |
|
1352 | + if ($this->listInsertionMap) { |
|
1353 | + return; |
|
1354 | + } |
|
1343 | 1355 | |
1344 | 1356 | $this->listInsertionMap = [ |
1345 | 1357 | // special |
@@ -1433,7 +1445,9 @@ discard block |
||
1433 | 1445 | } |
1434 | 1446 | |
1435 | 1447 | protected function initializeEmptyListInsertionMap() { |
1436 | - if ($this->emptyListInsertionMap) return; |
|
1448 | + if ($this->emptyListInsertionMap) { |
|
1449 | + return; |
|
1450 | + } |
|
1437 | 1451 | |
1438 | 1452 | // TODO Insertion into empty statement lists. |
1439 | 1453 | |
@@ -1486,7 +1500,9 @@ discard block |
||
1486 | 1500 | } |
1487 | 1501 | |
1488 | 1502 | protected function initializeModifierChangeMap() { |
1489 | - if ($this->modifierChangeMap) return; |
|
1503 | + if ($this->modifierChangeMap) { |
|
1504 | + return; |
|
1505 | + } |
|
1490 | 1506 | |
1491 | 1507 | $this->modifierChangeMap = [ |
1492 | 1508 | 'Stmt_ClassConst->flags' => \T_CONST, |
@@ -69,9 +69,12 @@ discard block |
||
69 | 69 | echo esc(static::cleanPath($row['file']) . ' : ' . $row['line']); |
70 | 70 | } |
71 | 71 | ?> |
72 | - <?php else : ?> |
|
72 | + <?php else { |
|
73 | + : ?> |
|
73 | 74 | {PHP internal code} |
74 | - <?php endif; ?> |
|
75 | + <?php endif; |
|
76 | +} |
|
77 | +?> |
|
75 | 78 | |
76 | 79 | <!-- Class/Method --> |
77 | 80 | <?php if (isset($row['class'])) : ?> |
@@ -99,9 +102,12 @@ discard block |
||
99 | 102 | |
100 | 103 | </table> |
101 | 104 | </div> |
102 | - <?php else : ?> |
|
105 | + <?php else { |
|
106 | + : ?> |
|
103 | 107 | () |
104 | - <?php endif; ?> |
|
108 | + <?php endif; |
|
109 | +} |
|
110 | +?> |
|
105 | 111 | <?php endif; ?> |
106 | 112 | |
107 | 113 | <?php if (! isset($row['class']) && isset($row['function'])) : ?> |
@@ -146,9 +152,12 @@ discard block |
||
146 | 152 | <td> |
147 | 153 | <?php if (is_string($value)) : ?> |
148 | 154 | <?= esc($value) ?> |
149 | - <?php else: ?> |
|
155 | + <?php else { |
|
156 | + : ?> |
|
150 | 157 | <pre><?= esc(print_r($value, true)) ?></pre> |
151 | - <?php endif; ?> |
|
158 | + <?php endif; |
|
159 | +} |
|
160 | +?> |
|
152 | 161 | </td> |
153 | 162 | </tr> |
154 | 163 | <?php endforeach; ?> |
@@ -176,9 +185,12 @@ discard block |
||
176 | 185 | <td> |
177 | 186 | <?php if (is_string($value)) : ?> |
178 | 187 | <?= esc($value) ?> |
179 | - <?php else: ?> |
|
188 | + <?php else { |
|
189 | + : ?> |
|
180 | 190 | <pre><?= esc(print_r($value, true)) ?></pre> |
181 | - <?php endif; ?> |
|
191 | + <?php endif; |
|
192 | +} |
|
193 | +?> |
|
182 | 194 | </td> |
183 | 195 | </tr> |
184 | 196 | <?php endforeach; ?> |
@@ -251,9 +263,12 @@ discard block |
||
251 | 263 | <td> |
252 | 264 | <?php if (is_string($value)) : ?> |
253 | 265 | <?= esc($value) ?> |
254 | - <?php else: ?> |
|
266 | + <?php else { |
|
267 | + : ?> |
|
255 | 268 | <pre><?= esc(print_r($value, true)) ?></pre> |
256 | - <?php endif; ?> |
|
269 | + <?php endif; |
|
270 | +} |
|
271 | +?> |
|
257 | 272 | </td> |
258 | 273 | </tr> |
259 | 274 | <?php endforeach; ?> |
@@ -69,9 +69,12 @@ discard block |
||
69 | 69 | echo esc(static::cleanPath($row['file']) . ' : ' . $row['line']); |
70 | 70 | } |
71 | 71 | ?> |
72 | - <?php else : ?> |
|
72 | + <?php else { |
|
73 | + : ?> |
|
73 | 74 | {PHP internal code} |
74 | - <?php endif; ?> |
|
75 | + <?php endif; |
|
76 | +} |
|
77 | +?> |
|
75 | 78 | |
76 | 79 | <!-- Class/Method --> |
77 | 80 | <?php if (isset($row['class'])) : ?> |
@@ -99,9 +102,12 @@ discard block |
||
99 | 102 | |
100 | 103 | </table> |
101 | 104 | </div> |
102 | - <?php else : ?> |
|
105 | + <?php else { |
|
106 | + : ?> |
|
103 | 107 | () |
104 | - <?php endif; ?> |
|
108 | + <?php endif; |
|
109 | +} |
|
110 | +?> |
|
105 | 111 | <?php endif; ?> |
106 | 112 | |
107 | 113 | <?php if (! isset($row['class']) && isset($row['function'])) : ?> |
@@ -146,9 +152,12 @@ discard block |
||
146 | 152 | <td> |
147 | 153 | <?php if (is_string($value)) : ?> |
148 | 154 | <?= esc($value) ?> |
149 | - <?php else: ?> |
|
155 | + <?php else { |
|
156 | + : ?> |
|
150 | 157 | <pre><?= esc(print_r($value, true)) ?></pre> |
151 | - <?php endif; ?> |
|
158 | + <?php endif; |
|
159 | +} |
|
160 | +?> |
|
152 | 161 | </td> |
153 | 162 | </tr> |
154 | 163 | <?php endforeach; ?> |
@@ -176,9 +185,12 @@ discard block |
||
176 | 185 | <td> |
177 | 186 | <?php if (is_string($value)) : ?> |
178 | 187 | <?= esc($value) ?> |
179 | - <?php else: ?> |
|
188 | + <?php else { |
|
189 | + : ?> |
|
180 | 190 | <pre><?= esc(print_r($value, true)) ?></pre> |
181 | - <?php endif; ?> |
|
191 | + <?php endif; |
|
192 | +} |
|
193 | +?> |
|
182 | 194 | </td> |
183 | 195 | </tr> |
184 | 196 | <?php endforeach; ?> |
@@ -251,9 +263,12 @@ discard block |
||
251 | 263 | <td> |
252 | 264 | <?php if (is_string($value)) : ?> |
253 | 265 | <?= esc($value) ?> |
254 | - <?php else: ?> |
|
266 | + <?php else { |
|
267 | + : ?> |
|
255 | 268 | <pre><?= esc(print_r($value, true)) ?></pre> |
256 | - <?php endif; ?> |
|
269 | + <?php endif; |
|
270 | +} |
|
271 | +?> |
|
257 | 272 | </td> |
258 | 273 | </tr> |
259 | 274 | <?php endforeach; ?> |
@@ -1540,7 +1540,10 @@ discard block |
||
1540 | 1540 | }, |
1541 | 1541 | 183 => function ($stackPos) { |
1542 | 1542 | $startAttributes = $this->startAttributeStack[$stackPos-(1-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $this->semValue = null; }; |
1543 | - if ($this->semValue === null) $this->semValue = array(); /* means: no statement */ |
|
1543 | + if ($this->semValue === null) { |
|
1544 | + $this->semValue = array(); |
|
1545 | + } |
|
1546 | + /* means: no statement */ |
|
1544 | 1547 | }, |
1545 | 1548 | 184 => function ($stackPos) { |
1546 | 1549 | $this->semValue = array(); |
@@ -2707,7 +2710,9 @@ discard block |
||
2707 | 2710 | $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); |
2708 | 2711 | }, |
2709 | 2712 | 566 => function ($stackPos) { |
2710 | - $this->semValue = $this->semStack[$stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) array_pop($this->semValue); |
|
2713 | + $this->semValue = $this->semStack[$stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) { |
|
2714 | + array_pop($this->semValue); |
|
2715 | + } |
|
2711 | 2716 | }, |
2712 | 2717 | 567 => function ($stackPos) { |
2713 | 2718 | $this->semValue = $this->semStack[$stackPos]; |
@@ -1450,7 +1450,10 @@ |
||
1450 | 1450 | }, |
1451 | 1451 | 163 => function ($stackPos) { |
1452 | 1452 | $startAttributes = $this->startAttributeStack[$stackPos-(1-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $this->semValue = null; }; |
1453 | - if ($this->semValue === null) $this->semValue = array(); /* means: no statement */ |
|
1453 | + if ($this->semValue === null) { |
|
1454 | + $this->semValue = array(); |
|
1455 | + } |
|
1456 | + /* means: no statement */ |
|
1454 | 1457 | }, |
1455 | 1458 | 164 => function ($stackPos) { |
1456 | 1459 | $this->semValue = array(); |
@@ -1122,7 +1122,9 @@ discard block |
||
1122 | 1122 | * The label char map determines whether a certain character may occur in a label. |
1123 | 1123 | */ |
1124 | 1124 | protected function initializeLabelCharMap() { |
1125 | - if ($this->labelCharMap) return; |
|
1125 | + if ($this->labelCharMap) { |
|
1126 | + return; |
|
1127 | + } |
|
1126 | 1128 | |
1127 | 1129 | $this->labelCharMap = []; |
1128 | 1130 | for ($i = 0; $i < 256; $i++) { |
@@ -1139,7 +1141,9 @@ discard block |
||
1139 | 1141 | * The node list differ is used to determine differences between two array subnodes. |
1140 | 1142 | */ |
1141 | 1143 | protected function initializeNodeListDiffer() { |
1142 | - if ($this->nodeListDiffer) return; |
|
1144 | + if ($this->nodeListDiffer) { |
|
1145 | + return; |
|
1146 | + } |
|
1143 | 1147 | |
1144 | 1148 | $this->nodeListDiffer = new Internal\Differ(function ($a, $b) { |
1145 | 1149 | if ($a instanceof Node && $b instanceof Node) { |
@@ -1157,7 +1161,9 @@ discard block |
||
1157 | 1161 | * some kind of "fixup" operation, e.g. the addition of parenthesis or braces. |
1158 | 1162 | */ |
1159 | 1163 | protected function initializeFixupMap() { |
1160 | - if ($this->fixupMap) return; |
|
1164 | + if ($this->fixupMap) { |
|
1165 | + return; |
|
1166 | + } |
|
1161 | 1167 | |
1162 | 1168 | $this->fixupMap = [ |
1163 | 1169 | Expr\PreInc::class => ['var' => self::FIXUP_PREC_RIGHT], |
@@ -1252,7 +1258,9 @@ discard block |
||
1252 | 1258 | * certain node is replaced by null. |
1253 | 1259 | */ |
1254 | 1260 | protected function initializeRemovalMap() { |
1255 | - if ($this->removalMap) return; |
|
1261 | + if ($this->removalMap) { |
|
1262 | + return; |
|
1263 | + } |
|
1256 | 1264 | |
1257 | 1265 | $stripBoth = ['left' => \T_WHITESPACE, 'right' => \T_WHITESPACE]; |
1258 | 1266 | $stripLeft = ['left' => \T_WHITESPACE]; |
@@ -1297,7 +1305,9 @@ discard block |
||
1297 | 1305 | } |
1298 | 1306 | |
1299 | 1307 | protected function initializeInsertionMap() { |
1300 | - if ($this->insertionMap) return; |
|
1308 | + if ($this->insertionMap) { |
|
1309 | + return; |
|
1310 | + } |
|
1301 | 1311 | |
1302 | 1312 | // TODO: "yield" where both key and value are inserted doesn't work |
1303 | 1313 | // [$find, $beforeToken, $extraLeft, $extraRight] |
@@ -1339,7 +1349,9 @@ discard block |
||
1339 | 1349 | } |
1340 | 1350 | |
1341 | 1351 | protected function initializeListInsertionMap() { |
1342 | - if ($this->listInsertionMap) return; |
|
1352 | + if ($this->listInsertionMap) { |
|
1353 | + return; |
|
1354 | + } |
|
1343 | 1355 | |
1344 | 1356 | $this->listInsertionMap = [ |
1345 | 1357 | // special |
@@ -1433,7 +1445,9 @@ discard block |
||
1433 | 1445 | } |
1434 | 1446 | |
1435 | 1447 | protected function initializeEmptyListInsertionMap() { |
1436 | - if ($this->emptyListInsertionMap) return; |
|
1448 | + if ($this->emptyListInsertionMap) { |
|
1449 | + return; |
|
1450 | + } |
|
1437 | 1451 | |
1438 | 1452 | // TODO Insertion into empty statement lists. |
1439 | 1453 | |
@@ -1486,7 +1500,9 @@ discard block |
||
1486 | 1500 | } |
1487 | 1501 | |
1488 | 1502 | protected function initializeModifierChangeMap() { |
1489 | - if ($this->modifierChangeMap) return; |
|
1503 | + if ($this->modifierChangeMap) { |
|
1504 | + return; |
|
1505 | + } |
|
1490 | 1506 | |
1491 | 1507 | $this->modifierChangeMap = [ |
1492 | 1508 | 'Stmt_ClassConst->flags' => \T_CONST, |
@@ -27,8 +27,7 @@ |
||
27 | 27 | 'time_cost' => $config->hashTimeCost, |
28 | 28 | 'threads' => $config->hashThreads, |
29 | 29 | ]; |
30 | - } |
|
31 | - else |
|
30 | + } else |
|
32 | 31 | { |
33 | 32 | $hashOptions = [ |
34 | 33 | 'cost' => $config->hashCost, |