Skip to content

Commit

Permalink
Making the response object accept array or string for body
Browse files Browse the repository at this point in the history
  • Loading branch information
JustSteveKing committed May 2, 2023
2 parents 886e50b + b4f1df9 commit d1f11bf
Show file tree
Hide file tree
Showing 13 changed files with 50 additions and 50 deletions.
8 changes: 4 additions & 4 deletions src/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ final class Configuration
* @param array<int,string> $maskedFields
*/
public function __construct(
public readonly string $apiKey,
public readonly string $projectId,
public readonly string $ignoredEnvironments,
public readonly array $maskedFields,
public string $apiKey,
public string $projectId,
public string $ignoredEnvironments,
public array $maskedFields,
) {
}

Expand Down
10 changes: 5 additions & 5 deletions src/DataObjects/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ final class Data implements TreblleObject
* @param list<Error> $errors The list of Errors.
*/
public function __construct(
public readonly Server $server,
public readonly Language $language,
public readonly Request $request,
public readonly Response $response,
public readonly array $errors,
public Server $server,
public Language $language,
public Request $request,
public Response $response,
public array $errors,
) {
}

Expand Down
10 changes: 5 additions & 5 deletions src/DataObjects/Error.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ final class Error implements TreblleObject
* @param int|null $line The exact line of code where the error happened.
*/
public function __construct(
public readonly null|string $source,
public readonly null|string $type,
public readonly null|string $message,
public readonly null|string $file,
public readonly null|int $line,
public null|string $source,
public null|string $type,
public null|string $message,
public null|string $file,
public null|int $line,
) {
}

Expand Down
8 changes: 4 additions & 4 deletions src/DataObjects/Language.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ final class Language implements TreblleObject
* @param string|null $display_errors
*/
public function __construct(
public readonly null|string $name,
public readonly null|string $version,
public readonly null|string $expose_php,
public readonly null|string $display_errors,
public null|string $name,
public null|string $version,
public null|string $expose_php,
public null|string $display_errors,
) {
}

Expand Down
6 changes: 3 additions & 3 deletions src/DataObjects/OS.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ final class OS implements TreblleObject
* @param string|null $architecture The server architecture.
*/
public function __construct(
public readonly null|string $name,
public readonly null|string $release,
public readonly null|string $architecture,
public null|string $name,
public null|string $release,
public null|string $architecture,
) {
}

Expand Down
16 changes: 8 additions & 8 deletions src/DataObjects/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ final class Request implements TreblleObject
* @param array<int|string,mixed> $raw The raw body from the request.
*/
public function __construct(
public readonly string $timestamp,
public readonly string $ip,
public readonly string $url,
public readonly string $user_agent,
public readonly null|Method $method,
public readonly array $headers,
public readonly array $body,
public readonly array $raw,
public string $timestamp,
public string $ip,
public string $url,
public string $user_agent,
public null|Method $method,
public array $headers,
public array $body,
public array $raw,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/DataObjects/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function __construct(
* code: null|int,
* size: null|int,
* load_time: null|float,
* body: array,
* body: string|array,
* }
*/
public function __toArray(): array
Expand Down
14 changes: 7 additions & 7 deletions src/DataObjects/Server.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ final class Server implements TreblleObject
* @param string|null $encoding
*/
public function __construct(
public readonly null|string $ip,
public readonly null|string $timezone,
public readonly null|string $software,
public readonly null|string $signature,
public readonly null|string $protocol,
public readonly null|OS $os,
public readonly null|string $encoding,
public null|string $ip,
public null|string $timezone,
public null|string $software,
public null|string $signature,
public null|string $protocol,
public null|OS $os,
public null|string $encoding,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/DataProviders/GlobalRequestProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
final class GlobalRequestProvider implements RequestContract
{
public function __construct(
private readonly MaskingContract $masker,
private MaskingContract $masker,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion src/DataProviders/LanguageProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
final class LanguageProvider implements LanguageContract
{
public function __construct(
private readonly PHP $php,
private PHP $php,
) {
}

Expand Down
4 changes: 2 additions & 2 deletions src/DataProviders/OutputBufferResponseProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
final class OutputBufferResponseProvider implements ResponseContract
{
public function __construct(
private readonly ErrorContract $error,
private readonly MaskingContract $masker,
private ErrorContract $error,
private MaskingContract $masker,
) {
if (ob_get_level() < 1) {
throw new RuntimeException(
Expand Down
4 changes: 2 additions & 2 deletions src/Http/Middleware/PSR15/TreblleRequestHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
final class TreblleRequestHandler implements RequestHandlerInterface
{
public function __construct(
private readonly MiddlewareInterface $middleware,
private readonly RequestHandlerInterface $next,
private MiddlewareInterface $middleware,
private RequestHandlerInterface $next,
) {}

public function handle(ServerRequestInterface $request): ResponseInterface
Expand Down
14 changes: 7 additions & 7 deletions src/Treblle.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
final class Treblle
{
public function __construct(
private readonly Configuration $configuration,
private readonly ServerContract $server,
private readonly LanguageContract $language,
private readonly RequestContract $request,
private readonly ResponseContract $response,
public readonly ErrorContract $error,
private Configuration $configuration,
private ServerContract $server,
private LanguageContract $language,
private RequestContract $request,
private ResponseContract $response,
public ErrorContract $error,
public ShutdownHandlerContract $handler,
private readonly bool $debug = false,
private bool $debug = false,
) {
}

Expand Down

0 comments on commit d1f11bf

Please sign in to comment.