Fix incorrect inheritance of build method #503
Merged
Conversation
This file contains 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
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## master #503 +/- ##
============================================
- Coverage 96.47% 96.46% -0.01%
+ Complexity 2182 2176 -6
============================================
Files 66 66
Lines 5073 5059 -14
============================================
- Hits 4894 4880 -14
Misses 179 179
☔ View full report in Codecov by Sentry. |
williamdes
approved these changes
Aug 30, 2023
MauricioFauth
approved these changes
Sep 16, 2023
kamil-tekiela
added a commit
to kamil-tekiela/phpmyadmin
that referenced
this pull request
Sep 16, 2023
phpmyadmin/sql-parser#503 Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
akama-aka
added a commit
to akama-aka/phpmyadmin
that referenced
this pull request
Oct 31, 2023
* Fix Selenium\Database\OperationsTest failing test Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix TableTest failing test Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Rename the directory libraries/classes/ to src/ Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Replace libraries/classes references with src Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Use PHP 8.4 instead of nightly in the tests workflow Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Add windows-latest to tests workflow Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix ServerRequestFactoryTest failing test For random order seed 1693489393. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix mutation-tests workflow Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Revert "Add windows-latest to tests workflow" This reverts commit b55e2ab. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Force a full page reload for top menu links Each page is a different page, so it makes more sense to do a full page reload instead of using AJAX to load the main content. This also avoid some possible issues with broken event handlers and not properly loaded pages. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> (cherry picked from commit 36a77f7) Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix UtilTest::testLocalisedDate() with missing locale Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix infection.json5.dist source directory Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fixed the exit exception for the /url path (phpmyadmin#18673) * Fixed the exit exception for the /url path Signed-off-by: Sachin Bahukhandi <sachinb0013@gmail.com> * Fixed the exit exception if in case the url is empty Signed-off-by: Sachin Bahukhandi <sachinb0013@gmail.com> * Added new lines to pass linter checks --------- Signed-off-by: Sachin Bahukhandi <sachinb0013@gmail.com> * Add Medium attribute to some test classes This test classes will fail if the Small attribute was used instead. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Optimize autocomplete Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Optimize ChangeController Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Improve param types in ColumnsDefinition Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Refactor getSqlTemplateAndRequiredFields() Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Refactor expandUserString() Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Refactor getColumn and getColumns Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Deprecate Config::getInstance() method Dependency injection should be used instead. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Remove ExitException from AbstractController::checkParameters() Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Add a documentation note to the nopassword config Adds a note to the $cfg['Servers'][$i]['nopassword'] directive to add a reference to the $cfg['Servers'][$i]['AllowNoPassword']. Fixes phpmyadmin#18680. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Remove some calls to ResponseRenderer::callExit() Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Move the Middleware namespace into the Http namespace Middleware is directly related to HTTP. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Update po files [ci skip] Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net> * Remove PHP 8.3 from experimental Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (3427 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/pt_BR/ Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix RelationController view Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Translated using Weblate (Turkish) Currently translated at 100.0% (3410 of 3410 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/ Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com> * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (3410 of 3410 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pt_BR/ Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Translated using Weblate (Turkish) Currently translated at 100.0% (3427 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/tr/ Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com> * Fix ChangeController Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Remove $GLOBALS['num_fields'] completely Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Move getNumberOfFieldsFromRequest() to controller Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Add security link to composer.json file https://getcomposer.org/doc/04-schema.md#support Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Inline the RelationController::updateForForeignKeys() method This allows the removal of the ResponseRenderer::callExit() method. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix Selenium\Database\EventsTest failing test Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix Selenium\Database\ProceduresTest failing test Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Update actions/checkout action to v4 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Add title for db and table operation pages Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix Selenium\TriggersTest failing test Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix Selenium\Database\OperationsTest failing test Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Remove null return for Routing::callSetupController() method Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Use getColumn in getValuesForColumn Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Translated using Weblate (Polish) Currently translated at 83.2% (2853 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/pl/ Signed-off-by: sebastians17 <sebastians117.ss@gmail.com> * Translated using Weblate (Polish) Currently translated at 83.2% (2853 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/pl/ Signed-off-by: Adrian Wanic <adrianwanic@gmail.com> * Translated using Weblate (Polish) Currently translated at 99.2% (3385 of 3410 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/pl/ Signed-off-by: sebastians17 <sebastians117.ss@gmail.com> * Translated using Weblate (Polish) Currently translated at 83.2% (2853 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/pl/ Signed-off-by: sebastians17 <sebastians117.ss@gmail.com> * Remove htmlentities() Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Add simpler implementation of parseEnumSetValues Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Allow GIS tests to test against different TCPDF versions Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix max execution time exceeded error in tests Runs these tests in isolation because they are causing a time out error when backing up the global state. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * fix: removed inline onclick javascript events (phpmyadmin#18687) * fix: Removed inline onclick javascript events Signed-off-by: Dipesh Gangwani <dagangwani101@gmail.com> * fix: solved syntax errors Signed-off-by: Dipesh Gangwani <dagangwani101@gmail.com> * fix: Update tests for Normalization onclick event issues Signed-off-by: Dipesh Gangwani <dagangwani101@gmail.com> --------- Signed-off-by: Dipesh Gangwani <dagangwani101@gmail.com> * Replace escapeString in Transformations Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Replace escapeString in Common Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Replace escapeString in NodeTable Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Replace escapeString in Search Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Limit label width in create-view table Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Backport two test methods for phpunit 8.5 Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Fix filtering by initials for user accounts starting with %, \, or _ Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Fix user pagination for 'Any' user If the user name is empty any user may login from this host. This fixes the pagination to display 'Any' instead of an empty string and makes filtering with this link work. Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Update po files [ci skip] Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net> * Translated using Weblate (Turkish) Currently translated at 100.0% (3411 of 3411 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/ Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com> * Bump phpmyadmin/shapefile to 4.0 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Bump phpmyadmin/twig-i18n-extension version to 5.0 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Translated using Weblate (Slovenian) Currently translated at 100.0% (3411 of 3411 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sl/ Signed-off-by: Domen <mitenem@outlook.com> * Remove unnecessary array count in ImportShp::doImport() Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Include code coverage for transformation plugins Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Remove unused variable Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Refactor addSuffixes() Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Fix GIS editor form layout - Missing button classes for buttons added by JS - Connect labels with their input elements - Labels and input had wrong spacing when added from JS Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Remember the current column type After switching the geometry type once the geometry select disappeared. Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Fix opening GIS editor in zoom search The editor couldn't be opened there at all Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Allow switching geometry type when editing in search views Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Update JavaScript dependencies - Updates jQuery to 3.7.1 - Updates Bootstrap to 5.3.2 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Update PHPStan and Psalm baselines Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix AJAX real-row-count Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Fix bookmark delete Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Fix bookmark delete Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Fix build() invocations phpmyadmin/sql-parser#503 Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Update po files [ci skip] Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net> * Fix TokensList usages phpmyadmin/sql-parser#504 Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Translated using Weblate (Ukrainian) Currently translated at 100.0% (3427 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/uk/ Signed-off-by: Kipя <yankirill@icloud.com> * Translated using Weblate (Ukrainian) Currently translated at 100.0% (3427 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/uk/ Signed-off-by: Yevhen Bronza <zhenya.bronza@gmail.com> * Translated using Weblate (Ukrainian) Currently translated at 97.7% (3335 of 3411 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/uk/ Signed-off-by: Kipя <yankirill@icloud.com> * Translated using Weblate (Ukrainian) Currently translated at 100.0% (3427 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/uk/ Signed-off-by: Kipя <yankirill@icloud.com> * Improve git hash info error handling in home.js Instead of showing a generic error message alert when an error occurs, it displays an error message at the same place where the success output goes. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Remove duplicate _gis.scss files Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Resize editor overlay and its textarea on page resize Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Split up Bookmark::get() Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Refactor createBookmark() Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Create Bookmarks namespace Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Create BookmarkRepository class Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Refactor static into instance Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Update po files [ci skip] Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net> * Remove obsolete code for stand-alone gis editor Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Move gis editor form creation entirely to JS Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Add nesting to the gis editor form inputs Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Use button instead anchor in gis editor Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Count data_length in JS by number of inputs instead using the data_length value Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Refactor generateWkt of gis classes Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Move visualization choice and download button below other inputs Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Replace SqlParser\Token::TYPE_ with SqlParser\TokenType Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Update Psalm/PHPStan baselines Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Remove SqlParser\Utils\Query::getAll() stub Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Refactor the Core::getenv() method Renames it to getEnv() and adds unit tests for it. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Replace is_resource with different than false This will avoid an issue when proc_open will return an object instead of a resource in future PHP versions. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Ignore some PHPStan errors Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Update PHPStan baseline Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Move ./libraries/cache directory to ./cache - Related to phpmyadmin#18512 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Refactor Privileges pagination Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Update po files [ci skip] Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net> * Remove sanitize method Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Refactor getLevel() Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Refactor number and add errorNumber Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Translated using Weblate (Turkish) Currently translated at 100.0% (3403 of 3403 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/tr/ Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com> * Translated using Weblate (Slovenian) Currently translated at 100.0% (3403 of 3403 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sl/ Signed-off-by: Domen <mitenem@outlook.com> * Replace escapeString with quoteString Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Relax ConfigTest::testVendorConfigFile() test Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Add composer.lock to version control This will allow more control over the dependencies and will be easier to investigate issues from past commits as the dependencies will be locked. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Refactor gis visualization ts code - Make both visualizations work in gis editor and allow switching - Dynamic size for the gis visualization - Refactor visualization code as classes - Don't use so many ids in html Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> * Fix coding standard issues for Twig files Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Update PHPStan baseline Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Update po files [ci skip] Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net> * Fix undefined variable in login/header template Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Remove $diagram property from ExportRelationSchema Replaces it with a private property for each child class. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Inject Relation dep in ExportRelationSchema classes Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix possible invalid argument in PdfRelationSchema Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Translated using Weblate (Russian) Currently translated at 98.0% (3360 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ru/ Signed-off-by: Andrei Stepanov <adem4ik@gmail.com> * Translated using Weblate (Russian) Currently translated at 95.5% (3251 of 3403 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ru/ Signed-off-by: Andrei Stepanov <adem4ik@gmail.com> * Translated using Weblate (Macedonian) Currently translated at 25.5% (868 of 3403 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/mk/ Signed-off-by: "Kristijan \"Fremen\" Velkovski" <me@krisfremen.com> * Translated using Weblate (Russian) Currently translated at 98.3% (3371 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ru/ Signed-off-by: Andrei Stepanov <adem4ik@gmail.com> * Update po files [ci skip] Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net> * Translated using Weblate (Russian) Currently translated at 95.8% (3261 of 3403 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ru/ Signed-off-by: Andrei Stepanov <adem4ik@gmail.com> * Translated using Weblate (Russian) Currently translated at 98.3% (3371 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ru/ Signed-off-by: Andrei Stepanov <adem4ik@gmail.com> * Replaced superglobals with ServerRequest in FindReplaceController and ChangeRowsController Signed-off-by: Vasiliy Mulyarets <dardvas@gmail.com> * Fix failing tests Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Upgrade JavaScript dependencies Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Destroy Template's $twig property for tests Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Remove Jenkins build.xml Jenkins builds are not working for a long time. Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Update Composer dependencies Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Update PHPStan baseline Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Move ./templates directory to ./resources/templates - Related to phpmyadmin#18512 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix some type errors when exporting from db designer Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Add some basic unit tests to schema plugins Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Move ./sql directory to ./resources/sql - Related to phpmyadmin#18512 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Translated using Weblate (Macedonian) Currently translated at 25.5% (871 of 3403 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/mk/ Signed-off-by: "Kristijan \"Fremen\" Velkovski" <me@krisfremen.com> * Translated using Weblate (Macedonian) Currently translated at 26.9% (922 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/ Signed-off-by: "Kristijan \"Fremen\" Velkovski" <me@krisfremen.com> * Translated using Weblate (Macedonian) Currently translated at 26.9% (922 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/ Signed-off-by: Daniel Dimitrov <dimitrov.daniel@hotmail.com> * Fix param type in getSpecialLinkUrl() Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Add test for Zoom Search's change table info action Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Translated using Weblate (Romanian) Currently translated at 90.6% (3085 of 3403 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/ro/ Signed-off-by: Vlăduț Ilie <vladilie94@gmail.com> * Translated using Weblate (Romanian) Currently translated at 91.8% (3146 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/ro/ Signed-off-by: Vlăduț Ilie <vladilie94@gmail.com> * Fix param type in getSpecialLinkUrl() Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Simplify getColumnParams() Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Remove $properties Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Remove 1st param in getUniqueCondition() Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Create UniqueCondition class Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> * Update po files [ci skip] Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net> * Apply suggestions from code review Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix unneeded consts in UtilTest Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Translated using Weblate (Slovak) Currently translated at 70.2% (2392 of 3403 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sk/ Signed-off-by: Pavol Linet <linet.pavol@gmail.com> * Translated using Weblate (Slovak) Currently translated at 72.8% (2498 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/sk/ Signed-off-by: Pavol Linet <linet.pavol@gmail.com> * Rename ./libraries directory to ./app Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Move ./cache directory to ./app/cache Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Update PHP dependencies - Upgrading php-webdriver/webdriver (1.15.0 => 1.15.1) - Upgrading phpmyadmin/sql-parser (dev-master 46ff7ec => dev-master 08f465a) - Upgrading roave/security-advisories (dev-latest 26c07e7 => dev-latest 66671a6) - Upgrading symfony/cache (v6.3.5 => v6.3.6) - Upgrading symfony/var-exporter (v6.3.4 => v6.3.6) Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Move ./js directory to ./resources/js - Related to phpmyadmin#18512 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Add shellcheck to CI Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Fix issues reported by shellcheck Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Remove motranslator functions file from composer.json Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Update po files [ci skip] Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net> * Translated using Weblate (Macedonian) Currently translated at 25.8% (878 of 3403 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/mk/ Signed-off-by: "Kristijan \"Fremen\" Velkovski" <me@krisfremen.com> * Translated using Weblate (Macedonian) Currently translated at 27.1% (929 of 3427 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/mk/ Signed-off-by: "Kristijan \"Fremen\" Velkovski" <me@krisfremen.com> * Improve collations support for MariaDB 10.10+ (phpmyadmin#18760) * Added new charset queries Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Improve collations support for MariaDB 10.10+ Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Using dbi to check for MariaDB Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Removed unnecessary query Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Cleanup Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Whitespaces Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Whitespaces Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Switched to getVersion() Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Removed use of version_compare Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Test for MariaDB 10.10+ Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Update test/classes/CharsetsTest.php Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> --------- Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Improve collations support for MariaDB 10.10+ (phpmyadmin#18760) * Added new charset queries Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Improve collations support for MariaDB 10.10+ Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Using dbi to check for MariaDB Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Removed unnecessary query Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Cleanup Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Whitespaces Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Whitespaces Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Switched to getVersion() Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Removed use of version_compare Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Test for MariaDB 10.10+ Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> * Update test/classes/CharsetsTest.php Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> Fixes phpmyadmin#18769 --------- Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev> (cherry picked from commit ef92f1f) Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Update JavaScript dependencies Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> * Update Composer dependencies - Upgrading laminas/laminas-diactoros (3.2.0 => 3.3.0) - Upgrading phpmyadmin/sql-parser (dev-master 08f465a => dev-master 9db9c53) - Upgrading phpstan/phpstan (1.10.39 => 1.10.40) - Upgrading phpstan/phpstan-strict-rules (1.5.1 => 1.5.2) - Upgrading phpunit/phpunit (10.4.1 => 10.4.2) - Upgrading roave/security-advisories (dev-latest 66671a6 => dev-latest d66cd3b) Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> --------- Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev> Signed-off-by: Sachin Bahukhandi <sachinb0013@gmail.com> Signed-off-by: Kamil Tekiela <tekiela246@gmail.com> Signed-off-by: phpMyAdmin bot <bot@phpmyadmin.net> Signed-off-by: Burak Yavuz <hitowerdigit@hotmail.com> Signed-off-by: sebastians17 <sebastians117.ss@gmail.com> Signed-off-by: Adrian Wanic <adrianwanic@gmail.com> Signed-off-by: Dipesh Gangwani <dagangwani101@gmail.com> Signed-off-by: Maximilian Krög <maxi_kroeg@web.de> Signed-off-by: Domen <mitenem@outlook.com> Signed-off-by: Kipя <yankirill@icloud.com> Signed-off-by: Yevhen Bronza <zhenya.bronza@gmail.com> Signed-off-by: Andrei Stepanov <adem4ik@gmail.com> Signed-off-by: "Kristijan \"Fremen\" Velkovski" <me@krisfremen.com> Signed-off-by: Vasiliy Mulyarets <dardvas@gmail.com> Signed-off-by: Daniel Dimitrov <dimitrov.daniel@hotmail.com> Signed-off-by: Vlăduț Ilie <vladilie94@gmail.com> Signed-off-by: Pavol Linet <linet.pavol@gmail.com> Signed-off-by: Dmitrii Kustov <simbiat@outlook.com> Co-authored-by: Maurício Meneghini Fauth <mauricio@fauth.dev> Co-authored-by: Sachin Bahukhandi <SachinBahukhandi@users.noreply.github.com> Co-authored-by: Kamil Tekiela <tekiela246@gmail.com> Co-authored-by: phpMyAdmin bot <bot@phpmyadmin.net> Co-authored-by: Burak Yavuz <hitowerdigit@hotmail.com> Co-authored-by: William Desportes <williamdes@wdes.fr> Co-authored-by: sebastians17 <sebastians117.ss@gmail.com> Co-authored-by: Adrian Wanic <adrianwanic@gmail.com> Co-authored-by: Dipesh-Gangwani <109654990+Dipesh-Gangwani@users.noreply.github.com> Co-authored-by: Maximilian Krög <maxi_kroeg@web.de> Co-authored-by: Domen <mitenem@outlook.com> Co-authored-by: Kipя <yankirill@icloud.com> Co-authored-by: Yevhen Bronza <zhenya.bronza@gmail.com> Co-authored-by: Andrei Stepanov <adem4ik@gmail.com> Co-authored-by: Kristijan \"Fremen\" Velkovski <me@krisfremen.com> Co-authored-by: Vasiliy Mulyarets <dardvas@gmail.com> Co-authored-by: Daniel Dimitrov <dimitrov.daniel@hotmail.com> Co-authored-by: Vlăduț Ilie <vladilie94@gmail.com> Co-authored-by: Pavol Linet <linet.pavol@gmail.com> Co-authored-by: Dmitrii Kustov <simbiat@outlook.com>
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.
This fixes the incorrect inheritance due to type broadening. This method should never be static as it mostly relied on the instance object. All other issues with this method have been resolved in previous PR, so we can now make this an instance method.
As you may notice, we have a problem with nullable properties, but this is an issue that was there before and this PR doesn't attempt to solve it.