Skip to content

Commit 2e4cdf7

Browse files
guanguansguanguans
committed
Fix style
1 parent c7eddf2 commit 2e4cdf7

10 files changed

+55
-139
lines changed

‎src/Contracts/Output.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
interface Output
1616
{
1717
/**
18-
* @param \Symfony\Component\HttpFoundation\Response $requestHandled
19-
* @param \Illuminate\Console\Events\CommandFinished $requestHandled
20-
* @param \Illuminate\Foundation\Http\Events\RequestHandled $requestHandled
18+
* @param \Illuminate\Console\Events\CommandFinished|\Symfony\Component\HttpFoundation\Response $dispatcher
2119
*
2220
* @return mixed
2321
*/
24-
public function output(Collection $scores, $requestHandled);
22+
public function output(Collection $scores, $dispatcher);
2523
}

‎src/OutputManager.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,14 @@ public function offsetSet($offset, $value): void
3939
}
4040

4141
/**
42-
* @param \Symfony\Component\HttpFoundation\Response $requestHandled
43-
* @param \Illuminate\Console\Events\CommandFinished $requestHandled
44-
* @param \Illuminate\Foundation\Http\Events\RequestHandled $requestHandled
45-
*
46-
* @return mixed
42+
* {@inheritdoc}
4743
*/
48-
public function output(Collection $scores, $requestHandled)
44+
public function output(Collection $scores, $dispatcher)
4945
{
5046
/* @var Output $output */
5147
foreach ($this->attributes as $output) {
52-
event(new OutputtingEvent($output, $scores, $requestHandled));
53-
$result = $output->output($scores, $requestHandled);
48+
event(new OutputtingEvent($output, $scores, $dispatcher));
49+
$result = $output->output($scores, $dispatcher);
5450
event(new OutputtedEvent($output, $scores, $result));
5551
}
5652
}

‎src/Outputs/ClockworkOutput.php

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
class ClockworkOutput extends Output
1616
{
1717
/**
18-
* @param \Illuminate\Console\Events\CommandFinished $event
19-
* @param \Illuminate\Foundation\Http\Events\RequestHandled $event
20-
*
21-
* @return mixed
18+
* {@inheritdoc}
2219
*/
23-
public function output(Collection $scores, $event)
20+
public function output(Collection $scores, $dispatcher)
2421
{
25-
if (! $this->shouldOutput($event)) {
22+
if (! function_exists('clock')) {
2623
return;
2724
}
2825

@@ -31,9 +28,4 @@ public function output(Collection $scores, $event)
3128
clock()->warning($score['Summary'], $score);
3229
});
3330
}
34-
35-
protected function shouldOutput($event): bool
36-
{
37-
return function_exists('clock');
38-
}
3931
}

‎src/Outputs/Concerns/OutputCondition.php

Lines changed: 17 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -11,75 +11,47 @@
1111
namespace Guanguans\LaravelSoar\Outputs\Concerns;
1212

1313
use Illuminate\Console\Events\CommandFinished;
14-
use Illuminate\Foundation\Http\Events\RequestHandled;
1514
use Illuminate\Http\JsonResponse;
1615
use Illuminate\Http\Response;
1716
use Illuminate\Support\Str;
1817

