Merge pull request #19984 from kamil-tekiela/issets

MauricioFauth · web-flow · commit ccd5dd9d2291 · 2025-12-09T17:04:42.000-03:00
Remove all redundant issets
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -3582,7 +3582,7 @@ parameters:
 		-
 			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
 			identifier: empty.notAllowed
-			count: 2
+			count: 1
 			path: src/Controllers/Table/Structure/PartitioningController.php
 
 		-
@@ -3591,12 +3591,6 @@ parameters:
 			count: 1
 			path: src/Controllers/Table/Structure/PartitioningController.php
 
-		-
-			message: '#^Offset ''partition_by'' on array\{partition_by\: string, partition_expr\: string, partition_count\: mixed, subpartition_by\: string, subpartition_expr\: string, subpartition_count\: mixed, can_have_subpartitions\: bool\} in isset\(\) always exists and is not nullable\.$#'
-			identifier: isset.offset
-			count: 1
-			path: src/Controllers/Table/Structure/PartitioningController.php
-
 		-
 			message: '#^Offset 0 might not exist on array\<PhpMyAdmin\\SqlParser\\Components\\PartitionDefinition\>\|null\.$#'
 			identifier: offsetAccess.notFound
@@ -7770,7 +7764,7 @@ parameters:
 		-
 			message: '#^Loose comparison via "\=\=" is not allowed\.$#'
 			identifier: equal.notAllowed
-			count: 3
+			count: 1
 			path: src/InsertEdit.php
 
 		-
@@ -14190,12 +14184,6 @@ parameters:
 			count: 1
 			path: src/Util.php
 
-		-
-			message: '#^Offset int\<1, 6\> on array\{string, string, string, string, string, string, string\} in isset\(\) always exists and is not nullable\.$#'
-			identifier: isset.offset
-			count: 1
-			path: src/Util.php
-
 		-
 			message: '#^Only booleans are allowed in a negated boolean, int\<0, 2\> given\.$#'
 			identifier: booleanNot.exprNotBoolean
@@ -17056,21 +17044,9 @@ parameters:
 			path: tests/unit/Navigation/Nodes/NodeTest.php
 
 		-
-			message: '#^Property PhpMyAdmin\\Config\:\:\$selectedServer \(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, \.\.\.\}\) does not accept array\<''AllowDeny''\|''AllowNoPassword''\|''AllowRoot''\|''auth_http_realm''\|''auth_type''\|''bookmarktable''\|''central_columns''\|''column_info''\|''compress''\|''control_compress''\|''control_hide…''\|''control_socket''\|''control_ssl''\|''control_ssl_ca''\|''control_ssl_ca_path''\|''control_ssl_cert''\|''control_ssl_ciphers''\|''control_ssl_key''\|''control_ssl_verify''\|''controlhost''\|''controlpass''\|''controlport''\|''controluser''\|''designer_settings''\|''DisableIS''\|''export_templates''\|''favorite''\|''history''\|''host''\|''LogoutURL''\|''MaxTableUiprefs''\|''navigationhiding''\|''only_db''\|''password''\|''pdf_pages''\|''pmadb''\|''port''\|''recent''\|''relation''\|''savedsearches''\|''SessionTimeZone''\|''SignonCookieParams''\|''SignonScript''\|''SignonSession''\|''SignonURL''\|''socket''\|''ssl''\|''ssl_ca''\|''ssl_ca_path''\|''ssl_cert''\|''ssl_ciphers''\|''ssl_key''\|''ssl_verify''\|''table_coords''\|''table_info''\|''table_uiprefs''\|''tracking''\|''user''\|''userconfig''\|''usergroups''\|''users''\|''verbose'', array\<array\<string\>\|bool\|int\<0, max\>\|string\>\|bool\|int\<1, max\>\|string\|null\>\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: tests/unit/Navigation/Nodes/NodeTest.php
-
-		-
-			message: '#^Property PhpMyAdmin\\Config\:\:\$selectedServer \(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, \.\.\.\}\) does not accept array\<''AllowDeny''\|''AllowNoPassword''\|''AllowRoot''\|''auth_http_realm''\|''auth_type''\|''bookmarktable''\|''central_columns''\|''column_info''\|''compress''\|''control_compress''\|''control_hide…''\|''control_socket''\|''control_ssl''\|''control_ssl_ca''\|''control_ssl_ca_path''\|''control_ssl_cert''\|''control_ssl_ciphers''\|''control_ssl_key''\|''control_ssl_verify''\|''controlhost''\|''controlpass''\|''controlport''\|''controluser''\|''designer_settings''\|''DisableIS''\|''export_templates''\|''favorite''\|''history''\|''host''\|''LogoutURL''\|''MaxTableUiprefs''\|''navigationhiding''\|''password''\|''pdf_pages''\|''pmadb''\|''port''\|''recent''\|''relation''\|''savedsearches''\|''SessionTimeZone''\|''SignonCookieParams''\|''SignonScript''\|''SignonSession''\|''SignonURL''\|''socket''\|''ssl''\|''ssl_ca''\|''ssl_ca_path''\|''ssl_cert''\|''ssl_ciphers''\|''ssl_key''\|''ssl_verify''\|''table_coords''\|''table_info''\|''table_uiprefs''\|''tracking''\|''user''\|''userconfig''\|''usergroups''\|''users''\|''verbose'', array\<array\<string\>\|bool\|int\<0, max\>\|string\>\|bool\|int\<1, max\>\|string\|null\>\.$#'
-			identifier: assign.propertyType
-			count: 2
-			path: tests/unit/Navigation/Nodes/NodeTest.php
-
-		-
-			message: '#^Property PhpMyAdmin\\Config\:\:\$selectedServer \(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, \.\.\.\}\) does not accept array\{\}\.$#'
+			message: '#^Property PhpMyAdmin\\Config\:\:\$selectedServer \(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, \.\.\.\}\) does not accept 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, \.\.\.\}\.$#'
 			identifier: assign.propertyType
