fix: harden report class loading and query parameters

2026-09-01 22:50:39 +02:00
parent 2997caacc1
commit d2ee80ebe7
1 changed files with 12 additions and 7 deletions
@@ -1,31 +1,36 @@
 <?php
 declare(strict_types=1);
-namespace App\Domain\Reporting {

-use \ReportFilters;
-use \ReportDataMapper;
-use \ReportQuery;
-use \ReportAudience;
+namespace App\Domain\Reporting {

 require_once __DIR__ . '/ReportFilters.php';
 require_once __DIR__ . '/ReportDataMapper.php';
 require_once __DIR__ . '/ReportQuery.php';
 require_once __DIR__ . '/ReportAudience.php';

+use \ReportFilters;
+use \ReportDataMapper;
+use \ReportQuery;
+use \ReportAudience;
+
 final class ClientHistoryReport implements ReportQuery
 {
    public function __construct(private readonly ?ReportFilters $filters = null, private readonly ?ReportDataMapper $mapper = null) {}
+
    /** @param list<array<string,mixed>> $rows @return list<array<string,mixed>> */
    public function build(array $rows, string $audience = 'client'): array
    {
        ReportAudience::validate($audience);
-        $filters = $this->filters ?? new ReportFilters(); $mapper = $this->mapper ?? new ReportDataMapper(); $selected = [];
+        $filters = $this->filters ?? new ReportFilters();
+        $mapper = $this->mapper ?? new ReportDataMapper();
+        $selected = [];
        foreach ($rows as $row) if ($filters->matches($row)) $selected[] = $row;
-        usort($selected, static fn(array $a,array $b): int => strcmp((string)($a['changed_at'] ?? ''), (string)($b['changed_at'] ?? '')) ?: ((int)($a['id'] ?? $a['jobcard_id'] ?? 0) <=> (int)($b['id'] ?? $b['jobcard_id'] ?? 0)) ?: strcmp((string)($a['reference_no'] ?? ''), (string)($b['reference_no'] ?? '')));
+        usort($selected, static fn(array $a, array $b): int => strcmp((string)($a['changed_at'] ?? ''), (string)($b['changed_at'] ?? '')) ?: ((int)($a['id'] ?? $a['jobcard_id'] ?? 0) <=> (int)($b['id'] ?? $b['jobcard_id'] ?? 0)) ?: strcmp((string)($a['reference_no'] ?? ''), (string)($b['reference_no'] ?? '')));
        $result = [];
        foreach ($selected as $row) $result[] = $audience === ReportAudience::INTERNAL ? $mapper->internalHistory($row) : $mapper->clientHistory($row);
        return $result;
    }
+
    public function query(array $rows, string $audience = 'client'): array { return $this->build($rows, $audience); }
 }
 }