- 2.14.x: Bump Psalm to 5.0.0 and fix errors for Symfony 6.2 (#10261) Make use statements redundant Leverage Lexer's Token type (follow up)
derrabus
Showing 1 of 4 files from the diff.
lib/Doctrine/ORM/Query/Parser.php
changed.
Other files ignored by Codecov
psalm-baseline.xml
has changed.
composer.json
has changed.
@@ -9,58 +9,7 @@
Loading
| 9 | 9 | use Doctrine\ORM\EntityManagerInterface; |
|
| 10 | 10 | use Doctrine\ORM\Mapping\ClassMetadata; |
|
| 11 | 11 | use Doctrine\ORM\Query; |
|
| 12 | - | use Doctrine\ORM\Query\AST\AggregateExpression; |
|
| 13 | - | use Doctrine\ORM\Query\AST\ArithmeticExpression; |
|
| 14 | - | use Doctrine\ORM\Query\AST\ArithmeticFactor; |
|
| 15 | - | use Doctrine\ORM\Query\AST\ArithmeticTerm; |
|
| 16 | - | use Doctrine\ORM\Query\AST\BetweenExpression; |
|
| 17 | - | use Doctrine\ORM\Query\AST\CoalesceExpression; |
|
| 18 | - | use Doctrine\ORM\Query\AST\CollectionMemberExpression; |
|
| 19 | - | use Doctrine\ORM\Query\AST\ComparisonExpression; |
|
| 20 | - | use Doctrine\ORM\Query\AST\ConditionalPrimary; |
|
| 21 | - | use Doctrine\ORM\Query\AST\DeleteClause; |
|
| 22 | - | use Doctrine\ORM\Query\AST\DeleteStatement; |
|
| 23 | - | use Doctrine\ORM\Query\AST\EmptyCollectionComparisonExpression; |
|
| 24 | - | use Doctrine\ORM\Query\AST\ExistsExpression; |
|
| 25 | - | use Doctrine\ORM\Query\AST\FromClause; |
|
| 26 | 12 | use Doctrine\ORM\Query\AST\Functions; |
|
| 27 | - | use Doctrine\ORM\Query\AST\Functions\FunctionNode; |
|
| 28 | - | use Doctrine\ORM\Query\AST\GeneralCaseExpression; |
|
| 29 | - | use Doctrine\ORM\Query\AST\GroupByClause; |
|
| 30 | - | use Doctrine\ORM\Query\AST\HavingClause; |
|
| 31 | - | use Doctrine\ORM\Query\AST\IdentificationVariableDeclaration; |
|
| 32 | - | use Doctrine\ORM\Query\AST\IndexBy; |
|
| 33 | - | use Doctrine\ORM\Query\AST\InExpression; |
|
| 34 | - | use Doctrine\ORM\Query\AST\InputParameter; |
|
| 35 | - | use Doctrine\ORM\Query\AST\InstanceOfExpression; |
|
| 36 | - | use Doctrine\ORM\Query\AST\Join; |
|
| 37 | - | use Doctrine\ORM\Query\AST\JoinAssociationPathExpression; |
|
| 38 | - | use Doctrine\ORM\Query\AST\LikeExpression; |
|
| 39 | - | use Doctrine\ORM\Query\AST\Literal; |
|
| 40 | - | use Doctrine\ORM\Query\AST\NewObjectExpression; |
|
| 41 | - | use Doctrine\ORM\Query\AST\Node; |
|
| 42 | - | use Doctrine\ORM\Query\AST\NullComparisonExpression; |
|
| 43 | - | use Doctrine\ORM\Query\AST\NullIfExpression; |
|
| 44 | - | use Doctrine\ORM\Query\AST\OrderByClause; |
|
| 45 | - | use Doctrine\ORM\Query\AST\OrderByItem; |
|
| 46 | - | use Doctrine\ORM\Query\AST\PartialObjectExpression; |
|
| 47 | - | use Doctrine\ORM\Query\AST\PathExpression; |
|
| 48 | - | use Doctrine\ORM\Query\AST\QuantifiedExpression; |
|
| 49 | - | use Doctrine\ORM\Query\AST\RangeVariableDeclaration; |
|
| 50 | - | use Doctrine\ORM\Query\AST\SelectClause; |
|
| 51 | - | use Doctrine\ORM\Query\AST\SelectExpression; |
|
| 52 | - | use Doctrine\ORM\Query\AST\SelectStatement; |
|
| 53 | - | use Doctrine\ORM\Query\AST\SimpleArithmeticExpression; |
|
| 54 | - | use Doctrine\ORM\Query\AST\SimpleSelectClause; |
|
| 55 | - | use Doctrine\ORM\Query\AST\SimpleSelectExpression; |
|
| 56 | - | use Doctrine\ORM\Query\AST\SimpleWhenClause; |
|
| 57 | - | use Doctrine\ORM\Query\AST\Subselect; |
|
| 58 | - | use Doctrine\ORM\Query\AST\SubselectFromClause; |
|
| 59 | - | use Doctrine\ORM\Query\AST\UpdateClause; |
|
| 60 | - | use Doctrine\ORM\Query\AST\UpdateItem; |
|
| 61 | - | use Doctrine\ORM\Query\AST\UpdateStatement; |
|
| 62 | - | use Doctrine\ORM\Query\AST\WhenClause; |
|
| 63 | - | use Doctrine\ORM\Query\AST\WhereClause; |
|
| 64 | 13 | use LogicException; |
|
| 65 | 14 | use ReflectionClass; |
|
| 66 | 15 |
@@ -298,7 +247,7 @@
Loading
| 298 | 247 | /** |
|
| 299 | 248 | * Parses and builds AST for the given Query. |
|
| 300 | 249 | * |
|
| 301 | - | * @return SelectStatement|UpdateStatement|DeleteStatement |
|
| 250 | + | * @return AST\SelectStatement|AST\UpdateStatement|AST\DeleteStatement |
|
| 302 | 251 | */ |
|
| 303 | 252 | public function getAST() |
|
| 304 | 253 | { |
@@ -458,7 +407,7 @@
Loading
| 458 | 407 | * |
|
| 459 | 408 | * @param AST\SelectStatement|AST\DeleteStatement|AST\UpdateStatement $AST |
|
| 460 | 409 | */ |
|
| 461 | - | private function fixIdentificationVariableOrder(Node $AST): void |
|
| 410 | + | private function fixIdentificationVariableOrder(AST\Node $AST): void |
|
| 462 | 411 | { |
|
| 463 | 412 | if (count($this->identVariableExpressions) <= 1) { |
|
| 464 | 413 | return; |
@@ -550,7 +499,7 @@
Loading
| 550 | 499 | * @param bool $resetPeek Reset peek after finding the closing parenthesis. |
|
| 551 | 500 | * |
|
| 552 | 501 | * @return mixed[] |
|
| 553 | - | * @psalm-return array{value: string, type: int|null|string, position: int}|null |
|
| 502 | + | * @psalm-return Token|null |
|
| 554 | 503 | */ |
|
| 555 | 504 | private function peekBeyondClosingParenthesis(bool $resetPeek = true): array|null |
|
| 556 | 505 | { |
@@ -674,7 +623,7 @@
Loading
| 674 | 623 | /** |
|
| 675 | 624 | * Validates that the given <tt>NewObjectExpression</tt>. |
|
| 676 | 625 | */ |
|
| 677 | - | private function processDeferredNewObjectExpressions(SelectStatement $AST): void |
|
| 626 | + | private function processDeferredNewObjectExpressions(AST\SelectStatement $AST): void |
|
| 678 | 627 | { |
|
| 679 | 628 | foreach ($this->deferredNewObjectExpressions as $deferredItem) { |
|
| 680 | 629 | $expression = $deferredItem['expression']; |
@@ -883,7 +832,7 @@
Loading
| 883 | 832 | /** |
|
| 884 | 833 | * QueryLanguage ::= SelectStatement | UpdateStatement | DeleteStatement |
|
| 885 | 834 | * |
|
| 886 | - | * @return SelectStatement|UpdateStatement|DeleteStatement |
|
| 835 | + | * @return AST\SelectStatement|AST\UpdateStatement|AST\DeleteStatement |
|
| 887 | 836 | */ |
|
| 888 | 837 | public function QueryLanguage() |
|
| 889 | 838 | { |
@@ -920,7 +869,7 @@
Loading
| 920 | 869 | /** |
|
| 921 | 870 | * SelectStatement ::= SelectClause FromClause [WhereClause] [GroupByClause] [HavingClause] [OrderByClause] |
|
| 922 | 871 | * |
|
| 923 | - | * @return SelectStatement |
|
| 872 | + | * @return AST\SelectStatement |
|
| 924 | 873 | */ |
|
| 925 | 874 | public function SelectStatement() |
|
| 926 | 875 | { |
@@ -937,7 +886,7 @@
Loading
| 937 | 886 | /** |
|
| 938 | 887 | * UpdateStatement ::= UpdateClause [WhereClause] |
|
| 939 | 888 | * |
|
| 940 | - | * @return UpdateStatement |
|
| 889 | + | * @return AST\UpdateStatement |
|
| 941 | 890 | */ |
|
| 942 | 891 | public function UpdateStatement() |
|
| 943 | 892 | { |
@@ -951,7 +900,7 @@
Loading
| 951 | 900 | /** |
|
| 952 | 901 | * DeleteStatement ::= DeleteClause [WhereClause] |
|
| 953 | 902 | * |
|
| 954 | - | * @return DeleteStatement |
|
| 903 | + | * @return AST\DeleteStatement |
|
| 955 | 904 | */ |
|
| 956 | 905 | public function DeleteStatement() |
|
| 957 | 906 | { |
@@ -1085,7 +1034,7 @@
Loading
| 1085 | 1034 | /** |
|
| 1086 | 1035 | * JoinAssociationPathExpression ::= IdentificationVariable "." (CollectionValuedAssociationField | SingleValuedAssociationField) |
|
| 1087 | 1036 | * |
|
| 1088 | - | * @return JoinAssociationPathExpression |
|
| 1037 | + | * @return AST\JoinAssociationPathExpression |
|
| 1089 | 1038 | */ |
|
| 1090 | 1039 | public function JoinAssociationPathExpression() |
|
| 1091 | 1040 | { |
@@ -1120,9 +1069,9 @@
Loading
| 1120 | 1069 | * PathExpression ::= IdentificationVariable {"." identifier}* |
|
| 1121 | 1070 | * |
|
| 1122 | 1071 | * @param int $expectedTypes |
|
| 1123 | - | * @psalm-param int-mask-of<PathExpression::TYPE_*> $expectedTypes |
|
| 1072 | + | * @psalm-param int-mask-of<AST\PathExpression::TYPE_*> $expectedTypes |
|
| 1124 | 1073 | * |
|
| 1125 | - | * @return PathExpression |
|
| 1074 | + | * @return AST\PathExpression |
|
| 1126 | 1075 | */ |
|
| 1127 | 1076 | public function PathExpression($expectedTypes) |
|
| 1128 | 1077 | { |
@@ -1158,7 +1107,7 @@
Loading
| 1158 | 1107 | /** |
|
| 1159 | 1108 | * AssociationPathExpression ::= CollectionValuedPathExpression | SingleValuedAssociationPathExpression |
|
| 1160 | 1109 | * |
|
| 1161 | - | * @return PathExpression |
|
| 1110 | + | * @return AST\PathExpression |
|
| 1162 | 1111 | */ |
|
| 1163 | 1112 | public function AssociationPathExpression() |
|
| 1164 | 1113 | { |
@@ -1171,7 +1120,7 @@
Loading
| 1171 | 1120 | /** |
|
| 1172 | 1121 | * SingleValuedPathExpression ::= StateFieldPathExpression | SingleValuedAssociationPathExpression |
|
| 1173 | 1122 | * |
|
| 1174 | - | * @return PathExpression |
|
| 1123 | + | * @return AST\PathExpression |
|
| 1175 | 1124 | */ |
|
| 1176 | 1125 | public function SingleValuedPathExpression() |
|
| 1177 | 1126 | { |
@@ -1184,7 +1133,7 @@
Loading
| 1184 | 1133 | /** |
|
| 1185 | 1134 | * StateFieldPathExpression ::= IdentificationVariable "." StateField |
|
| 1186 | 1135 | * |
|
| 1187 | - | * @return PathExpression |
|
| 1136 | + | * @return AST\PathExpression |
|
| 1188 | 1137 | */ |
|
| 1189 | 1138 | public function StateFieldPathExpression() |
|
| 1190 | 1139 | { |
@@ -1194,7 +1143,7 @@
Loading
| 1194 | 1143 | /** |
|
| 1195 | 1144 | * SingleValuedAssociationPathExpression ::= IdentificationVariable "." SingleValuedAssociationField |
|
| 1196 | 1145 | * |
|
| 1197 | - | * @return PathExpression |
|
| 1146 | + | * @return AST\PathExpression |
|
| 1198 | 1147 | */ |
|
| 1199 | 1148 | public function SingleValuedAssociationPathExpression() |
|
| 1200 | 1149 | { |
@@ -1204,7 +1153,7 @@
Loading
| 1204 | 1153 | /** |
|
| 1205 | 1154 | * CollectionValuedPathExpression ::= IdentificationVariable "." CollectionValuedAssociationField |
|
| 1206 | 1155 | * |
|
| 1207 | - | * @return PathExpression |
|
| 1156 | + | * @return AST\PathExpression |
|
| 1208 | 1157 | */ |
|
| 1209 | 1158 | public function CollectionValuedPathExpression() |
|
| 1210 | 1159 | { |
@@ -1214,7 +1163,7 @@
Loading
| 1214 | 1163 | /** |
|
| 1215 | 1164 | * SelectClause ::= "SELECT" ["DISTINCT"] SelectExpression {"," SelectExpression} |
|
| 1216 | 1165 | * |
|
| 1217 | - | * @return SelectClause |
|
| 1166 | + | * @return AST\SelectClause |
|
| 1218 | 1167 | */ |
|
| 1219 | 1168 | public function SelectClause() |
|
| 1220 | 1169 | { |
@@ -1244,7 +1193,7 @@
Loading
| 1244 | 1193 | /** |
|
| 1245 | 1194 | * SimpleSelectClause ::= "SELECT" ["DISTINCT"] SimpleSelectExpression |
|
| 1246 | 1195 | * |
|
| 1247 | - | * @return SimpleSelectClause |
|
| 1196 | + | * @return AST\SimpleSelectClause |
|
| 1248 | 1197 | */ |
|
| 1249 | 1198 | public function SimpleSelectClause() |
|
| 1250 | 1199 | { |
@@ -1263,7 +1212,7 @@
Loading
| 1263 | 1212 | /** |
|
| 1264 | 1213 | * UpdateClause ::= "UPDATE" AbstractSchemaName ["AS"] AliasIdentificationVariable "SET" UpdateItem {"," UpdateItem}* |
|
| 1265 | 1214 | * |
|
| 1266 | - | * @return UpdateClause |
|
| 1215 | + | * @return AST\UpdateClause |
|
| 1267 | 1216 | */ |
|
| 1268 | 1217 | public function UpdateClause() |
|
| 1269 | 1218 | { |
@@ -1315,7 +1264,7 @@
Loading
| 1315 | 1264 | /** |
|
| 1316 | 1265 | * DeleteClause ::= "DELETE" ["FROM"] AbstractSchemaName ["AS"] AliasIdentificationVariable |
|
| 1317 | 1266 | * |
|
| 1318 | - | * @return DeleteClause |
|
| 1267 | + | * @return AST\DeleteClause |
|
| 1319 | 1268 | */ |
|
| 1320 | 1269 | public function DeleteClause() |
|
| 1321 | 1270 | { |
@@ -1362,7 +1311,7 @@
Loading
| 1362 | 1311 | /** |
|
| 1363 | 1312 | * FromClause ::= "FROM" IdentificationVariableDeclaration {"," IdentificationVariableDeclaration}* |
|
| 1364 | 1313 | * |
|
| 1365 | - | * @return FromClause |
|
| 1314 | + | * @return AST\FromClause |
|
| 1366 | 1315 | */ |
|
| 1367 | 1316 | public function FromClause() |
|
| 1368 | 1317 | { |
@@ -1383,7 +1332,7 @@
Loading
| 1383 | 1332 | /** |
|
| 1384 | 1333 | * SubselectFromClause ::= "FROM" SubselectIdentificationVariableDeclaration {"," SubselectIdentificationVariableDeclaration}* |
|
| 1385 | 1334 | * |
|
| 1386 | - | * @return SubselectFromClause |
|
| 1335 | + | * @return AST\SubselectFromClause |
|
| 1387 | 1336 | */ |
|
| 1388 | 1337 | public function SubselectFromClause() |
|
| 1389 | 1338 | { |
@@ -1404,7 +1353,7 @@
Loading
| 1404 | 1353 | /** |
|
| 1405 | 1354 | * WhereClause ::= "WHERE" ConditionalExpression |
|
| 1406 | 1355 | * |
|
| 1407 | - | * @return WhereClause |
|
| 1356 | + | * @return AST\WhereClause |
|
| 1408 | 1357 | */ |
|
| 1409 | 1358 | public function WhereClause() |
|
| 1410 | 1359 | { |
@@ -1416,7 +1365,7 @@
Loading
| 1416 | 1365 | /** |
|
| 1417 | 1366 | * HavingClause ::= "HAVING" ConditionalExpression |
|
| 1418 | 1367 | * |
|
| 1419 | - | * @return HavingClause |
|
| 1368 | + | * @return AST\HavingClause |
|
| 1420 | 1369 | */ |
|
| 1421 | 1370 | public function HavingClause() |
|
| 1422 | 1371 | { |
@@ -1428,7 +1377,7 @@
Loading
| 1428 | 1377 | /** |
|
| 1429 | 1378 | * GroupByClause ::= "GROUP" "BY" GroupByItem {"," GroupByItem}* |
|
| 1430 | 1379 | * |
|
| 1431 | - | * @return GroupByClause |
|
| 1380 | + | * @return AST\GroupByClause |
|
| 1432 | 1381 | */ |
|
| 1433 | 1382 | public function GroupByClause() |
|
| 1434 | 1383 | { |
@@ -1449,7 +1398,7 @@
Loading
| 1449 | 1398 | /** |
|
| 1450 | 1399 | * OrderByClause ::= "ORDER" "BY" OrderByItem {"," OrderByItem}* |
|
| 1451 | 1400 | * |
|
| 1452 | - | * @return OrderByClause |
|
| 1401 | + | * @return AST\OrderByClause |
|
| 1453 | 1402 | */ |
|
| 1454 | 1403 | public function OrderByClause() |
|
| 1455 | 1404 | { |
@@ -1471,7 +1420,7 @@
Loading
| 1471 | 1420 | /** |
|
| 1472 | 1421 | * Subselect ::= SimpleSelectClause SubselectFromClause [WhereClause] [GroupByClause] [HavingClause] [OrderByClause] |
|
| 1473 | 1422 | * |
|
| 1474 | - | * @return Subselect |
|
| 1423 | + | * @return AST\Subselect |
|
| 1475 | 1424 | */ |
|
| 1476 | 1425 | public function Subselect() |
|
| 1477 | 1426 | { |
@@ -1494,7 +1443,7 @@
Loading
| 1494 | 1443 | /** |
|
| 1495 | 1444 | * UpdateItem ::= SingleValuedPathExpression "=" NewValue |
|
| 1496 | 1445 | * |
|
| 1497 | - | * @return UpdateItem |
|
| 1446 | + | * @return AST\UpdateItem |
|
| 1498 | 1447 | */ |
|
| 1499 | 1448 | public function UpdateItem() |
|
| 1500 | 1449 | { |
@@ -1508,7 +1457,7 @@
Loading
| 1508 | 1457 | /** |
|
| 1509 | 1458 | * GroupByItem ::= IdentificationVariable | ResultVariable | SingleValuedPathExpression |
|
| 1510 | 1459 | * |
|
| 1511 | - | * @return string|PathExpression |
|
| 1460 | + | * @return string|AST\PathExpression |
|
| 1512 | 1461 | */ |
|
| 1513 | 1462 | public function GroupByItem() |
|
| 1514 | 1463 | { |
@@ -1537,7 +1486,7 @@
Loading
| 1537 | 1486 | * ScalarExpression | ResultVariable | FunctionDeclaration |
|
| 1538 | 1487 | * ) ["ASC" | "DESC"] |
|
| 1539 | 1488 | * |
|
| 1540 | - | * @return OrderByItem |
|
| 1489 | + | * @return AST\OrderByItem |
|
| 1541 | 1490 | */ |
|
| 1542 | 1491 | public function OrderByItem() |
|
| 1543 | 1492 | { |
@@ -1631,7 +1580,7 @@
Loading
| 1631 | 1580 | /** |
|
| 1632 | 1581 | * IdentificationVariableDeclaration ::= RangeVariableDeclaration [IndexBy] {Join}* |
|
| 1633 | 1582 | * |
|
| 1634 | - | * @return IdentificationVariableDeclaration |
|
| 1583 | + | * @return AST\IdentificationVariableDeclaration |
|
| 1635 | 1584 | */ |
|
| 1636 | 1585 | public function IdentificationVariableDeclaration() |
|
| 1637 | 1586 | { |
@@ -1672,7 +1621,7 @@
Loading
| 1672 | 1621 | * accessible is "FROM", prohibiting an easy implementation without larger |
|
| 1673 | 1622 | * changes.} |
|
| 1674 | 1623 | * |
|
| 1675 | - | * @return IdentificationVariableDeclaration |
|
| 1624 | + | * @return AST\IdentificationVariableDeclaration |
|
| 1676 | 1625 | */ |
|
| 1677 | 1626 | public function SubselectIdentificationVariableDeclaration() |
|
| 1678 | 1627 | { |
@@ -1721,7 +1670,7 @@
Loading
| 1721 | 1670 | * (JoinAssociationDeclaration | RangeVariableDeclaration) |
|
| 1722 | 1671 | * ["WITH" ConditionalExpression] |
|
| 1723 | 1672 | * |
|
| 1724 | - | * @return Join |
|
| 1673 | + | * @return AST\Join |
|
| 1725 | 1674 | */ |
|
| 1726 | 1675 | public function Join() |
|
| 1727 | 1676 | { |
@@ -1776,7 +1725,7 @@
Loading
| 1776 | 1725 | /** |
|
| 1777 | 1726 | * RangeVariableDeclaration ::= AbstractSchemaName ["AS"] AliasIdentificationVariable |
|
| 1778 | 1727 | * |
|
| 1779 | - | * @return RangeVariableDeclaration |
|
| 1728 | + | * @return AST\RangeVariableDeclaration |
|
| 1780 | 1729 | * |
|
| 1781 | 1730 | * @throws QueryException |
|
| 1782 | 1731 | */ |
@@ -1857,7 +1806,7 @@
Loading
| 1857 | 1806 | * PartialObjectExpression ::= "PARTIAL" IdentificationVariable "." PartialFieldSet |
|
| 1858 | 1807 | * PartialFieldSet ::= "{" SimpleStateField {"," SimpleStateField}* "}" |
|
| 1859 | 1808 | * |
|
| 1860 | - | * @return PartialObjectExpression |
|
| 1809 | + | * @return AST\PartialObjectExpression |
|
| 1861 | 1810 | */ |
|
| 1862 | 1811 | public function PartialObjectExpression() |
|
| 1863 | 1812 | { |
@@ -1921,7 +1870,7 @@
Loading
| 1921 | 1870 | /** |
|
| 1922 | 1871 | * NewObjectExpression ::= "NEW" AbstractSchemaName "(" NewObjectArg {"," NewObjectArg}* ")" |
|
| 1923 | 1872 | * |
|
| 1924 | - | * @return NewObjectExpression |
|
| 1873 | + | * @return AST\NewObjectExpression |
|
| 1925 | 1874 | */ |
|
| 1926 | 1875 | public function NewObjectExpression() |
|
| 1927 | 1876 | { |
@@ -1978,7 +1927,7 @@
Loading
| 1978 | 1927 | /** |
|
| 1979 | 1928 | * IndexBy ::= "INDEX" "BY" SingleValuedPathExpression |
|
| 1980 | 1929 | * |
|
| 1981 | - | * @return IndexBy |
|
| 1930 | + | * @return AST\IndexBy |
|
| 1982 | 1931 | */ |
|
| 1983 | 1932 | public function IndexBy() |
|
| 1984 | 1933 | { |
@@ -2117,7 +2066,7 @@
Loading
| 2117 | 2066 | /** |
|
| 2118 | 2067 | * CoalesceExpression ::= "COALESCE" "(" ScalarExpression {"," ScalarExpression}* ")" |
|
| 2119 | 2068 | * |
|
| 2120 | - | * @return CoalesceExpression |
|
| 2069 | + | * @return AST\CoalesceExpression |
|
| 2121 | 2070 | */ |
|
| 2122 | 2071 | public function CoalesceExpression() |
|
| 2123 | 2072 | { |
@@ -2142,7 +2091,7 @@
Loading
| 2142 | 2091 | /** |
|
| 2143 | 2092 | * NullIfExpression ::= "NULLIF" "(" ScalarExpression "," ScalarExpression ")" |
|
| 2144 | 2093 | * |
|
| 2145 | - | * @return NullIfExpression |
|
| 2094 | + | * @return AST\NullIfExpression |
|
| 2146 | 2095 | */ |
|
| 2147 | 2096 | public function NullIfExpression() |
|
| 2148 | 2097 | { |
@@ -2161,7 +2110,7 @@
Loading
| 2161 | 2110 | /** |
|
| 2162 | 2111 | * GeneralCaseExpression ::= "CASE" WhenClause {WhenClause}* "ELSE" ScalarExpression "END" |
|
| 2163 | 2112 | * |
|
| 2164 | - | * @return GeneralCaseExpression |
|
| 2113 | + | * @return AST\GeneralCaseExpression |
|
| 2165 | 2114 | */ |
|
| 2166 | 2115 | public function GeneralCaseExpression() |
|
| 2167 | 2116 | { |
@@ -2209,7 +2158,7 @@
Loading
| 2209 | 2158 | /** |
|
| 2210 | 2159 | * WhenClause ::= "WHEN" ConditionalExpression "THEN" ScalarExpression |
|
| 2211 | 2160 | * |
|
| 2212 | - | * @return WhenClause |
|
| 2161 | + | * @return AST\WhenClause |
|
| 2213 | 2162 | */ |
|
| 2214 | 2163 | public function WhenClause() |
|
| 2215 | 2164 | { |
@@ -2223,7 +2172,7 @@
Loading
| 2223 | 2172 | /** |
|
| 2224 | 2173 | * SimpleWhenClause ::= "WHEN" ScalarExpression "THEN" ScalarExpression |
|
| 2225 | 2174 | * |
|
| 2226 | - | * @return SimpleWhenClause |
|
| 2175 | + | * @return AST\SimpleWhenClause |
|
| 2227 | 2176 | */ |
|
| 2228 | 2177 | public function SimpleWhenClause() |
|
| 2229 | 2178 | { |
@@ -2240,7 +2189,7 @@
Loading
| 2240 | 2189 | * PartialObjectExpression | "(" Subselect ")" | CaseExpression | NewObjectExpression |
|
| 2241 | 2190 | * ) [["AS"] ["HIDDEN"] AliasResultVariable] |
|
| 2242 | 2191 | * |
|
| 2243 | - | * @return SelectExpression |
|
| 2192 | + | * @return AST\SelectExpression |
|
| 2244 | 2193 | */ |
|
| 2245 | 2194 | public function SelectExpression() |
|
| 2246 | 2195 | { |
@@ -2371,7 +2320,7 @@
Loading
| 2371 | 2320 | * AggregateExpression | "(" Subselect ")" | ScalarExpression |
|
| 2372 | 2321 | * ) [["AS"] AliasResultVariable] |
|
| 2373 | 2322 | * |
|
| 2374 | - | * @return SimpleSelectExpression |
|
| 2323 | + | * @return AST\SimpleSelectExpression |
|
| 2375 | 2324 | */ |
|
| 2376 | 2325 | public function SimpleSelectExpression() |
|
| 2377 | 2326 | { |
@@ -2537,7 +2486,7 @@
Loading
| 2537 | 2486 | /** |
|
| 2538 | 2487 | * ConditionalPrimary ::= SimpleConditionalExpression | "(" ConditionalExpression ")" |
|
| 2539 | 2488 | * |
|
| 2540 | - | * @return ConditionalPrimary |
|
| 2489 | + | * @return AST\ConditionalPrimary |
|
| 2541 | 2490 | */ |
|
| 2542 | 2491 | public function ConditionalPrimary() |
|
| 2543 | 2492 | { |
@@ -2682,7 +2631,7 @@
Loading
| 2682 | 2631 | /** |
|
| 2683 | 2632 | * EmptyCollectionComparisonExpression ::= CollectionValuedPathExpression "IS" ["NOT"] "EMPTY" |
|
| 2684 | 2633 | * |
|
| 2685 | - | * @return EmptyCollectionComparisonExpression |
|
| 2634 | + | * @return AST\EmptyCollectionComparisonExpression |
|
| 2686 | 2635 | */ |
|
| 2687 | 2636 | public function EmptyCollectionComparisonExpression() |
|
| 2688 | 2637 | { |
@@ -2707,7 +2656,7 @@
Loading
| 2707 | 2656 | * EntityExpression ::= SingleValuedAssociationPathExpression | SimpleEntityExpression |
|
| 2708 | 2657 | * SimpleEntityExpression ::= IdentificationVariable | InputParameter |
|
| 2709 | 2658 | * |
|
| 2710 | - | * @return CollectionMemberExpression |
|
| 2659 | + | * @return AST\CollectionMemberExpression |
|
| 2711 | 2660 | */ |
|
| 2712 | 2661 | public function CollectionMemberExpression() |
|
| 2713 | 2662 | { |
@@ -2738,7 +2687,7 @@
Loading
| 2738 | 2687 | /** |
|
| 2739 | 2688 | * Literal ::= string | char | integer | float | boolean |
|
| 2740 | 2689 | * |
|
| 2741 | - | * @return Literal |
|
| 2690 | + | * @return AST\Literal |
|
| 2742 | 2691 | */ |
|
| 2743 | 2692 | public function Literal() |
|
| 2744 | 2693 | { |
@@ -2786,7 +2735,7 @@
Loading
| 2786 | 2735 | /** |
|
| 2787 | 2736 | * InputParameter ::= PositionalParameter | NamedParameter |
|
| 2788 | 2737 | * |
|
| 2789 | - | * @return InputParameter |
|
| 2738 | + | * @return AST\InputParameter |
|
| 2790 | 2739 | */ |
|
| 2791 | 2740 | public function InputParameter() |
|
| 2792 | 2741 | { |
@@ -2798,7 +2747,7 @@
Loading
| 2798 | 2747 | /** |
|
| 2799 | 2748 | * ArithmeticExpression ::= SimpleArithmeticExpression | "(" Subselect ")" |
|
| 2800 | 2749 | * |
|
| 2801 | - | * @return ArithmeticExpression |
|
| 2750 | + | * @return AST\ArithmeticExpression |
|
| 2802 | 2751 | */ |
|
| 2803 | 2752 | public function ArithmeticExpression() |
|
| 2804 | 2753 | { |
@@ -2824,7 +2773,7 @@
Loading
| 2824 | 2773 | /** |
|
| 2825 | 2774 | * SimpleArithmeticExpression ::= ArithmeticTerm {("+" | "-") ArithmeticTerm}* |
|
| 2826 | 2775 | * |
|
| 2827 | - | * @return SimpleArithmeticExpression|ArithmeticTerm |
|
| 2776 | + | * @return AST\SimpleArithmeticExpression|AST\ArithmeticTerm |
|
| 2828 | 2777 | */ |
|
| 2829 | 2778 | public function SimpleArithmeticExpression() |
|
| 2830 | 2779 | { |
@@ -2850,7 +2799,7 @@
Loading
| 2850 | 2799 | /** |
|
| 2851 | 2800 | * ArithmeticTerm ::= ArithmeticFactor {("*" | "/") ArithmeticFactor}* |
|
| 2852 | 2801 | * |
|
| 2853 | - | * @return ArithmeticTerm |
|
| 2802 | + | * @return AST\ArithmeticTerm |
|
| 2854 | 2803 | */ |
|
| 2855 | 2804 | public function ArithmeticTerm() |
|
| 2856 | 2805 | { |
@@ -2876,7 +2825,7 @@
Loading
| 2876 | 2825 | /** |
|
| 2877 | 2826 | * ArithmeticFactor ::= [("+" | "-")] ArithmeticPrimary |
|
| 2878 | 2827 | * |
|
| 2879 | - | * @return ArithmeticFactor |
|
| 2828 | + | * @return AST\ArithmeticFactor |
|
| 2880 | 2829 | */ |
|
| 2881 | 2830 | public function ArithmeticFactor() |
|
| 2882 | 2831 | { |
@@ -2905,7 +2854,7 @@
Loading
| 2905 | 2854 | * | FunctionsReturningDatetime | IdentificationVariable | ResultVariable |
|
| 2906 | 2855 | * | InputParameter | CaseExpression |
|
| 2907 | 2856 | * |
|
| 2908 | - | * @return Node|string |
|
| 2857 | + | * @return AST\Node|string |
|
| 2909 | 2858 | */ |
|
| 2910 | 2859 | public function ArithmeticPrimary() |
|
| 2911 | 2860 | { |
@@ -2959,7 +2908,7 @@
Loading
| 2959 | 2908 | /** |
|
| 2960 | 2909 | * StringExpression ::= StringPrimary | ResultVariable | "(" Subselect ")" |
|
| 2961 | 2910 | * |
|
| 2962 | - | * @return Subselect|Node|string |
|
| 2911 | + | * @return AST\Subselect|AST\Node|string |
|
| 2963 | 2912 | */ |
|
| 2964 | 2913 | public function StringExpression() |
|
| 2965 | 2914 | { |
@@ -2988,7 +2937,7 @@
Loading
| 2988 | 2937 | /** |
|
| 2989 | 2938 | * StringPrimary ::= StateFieldPathExpression | string | InputParameter | FunctionsReturningStrings | AggregateExpression | CaseExpression |
|
| 2990 | 2939 | * |
|
| 2991 | - | * @return Node |
|
| 2940 | + | * @return AST\Node |
|
| 2992 | 2941 | */ |
|
| 2993 | 2942 | public function StringPrimary() |
|
| 2994 | 2943 | { |
@@ -3037,7 +2986,7 @@
Loading
| 3037 | 2986 | /** |
|
| 3038 | 2987 | * EntityExpression ::= SingleValuedAssociationPathExpression | SimpleEntityExpression |
|
| 3039 | 2988 | * |
|
| 3040 | - | * @return AST\InputParameter|PathExpression |
|
| 2989 | + | * @return AST\InputParameter|AST\PathExpression |
|
| 3041 | 2990 | */ |
|
| 3042 | 2991 | public function EntityExpression() |
|
| 3043 | 2992 | { |
@@ -3068,7 +3017,7 @@
Loading
| 3068 | 3017 | * AggregateExpression ::= |
|
| 3069 | 3018 | * ("AVG" | "MAX" | "MIN" | "SUM" | "COUNT") "(" ["DISTINCT"] SimpleArithmeticExpression ")" |
|
| 3070 | 3019 | * |
|
| 3071 | - | * @return AggregateExpression |
|
| 3020 | + | * @return AST\AggregateExpression |
|
| 3072 | 3021 | */ |
|
| 3073 | 3022 | public function AggregateExpression() |
|
| 3074 | 3023 | { |
@@ -3098,7 +3047,7 @@
Loading
| 3098 | 3047 | /** |
|
| 3099 | 3048 | * QuantifiedExpression ::= ("ALL" | "ANY" | "SOME") "(" Subselect ")" |
|
| 3100 | 3049 | * |
|
| 3101 | - | * @return QuantifiedExpression |
|
| 3050 | + | * @return AST\QuantifiedExpression |
|
| 3102 | 3051 | */ |
|
| 3103 | 3052 | public function QuantifiedExpression() |
|
| 3104 | 3053 | { |
@@ -3123,7 +3072,7 @@
Loading
| 3123 | 3072 | /** |
|
| 3124 | 3073 | * BetweenExpression ::= ArithmeticExpression ["NOT"] "BETWEEN" ArithmeticExpression "AND" ArithmeticExpression |
|
| 3125 | 3074 | * |
|
| 3126 | - | * @return BetweenExpression |
|
| 3075 | + | * @return AST\BetweenExpression |
|
| 3127 | 3076 | */ |
|
| 3128 | 3077 | public function BetweenExpression() |
|
| 3129 | 3078 | { |
@@ -3149,7 +3098,7 @@
Loading
| 3149 | 3098 | /** |
|
| 3150 | 3099 | * ComparisonExpression ::= ArithmeticExpression ComparisonOperator ( QuantifiedExpression | ArithmeticExpression ) |
|
| 3151 | 3100 | * |
|
| 3152 | - | * @return ComparisonExpression |
|
| 3101 | + | * @return AST\ComparisonExpression |
|
| 3153 | 3102 | */ |
|
| 3154 | 3103 | public function ComparisonExpression() |
|
| 3155 | 3104 | { |
@@ -3167,7 +3116,7 @@
Loading
| 3167 | 3116 | /** |
|
| 3168 | 3117 | * InExpression ::= SingleValuedPathExpression ["NOT"] "IN" "(" (InParameter {"," InParameter}* | Subselect) ")" |
|
| 3169 | 3118 | * |
|
| 3170 | - | * @return InExpression |
|
| 3119 | + | * @return AST\InExpression |
|
| 3171 | 3120 | */ |
|
| 3172 | 3121 | public function InExpression() |
|
| 3173 | 3122 | { |
@@ -3203,7 +3152,7 @@
Loading
| 3203 | 3152 | /** |
|
| 3204 | 3153 | * InstanceOfExpression ::= IdentificationVariable ["NOT"] "INSTANCE" ["OF"] (InstanceOfParameter | "(" InstanceOfParameter {"," InstanceOfParameter}* ")") |
|
| 3205 | 3154 | * |
|
| 3206 | - | * @return InstanceOfExpression |
|
| 3155 | + | * @return AST\InstanceOfExpression |
|
| 3207 | 3156 | */ |
|
| 3208 | 3157 | public function InstanceOfExpression() |
|
| 3209 | 3158 | { |
@@ -3267,7 +3216,7 @@
Loading
| 3267 | 3216 | /** |
|
| 3268 | 3217 | * LikeExpression ::= StringExpression ["NOT"] "LIKE" StringPrimary ["ESCAPE" char] |
|
| 3269 | 3218 | * |
|
| 3270 | - | * @return LikeExpression |
|
| 3219 | + | * @return AST\LikeExpression |
|
| 3271 | 3220 | */ |
|
| 3272 | 3221 | public function LikeExpression() |
|
| 3273 | 3222 | { |
@@ -3306,7 +3255,7 @@
Loading
| 3306 | 3255 | /** |
|
| 3307 | 3256 | * NullComparisonExpression ::= (InputParameter | NullIfExpression | CoalesceExpression | AggregateExpression | FunctionDeclaration | IdentificationVariable | SingleValuedPathExpression | ResultVariable) "IS" ["NOT"] "NULL" |
|
| 3308 | 3257 | * |
|
| 3309 | - | * @return NullComparisonExpression |
|
| 3258 | + | * @return AST\NullComparisonExpression |
|
| 3310 | 3259 | */ |
|
| 3311 | 3260 | public function NullComparisonExpression() |
|
| 3312 | 3261 | { |
@@ -3380,7 +3329,7 @@
Loading
| 3380 | 3329 | /** |
|
| 3381 | 3330 | * ExistsExpression ::= ["NOT"] "EXISTS" "(" Subselect ")" |
|
| 3382 | 3331 | * |
|
| 3383 | - | * @return ExistsExpression |
|
| 3332 | + | * @return AST\ExistsExpression |
|
| 3384 | 3333 | */ |
|
| 3385 | 3334 | public function ExistsExpression() |
|
| 3386 | 3335 | { |
@@ -3454,7 +3403,7 @@
Loading
| 3454 | 3403 | /** |
|
| 3455 | 3404 | * FunctionDeclaration ::= FunctionsReturningStrings | FunctionsReturningNumerics | FunctionsReturningDatetime |
|
| 3456 | 3405 | * |
|
| 3457 | - | * @return FunctionNode |
|
| 3406 | + | * @return Functions\FunctionNode |
|
| 3458 | 3407 | */ |
|
| 3459 | 3408 | public function FunctionDeclaration() |
|
| 3460 | 3409 | { |
@@ -3485,7 +3434,7 @@
Loading
| 3485 | 3434 | /** |
|
| 3486 | 3435 | * Helper function for FunctionDeclaration grammar rule. |
|
| 3487 | 3436 | */ |
|
| 3488 | - | private function CustomFunctionDeclaration(): FunctionNode|null |
|
| 3437 | + | private function CustomFunctionDeclaration(): Functions\FunctionNode|null |
|
| 3489 | 3438 | { |
|
| 3490 | 3439 | $token = $this->lexer->lookahead; |
|
| 3491 | 3440 | $funcName = strtolower($token['value']); |
@@ -3520,7 +3469,7 @@
Loading
| 3520 | 3469 | * "BIT_AND" "(" ArithmeticPrimary "," ArithmeticPrimary ")" | |
|
| 3521 | 3470 | * "BIT_OR" "(" ArithmeticPrimary "," ArithmeticPrimary ")" |
|
| 3522 | 3471 | * |
|
| 3523 | - | * @return FunctionNode |
|
| 3472 | + | * @return Functions\FunctionNode |
|
| 3524 | 3473 | */ |
|
| 3525 | 3474 | public function FunctionsReturningNumerics() |
|
| 3526 | 3475 | { |
@@ -3533,7 +3482,7 @@
Loading
| 3533 | 3482 | return $function; |
|
| 3534 | 3483 | } |
|
| 3535 | 3484 | ||
| 3536 | - | /** @return FunctionNode */ |
|
| 3485 | + | /** @return Functions\FunctionNode */ |
|
| 3537 | 3486 | public function CustomFunctionsReturningNumerics() |
|
| 3538 | 3487 | { |
|
| 3539 | 3488 | // getCustomNumericFunction is case-insensitive |
@@ -3559,7 +3508,7 @@
Loading
| 3559 | 3508 | * "DATE_ADD" "(" ArithmeticPrimary "," ArithmeticPrimary "," StringPrimary ")" | |
|
| 3560 | 3509 | * "DATE_SUB" "(" ArithmeticPrimary "," ArithmeticPrimary "," StringPrimary ")" |
|
| 3561 | 3510 | * |
|
| 3562 | - | * @return FunctionNode |
|
| 3511 | + | * @return Functions\FunctionNode |
|
| 3563 | 3512 | */ |
|
| 3564 | 3513 | public function FunctionsReturningDatetime() |
|
| 3565 | 3514 | { |
@@ -3572,7 +3521,7 @@
Loading
| 3572 | 3521 | return $function; |
|
| 3573 | 3522 | } |
|
| 3574 | 3523 | ||
| 3575 | - | /** @return FunctionNode */ |
|
| 3524 | + | /** @return Functions\FunctionNode */ |
|
| 3576 | 3525 | public function CustomFunctionsReturningDatetime() |
|
| 3577 | 3526 | { |
|
| 3578 | 3527 | // getCustomDatetimeFunction is case-insensitive |
@@ -3600,7 +3549,7 @@
Loading
| 3600 | 3549 | * "UPPER" "(" StringPrimary ")" | |
|
| 3601 | 3550 | * "IDENTITY" "(" SingleValuedAssociationPathExpression {"," string} ")" |
|
| 3602 | 3551 | * |
|
| 3603 | - | * @return FunctionNode |
|
| 3552 | + | * @return Functions\FunctionNode |
|
| 3604 | 3553 | */ |
|
| 3605 | 3554 | public function FunctionsReturningStrings() |
|
| 3606 | 3555 | { |
@@ -3613,7 +3562,7 @@
Loading
| 3613 | 3562 | return $function; |
|
| 3614 | 3563 | } |
|
| 3615 | 3564 | ||
| 3616 | - | /** @return FunctionNode */ |
|
| 3565 | + | /** @return Functions\FunctionNode */ |
|
| 3617 | 3566 | public function CustomFunctionsReturningStrings() |
|
| 3618 | 3567 | { |
|
| 3619 | 3568 | // getCustomStringFunction is case-insensitive |
| Files | Coverage |
|---|---|
| lib/Doctrine/ORM | 89.64% |
| Project Totals (330 files) | 89.64% |
3587190372
3587137388
Sunburst
The inner-most circle is the entire project, moving away from the center are folders then, finally, a single file.
The size and color of each slice is representing the number of statements and the coverage, respectively.
Icicle
The top section represents the entire project. Proceeding with folders and finally individual files.
The size and color of each slice is representing the number of statements and the coverage, respectively.
