Skip to content

Commit 37bf259

Browse files
authored
Merge pull request #66 from IvanLutokhin/feature-delivery-dellin
Feature delivery dellin
2 parents 78d7935 + 5745d03 commit 37bf259

File tree

179 files changed

+14151
-10
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+14151
-10
lines changed

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
"ext-json": "*",
3131
"league/oauth2-client": "1.4.2",
3232
"doctrine/annotations": "^1.6",
33-
"symfony/validator": "^4.3",
33+
"symfony/validator": "^4.3|^5.0",
3434
"guzzlehttp/guzzle": "^6.3",
35-
"jms/serializer": "^1.14"
35+
"jms/serializer": "^1.14|^3.4"
3636
},
3737
"require-dev": {
3838
"phpunit/phpunit": "^7.4",

src/Service/Boxberry/Client.php

+11-4
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,17 @@ public function __construct(string $token, bool $new = true, bool $test = false)
8989
$this->url = $new ? self::API_URL_NEW : ($test ? self::API_URL : self::API_URL_TEST);
9090
$this->client = new GuzzleHttp\Client(self::CONFIG);
9191

92-
$this->serializer = SerializerBuilder::create()->setPropertyNamingStrategy(
93-
new SerializedNameAnnotationStrategy(
94-
new IdenticalPropertyNamingStrategy()
92+
$serializer = SerializerBuilder::create()
93+
->setPropertyNamingStrategy(
94+
new SerializedNameAnnotationStrategy(
95+
new IdenticalPropertyNamingStrategy()
96+
)
9597
)
96-
)->build();
98+
->build()
99+
;
100+
101+
if ($serializer instanceof Serializer) {
102+
$this->serializer = $serializer;
103+
}
97104
}
98105
}

0 commit comments

Comments
 (0)