Skip to content

Commit 6b86be5

Browse files
authored
Merge pull request #6 from always-open/fix-timeout-errors
fix timeout errors
2 parents a331ab4 + 8159a24 commit 6b86be5

3 files changed

Lines changed: 38 additions & 20 deletions

File tree

config/bwt-api.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
return [
44
'base_url' => env('BWT_API_BASE_URL', 'https://bwt.com/api'),
55
'api_key' => env('BWT_API_KEY'),
6-
'timeout' => env('BWT_API_TIMEOUT', 120),
6+
'timeout' => env('BWT_API_TIMEOUT', 300),
77
];

config/data.php

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
11
<?php
22

3+
use Illuminate\Contracts\Support\Arrayable;
34
use Illuminate\Support\Enumerable;
5+
use Spatie\LaravelData\Casts\DateTimeInterfaceCast;
6+
use Spatie\LaravelData\Casts\EnumCast;
7+
use Spatie\LaravelData\Casts\EnumerableCast;
8+
use Spatie\LaravelData\Normalizers\ArrayableNormalizer;
9+
use Spatie\LaravelData\Normalizers\ArrayNormalizer;
10+
use Spatie\LaravelData\Normalizers\JsonNormalizer;
11+
use Spatie\LaravelData\Normalizers\ModelNormalizer;
12+
use Spatie\LaravelData\Normalizers\ObjectNormalizer;
13+
use Spatie\LaravelData\RuleInferrers\AttributesRuleInferrer;
14+
use Spatie\LaravelData\RuleInferrers\BuiltInTypesRuleInferrer;
15+
use Spatie\LaravelData\RuleInferrers\NullableRuleInferrer;
16+
use Spatie\LaravelData\RuleInferrers\RequiredRuleInferrer;
17+
use Spatie\LaravelData\RuleInferrers\SometimesRuleInferrer;
18+
use Spatie\LaravelData\Support\Creation\ValidationStrategy;
19+
use Spatie\LaravelData\Transformers\ArrayableTransformer;
20+
use Spatie\LaravelData\Transformers\DateTimeInterfaceTransformer;
21+
use Spatie\LaravelData\Transformers\EnumTransformer;
422

523
return [
624
/*
@@ -38,19 +56,19 @@
3856
* types.
3957
*/
4058
'transformers' => [
41-
DateTimeInterface::class => \Spatie\LaravelData\Transformers\DateTimeInterfaceTransformer::class,
42-
\Illuminate\Contracts\Support\Arrayable::class => \Spatie\LaravelData\Transformers\ArrayableTransformer::class,
43-
BackedEnum::class => Spatie\LaravelData\Transformers\EnumTransformer::class,
59+
DateTimeInterface::class => DateTimeInterfaceTransformer::class,
60+
Arrayable::class => ArrayableTransformer::class,
61+
BackedEnum::class => EnumTransformer::class,
4462
],
4563

4664
/*
4765
* Global casts will cast values into complex types when creating a data
4866
* object from simple types.
4967
*/
5068
'casts' => [
51-
DateTimeInterface::class => Spatie\LaravelData\Casts\DateTimeInterfaceCast::class,
52-
BackedEnum::class => Spatie\LaravelData\Casts\EnumCast::class,
53-
Enumerable::class => Spatie\LaravelData\Casts\EnumerableCast::class,
69+
DateTimeInterface::class => DateTimeInterfaceCast::class,
70+
BackedEnum::class => EnumCast::class,
71+
Enumerable::class => EnumerableCast::class,
5472
],
5573

5674
/*
@@ -59,11 +77,11 @@
5977
* the type of the property.
6078
*/
6179
'rule_inferrers' => [
62-
Spatie\LaravelData\RuleInferrers\SometimesRuleInferrer::class,
63-
Spatie\LaravelData\RuleInferrers\NullableRuleInferrer::class,
64-
Spatie\LaravelData\RuleInferrers\RequiredRuleInferrer::class,
65-
Spatie\LaravelData\RuleInferrers\BuiltInTypesRuleInferrer::class,
66-
Spatie\LaravelData\RuleInferrers\AttributesRuleInferrer::class,
80+
SometimesRuleInferrer::class,
81+
NullableRuleInferrer::class,
82+
RequiredRuleInferrer::class,
83+
BuiltInTypesRuleInferrer::class,
84+
AttributesRuleInferrer::class,
6785
],
6886

6987
/*
@@ -72,12 +90,12 @@
7290
* every data object, unless overridden in a specific data object class.
7391
*/
7492
'normalizers' => [
75-
Spatie\LaravelData\Normalizers\ModelNormalizer::class,
93+
ModelNormalizer::class,
7694
// Spatie\LaravelData\Normalizers\FormRequestNormalizer::class,
77-
Spatie\LaravelData\Normalizers\ArrayableNormalizer::class,
78-
Spatie\LaravelData\Normalizers\ObjectNormalizer::class,
79-
Spatie\LaravelData\Normalizers\ArrayNormalizer::class,
80-
Spatie\LaravelData\Normalizers\JsonNormalizer::class,
95+
ArrayableNormalizer::class,
96+
ObjectNormalizer::class,
97+
ArrayNormalizer::class,
98+
JsonNormalizer::class,
8199
],
82100

83101
/*
@@ -126,7 +144,7 @@
126144
* method. By default, only when a request is passed the data is being validated. This
127145
* behaviour can be changed to always validate or to completely disable validation.
128146
*/
129-
'validation_strategy' => \Spatie\LaravelData\Support\Creation\ValidationStrategy::OnlyRequests->value,
147+
'validation_strategy' => ValidationStrategy::OnlyRequests->value,
130148

131149
/*
132150
* A data object can map the names of its properties when transforming (output) or when

src/BwtApiClient.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class BwtApiClient
2020

2121
protected ?string $apiKey = null;
2222

23-
protected int $timeout = 60;
23+
protected int $timeout = 300;
2424

2525
public function __construct(
2626
?string $baseUrl = null,
@@ -29,7 +29,7 @@ public function __construct(
2929
) {
3030
$this->baseUrl = $baseUrl ?? config('bwt-api.base_url', 'https://bwt.com/api');
3131
$this->apiKey = $apiKey ?? config('bwt-api.api_key') ?? '';
32-
$this->timeout = $timeout ?? config('bwt-api.timeout', 60);
32+
$this->timeout = $timeout ?? config('bwt-api.timeout', 300);
3333
}
3434

3535
protected function getAuthHeader(): array

0 commit comments

Comments
 (0)