Skip to content

Commit d1052a3

Browse files
authored
Merge pull request #8652 from BacLuc/update-api-platform-hal
chore(api): switch from api-platform/hal-json to api-platform/hal
2 parents fe96602 + fe03822 commit d1052a3

File tree

6 files changed

+25556
-42106
lines changed

6 files changed

+25556
-42106
lines changed

api/composer.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@
88
"api-platform/doctrine-orm": "4.2.10",
99
"api-platform/doctrine-common": "4.2.10",
1010
"api-platform/documentation": "4.2.10",
11+
"api-platform/hal": "4.2.10",
1112
"api-platform/http-cache": "4.2.10",
1213
"api-platform/json-api": "4.2.10",
13-
"api-platform/json-hal": "4.1.28",
1414
"api-platform/metadata": "4.2.9",
1515
"api-platform/openapi": "4.2.10",
1616
"api-platform/serializer": "4.2.10",
1717
"api-platform/state": "4.2.9",
1818
"api-platform/symfony": "4.2.9",
1919
"api-platform/validator": "4.2.10",
2020
"composer/package-versions-deprecated": "1.11.99",
21-
"cweagans/composer-patches": "2.0.0",
2221
"doctrine/common": "3.5.0",
2322
"doctrine/doctrine-bundle": "3.1.0",
2423
"doctrine/doctrine-migrations-bundle": "4.0.0",
@@ -92,7 +91,6 @@
9291
},
9392
"sort-packages": true,
9493
"allow-plugins": {
95-
"cweagans/composer-patches": true,
9694
"php-http/discovery": false,
9795
"symfony/flex": true,
9896
"symfony/runtime": true
@@ -161,13 +159,5 @@
161159
"conflict": {
162160
"symfony/dependency-injection": "5.3.7",
163161
"symfony/symfony": "*"
164-
},
165-
"extra": {
166-
"composer-exit-on-patch-failure": true,
167-
"patches": {
168-
"api-platform/json-hal": {
169-
"Allow NULL-Links": "patch/api-plattform-allow-null-links.patch"
170-
}
171-
}
172162
}
173163
}

api/composer.lock

Lines changed: 79 additions & 200 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/src/Serializer/SerializerContextBuilder.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public function createFromRequest(Request $request, bool $normalization, ?array
2222
$context = $this->decorated->createFromRequest($request, $normalization, $extractedAttributes);
2323

2424
if ($normalization) {
25+
$context['skip_null_to_one_relations'] = false;
2526
$context['skip_null_values'] = false;
2627
}
2728

api/symfony.lock

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737
"composer/xdebug-handler": {
3838
"version": "1.4.6"
3939
},
40-
"cweagans/composer-patches": {
41-
"version": "1.7.1"
42-
},
4340
"dnoegel/php-xdg-base-dir": {
4441
"version": "v0.1.1"
4542
},

0 commit comments

Comments
 (0)