gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #19860 - Fix #19859 - Fix deprecated null array offset

Browse Source 
Pull-request: #19860
Fixes: #19859
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2025-09-14 15:51:34 +02:00
commit e903b739a7
No known key found for this signature in database
GPG Key ID: 70684F4717D49A31
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/classes/Partitioning/Partition.php
View File

@ -156,20 +156,18 @@ class Partition extends SubPartition
$partitionMap = [];
/** @var array $row */
foreach ($result as $row) {
if (isset($partitionMap[$row['PARTITION_NAME']])) {
$partition = $partitionMap[$row['PARTITION_NAME']];
} else {
$partition = new Partition($row);
$partitionMap[$row['PARTITION_NAME']] = $partition;
if (empty($row['PARTITION_NAME'])) {
continue;
}
$partition = $partitionMap[$row['PARTITION_NAME']] ?? new Partition($row);
$partitionMap[$row['PARTITION_NAME']] = $partition;
if (empty($row['SUBPARTITION_NAME'])) {
continue;
}
$parentPartition = $partition;
$partition = new SubPartition($row);
$parentPartition->addSubPartition($partition);
$partition->addSubPartition(new SubPartition($row));
}
return array_values($partitionMap);

2
phpstan-baseline.neon
View File

@ -24432,7 +24432,7 @@ parameters:
-
message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
count: 7
count: 8
path: libraries/classes/Partitioning/Partition.php
-