-			count: 1
+			count: 3
 			path: tests/unit/Navigation/Nodes/NodeTest.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1639,12 +1639,10 @@
       <code><![CDATA[__construct]]></code>
     </PossiblyUnusedMethod>
     <RedundantCondition>
-      <code><![CDATA[$request->hasBodyParam('import_type')
-                && $request->getParsedBodyParam('import_type') === 'text_file'
+      <code><![CDATA[$request->getParsedBodyParam('import_type') === 'text_file'
                 && isset($_FILES['import_file'])
                 && is_array($_FILES['import_file'])]]></code>
-      <code><![CDATA[$request->hasBodyParam('import_type')
-                && $request->getParsedBodyParam('import_type') === 'text_file'
+      <code><![CDATA[$request->getParsedBodyParam('import_type') === 'text_file'
                 && isset($_FILES['import_file'])
                 && is_array($_FILES['import_file'])
                 && $_FILES['import_file']['error'] == UPLOAD_ERR_OK
@@ -2639,7 +2637,6 @@
       <code><![CDATA[__construct]]></code>
     </PossiblyUnusedMethod>
     <RiskyTruthyFalsyComparison>
-      <code><![CDATA[empty($stmt->partitionBy)]]></code>
       <code><![CDATA[empty($stmt->subpartitionBy)]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
@@ -10731,14 +10728,9 @@
       <code><![CDATA[Config::getInstance()]]></code>
       <code><![CDATA[Config::getInstance()]]></code>
     </DeprecatedMethod>
-    <DocblockTypeContradiction>
-      <code><![CDATA[isset($config->selectedServer)]]></code>
-    </DocblockTypeContradiction>
     <InvalidPropertyAssignmentValue>
       <code><![CDATA[$config->selectedServer]]></code>
       <code><![CDATA[$config->selectedServer]]></code>
-      <code><![CDATA[$config->selectedServer]]></code>
-      <code><![CDATA[[]]]></code>
     </InvalidPropertyAssignmentValue>
   </file>
   <file src="tests/unit/Navigation/Nodes/ObjectFetcherTest.php">
diff --git a/src/Controllers/BrowseForeignersController.php b/src/Controllers/BrowseForeignersController.php
@@ -35,7 +35,7 @@ public function __invoke(ServerRequest $request): Response
         $foreignFilter = $request->getParsedBodyParamAsString('foreign_filter', '');
         $rownumber = $request->getParsedBodyParamAsStringOrNull('rownumber');
 
-        if (! isset($database, $table, $field)) {
+        if ($database === null || $table === null || $field === null) {
             return $this->response->response();
         }
 
diff --git a/src/Controllers/ColumnController.php b/src/Controllers/ColumnController.php
@@ -23,7 +23,7 @@ public function __invoke(ServerRequest $request): Response
         $db = $request->getParsedBodyParamAsStringOrNull('db');
         $table = $request->getParsedBodyParamAsStringOrNull('table');
 
-        if (! isset($db, $table)) {
+        if ($db === null || $table === null) {
             $this->response->setRequestStatus(false);
             $this->response->addJSON(['message' => Message::error()]);
 
diff --git a/src/Controllers/Export/ExportController.php b/src/Controllers/Export/ExportController.php
@@ -227,7 +227,7 @@ public function __invoke(ServerRequest $request): Response
         // Do we need to convert charset?
         Export::$outputCharsetConversion = Export::$asFile
             && Encoding::isSupported()
-            && isset(Current::$charset) && Current::$charset !== 'utf-8'
+            && Current::$charset !== null && Current::$charset !== 'utf-8'
             && in_array(Current::$charset, Encoding::listEncodings(), true);
 
         // Use on the fly compression?
diff --git a/src/Controllers/GisDataEditorController.php b/src/Controllers/GisDataEditorController.php
@@ -54,7 +54,7 @@ public function __invoke(ServerRequest $request): Response
         $value = $request->getParsedBodyParamAsStringOrNull('value');
         $inputName = $request->getParsedBodyParamAsStringOrNull('input_name');
 
-        if (! isset($field)) {
+        if ($field === null) {
             return $this->response->response();
         }
 
@@ -70,7 +70,7 @@ public function __invoke(ServerRequest $request): Response
             return $this->response->response();
         }
 
-        if (isset($value)) {
+        if ($value !== null) {
             $gisData = array_merge($gisData, $gisObj->generateParams($value));
         }
 
diff --git a/src/Controllers/Normalization/AddNewPrimaryController.php b/src/Controllers/Normalization/AddNewPrimaryController.php
@@ -34,8 +34,8 @@ public function __invoke(ServerRequest $request): Response
 
         $db = DatabaseName::tryFrom(Current::$database);
         $table = TableName::tryFrom(Current::$table);
-        $dbName = isset($db) ? $db->getName() : '';
-        $tableName = isset($table) ? $table->getName() : '';
+        $dbName = $db?->getName() ?? '';
+        $tableName = $table?->getName() ?? '';
 
         $columnMeta = ['Field' => $tableName . '_id', 'Extra' => 'auto_increment'];
         $html = $this->normalization->getHtmlForCreateNewColumn(
diff --git a/src/Controllers/Preferences/ManageController.php b/src/Controllers/Preferences/ManageController.php
@@ -106,8 +106,7 @@ public function __invoke(ServerRequest $request): Response
             // load from JSON file
             $json = '';
             if (
-                $request->hasBodyParam('import_type')
-                && $request->getParsedBodyParam('import_type') === 'text_file'
+                $request->getParsedBodyParam('import_type') === 'text_file'
                 && isset($_FILES['import_file'])
                 && is_array($_FILES['import_file'])
                 && $_FILES['import_file']['error'] == UPLOAD_ERR_OK
diff --git a/src/Controllers/Server/PrivilegesController.php b/src/Controllers/Server/PrivilegesController.php
@@ -166,7 +166,7 @@ public function __invoke(ServerRequest $request): Response
                 $relationParameters->configurableMenusFeature !== null,
             );
             //update the old variables
-            if (isset($retMessage)) {
+            if ($retMessage !== null) {
                 Current::$message = $retMessage;
                 unset($retMessage);
             }
diff --git a/src/Controllers/Sql/SqlController.php b/src/Controllers/Sql/SqlController.php
@@ -178,7 +178,7 @@ public function __invoke(ServerRequest $request): Response
             Import::$importText,
             Current::$messageToShow,
             UrlParams::$goto,
-            isset(Current::$dispQuery) ? Current::$displayQuery : null,
+            Current::$dispQuery !== null ? Current::$displayQuery : null,
             Current::$displayMessage ?? '',
             Current::$sqlQuery,
             Current::$completeQuery ?? Current::$sqlQuery,
diff --git a/src/Controllers/Table/DeleteConfirmController.php b/src/Controllers/Table/DeleteConfirmController.php
@@ -33,7 +33,7 @@ public function __invoke(ServerRequest $request): Response
     {
         $selected = $_POST['rows_to_delete'] ?? null;
 
-        if (! isset($selected) || ! is_array($selected)) {
+        if (! is_array($selected)) {
             $this->response->setRequestStatus(false);
             $this->response->addJSON('message', __('No row selected.'));
 
diff --git a/src/Controllers/Table/Structure/PartitioningController.php b/src/Controllers/Table/Structure/PartitioningController.php
@@ -102,7 +102,7 @@ private function extractPartitionDetails(): array|null
         $partitionDetails['partition_expr'] = '';
         $partitionDetails['partition_count'] = 0;
 
-        if (! empty($stmt->partitionBy)) {
+        if ($stmt->partitionBy !== '' && $stmt->partitionBy !== null) {
             $openPos = strpos($stmt->partitionBy, '(');
             $closePos = strrpos($stmt->partitionBy, ')');
 
@@ -147,8 +147,11 @@ private function extractPartitionDetails(): array|null
             && in_array($partitionDetails['partition_by'], ['RANGE', 'RANGE COLUMNS', 'LIST', 'LIST COLUMNS'], true);
 
         // Values are specified only for LIST and RANGE type partitions
-        $partitionDetails['value_enabled'] = isset($partitionDetails['partition_by'])
-            && in_array($partitionDetails['partition_by'], ['RANGE', 'RANGE COLUMNS', 'LIST', 'LIST COLUMNS'], true);
+        $partitionDetails['value_enabled'] = in_array(
+            $partitionDetails['partition_by'],
+            ['RANGE', 'RANGE COLUMNS', 'LIST', 'LIST COLUMNS'],
+            true,
+        );
 
         $partitionDetails['partitions'] = [];
 
diff --git a/src/Export/Export.php b/src/Export/Export.php
@@ -950,7 +950,7 @@ public function mergeAliases(array $aliases1, array $aliases2): array
                 }
 
                 foreach ($tbl['columns'] as $col => $colAs) {
-                    if (! isset($colAs) || ! is_array($colAs)) {
+                    if (! is_array($colAs)) {
                         continue;
                     }
 
diff --git a/src/Git.php b/src/Git.php
@@ -498,7 +498,7 @@ private function getHashFromHeadRef(string $gitFolder, string $refHead): array
             }
         }
 
-        if (! isset($hash)) {
+        if ($hash === null) {
             $this->hasGit = false;
 
             // Could not find ref
diff --git a/src/Html/Generator.php b/src/Html/Generator.php
@@ -424,7 +424,7 @@ public static function getMessage(
         $config = Config::getInstance();
         $renderSql = $config->settings['ShowSQL'] && $sqlQuery !== '' && $sqlQuery !== ';';
 
-        if (isset(Sql::$usingBookmarkMessage)) {
+        if (Sql::$usingBookmarkMessage !== null) {
             $retval .= Sql::$usingBookmarkMessage->getDisplay();
             Sql::$usingBookmarkMessage = null;
         }
diff --git a/src/InsertEdit.php b/src/InsertEdit.php
@@ -1640,9 +1640,9 @@ private function getHtmlForInsertEditFormColumn(
 
                 foreach ($enumValues as $enumValue) {
                     if (
-                        $data == $enumValue || ($data == ''
+                        $data === $enumValue || ($data == ''
                             && (! isset($_POST['where_clause']) || ! $column->isNull)
-                            && isset($column->default) && $enumValue == $column->default)
+                            && $enumValue === $column->default)
                     ) {
                         $enumSelectedValue = $enumValue;
                         break;
diff --git a/src/Plugins/Export/ExportSql.php b/src/Plugins/Export/ExportSql.php
@@ -1090,7 +1090,7 @@ private function exportConfigurationMetadata(
         $relationParameters = $this->relation->getRelationParameters();
         $relationParams = $relationParameters->toArray();
 
-        if (isset($table)) {
+        if ($table !== null) {
             $types = [
                 RelationParameters::COLUMN_INFO => 'db_name',
                 RelationParameters::TABLE_UI_PREFS => 'db_name',
@@ -1219,7 +1219,7 @@ private function exportConfigurationMetadata(
                 . '.' . Util::backquote((string) $relationParams[$type])
                 . ' WHERE ' . Util::backquote($dbNameColumn)
                 . ' = ' . $dbi->quoteString($db);
-            if (isset($table)) {
+            if ($table !== null) {
                 $sqlQuery .= ' AND `table_name` = ' . $dbi->quoteString($table);
             }
 
diff --git a/src/Plugins/Schema/Svg/Svg.php b/src/Plugins/Schema/Svg/Svg.php
@@ -198,7 +198,7 @@ public function printElement(
         $this->writeAttribute('x', (string) $x);
         $this->writeAttribute('y', (string) $y);
         $this->writeAttribute('style', $styles);
-        if (isset($text)) {
+        if ($text !== null) {
             $this->writeAttribute('font-family', $this->font);
             $this->writeAttribute('font-size', $this->fontSize . 'px');
             $this->text($text);
diff --git a/src/Server/Status/Monitor.php b/src/Server/Status/Monitor.php
@@ -460,7 +460,7 @@ private function getSuspensionPoints(string $lastChar): string
      */
     public function getJsonForLoggingVars(string|null $name, string|null $value): array
     {
-        if (isset($name, $value)) {
+        if ($name !== null && $value !== null) {
             if (preg_match('/[^a-zA-Z0-9_]+/', $name) !== 1) {
                 if (! is_numeric($value)) {
                     $value = $this->dbi->quoteString($value);
diff --git a/src/Table/Table.php b/src/Table/Table.php
@@ -1428,7 +1428,7 @@ public function updateInternalRelations(
                     . $this->dbi->quoteString($masterField, ConnectionType::ControlUser);
             }
 
-            if (! isset($updQuery)) {
+            if ($updQuery === null) {
                 continue;
             }
 
diff --git a/src/Util.php b/src/Util.php
@@ -330,7 +330,7 @@ public static function formatByteDown(float|int|string|null $value, int $limes =
         /** @infection-ignore-all */
         for ($d = 6, $ex = 15; $d >= 1; $d--, $ex -= 3) {
             $unitSize = $li * 10 ** $ex;
-            if (isset($byteUnits[$d]) && $value >= $unitSize) {
+            if ($value >= $unitSize) {
                 // use 1024.0 to avoid integer overflow on 64-bit machines
                 $value = round($value / (1024 ** $d / $dh)) / $dh;
                 $unit = $byteUnits[$d];
diff --git a/tests/unit/Navigation/Nodes/NodeTest.php b/tests/unit/Navigation/Nodes/NodeTest.php
@@ -290,10 +290,6 @@ public function testGetWhereClause(): void
             $method->invoke($node, 'SCHEMA_NAME', 'schemaName'),
         );
 
-        if (! isset($config->selectedServer)) {
-            $config->selectedServer = [];
-        }
-
         // When hide_db regular expression is present
         $config->selectedServer['hide_db'] = 'regexpHideDb';
         self::assertSame(

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function __invoke(ServerRequest $request): Response`
`35`	`35`	`$foreignFilter = $request->getParsedBodyParamAsString('foreign_filter', '');`
`36`	`36`	`$rownumber = $request->getParsedBodyParamAsStringOrNull('rownumber');`
`37`	`37`
`38`		`- if (! isset($database, $table, $field)) {`
	`38`	`+ if ($database === null \|\| $table === null \|\| $field === null) {`
`39`	`39`	`return $this->response->response();`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function __invoke(ServerRequest $request): Response`
`54`	`54`	`$value = $request->getParsedBodyParamAsStringOrNull('value');`
`55`	`55`	`$inputName = $request->getParsedBodyParamAsStringOrNull('input_name');`
`56`	`56`
`57`		`- if (! isset($field)) {`
	`57`	`+ if ($field === null) {`
`58`	`58`	`return $this->response->response();`
`59`	`59`	`}`
`60`	`60`
`@@ -70,7 +70,7 @@ public function __invoke(ServerRequest $request): Response`
`70`	`70`	`return $this->response->response();`
`71`	`71`	`}`
`72`	`72`
`73`		`- if (isset($value)) {`
	`73`	`+ if ($value !== null) {`
`74`	`74`	`$gisData = array_merge($gisData, $gisObj->generateParams($value));`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public function __invoke(ServerRequest $request): Response`
`166`	`166`	`$relationParameters->configurableMenusFeature !== null,`
`167`	`167`	`);`
`168`	`168`	`//update the old variables`
`169`		`- if (isset($retMessage)) {`
	`169`	`+ if ($retMessage !== null) {`
`170`	`170`	`Current::$message = $retMessage;`
`171`	`171`	`unset($retMessage);`
`172`	`172`	`}`