1918
trait OutputCondition
2019
{
2120
/**
22-
* @param \Symfony\Component\HttpFoundation\Response $event
23-
* @param \Illuminate\Console\Events\CommandFinished $event
24-
* @param \Illuminate\Foundation\Http\Events\RequestHandled $event
21+
* @param \Illuminate\Console\Events\CommandFinished|\Symfony\Component\HttpFoundation\Response $dispatcher
2522
*/
26-
protected function isEvent($event): bool
23+
protected function isCommandFinished($dispatcher): bool
2724
{
28-
return $event instanceof CommandFinished ||
29-
$event instanceof RequestHandled;
25+
return $dispatcher instanceof CommandFinished;
3026
}
3127

3228
/**
33-
* @param \Symfony\Component\HttpFoundation\Response $event
34-
* @param \Illuminate\Console\Events\CommandFinished $event
35-
* @param \Illuminate\Foundation\Http\Events\RequestHandled $event
29+
* @param \Illuminate\Console\Events\CommandFinished|\Symfony\Component\HttpFoundation\Response $dispatcher
3630
*/
37-
protected function isCommandFinishedEvent($event): bool
31+
protected function isResponse($dispatcher): bool
3832
{
39-
return $event instanceof CommandFinished;
33+
return $dispatcher instanceof Response;
4034
}
4135

4236
/**
43-
* @param \Symfony\Component\HttpFoundation\Response $event
44-
* @param \Illuminate\Console\Events\CommandFinished $event
45-
* @param \Illuminate\Foundation\Http\Events\RequestHandled $event
37+
* @param \Illuminate\Console\Events\CommandFinished|\Symfony\Component\HttpFoundation\Response $dispatcher
4638
*/
47-
protected function isRequestHandledEvent($event): bool
39+
protected function isHtmlResponse($dispatcher): bool
4840
{
49-
return $event instanceof RequestHandled;
41+
return $dispatcher instanceof Response &&
42+
Str::contains($dispatcher->headers->get('Content-Type'), 'text/html') &&
43+
! $this->isJsonResponse($dispatcher);
5044
}
5145

5246
/**
53-
* @param \Symfony\Component\HttpFoundation\Response $response
54-
* @param \Illuminate\Console\Events\CommandFinished $response
55-
* @param \Illuminate\Foundation\Http\Events\RequestHandled $response
47+
* @param \Illuminate\Console\Events\CommandFinished|\Symfony\Component\HttpFoundation\Response $dispatcher
5648
*/
57-
protected function isResponse($response): bool
49+
protected function isJsonResponse($dispatcher): bool
5850
{
59-
return $response instanceof Response;
60-
}
61-
62-
/**
63-
* @param \Illuminate\Http\Response $response
64-
* @param \Illuminate\Http\JsonResponse $response
65-
*/
66-
protected function isHtmlResponse($response): bool
67-
{
68-
return $response instanceof Response &&
69-
Str::contains($response->headers->get('Content-Type'), 'text/html') &&
70-
! $this->isJsonResponse($response);
71-
}
72-
73-
/**
74-
* @param \Illuminate\Http\Response $response
75-
* @param \Illuminate\Http\JsonResponse $response
76-
*/
77-
protected function isJsonResponse($response): bool
78-
{
79-
return $response instanceof JsonResponse &&
80-
Str::contains($response->headers->get('Content-Type'), 'application/json') &&
81-
transform($response, function (JsonResponse $response) {
82-
if ('' === ($content = $response->getContent())) {
51+
return $dispatcher instanceof JsonResponse &&
52+
Str::contains($dispatcher->headers->get('Content-Type'), 'application/json') &&
53+
transform($dispatcher, function (JsonResponse $dispatcher) {
54+
if ('' === ($content = $dispatcher->getContent())) {
8355
return false;
8456
}
8557

‎src/Outputs/ConsoleOutput.php

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,16 @@
1515
class ConsoleOutput extends Output
1616
{
1717
/**
18-
* @param \Illuminate\Foundation\Http\Events\RequestHandled $requestHandled
19-
*
20-
* @return mixed
18+
* {@inheritdoc}
2119
*/
22-
public function output(Collection $scores, $requestHandled)
20+
public function output(Collection $scores, $dispatcher)
2321
{
24-
if (! $this->shouldOutput($requestHandled)) {
22+
if (! $this->isHtmlResponse($dispatcher)) {
2523
return;
2624
}
2725

2826
$js = $this->transformToJs($scores);
29-
$content = $requestHandled->getContent();
27+
$content = $dispatcher->getContent();
3028

3129
// Try to put the widget at the end, directly before the </body>
3230
$pos = strripos($content, '</body>');
@@ -37,13 +35,8 @@ public function output(Collection $scores, $requestHandled)
3735
}
3836

3937
// Update the new content and reset the content length
40-
$requestHandled->setContent($content);
41-
$requestHandled->headers->remove('Content-Length');
42-
}
43-
44-
protected function shouldOutput($requestHandled): bool
45-
{
46-
return $this->isHtmlResponse($requestHandled);
38+
$dispatcher->setContent($content);
39+
$dispatcher->headers->remove('Content-Length');
4740
}
4841

4942
protected function transformToJs(Collection $scores): string

‎src/Outputs/DebugBarOutput.php

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,11 @@ class DebugBarOutput extends Output
2727
private static $outputted = false;
2828

2929
/**
30-
* @param \Symfony\Component\HttpFoundation\Response $response
31-
*
32-
* @return mixed
30+
* {@inheritdoc}
3331
*/
34-
public function output(Collection $scores, $response)
32+
public function output(Collection $scores, $dispatcher)
3533
{
36-
if (! $this->shouldOutput($response)) {
34+
if (! $this->shouldOutput($dispatcher)) {
3735
return;
3836
}
3937

@@ -52,9 +50,9 @@ public static function isOutputted(): bool
5250
return self::$outputted;
5351
}
5452

55-
protected function shouldOutput($response): bool
53+
protected function shouldOutput($dispatcher): bool
5654
{
57-
return $this->isResponse($response) &&
55+
return $this->isHtmlResponse($dispatcher) &&
5856
class_exists('Barryvdh\Debugbar\Facade') &&
5957
\Barryvdh\Debugbar\Facade::isEnabled();
6058
}

‎src/Outputs/DumpOutput.php

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,13 @@
1515
class DumpOutput extends Output
1616
{
1717
/**
18-
* @param \Illuminate\Console\Events\CommandFinished $event
19-
* @param \Illuminate\Foundation\Http\Events\RequestHandled $event
20-
*
21-
* @return mixed
18+
* {@inheritdoc}
2219
*/
23-
public function output(Collection $scores, $event)
20+
public function output(Collection $scores, $dispatcher)
2421
{
25-
if (! $this->shouldOutput($event)) {
26-
return;
27-
}
28-
2922
$scores->each(function (array $score) {
3023
unset($score['Basic']);
3124
dump($score);
3225
});
3326
}
34-
35-
protected function shouldOutput($event): bool
36-
{
37-
return true;
38-
}
3927
}

‎src/Outputs/JsonOutput.php

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@
1616
class JsonOutput extends Output
1717
{
1818
/**
19-
* @param \Illuminate\Foundation\Http\Events\RequestHandled $requestHandled
20-
*
21-
* @return mixed
19+
* {@inheritdoc}
2220
*/
23-
public function output(Collection $scores, $requestHandled)
21+
public function output(Collection $scores, $dispatcher)
2422
{
25-
if (! $this->shouldOutput($requestHandled)) {
23+
if (! $this->isJsonResponse($dispatcher)) {
2624
return;
2725
}
2826

@@ -32,14 +30,9 @@ public function output(Collection $scores, $requestHandled)
3230
return $score;
3331
});
3432

35-
$data = Arr::wrap($requestHandled->getData(true)) and $data['soar_scores'] = $scores;
33+
$data = Arr::wrap($dispatcher->getData(true)) and $data['soar_scores'] = $scores;
3634
// Update the new content and reset the content length
37-
$requestHandled->setData($data);
38-
$requestHandled->headers->remove('Content-Length');
39-
}
40-
41-
protected function shouldOutput($requestHandled): bool
42-
{
43-
return $this->isJsonResponse($requestHandled);
35+
$dispatcher->setData($data);
36+
$dispatcher->headers->remove('Content-Length');
4437
}
4538
}

‎src/Outputs/LogOutput.php

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,13 @@ public function __construct($channel = 'daily')
2626
}
2727

2828
/**
29-
* @param \Illuminate\Console\Events\CommandFinished $event
30-
* @param \Illuminate\Foundation\Http\Events\RequestHandled $event
31-
*
32-
* @return mixed
29+
* {@inheritdoc}
3330
*/
3431
public function output(Collection $scores, $event)
3532
{
36-
if (! $this->shouldOutput($event)) {
37-
return;
38-
}
39-
4033
$scores->each(function (array $score) {
4134
unset($score['Basic']);
4235
Log::channel($this->channel)->warning($score['Summary'].PHP_EOL.to_pretty_json($score));
4336
});
4437
}
45-
46-
protected function shouldOutput($event): bool
47-
{
48-
return true;
49-
}
5038
}

‎src/Outputs/SoarBarOutput.php

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@ public function __construct(SoarBar $debugBar)
3232
}
3333

3434
/**
35-
* @param \Illuminate\Foundation\Http\Events\RequestHandled $requestHandled
36-
*
37-
* @return mixed
35+
* {@inheritdoc}
3836
*/
39-
public function output(Collection $scores, $requestHandled)
37+
public function output(Collection $scores, $dispatcher)
4038
{
41-
if (! $this->shouldOutput($requestHandled)) {
39+
if (! $this->shouldOutput($dispatcher)) {
4240
return;
4341
}
4442

@@ -48,7 +46,7 @@ public function output(Collection $scores, $requestHandled)
4846
$this->debugBar['scores']->addMessage($score['Summary'].PHP_EOL.to_pretty_json($score), 'warning', false);
4947
});
5048

51-
$content = $requestHandled->getContent();
49+
$content = $dispatcher->getContent();
5250
$head = $this->renderer->renderHead();
5351
$widget = $this->renderer->render();
5452

@@ -70,13 +68,13 @@ public function output(Collection $scores, $requestHandled)
7068
}
7169

7270
// Update the new content and reset the content length
73-
$requestHandled->setContent($content);
74-
$requestHandled->headers->remove('Content-Length');
71+
$dispatcher->setContent($content);
72+
$dispatcher->headers->remove('Content-Length');
7573
}
7674

77-
protected function shouldOutput($requestHandled): bool
75+
protected function shouldOutput($dispatcher): bool
7876
{
79-
return ! DebugBarOutput::isOutputted()
80-
&& $this->isHtmlResponse($requestHandled);
77+
return ! DebugBarOutput::isOutputted() &&
78+
$this->isHtmlResponse($dispatcher);
8179
}
8280
}

0 commit comments

Comments
 (0)