Skip to content

Commit 95802ae

Browse files
h4kunapionl
authored andcommitted
feat(Interface): use Throwable instead of Exception
1 parent b0d95e3 commit 95802ae

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

src/Actions/SendRequestAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function execute(
4949
): AbstractResponse {
5050
$timeStart = (float) microtime(true);
5151

52-
$id = md5($request->getUri() . microtime(true));
52+
$id = md5($request->getUri() . $timeStart);
5353

5454
$dispatcher = $api
5555
->factory()

src/Events/RequestConnectionFailedEvent.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
namespace WrkFlow\ApiSdkBuilder\Events;
66

7-
use Exception;
87
use Psr\Http\Message\RequestInterface;
8+
use Throwable;
99

1010
class RequestConnectionFailedEvent
1111
{
1212
public function __construct(
1313
public readonly string $id,
1414
public readonly RequestInterface $request,
15-
public readonly Exception $exception,
15+
public readonly Throwable $exception,
1616
public readonly float $requestDurationInSeconds,
1717
) {
1818
}

src/Log/Actions/GetTextForLogAction.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Exception;
88
use Psr\Http\Message\RequestInterface;
99
use Psr\Http\Message\ResponseInterface;
10+
use Throwable;
1011

1112
class GetTextForLogAction
1213
{
@@ -20,7 +21,7 @@ public function execute(
2021
RequestInterface $request,
2122
float $requestDurationInSeconds,
2223
?ResponseInterface $response = null,
23-
?Exception $exception = null
24+
?Throwable $exception = null,
2425
): string {
2526
$uri = $request->getUri();
2627

@@ -35,7 +36,7 @@ public function execute(
3536
$statusCode,
3637
$uri->getHost(),
3738
$uri->getPath(),
38-
$requestDurationInSeconds
39+
$requestDurationInSeconds,
3940
);
4041
}
4142
}

src/Log/Loggers/DebugLogger.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace WrkFlow\ApiSdkBuilder\Log\Loggers;
66

7-
use Exception;
87
use Psr\Http\Message\RequestInterface;
98
use Psr\Http\Message\ResponseInterface;
109
use Psr\Log\LoggerInterface;
@@ -82,7 +81,7 @@ private function debug(
8281
RequestInterface $request,
8382
float $requestDurationInSeconds,
8483
?ResponseInterface $response = null,
85-
?Exception $exception = null
84+
?Throwable $exception = null
8685
): void {
8786
$uri = $request->getUri();
8887

src/Log/Loggers/InfoLogger.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Psr\Http\Message\RequestInterface;
99
use Psr\Http\Message\ResponseInterface;
1010
use Psr\Log\LoggerInterface;
11+
use Throwable;
1112
use WrkFlow\ApiSdkBuilder\Events\RequestConnectionFailedEvent;
1213
use WrkFlow\ApiSdkBuilder\Events\RequestFailedEvent;
1314
use WrkFlow\ApiSdkBuilder\Events\ResponseReceivedEvent;
@@ -33,7 +34,7 @@ public function requestFailed(RequestFailedEvent $event, LoggerFailConfigEntity
3334
request: $event->request,
3435
requestDurationInSeconds: $event->requestDurationInSeconds,
3536
response: $event->exception->getResponse(),
36-
exception: $event->exception
37+
exception: $event->exception,
3738
);
3839
}
3940

@@ -42,7 +43,7 @@ public function requestConnectionFailed(RequestConnectionFailedEvent $event, Log
4243
$this->debug(
4344
request: $event->request,
4445
requestDurationInSeconds: $event->requestDurationInSeconds,
45-
exception: $event->exception
46+
exception: $event->exception,
4647
);
4748
}
4849

@@ -51,26 +52,26 @@ public function responseReceivedEvent(ResponseReceivedEvent $event, LoggerConfig
5152
$this->debug(
5253
request: $event->request,
5354
requestDurationInSeconds: $event->requestDurationInSeconds,
54-
response: $event->response->getResponse()
55+
response: $event->response->getResponse(),
5556
);
5657
}
5758

5859
private function debug(
5960
RequestInterface $request,
6061
float $requestDurationInSeconds,
6162
?ResponseInterface $response = null,
62-
?Exception $exception = null
63+
?Throwable $exception = null,
6364
): void {
6465
$this->logger->info(
6566
message: $this->getTextForLogAction->execute(
6667
request: $request,
6768
requestDurationInSeconds: $requestDurationInSeconds,
6869
response: $response,
69-
exception: $exception
70+
exception: $exception,
7071
),
7172
context: $exception instanceof Exception === false ? [] : [
7273
'exception' => $exception->getMessage(),
73-
]
74+
],
7475
);
7576
}
7677
}

0 commit comments

Comments
 (0)