Skip to content

Commit 7655ba8

Browse files
committed
Merge remote-tracking branch 'upstream/2.5' into merge-25
2 parents 9920f15 + ab2f82c commit 7655ba8

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

CHANGELOG.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,16 @@
55
* MongoDB: Possibility to add execute options (aggregate command fields) for a resource, like `allowDiskUse` (#3144)
66
* GraphQL: Allow to format GraphQL errors based on exceptions (#3063)
77

8+
## 2.5.2
9+
10+
* Compatibility with Symfony 5 RC
11+
* Compatibility with NelmioCorsBundle 2
12+
* Fix the type of `ApiResource::$paginationPartial`
13+
* Ensure correct return type from `AbstractItemNormalizer::normalizeRelation`
14+
815
## 2.5.1
916

10-
* Compatibility with Symfony 5
17+
* Compatibility with Symfony 5 beta
1118
* Fix a notice in `SerializerContextBuilder`
1219
* Fix dashed path segment generation
1320
* Fix support for custom filters without constructor in the `@ApiFilter` annotation
@@ -38,7 +45,7 @@
3845

3946
* Allow to not declare GET item operation
4047
* Add support for the Accept-Patch header
41-
* Make the the `maximum_items_per_page` attribute consistent with other attributes controlling pagination
48+
* Make the the `maximum_items_per_page` attribute consistent with other attributes controlling pagination
4249
* Allow to use a string instead of an array for serializer groups
4350
* Test: Add an helper method to find the IRI of a resource
4451
* Test: Add assertions for testing response against JSON Schema from API resource

phpstan.neon.dist

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ parameters:
7878
message: "#Call to function method_exists\\(\\) with 'Symfony\\\\\\\\Component.+' and 'getRoleNames' will always evaluate to false\\.#"
7979
path: %currentWorkingDirectory%/tests/Security/EventListener/DenyAccessListenerTest.php
8080
- "#Call to method PHPUnit\\\\Framework\\\\Assert::assertSame\\(\\) with array\\('(collection_context|item_context|subresource_context)'\\) and array<Symfony\\\\Component\\\\VarDumper\\\\Cloner\\\\Data>\\|bool\\|float\\|int\\|string\\|null will always evaluate to false\\.#"
81-
# https://github.com/doctrine/doctrine2/pull/7298
82-
- '#Strict comparison using === between null and int will always evaluate to false\.#'
8381
-
8482
message: '#Binary operation "\+" between (float\|int\|)?string and 0 results in an error\.#'
8583
path: %currentWorkingDirectory%/src/Bridge/Doctrine/Common/Filter/RangeFilterTrait.php

0 commit comments

Comments
 (0)