Avoid using a null alias as an array offset in getAliases()#658
Open
ardittirana wants to merge 1 commit into
Open
Avoid using a null alias as an array offset in getAliases()#658ardittirana wants to merge 1 commit into
ardittirana wants to merge 1 commit into
Conversation
SelectStatement::getAliases() built a table-alias map with
`$tables[$thisDb][$expr->alias] = $expr->table` for every FROM/JOIN
expression. When a table has no alias, `$expr->alias` is null, so this
used null as an array offset, which is deprecated as of PHP 8.5
("Using null as an array offset is deprecated, use an empty string
instead"). The null-keyed entry was never read back either: the only
consumer looks up `$tables[$thisDb][$expr->table]`, whose offset is
always a non-empty string.
Skip expressions without an alias, mirroring the existing
`isset($expr->alias) && $expr->alias !== ''` checks above. getAliases()
output is unchanged. Removes the now-resolved PossiblyNullArrayOffset
entry from the Psalm baseline and adds a regression test.
williamdes
reviewed
Jun 22, 2026
| // Only record an alias => table mapping when an alias exists. | ||
| // Using a null alias as an array offset is deprecated as of | ||
| // PHP 8.5, and such an entry is never read back below anyway. | ||
| if (! isset($expr->alias) || ($expr->alias === '')) { |
Member
There was a problem hiding this comment.
It is better to check explicitly null
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #658 +/- ##
=========================================
Coverage 96.30% 96.30%
- Complexity 2254 2256 +2
=========================================
Files 90 90
Lines 4982 4984 +2
=========================================
+ Hits 4798 4800 +2
Misses 184 184
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. |
williamdes
reviewed
Jun 22, 2026
| } | ||
|
|
||
| // Only record an alias => table mapping when an alias exists. | ||
| // Using a null alias as an array offset is deprecated as of |
Member
There was a problem hiding this comment.
The comment lines look like they where added by an AI
Please remove this line and below it adds no value
williamdes
reviewed
Jun 22, 2026
| [ | ||
| // An unaliased table alongside an aliased one. The unaliased | ||
| // table must not break alias resolution; previously its null | ||
| // alias was used as an array offset (deprecated in PHP 8.5). |
Member
|
Thank you for this contribution! And finally please fix lint step |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves the
phpmyadmin/sql-parserside of phpmyadmin/phpmyadmin#20313.Problem
SelectStatement::getAliases()builds a table-alias map:for every
FROM/JOINexpression. When a table has no alias,$expr->aliasisnull, so this uses null as an array offset, which is deprecated as of PHP 8.5:phpMyAdmin surfaces this as an
ErrorException(SelectStatement.php:614) during table export on PHP 8.5.Fix
Skip expressions without an alias, mirroring the existing
isset($expr->alias) && $expr->alias !== ''guards a few lines above. The null-keyed entry was never read anyway — the only consumer looks up$tables[$thisDb][$expr->table], whose offset is always a non-empty string — sogetAliases()output is unchanged.Notes
PossiblyNullArrayOffsetentry frompsalm-baseline.xml(verified viapsalm --update-baseline; only that entry changed).Utils/Misc.php, which no longer exists —getAliases()was moved intoSelectStatementin Remove Misc class #454 — so this covers the live code path.Tests
getAliasesProvidercase mixing an unaliased table with an aliased one (the null-alias path), asserting unchanged output.phpcs/psalmclean for the change.