From e295f17bd4f00e418539a1844f66450ae2ee4769 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Sat, 26 Oct 2024 11:14:25 +0100 Subject: [PATCH] Fix after update to OptionsArray Signed-off-by: Kamil Tekiela --- composer.lock | 136 +++++++++--------- phpstan-baseline.neon | 67 ++------- psalm-baseline.xml | 13 +- .../Structure/PartitioningController.php | 32 ++--- src/Database/Routines.php | 2 +- src/Plugins/Export/ExportSql.php | 8 +- 6 files changed, 106 insertions(+), 152 deletions(-) diff --git a/composer.lock b/composer.lock index 01e96f1140..9ef37b5527 100644 --- a/composer.lock +++ b/composer.lock @@ -192,30 +192,30 @@ }, { "name": "laminas/laminas-httphandlerrunner", - "version": "2.10.0", + "version": "2.11.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-httphandlerrunner.git", - "reference": "35a0ba92e940a2f9533754f5a56187fa321f7693" + "reference": "c428d9f67f280d155637cbe2b7245b5188c8cdae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/35a0ba92e940a2f9533754f5a56187fa321f7693", - "reference": "35a0ba92e940a2f9533754f5a56187fa321f7693", + "url": "https://api.github.com/repos/laminas/laminas-httphandlerrunner/zipball/c428d9f67f280d155637cbe2b7245b5188c8cdae", + "reference": "c428d9f67f280d155637cbe2b7245b5188c8cdae", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", "psr/http-message": "^1.0 || ^2.0", "psr/http-message-implementation": "^1.0 || ^2.0", "psr/http-server-handler": "^1.0" }, "require-dev": { - "laminas/laminas-coding-standard": "~2.5.0", - "laminas/laminas-diactoros": "^3.3.0", - "phpunit/phpunit": "^10.5.5", - "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.18" + "laminas/laminas-coding-standard": "~3.0.0", + "laminas/laminas-diactoros": "^3.4.0", + "phpunit/phpunit": "^10.5.36", + "psalm/plugin-phpunit": "^0.19.0", + "vimeo/psalm": "^5.26.1" }, "type": "library", "extra": { @@ -255,7 +255,7 @@ "type": "community_bridge" } ], - "time": "2024-01-04T10:50:34+00:00" + "time": "2024-10-17T20:37:17+00:00" }, { "name": "nikic/fast-route", @@ -384,12 +384,12 @@ "source": { "type": "git", "url": "https://github.com/phpmyadmin/shapefile.git", - "reference": "d8550bac097b653fa00bb149a654c06be2ae5896" + "reference": "27384f587c9d65ecf12cf8fdcd3fc01048200fdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmyadmin/shapefile/zipball/d8550bac097b653fa00bb149a654c06be2ae5896", - "reference": "d8550bac097b653fa00bb149a654c06be2ae5896", + "url": "https://api.github.com/repos/phpmyadmin/shapefile/zipball/27384f587c9d65ecf12cf8fdcd3fc01048200fdb", + "reference": "27384f587c9d65ecf12cf8fdcd3fc01048200fdb", "shasum": "" }, "require": { @@ -446,7 +446,7 @@ "issues": "https://github.com/phpmyadmin/shapefile/issues", "source": "https://github.com/phpmyadmin/shapefile" }, - "time": "2024-10-10T19:33:38+00:00" + "time": "2024-10-24T16:29:41+00:00" }, { "name": "phpmyadmin/sql-parser", @@ -454,12 +454,12 @@ "source": { "type": "git", "url": "https://github.com/phpmyadmin/sql-parser.git", - "reference": "98b704ce46e0443209b1762d679020e0a17c4f05" + "reference": "f4b2a2012e3825546cf923dc35a40e155c66216d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/98b704ce46e0443209b1762d679020e0a17c4f05", - "reference": "98b704ce46e0443209b1762d679020e0a17c4f05", + "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/f4b2a2012e3825546cf923dc35a40e155c66216d", + "reference": "f4b2a2012e3825546cf923dc35a40e155c66216d", "shasum": "" }, "require": { @@ -538,7 +538,7 @@ "type": "other" } ], - "time": "2024-09-24T16:33:57+00:00" + "time": "2024-10-25T20:01:40+00:00" }, { "name": "psr/cache", @@ -3484,23 +3484,26 @@ }, { "name": "laminas/laminas-diactoros", - "version": "3.4.0", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "2cce7e77ca4c6c4183e9e8d4edeba483afc14487" + "reference": "143a16306602ce56b8b092a7914fef03c37f9ed2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/2cce7e77ca4c6c4183e9e8d4edeba483afc14487", - "reference": "2cce7e77ca4c6c4183e9e8d4edeba483afc14487", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/143a16306602ce56b8b092a7914fef03c37f9ed2", + "reference": "143a16306602ce56b8b092a7914fef03c37f9ed2", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0", - "psr/http-factory": "^1.0.2", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", + "psr/http-factory": "^1.1", "psr/http-message": "^1.1 || ^2.0" }, + "conflict": { + "amphp/amp": "<2.6.4" + }, "provide": { "psr/http-factory-implementation": "^1.0", "psr/http-message-implementation": "^1.1 || ^2.0" @@ -3513,9 +3516,9 @@ "http-interop/http-factory-tests": "^2.2.0", "laminas/laminas-coding-standard": "~2.5.0", "php-http/psr7-integration-tests": "^1.4.0", - "phpunit/phpunit": "^10.5.31", + "phpunit/phpunit": "^10.5.36", "psalm/plugin-phpunit": "^0.19.0", - "vimeo/psalm": "^5.25.0" + "vimeo/psalm": "^5.26.1" }, "type": "library", "extra": { @@ -3565,7 +3568,7 @@ "type": "community_bridge" } ], - "time": "2024-09-11T00:55:07+00:00" + "time": "2024-10-14T11:59:49+00:00" }, { "name": "lcobucci/clock", @@ -4395,16 +4398,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.32.0", + "version": "1.33.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4" + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4", - "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140", + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140", "shasum": "" }, "require": { @@ -4436,22 +4439,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.32.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0" }, - "time": "2024-09-26T07:23:32+00:00" + "time": "2024-10-13T11:25:22+00:00" }, { "name": "phpstan/phpstan", - "version": "1.12.6", + "version": "1.12.7", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae" + "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc4d2f145a88ea7141ae698effd64d9df46527ae", - "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", + "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", "shasum": "" }, "require": { @@ -4496,7 +4499,7 @@ "type": "github" } ], - "time": "2024-10-06T15:03:59+00:00" + "time": "2024-10-18T11:12:07+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -5020,16 +5023,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.36", + "version": "10.5.37", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870" + "reference": "c7cffa0efa2b70c22366523e6d804c9419eb2400" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870", - "reference": "aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c7cffa0efa2b70c22366523e6d804c9419eb2400", + "reference": "c7cffa0efa2b70c22366523e6d804c9419eb2400", "shasum": "" }, "require": { @@ -5050,7 +5053,7 @@ "phpunit/php-timer": "^6.0.0", "sebastian/cli-parser": "^2.0.1", "sebastian/code-unit": "^2.0.0", - "sebastian/comparator": "^5.0.2", + "sebastian/comparator": "^5.0.3", "sebastian/diff": "^5.1.1", "sebastian/environment": "^6.1.0", "sebastian/exporter": "^5.1.2", @@ -5101,7 +5104,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.36" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.37" }, "funding": [ { @@ -5117,7 +5120,7 @@ "type": "tidelift" } ], - "time": "2024-10-08T15:36:51+00:00" + "time": "2024-10-19T13:03:41+00:00" }, { "name": "pragmarx/google2fa", @@ -5454,20 +5457,20 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "6fc16d8c05a872bf86eb0a1684d89b9bcb93d636" + "reference": "bae581ca4125f92b1ad4d316ac691fa2d5231649" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/6fc16d8c05a872bf86eb0a1684d89b9bcb93d636", - "reference": "6fc16d8c05a872bf86eb0a1684d89b9bcb93d636", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/bae581ca4125f92b1ad4d316ac691fa2d5231649", + "reference": "bae581ca4125f92b1ad4d316ac691fa2d5231649", "shasum": "" }, "conflict": { "3f/pygmentize": "<1.2", - "admidio/admidio": "<4.3.10", + "admidio/admidio": "<4.3.12", "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", "aheinze/cockpit": "<2.2", - "aimeos/ai-admin-graphql": ">=2022.04.1,<2022.10.10|>=2023.04.1,<2023.10.6|>=2024.04.1,<2024.04.6", + "aimeos/ai-admin-graphql": ">=2022.04.1,<2022.10.10|>=2023.04.1,<2023.10.6|>=2024.04.1,<2024.07.2", "aimeos/ai-admin-jsonadm": "<2020.10.13|>=2021.04.1,<2021.10.6|>=2022.04.1,<2022.10.3|>=2023.04.1,<2023.10.4|==2024.04.1", "aimeos/ai-client-html": ">=2020.04.1,<2020.10.27|>=2021.04.1,<2021.10.22|>=2022.04.1,<2022.10.13|>=2023.04.1,<2023.10.15|>=2024.04.1,<2024.04.7", "aimeos/ai-controller-frontend": "<2020.10.15|>=2021.04.1,<2021.10.8|>=2022.04.1,<2022.10.8|>=2023.04.1,<2023.10.9|==2024.04.1", @@ -5511,7 +5514,7 @@ "barrelstrength/sprout-forms": "<3.9", "barryvdh/laravel-translation-manager": "<0.6.2", "barzahlen/barzahlen-php": "<2.0.1", - "baserproject/basercms": "<5.0.9", + "baserproject/basercms": "<=5.1.1", "bassjobsen/bootstrap-3-typeahead": ">4.0.2", "bbpress/bbpress": "<2.6.5", "bcosca/fatfree": "<3.7.2", @@ -5679,7 +5682,7 @@ "froxlor/froxlor": "<=2.2.0.0-RC3", "frozennode/administrator": "<=5.0.12", "fuel/core": "<1.8.1", - "funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3", + "funadmin/funadmin": "<=5.0.2", "gaoming13/wechat-php-sdk": "<=1.10.2", "genix/cms": "<=1.1.11", "getformwork/formwork": "<1.13.1|==2.0.0.0-beta1", @@ -5796,7 +5799,8 @@ "lms/routes": "<2.1.1", "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2", "luyadev/yii-helpers": "<1.2.1", - "magento/community-edition": "<2.4.5|==2.4.5|>=2.4.5.0-patch1,<2.4.5.0-patch9|==2.4.6|>=2.4.6.0-patch1,<2.4.6.0-patch7|==2.4.7|>=2.4.7.0-patch1,<2.4.7.0-patch2", + "maestroerror/php-heic-to-jpg": "<1.0.5", + "magento/community-edition": "<2.4.5|==2.4.5|>=2.4.5.0-patch1,<2.4.5.0-patch10|==2.4.6|>=2.4.6.0-patch1,<2.4.6.0-patch8|>=2.4.7.0-beta1,<2.4.7.0-patch3", "magento/core": "<=1.9.4.5", "magento/magento1ce": "<1.9.4.3-dev", "magento/magento1ee": ">=1,<1.14.4.3-dev", @@ -5956,7 +5960,7 @@ "processwire/processwire": "<=3.0.229", "propel/propel": ">=2.0.0.0-alpha1,<=2.0.0.0-alpha7", "propel/propel1": ">=1,<=1.7.1", - "pterodactyl/panel": "<1.11.6", + "pterodactyl/panel": "<1.11.8", "ptheofan/yii2-statemachine": ">=2.0.0.0-RC1-dev,<=2", "ptrofimov/beanstalk_console": "<1.7.14", "pubnub/pubnub": "<6.1", @@ -5973,7 +5977,7 @@ "rap2hpoutre/laravel-log-viewer": "<0.13", "react/http": ">=0.7,<1.9", "really-simple-plugins/complianz-gdpr": "<6.4.2", - "redaxo/source": "<=5.15.1", + "redaxo/source": "<=5.17.1", "remdex/livehelperchat": "<4.29", "reportico-web/reportico": "<=8.1", "rhukster/dom-sanitizer": "<1.0.7", @@ -6029,7 +6033,7 @@ "slim/slim": "<2.6", "slub/slub-events": "<3.0.3", "smarty/smarty": "<4.5.3|>=5,<5.1.1", - "snipe/snipe-it": "<6.4.2", + "snipe/snipe-it": "<7.0.10", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", "spatie/browsershot": "<3.57.4", @@ -6047,7 +6051,7 @@ "subhh/libconnect": "<7.0.8|>=8,<8.1", "sukohi/surpass": "<1", "sulu/form-bundle": ">=2,<2.5.3", - "sulu/sulu": "<1.6.44|>=2,<2.6.5", + "sulu/sulu": "<1.6.44|>=2,<2.5.21|>=2.6,<2.6.5", "sumocoders/framework-user-bundle": "<1.4", "superbig/craft-audit": "<3.0.2", "swag/paypal": "<5.4.4", @@ -6278,7 +6282,7 @@ "type": "tidelift" } ], - "time": "2024-10-10T00:18:21+00:00" + "time": "2024-10-24T22:04:53+00:00" }, { "name": "sebastian/cli-parser", @@ -6450,16 +6454,16 @@ }, { "name": "sebastian/comparator", - "version": "5.0.2", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53" + "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53", - "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", + "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", "shasum": "" }, "require": { @@ -6470,7 +6474,7 @@ "sebastian/exporter": "^5.0" }, "require-dev": { - "phpunit/phpunit": "^10.4" + "phpunit/phpunit": "^10.5" }, "type": "library", "extra": { @@ -6515,7 +6519,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.2" + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3" }, "funding": [ { @@ -6523,7 +6527,7 @@ "type": "github" } ], - "time": "2024-08-12T06:03:08+00:00" + "time": "2024-10-18T14:56:07+00:00" }, { "name": "sebastian/complexity", diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index a1c7d177c3..cfd930ee65 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -5038,15 +5038,10 @@ parameters: path: src/Controllers/Table/Structure/ChangeController.php - - message: "#^Cannot call method has\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#" + message: "#^Cannot call method get\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#" count: 16 path: src/Controllers/Table/Structure/PartitioningController.php - - - message: "#^Cannot cast mixed to string\\.$#" - count: 6 - path: src/Controllers/Table/Structure/PartitioningController.php - - message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#" count: 2 @@ -6314,11 +6309,6 @@ parameters: count: 9 path: src/Database/Routines.php - - - message: "#^Cannot access offset 'value' on mixed\\.$#" - count: 2 - path: src/Database/Routines.php - - message: "#^Cannot access offset int\\<0, max\\> on mixed\\.$#" count: 16 @@ -6355,12 +6345,12 @@ parameters: path: src/Database/Routines.php - - message: "#^Cannot assign new offset to array\\, mixed\\>\\|string\\.$#" + message: "#^Cannot assign new offset to array\\, string\\|null\\>\\|string\\.$#" count: 1 path: src/Database/Routines.php - - message: "#^Cannot call method has\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#" + message: "#^Cannot call method get\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#" count: 1 path: src/Database/Routines.php @@ -6450,7 +6440,7 @@ parameters: path: src/Database/Routines.php - - message: "#^Parameter \\#2 \\$array of function implode expects array\\|null, array\\, mixed\\>\\|string given\\.$#" + message: "#^Parameter \\#2 \\$array of function implode expects array\\|null, array\\, string\\|null\\>\\|string given\\.$#" count: 1 path: src/Database/Routines.php @@ -10799,9 +10789,14 @@ parameters: count: 7 path: src/Plugins/Export/ExportSql.php + - + message: "#^Cannot call method get\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#" + count: 1 + path: src/Plugins/Export/ExportSql.php + - message: "#^Cannot call method has\\(\\) on PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#" - count: 8 + count: 7 path: src/Plugins/Export/ExportSql.php - @@ -10816,7 +10811,7 @@ parameters: - message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#" - count: 42 + count: 41 path: src/Plugins/Export/ExportSql.php - @@ -10824,26 +10819,11 @@ parameters: count: 1 path: src/Plugins/Export/ExportSql.php - - - message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#" - count: 1 - path: src/Plugins/Export/ExportSql.php - - - - message: "#^Only booleans are allowed in an elseif condition, mixed given\\.$#" - count: 1 - path: src/Plugins/Export/ExportSql.php - - message: "#^Only booleans are allowed in an if condition, bool\\|null given\\.$#" count: 1 path: src/Plugins/Export/ExportSql.php - - - message: "#^Only booleans are allowed in an if condition, mixed given\\.$#" - count: 1 - path: src/Plugins/Export/ExportSql.php - - message: "#^Only booleans are allowed in \\|\\|, array\\ given on the left side\\.$#" count: 1 @@ -10854,16 +10834,6 @@ parameters: count: 1 path: src/Plugins/Export/ExportSql.php - - - message: "#^Only booleans are allowed in \\|\\|, mixed given on the left side\\.$#" - count: 1 - path: src/Plugins/Export/ExportSql.php - - - - message: "#^Only booleans are allowed in \\|\\|, mixed given on the right side\\.$#" - count: 3 - path: src/Plugins/Export/ExportSql.php - - message: "#^Parameter \\#1 \\$haystack of function str_contains expects string, string\\|null given\\.$#" count: 3 @@ -10879,11 +10849,6 @@ parameters: count: 17 path: src/Plugins/Export/ExportSql.php - - - message: "#^Parameter \\#1 \\$string of function strtoupper expects string, mixed given\\.$#" - count: 1 - path: src/Plugins/Export/ExportSql.php - - message: "#^Parameter \\#2 \\$compat of method PhpMyAdmin\\\\Plugins\\\\Export\\\\ExportSql\\:\\:exportUseStatement\\(\\) expects string, mixed given\\.$#" count: 2 @@ -13654,11 +13619,6 @@ parameters: count: 1 path: src/Sql.php - - - message: "#^Only booleans are allowed in &&, mixed given on the right side\\.$#" - count: 1 - path: src/Sql.php - - message: "#^Only booleans are allowed in &&, string given on the left side\\.$#" count: 1 @@ -14329,11 +14289,6 @@ parameters: count: 1 path: src/Table/TableMover.php - - - message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#" - count: 2 - path: src/Table/TableMover.php - - message: "#^Parameter \\#1 \\$str of method PhpMyAdmin\\\\DatabaseInterface\\:\\:quoteString\\(\\) expects string, string\\|null given\\.$#" count: 6 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 7bab0fe34f..b390c62a9d 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -3850,8 +3850,8 @@ partitions[0]->subpartitions]]> - - + + @@ -4833,7 +4833,6 @@ - @@ -4927,7 +4926,7 @@ return->parameters]]> - + @@ -8087,7 +8086,6 @@ - @@ -8113,7 +8111,6 @@ - name]]> references->table->table]]> @@ -8127,7 +8124,6 @@ - entityOptions->has('AUTO_INCREMENT')]]> key->columns]]> @@ -8166,7 +8162,7 @@ table->table]]> - + @@ -8187,7 +8183,6 @@ collation)]]> selectedServer['port'])]]> - fields)]]> name->database)]]> name->database)]]> diff --git a/src/Controllers/Table/Structure/PartitioningController.php b/src/Controllers/Table/Structure/PartitioningController.php index 24dc952fb8..3cfb8c51bf 100644 --- a/src/Controllers/Table/Structure/PartitioningController.php +++ b/src/Controllers/Table/Structure/PartitioningController.php @@ -183,14 +183,14 @@ final class PartitioningController implements InvocableController 'name' => $p->name, 'value_type' => $type, 'value' => $expr, - 'engine' => $p->options->has('ENGINE', true), - 'comment' => trim((string) $p->options->has('COMMENT', true), "'"), - 'data_directory' => trim((string) $p->options->has('DATA DIRECTORY', true), "'"), - 'index_directory' => trim((string) $p->options->has('INDEX_DIRECTORY', true), "'"), - 'max_rows' => $p->options->has('MAX_ROWS', true), - 'min_rows' => $p->options->has('MIN_ROWS', true), - 'tablespace' => $p->options->has('TABLESPACE', true), - 'node_group' => $p->options->has('NODEGROUP', true), + 'engine' => $p->options->get('ENGINE', true), + 'comment' => trim((string) $p->options->get('COMMENT', true), "'"), + 'data_directory' => trim((string) $p->options->get('DATA DIRECTORY', true), "'"), + 'index_directory' => trim((string) $p->options->get('INDEX_DIRECTORY', true), "'"), + 'max_rows' => $p->options->get('MAX_ROWS', true), + 'min_rows' => $p->options->get('MIN_ROWS', true), + 'tablespace' => $p->options->get('TABLESPACE', true), + 'node_group' => $p->options->get('NODEGROUP', true), ]; } @@ -221,14 +221,14 @@ final class PartitioningController implements InvocableController $sp = $stmt->partitions[$i]->subpartitions[$j]; $partition['subpartitions'][$j] = [ 'name' => $sp->name, - 'engine' => $sp->options->has('ENGINE', true), - 'comment' => trim((string) $sp->options->has('COMMENT', true), "'"), - 'data_directory' => trim((string) $sp->options->has('DATA DIRECTORY', true), "'"), - 'index_directory' => trim((string) $sp->options->has('INDEX_DIRECTORY', true), "'"), - 'max_rows' => $sp->options->has('MAX_ROWS', true), - 'min_rows' => $sp->options->has('MIN_ROWS', true), - 'tablespace' => $sp->options->has('TABLESPACE', true), - 'node_group' => $sp->options->has('NODEGROUP', true), + 'engine' => $sp->options->get('ENGINE', true), + 'comment' => trim((string) $sp->options->get('COMMENT', true), "'"), + 'data_directory' => trim((string) $sp->options->get('DATA DIRECTORY', true), "'"), + 'index_directory' => trim((string) $sp->options->get('INDEX_DIRECTORY', true), "'"), + 'max_rows' => $sp->options->get('MAX_ROWS', true), + 'min_rows' => $sp->options->get('MIN_ROWS', true), + 'tablespace' => $sp->options->get('TABLESPACE', true), + 'node_group' => $sp->options->get('NODEGROUP', true), ]; } diff --git a/src/Database/Routines.php b/src/Database/Routines.php index cdfc3cd56c..5d96dec892 100644 --- a/src/Database/Routines.php +++ b/src/Database/Routines.php @@ -489,7 +489,7 @@ class Routines $retval['item_returnopts_text'] = implode(' ', $options); } - $retval['item_definer'] = $stmt->options->has('DEFINER'); + $retval['item_definer'] = $stmt->options->get('DEFINER'); $retval['item_definition'] = $body; $retval['item_isdeterministic'] = ''; if ($routine['IS_DETERMINISTIC'] === 'YES') { diff --git a/src/Plugins/Export/ExportSql.php b/src/Plugins/Export/ExportSql.php index 08f069ca77..645df9800d 100644 --- a/src/Plugins/Export/ExportSql.php +++ b/src/Plugins/Export/ExportSql.php @@ -1531,7 +1531,7 @@ class ExportSql extends ExportPlugin $statement = $parser->statements[0]; if (! empty($statement->entityOptions)) { - $engine = $statement->entityOptions->has('ENGINE'); + $engine = $statement->entityOptions->get('ENGINE'); } else { $engine = ''; } @@ -1539,7 +1539,7 @@ class ExportSql extends ExportPlugin /* Avoid operation on ARCHIVE tables as those can not be altered */ if ( ! empty($statement->fields) && is_array($statement->fields) - && (empty($engine) || strtoupper($engine) !== 'ARCHIVE') + && ($engine === '' || strtoupper((string) $engine) !== 'ARCHIVE') ) { /** @@ -1679,11 +1679,11 @@ class ExportSql extends ExportPlugin . implode(',' . "\n" . ' MODIFY ', $autoIncrement); if ( isset($GLOBALS['sql_auto_increment']) - && $statement->entityOptions->has('AUTO_INCREMENT') !== false + && $statement->entityOptions->has('AUTO_INCREMENT') && (! isset($GLOBALS['table_data']) || in_array($table, $GLOBALS['table_data'])) ) { $sqlAutoIncrementsQuery .= ', AUTO_INCREMENT=' - . $statement->entityOptions->has('AUTO_INCREMENT'); + . $statement->entityOptions->get('AUTO_INCREMENT'); } $sqlAutoIncrementsQuery .= ';' . "\n";