Skip to content

Commit a2615af

Browse files
Move report renderer to the FlareProvider constructor
The renderer is an integration hook (like gracefulSpanEnderClosure), not user config, so it lives on the FlareProvider constructor and Flare::make() forwards it. Removed from FlareConfig.
1 parent 7bfc479 commit a2615af

3 files changed

Lines changed: 5 additions & 14 deletions

File tree

src/Flare.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,13 @@ public function __construct(
5353

5454
public static function make(
5555
string|FlareConfig $apiToken,
56+
?Closure $reportRenderer = null,
5657
): self {
5758
$config = is_string($apiToken) ? FlareConfig::make($apiToken)->useDefaults() : $apiToken;
5859

5960
$container = Container::instance();
6061

61-
$provider = new FlareProvider($config, $container);
62+
$provider = new FlareProvider($config, $container, reportRenderer: $reportRenderer);
6263

6364
$provider->register();
6465
$provider->boot();

src/FlareConfig.php

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ public function __construct(
9494
public ?int $reportErrorLevels = null,
9595
public ?Closure $filterExceptionsCallable = null,
9696
public ?Closure $filterReportsCallable = null,
97-
public ?Closure $reportRendererCallable = null,
9897
public array $overriddenGroupings = [],
9998

10099
// Tracing
@@ -653,16 +652,6 @@ public function filterReportsUsing(Closure $filterReportsCallable): static
653652
return $this;
654653
}
655654

656-
/**
657-
* @param Closure(ReportFactory): void $reportRendererCallable
658-
*/
659-
public function renderReportsUsing(Closure $reportRendererCallable): static
660-
{
661-
$this->reportRendererCallable = $reportRendererCallable;
662-
663-
return $this;
664-
}
665-
666655
public function reportErrorLevels(int $reportErrorLevels): static
667656
{
668657
$this->reportErrorLevels = $reportErrorLevels;

src/FlareProvider.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ public function __construct(
4747
protected ?Closure $registerRecorderAndMiddlewaresCallback = null,
4848
protected ?Closure $isUsingSubtasksClosure = null,
4949
protected ?Closure $gracefulSpanEnderClosure = null,
50-
protected bool $disableApiQueue = false
50+
protected bool $disableApiQueue = false,
51+
protected ?Closure $reportRenderer = null,
5152
) {
5253
$this->registerRecorderAndMiddlewaresCallback ??= $this->defaultRegisterRecordersAndMiddlewaresCallback();
5354
$this->mode = $this->config->mode ?? match (true) {
@@ -230,7 +231,7 @@ public function register(): void
230231
middleware: $middleware,
231232
recorders: $recorders,
232233
addReportsToTraces: $collects->collectErrorsWithTraces,
233-
reportRenderer: $this->config->reportRendererCallable,
234+
reportRenderer: $this->reportRenderer,
234235
);
235236
});
236237

0 commit comments

Comments
 (0)