Merge branch '1.12' into 1.13

* 1.12:
  [Maintenance] Allow APIP 2.7.2
This commit is contained in:
Grzegorz Sadowski 2022-10-26 08:26:49 +02:00
commit 1fdc04639d
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364
3 changed files with 2 additions and 6 deletions

View file

@ -50,7 +50,3 @@ references related issues.
`Sylius\Bundle\ApiBundle\Swagger\AcceptLanguageHeaderDocumentationNormalizer`
references this class throws an exception
`Class "ApiPlatform\Core\Metadata\Resource\ResourceNameCollection" not found`
- `api-platform/core:2.7.2`:
Due to the changes in the skolem IRI generation (see [this PR](https://github.com/api-platform/core/pull/5046))

View file

@ -178,7 +178,7 @@
"sylius/user-bundle": "self.version"
},
"conflict": {
"api-platform/core": "2.7.0 || 2.7.2",
"api-platform/core": "2.7.0",
"doctrine/doctrine-bundle": "2.3.0",
"jms/serializer-bundle": "4.1.0",
"symfony/framework-bundle": "^5.4.5",

View file

@ -87,6 +87,6 @@
<property name="fullName" writable="false" />
<property name="defaultAddress" writable="true" />
<property name="subscribedToNewsletter" writable="true" />
<property name="user" readable="true" />
<property name="user" readable="true" iri="true" />
</resource>
</resources>