From 92a345c77eb1a77e8d26305fe657cad2ebf0d7f0 Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Tue, 28 Nov 2023 16:34:23 +0100 Subject: [PATCH] Update PHPStan baseline Signed-off-by: Kamil Tekiela --- composer.lock | 27 +++++++----- phpstan-baseline.neon | 99 +++++++++++++++++++++++++++++++++++++++++- psalm-baseline.xml | 4 -- src/Export/Options.php | 4 +- 4 files changed, 114 insertions(+), 20 deletions(-) diff --git a/composer.lock b/composer.lock index b11697a9bc..a1730583c9 100644 --- a/composer.lock +++ b/composer.lock @@ -4655,16 +4655,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.45", + "version": "1.10.46", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "2f024fbb47432e2e62ad8a8032387aa2dd631c73" + "reference": "90d3d25c5b98b8068916bbf08ce42d5cb6c54e70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2f024fbb47432e2e62ad8a8032387aa2dd631c73", - "reference": "2f024fbb47432e2e62ad8a8032387aa2dd631c73", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/90d3d25c5b98b8068916bbf08ce42d5cb6c54e70", + "reference": "90d3d25c5b98b8068916bbf08ce42d5cb6c54e70", "shasum": "" }, "require": { @@ -4713,7 +4713,7 @@ "type": "tidelift" } ], - "time": "2023-11-27T14:15:06+00:00" + "time": "2023-11-28T14:57:26+00:00" }, { "name": "phpstan/phpstan-phpunit", @@ -5707,12 +5707,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "2b23329e299c9a6cd98a82f5137ab4909c8e506d" + "reference": "5cfed3056826da5ee547ebb4b58e39bc4ca14d6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/2b23329e299c9a6cd98a82f5137ab4909c8e506d", - "reference": "2b23329e299c9a6cd98a82f5137ab4909c8e506d", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/5cfed3056826da5ee547ebb4b58e39bc4ca14d6e", + "reference": "5cfed3056826da5ee547ebb4b58e39bc4ca14d6e", "shasum": "" }, "conflict": { @@ -5760,7 +5760,7 @@ "baserproject/basercms": "<4.8", "bassjobsen/bootstrap-3-typeahead": ">4.0.2", "bigfork/silverstripe-form-capture": ">=3,<3.1.1", - "billz/raspap-webgui": "<=2.9.2", + "billz/raspap-webgui": "<2.9.5", "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", "bmarshall511/wordpress_zero_spam": "<5.2.13", "bolt/bolt": "<3.7.2", @@ -6059,9 +6059,12 @@ "openmage/magento-lts": "<=19.5|>=20,<=20.1", "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2", "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5", + "oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1", "oro/commerce": ">=4.1,<5.0.11|>=5.1,<5.1.1", "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7", - "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<4.2.8", + "oro/crm-call-bundle": ">=4.2,<=4.2.5|>=5,<5.0.4|>=5.1,<5.1.1", + "oro/customer-portal": ">=4.2,<=4.2.8|>=5,<5.0.11|>=5.1,<5.1.1", + "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<=4.2.10|>=5,<5.0.8", "oxid-esales/oxideshop-ce": "<4.5", "packbackbooks/lti-1-3-php-library": "<5", "padraic/humbug_get_contents": "<1.1.2", @@ -6093,7 +6096,7 @@ "phpxmlrpc/extras": "<0.6.1", "phpxmlrpc/phpxmlrpc": "<4.9.2", "pi/pi": "<=2.5", - "pimcore/admin-ui-classic-bundle": "<1.2.1", + "pimcore/admin-ui-classic-bundle": "<1.2.2", "pimcore/customer-management-framework-bundle": "<3.4.2", "pimcore/data-hub": "<1.2.4", "pimcore/demo": "<10.3", @@ -6403,7 +6406,7 @@ "type": "tidelift" } ], - "time": "2023-11-23T04:04:32+00:00" + "time": "2023-11-28T00:14:42+00:00" }, { "name": "sebastian/cli-parser", diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index fb37208f4f..484b36c6fe 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1235,11 +1235,96 @@ parameters: count: 1 path: src/ConfigStorage/Relation.php + - + message: "#^Offset 'central_columns' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'column_info' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'designer_settings' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'export_templates' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'favorite' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'history' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'navigationhiding' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'pdf_pages' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'recent' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + - message: "#^Offset 'relation' on array\\{host\\: string, port\\: string, socket\\: string, ssl\\: bool, ssl_key\\: string\\|null, ssl_cert\\: string\\|null, ssl_ca\\: string\\|null, ssl_ca_path\\: string\\|null, \\.\\.\\.\\} on left side of \\?\\? always exists and is not nullable\\.$#" count: 1 path: src/ConfigStorage/Relation.php + - + message: "#^Offset 'savedsearches' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'table_coords' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'table_info' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'table_uiprefs' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'tracking' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'userconfig' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'usergroups' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + + - + message: "#^Offset 'users' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#" + count: 1 + path: src/ConfigStorage/Relation.php + - message: "#^Only booleans are allowed in &&, PhpMyAdmin\\\\Dbal\\\\ResultInterface\\|false given on the left side\\.$#" count: 2 @@ -12875,18 +12960,28 @@ parameters: count: 2 path: src/ParseAnalyze.php + - + message: "#^Offset 'select_tables' does not exist on array\\{distinct\\?\\: bool, drop_database\\?\\: bool, group\\?\\: bool, having\\?\\: bool, is_affected\\?\\: bool, is_analyse\\?\\: bool, is_count\\?\\: bool, is_delete\\?\\: bool, \\.\\.\\.\\}\\.$#" + count: 1 + path: src/ParseAnalyze.php + - message: "#^Offset 'select_tables' on array\\{distinct\\?\\: bool, drop_database\\?\\: bool, group\\?\\: bool, having\\?\\: bool, is_affected\\?\\: bool, is_analyse\\?\\: bool, is_count\\?\\: bool, is_delete\\?\\: bool, \\.\\.\\.\\} in empty\\(\\) does not exist\\.$#" count: 1 path: src/ParseAnalyze.php - - message: "#^Parameter \\#1 \\$info of static method PhpMyAdmin\\\\StatementInfo\\:\\:fromArray\\(\\) expects array\\{distinct\\: bool, drop_database\\: bool, group\\: bool, having\\: bool, is_affected\\: bool, is_analyse\\: bool, is_count\\: bool, is_delete\\: bool, \\.\\.\\.\\}, array\\{distinct\\?\\: bool, drop_database\\?\\: bool, group\\?\\: bool, having\\?\\: bool, is_affected\\?\\: bool, is_analyse\\?\\: bool, is_count\\?\\: bool, is_delete\\?\\: bool, \\.\\.\\.\\} given\\.$#" + message: "#^Offset 'select_tables' on array\\{distinct\\?\\: bool, drop_database\\?\\: bool, group\\?\\: bool, having\\?\\: bool, is_affected\\?\\: bool, is_analyse\\?\\: bool, is_count\\?\\: bool, is_delete\\?\\: bool, \\.\\.\\.\\} in isset\\(\\) does not exist\\.$#" count: 1 path: src/ParseAnalyze.php - - message: "#^Parameter \\#1 \\$string1 of function strcasecmp expects string, mixed given\\.$#" + message: "#^Offset 'select_tables' on array\\{distinct\\?\\: bool, drop_database\\?\\: bool, group\\?\\: bool, having\\?\\: bool, is_affected\\?\\: bool, is_analyse\\?\\: bool, is_count\\?\\: bool, is_delete\\?\\: bool, \\.\\.\\.\\} on left side of \\?\\? does not exist\\.$#" + count: 1 + path: src/ParseAnalyze.php + + - + message: "#^Parameter \\#1 \\$info of static method PhpMyAdmin\\\\StatementInfo\\:\\:fromArray\\(\\) expects array\\{distinct\\: bool, drop_database\\: bool, group\\: bool, having\\: bool, is_affected\\: bool, is_analyse\\: bool, is_count\\: bool, is_delete\\: bool, \\.\\.\\.\\}, array\\{distinct\\?\\: bool, drop_database\\?\\: bool, group\\?\\: bool, having\\?\\: bool, is_affected\\?\\: bool, is_analyse\\?\\: bool, is_count\\?\\: bool, is_delete\\?\\: bool, \\.\\.\\.\\} given\\.$#" count: 1 path: src/ParseAnalyze.php diff --git a/psalm-baseline.xml b/psalm-baseline.xml index f4e619eb10..620c6be7f1 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -6048,10 +6048,6 @@ - - is_array($dbSelect) - - diff --git a/src/Export/Options.php b/src/Export/Options.php index 29aa9b35c6..d55203821c 100644 --- a/src/Export/Options.php +++ b/src/Export/Options.php @@ -56,7 +56,7 @@ final class Options // Check if the selected databases are defined in $_POST // (from clicking Back button on /export page) - if (isset($dbSelect) && is_string($dbSelect)) { + if (is_string($dbSelect)) { $dbSelect = urldecode($dbSelect); $dbSelect = explode(',', $dbSelect); } @@ -68,7 +68,7 @@ final class Options } $isSelected = false; - if (isset($dbSelect) && is_array($dbSelect)) { + if (is_array($dbSelect)) { if (in_array($currentDb, $dbSelect)) { $isSelected = true; }