phpmyadmin
diff --git a/‎phpstan-baseline.neon‎
Lines changed: 1 addition & 1 deletion b/‎phpstan-baseline.neon‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎psalm-baseline.xml‎
Lines changed: 0 additions & 1 deletion b/‎psalm-baseline.xml‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/Partitioning/Partition.php‎
Lines changed: 24 additions & 22 deletions b/‎src/Partitioning/Partition.php‎
Lines changed: 24 additions & 22 deletions
@@ -8088,7 +8088,7 @@ parameters:
 		-
 			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
 			identifier: empty.notAllowed
-			count: 3
+			count: 2
 			path: src/Partitioning/Partition.php
 
 		-
 
@@ -5251,7 +5251,6 @@
     </PossiblyUnusedMethod>
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[$dbi->fetchValue('SELECT @@have_partitioning;')]]></code>
-      <code><![CDATA[empty($row['PARTITION_NAME'])]]></code>
       <code><![CDATA[empty($row['SUBPARTITION_NAME'])]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
 
@@ -141,35 +141,37 @@ public function getSubPartitions(): array
      */
     public static function getPartitions(string $db, string $table): array
     {
-        if (self::havePartitioning()) {
-            $dbi = DatabaseInterface::getInstance();
-            $result = $dbi->fetchResultSimple(
-                'SELECT * FROM `information_schema`.`PARTITIONS`'
-                . ' WHERE `TABLE_SCHEMA` = ' . $dbi->quoteString($db)
-                . ' AND `TABLE_NAME` = ' . $dbi->quoteString($table),
-            );
-            if ($result !== []) {
-                $partitionMap = [];
-                foreach ($result as $row) {
-                    if (empty($row['PARTITION_NAME'])) {
-                        continue;
-                    }
+        if (! self::havePartitioning()) {
+            return [];
+        }
 
-                    $partition = $partitionMap[$row['PARTITION_NAME']] ?? new Partition($row);
-                    $partitionMap[$row['PARTITION_NAME']] = $partition;
+        $dbi = DatabaseInterface::getInstance();
+        $result = $dbi->fetchResultSimple(
+            'SELECT * FROM `information_schema`.`PARTITIONS`'
+            . ' WHERE `TABLE_SCHEMA` = ' . $dbi->quoteString($db)
+            . ' AND `TABLE_NAME` = ' . $dbi->quoteString($table),
+        );
+        if ($result === []) {
+            return [];
+        }
 
-                    if (empty($row['SUBPARTITION_NAME'])) {
-                        continue;
-                    }
+        $partitionMap = [];
+        foreach ($result as $row) {
+            $partitionName = $row['PARTITION_NAME'] ?? '';
+            if ($partitionName === '') {
+                continue;
+            }
 
-                    $partition->addSubPartition(new SubPartition($row));
-                }
+            $partitionMap[$partitionName] ??= new Partition($row);
 
-                return array_values($partitionMap);
+            if (empty($row['SUBPARTITION_NAME'])) {
+                continue;
             }
+
+            $partitionMap[$partitionName]->addSubPartition(new SubPartition($row));
         }
 
-        return [];
+        return array_values($partitionMap);
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -8088,7 +8088,7 @@ parameters:`
`8088`	`8088`	`-`
`8089`	`8089`	`message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'`
`8090`	`8090`	`identifier: empty.notAllowed`
`8091`		`- count: 3`
	`8091`	`+ count: 2`
`8092`	`8092`	`path: src/Partitioning/Partition.php`
`8093`	`8093`
`8094`	`8094`	`-`