From f5290679c743a773ff92abd76d6b73f79cf963cb Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 14 Sep 2025 14:35:13 +0200 Subject: [PATCH 1/2] Fix deprecated null array offset Signed-off-by: Liviu-Mihail Concioiu --- libraries/classes/Partitioning/Partition.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/libraries/classes/Partitioning/Partition.php b/libraries/classes/Partitioning/Partition.php index 21c0bf1c91..4d05bc2c7d 100644 --- a/libraries/classes/Partitioning/Partition.php +++ b/libraries/classes/Partitioning/Partition.php @@ -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); From 9f234877e5ef7ad3bae40c6ecc922657585d5e3c Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sun, 14 Sep 2025 15:06:51 +0200 Subject: [PATCH 2/2] Update PHPStan Signed-off-by: Liviu-Mihail Concioiu --- phpstan-baseline.neon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index ec19fe65cd..09df975a1f 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -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 -