Skip to content

Commit 6fe6355

Browse files
committed
Lint and fix return type
1 parent b5b4097 commit 6fe6355

File tree

1 file changed

+20
-22
lines changed

1 file changed

+20
-22
lines changed

src/LaravelRequestDocsMiddleware.php

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,27 @@
44

55
use Closure;
66
use Illuminate\Database\Events\QueryExecuted;
7-
use Illuminate\Http\JsonResponse;
87
use Illuminate\Http\Request;
98
use Illuminate\Support\Facades\DB;
9+
use Illuminate\Support\Facades\Event;
1010
use Illuminate\Support\Facades\Log;
11+
use Illuminate\Support\Str;
1112
use KitLoong\AppLogger\QueryLog\LogWriter as QueryLogger;
12-
use Event;
13-
use Str;
1413
use Symfony\Component\HttpFoundation\Response;
1514

16-
1715
class LaravelRequestDocsMiddleware extends QueryLogger
1816
{
19-
private array $queries = [];
20-
private array $logs = [];
21-
private array $models = [];
17+
private array $queries = [];
18+
private array $logs = [];
19+
private array $models = [];
2220
private array $modelsTimeline = [];
2321

2422
/**
2523
* Handle an incoming request.
2624
*
27-
* @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\JsonResponse) $next
25+
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
2826
*/
29-
public function handle(Request $request, Closure $next): JsonResponse
27+
public function handle(Request $request, Closure $next): Response
3028
{
3129
if (!$request->headers->has('X-Request-LRD') || !config('app.debug')) {
3230
return $next($request);
@@ -53,12 +51,12 @@ public function handle(Request $request, Closure $next): JsonResponse
5351

5452
$content = $response->getData();
5553
$content->_lrd = [
56-
'queries' => $this->queries,
57-
'logs' => $this->logs,
58-
'models' => $this->models,
54+
'queries' => $this->queries,
55+
'logs' => $this->logs,
56+
'models' => $this->models,
5957
// 'modelsTimeline' => $this->modelsTimeline,
6058
'modelsTimeline' => array_unique($this->modelsTimeline, SORT_REGULAR),
61-
'memory' => (string) round(memory_get_peak_usage(true) / 1048576, 2) . "MB",
59+
'memory' => (string) round(memory_get_peak_usage(true) / 1048576, 2) . "MB",
6260
];
6361
$jsonContent = json_encode($content);
6462

@@ -75,7 +73,7 @@ public function handle(Request $request, Closure $next): JsonResponse
7573
return $response;
7674
}
7775

78-
public function listenToDB()
76+
public function listenToDB(): void
7977
{
8078
DB::listen(function (QueryExecuted $query) {
8179
$this->queries[] = $this->getMessages($query);
@@ -89,18 +87,18 @@ public function listenToLogs(): void
8987
});
9088
}
9189

92-
public function listenToModels()
90+
public function listenToModels(): void
9391
{
9492
Event::listen('eloquent.*', function ($event, $models) {
9593
foreach (array_filter($models) as $model) {
9694
// doing and booted ignore
9795
if (Str::startsWith($event, 'eloquent.booting')
98-
|| Str::startsWith($event, 'eloquent.booted')
99-
|| Str::startsWith($event, 'eloquent.retrieving')
100-
|| Str::startsWith($event, 'eloquent.creating')
101-
|| Str::startsWith($event, 'eloquent.saving')
102-
|| Str::startsWith($event, 'eloquent.updating')
103-
|| Str::startsWith($event, 'eloquent.deleting')
96+
|| Str::startsWith($event, 'eloquent.booted')
97+
|| Str::startsWith($event, 'eloquent.retrieving')
98+
|| Str::startsWith($event, 'eloquent.creating')
99+
|| Str::startsWith($event, 'eloquent.saving')
100+
|| Str::startsWith($event, 'eloquent.updating')
101+
|| Str::startsWith($event, 'eloquent.deleting')
104102
) {
105103
continue;
106104
}
@@ -120,7 +118,7 @@ public function listenToModels()
120118
if (!isset($this->models[$class][$event])) {
121119
$this->models[$class][$event] = 0;
122120
}
123-
$this->models[$class][$event] = $this->models[$class][$event]+1;
121+
$this->models[$class][$event] = $this->models[$class][$event] + 1;
124122
}
125123
});
126124
}

0 commit comments

Comments
 (0)