Repository navigation
ASM-21154 pull upstream Adminer 5.5.1 into the Akeyless fork - #6
Merged
Merged
Conversation
Add complete Croatian translation for Adminer, including all strings in adminer/lang/hr.inc.php, plural forms support in lang.inc.php, and Croatian descriptions and translations for all plugins.
Co-Authored-By: Claude Fable 5 <[email protected]>
Co-Authored-By: Claude Fable 5 <[email protected]>
Co-Authored-By: Claude Fable 5 <[email protected]>
Co-Authored-By: Claude Fable 5 <[email protected]>
Co-Authored-By: Claude Fable 5 <[email protected]>
deflate compresses ~27% better than LZW even re-encoded to the same ASCII-safe alphabet; the all-language build shrinks from 573 to 488 KB. Decompression uses gzinflate() with a pure-PHP inflate() fallback for PHP builds without the zlib extension. Co-Authored-By: Claude Fable 5 <[email protected]>
JUSH now carries both vendors' doc pages in 'mysql-key maria-key' entries regenerated by its update/sql.php from the MySQL 9.7 manual and the MariaDB docs, so the per-key MariaDB rewrites here are no longer needed - only the base URL and the version are set at runtime. Names one vendor doesn't know stay plain keywords or text there, and plugin variables are not highlighted at all. Co-Authored-By: Claude Fable 5 <[email protected]>
PostgreSQL uses this for connecting via socket: 'host=/tmp'. Elasticsearch uses https:// prefix.
PHPCS 4.0 removed CSS/JS scanning (all Squiz.CSS sniffs and Squiz.Objects.ObjectMemberComma) and the deprecated Generic.Functions.CallTimePassByReference. It also split the PSR12.Files.FileHeader.SpacingAfterBlock error code by block type. Co-Authored-By: Claude Fable 5 <[email protected]>
The exclude pattern for compiled adminer*.php and editor*.php also matched adminer/include/adminer.inc.php, editor/include/adminer.inc.php and plugins/adminer.js.php anywhere in the tree. Anchor it to the repo root, exclude the local adminer-plugins used by the dev server and fix the style violations these files accumulated while unchecked. Co-Authored-By: Claude Fable 5 <[email protected]>
Store schema field positions in a separate map instead of adding a pos key to Field arrays, mark the set_schema() stub as impure and update the ignores for changed PHPStan messages. Co-Authored-By: Claude Fable 5 <[email protected]>
CI creates vendor/ by Composer and mounts the checkout at /app so the plugins excludes cannot rely on the repo directory being named adminer. Co-Authored-By: Claude Fable 5 <[email protected]>
Adminer has no Composer dependencies so vendor/bin/phpstan never exists. Co-Authored-By: Claude Fable 5 <[email protected]>
Co-Authored-By: Claude Fable 5 <[email protected]>
Found by Biome lint/style/noDescendingSpecificity. Co-Authored-By: Claude Fable 5 <[email protected]>
Merge upstream v5.5.1 for its security fixes since 5.4.2 (GHSA-r4x9-5m63-3vxw, GHSA-h6jr-7pr6-grgj, GHSA-3582-q6xq-5vf7 and the rest listed in CHANGELOG.md for 5.4.3 to 5.5.1). The Akeyless changes carry over unchanged: the MongoDB retry and authSource behavior, the ssl_mode plugin with the MSSQL encrypt default, the Postgres sslrootcert DSN, and the last-page row count fallback. Replace the compiled adminer-5.4.2.php with adminer-5.5.1.php, built with php compile.php on php:8.4-cli. The same command reproduces the committed adminer-5.4.2.php at v5.4.2.2 byte for byte. Co-Authored-By: Claude Opus 5.5 <[email protected]>
|
Warning Review limit reached
This review includes 159 billable files and costs up to $39.75. View limit details
Comment |
Upstream v5.5.1 fails its own phpstan.neon under current PHPStan (a constant-folded VERSION comparison, an undefined-variable report, and ignore patterns that no longer match). Upstream fixed these later through unrelated refactors. Add two targeted ignores and stop failing on unmatched ignores, instead of editing upstream source. Clean on PHPStan 2.1.50, 2.3.0 and latest. Co-Authored-By: Claude Sonnet 5.5 <[email protected]>
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
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.
Pulls upstream Adminer 5.5.1 into the fork for the security fixes since 5.4.2, the same way 5.4.2 came in (#3). Once merged, tag
v5.5.1.1and point the V1 web bastion at it.Jira: ASM-21154
Why
Twelve upstream advisories affect the 5.4.2 base that V1 ships today (v5.4.2.2). Nine are fixed in 5.4.3, among them GHSA-r4x9-5m63-3vxw (critical, MSSQL server value injection), GHSA-3582-q6xq-5vf7 and the SQLite ones (high), and GHSA-h6jr-7pr6-grgj (the version string reflection Or reproduced). Three more are fixed in 5.5.0 and 5.5.1. The full list is in
CHANGELOG.md. 5.5.1 is the last 5.x release, so the login flow and plugin API the bastion relies on do not change.What changes
v5.5.1. No conflicts.v5.5.1is the same six files as againstv5.4.2at v5.4.2.2: MongoDB retry and authSource, the ssl_mode plugin with the MSSQL encrypt default, Postgressslrootcert, the last-page row count fallback,adminer-plugins.php.adminer-5.4.2.phpis replaced byadminer-5.5.1.php, built withphp compile.phponphp:8.4-cli. That command rebuilds the committedadminer-5.4.2.phpat v5.4.2.2 byte for byte, so the artifact is made the way the last one was.Checked
php -land serve the login page with no warnings on PHP 8.1 and 8.4.🤖 Generated with Claude Code