Skip to content

Commit 4c4d552

Browse files
MauricioFauthMauricioFauth
committed
Merge branch '5.10.x'
Signed-off-by: Maurício Meneghini Fauth <[email protected]>
2 parents 6bbea5b + 99b9f38 commit 4c4d552

File tree

101 files changed

+10750
-1757
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+10750
-1757
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
- Move `Misc::getAliases()` into `SelectStatement::getAliases()` (#454)
77
- Drop `USE_UTF_STRINGS` constant (#471)
88

9+
## [5.10.0] - YYYY-MM-DD
10+
11+
- Improve context files by using constants (#570)
12+
- Support parsing KILL statements (#556)
13+
- Fix query flags for lower-case functions (#564)
14+
- Allow using `::class` keyword to load a context (#571)
15+
916
## [5.9.1] - 2024-08-13
1017

1118
- Allow parsing ALTER TABLE statement with column check constraint (#554)

‎phpstan-baseline.neon

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -400,11 +400,6 @@ parameters:
400400
count: 1
401401
path: src/Statement.php
402402

403-
-
404-
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$processListId\\.$#"
405-
count: 1
406-
path: src/Statement.php
407-
408403
-
409404
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statement\\:\\:\\$renames\\.$#"
410405
count: 1
@@ -620,11 +615,6 @@ parameters:
620615
count: 1
621616
path: src/Statements/SelectStatement.php
622617

623-
-
624-
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\SelectStatement\\:\\:\\$processListId\\.$#"
625-
count: 1
626-
path: src/Statements/SelectStatement.php
627-
628618
-
629619
message: "#^Access to an undefined property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\SelectStatement\\:\\:\\$renames\\.$#"
630620
count: 1

‎psalm-baseline.xml

Lines changed: 0 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -167,136 +167,6 @@
167167
<code><![CDATA[static::isKeyword($str, true)]]></code>
168168
</RiskyTruthyFalsyComparison>
169169
</file>
170-
<file src="src/Contexts/ContextMariaDb100000.php">
171-
<UnusedClass>
172-
<code><![CDATA[ContextMariaDb100000]]></code>
173-
</UnusedClass>
174-
</file>
175-
<file src="src/Contexts/ContextMariaDb100100.php">
176-
<UnusedClass>
177-
<code><![CDATA[ContextMariaDb100100]]></code>
178-
</UnusedClass>
179-
</file>
180-
<file src="src/Contexts/ContextMariaDb100200.php">
181-
<UnusedClass>
182-
<code><![CDATA[ContextMariaDb100200]]></code>
183-
</UnusedClass>
184-
</file>
185-
<file src="src/Contexts/ContextMariaDb100300.php">
186-
<UnusedClass>
187-
<code><![CDATA[ContextMariaDb100300]]></code>
188-
</UnusedClass>
189-
</file>
190-
<file src="src/Contexts/ContextMariaDb100400.php">
191-
<UnusedClass>
192-
<code><![CDATA[ContextMariaDb100400]]></code>
193-
</UnusedClass>
194-
</file>
195-
<file src="src/Contexts/ContextMariaDb100500.php">
196-
<UnusedClass>
197-
<code><![CDATA[ContextMariaDb100500]]></code>
198-
</UnusedClass>
199-
</file>
200-
<file src="src/Contexts/ContextMariaDb100600.php">
201-
<UnusedClass>
202-
<code><![CDATA[ContextMariaDb100600]]></code>
203-
</UnusedClass>
204-
</file>
205-
<file src="src/Contexts/ContextMariaDb100700.php">
206-
<UnusedClass>
207-
<code><![CDATA[ContextMariaDb100700]]></code>
208-
</UnusedClass>
209-
</file>
210-
<file src="src/Contexts/ContextMariaDb100800.php">
211-
<UnusedClass>
212-
<code><![CDATA[ContextMariaDb100800]]></code>
213-
</UnusedClass>
214-
</file>
215-
<file src="src/Contexts/ContextMariaDb100900.php">
216-
<UnusedClass>
217-
<code><![CDATA[ContextMariaDb100900]]></code>
218-
</UnusedClass>
219-
</file>
220-
<file src="src/Contexts/ContextMariaDb101000.php">
221-
<UnusedClass>
222-
<code><![CDATA[ContextMariaDb101000]]></code>
223-
</UnusedClass>
224-
</file>
225-
<file src="src/Contexts/ContextMariaDb101100.php">
226-
<UnusedClass>
227-
<code><![CDATA[ContextMariaDb101100]]></code>
228-
</UnusedClass>
229-
</file>
230-
<file src="src/Contexts/ContextMariaDb110000.php">
231-
<UnusedClass>
232-
<code><![CDATA[ContextMariaDb110000]]></code>
233-
</UnusedClass>
234-
</file>
235-
<file src="src/Contexts/ContextMariaDb110100.php">
236-
<UnusedClass>
237-
<code><![CDATA[ContextMariaDb110100]]></code>
238-
</UnusedClass>
239-
</file>
240-
<file src="src/Contexts/ContextMariaDb110200.php">
241-
<UnusedClass>
242-
<code><![CDATA[ContextMariaDb110200]]></code>
243-
</UnusedClass>
244-
</file>
245-
<file src="src/Contexts/ContextMariaDb110300.php">
246-
<UnusedClass>
247-
<code><![CDATA[ContextMariaDb110300]]></code>
248-
</UnusedClass>
249-
</file>
250-
<file src="src/Contexts/ContextMariaDb110400.php">
251-
<UnusedClass>
252-
<code><![CDATA[ContextMariaDb110400]]></code>
253-
</UnusedClass>
254-
</file>
255-
<file src="src/Contexts/ContextMySql50000.php">
256-
<UnusedClass>
257-
<code><![CDATA[ContextMySql50000]]></code>
258-
</UnusedClass>
259-
</file>
260-
<file src="src/Contexts/ContextMySql50100.php">
261-
<UnusedClass>
262-
<code><![CDATA[ContextMySql50100]]></code>
263-
</UnusedClass>
264-
</file>
265-
<file src="src/Contexts/ContextMySql50500.php">
266-
<UnusedClass>
267-
<code><![CDATA[ContextMySql50500]]></code>
268-
</UnusedClass>
269-
</file>
270-
<file src="src/Contexts/ContextMySql50600.php">
271-
<UnusedClass>
272-
<code><![CDATA[ContextMySql50600]]></code>
273-
</UnusedClass>
274-
</file>
275-
<file src="src/Contexts/ContextMySql80000.php">
276-
<UnusedClass>
277-
<code><![CDATA[ContextMySql80000]]></code>
278-
</UnusedClass>
279-
</file>
280-
<file src="src/Contexts/ContextMySql80100.php">
281-
<UnusedClass>
282-
<code><![CDATA[ContextMySql80100]]></code>
283-
</UnusedClass>
284-
</file>
285-
<file src="src/Contexts/ContextMySql80200.php">
286-
<UnusedClass>
287-
<code><![CDATA[ContextMySql80200]]></code>
288-
</UnusedClass>
289-
</file>
290-
<file src="src/Contexts/ContextMySql80300.php">
291-
<UnusedClass>
292-
<code><![CDATA[ContextMySql80300]]></code>
293-
</UnusedClass>
294-
</file>
295-
<file src="src/Contexts/ContextMySql80400.php">
296-
<UnusedClass>
297-
<code><![CDATA[ContextMySql80400]]></code>
298-
</UnusedClass>
299-
</file>
300170
<file src="src/Lexer.php">
301171
<LoopInvalidation>
302172
<code><![CDATA[$this->last]]></code>

‎src/Context.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,8 +527,13 @@ public static function load(string $context = ''): bool
527527
return false;
528528
}
529529

530-
// Short context name (must be formatted into class name).
531-
$context = self::$contextPrefix . $context;
530+
// Could be the fully qualified class name was given, like `ContextDBMS::class`.
531+
if (class_exists('\\' . $context)) {
532+
$context = '\\' . $context;
533+
} else {
534+
// Short context name (must be formatted into class name).
535+
$context = self::$contextPrefix . $context;
536+
}
532537
}
533538

534539
self::$loadedContext = $context;

0 commit comments

Comments
 (0)