Skip to content

Fix issue after merge 17e3414#20094

Merged
MauricioFauth merged 1 commit intophpmyadmin:masterfrom
MauricioFauth:fix-merge-issue
Feb 11, 2026
Merged

Fix issue after merge 17e3414#20094
MauricioFauth merged 1 commit intophpmyadmin:masterfrom
MauricioFauth:fix-merge-issue

Conversation

@MauricioFauth
Copy link
Member

Fix issue after merge 17e3414

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
Copy link
Member

@williamdes williamdes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this not for QA?

@MauricioFauth
Copy link
Member Author

Why is this not for QA?

It works on QA.

The issue is that OptionsArray::has() changed in sql-parser 6.0. But this got caught by the E2E tests. See: https://github.com/phpmyadmin/phpmyadmin/actions/runs/21889263792/job/63197485944

@MauricioFauth MauricioFauth merged commit 0de5de4 into phpmyadmin:master Feb 11, 2026
42 checks passed
@MauricioFauth MauricioFauth deleted the fix-merge-issue branch February 11, 2026 14:25
@MauricioFauth MauricioFauth self-assigned this Feb 11, 2026
@MauricioFauth MauricioFauth added this to the 6.0.0 milestone Feb 11, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments