Merge branch '7.4' into 8.0

xabbuh · xabbuh · commit c1d6253c6579 · 2025-07-28T09:34:05.000+02:00
* 7.4:
  [Serializer] Make data provider return type match its PHPDoc
  fix fixture files locations
  resolve conflict
  [Console] Fix `TreeHelper::addChild` when providing a string
  [Serializer] Handle invalid mapping type property type
  [Config] Do not generate unreachable configuration paths
  [WebProfilerBundle] Fix missing indent on non php files opended in the profiler
  [Serializer] Add missing CHANGELOG entry
  [Validator] Add `min` and `max` in both error messages of `LengthValidator`
  remove docblocks for deprecated argument types
  [ObjectMapper] skip reading uninitialized values
  [Security] Support union type for `#[CurrentUser]` attribute
  Fix typos
  [Serializer] Add CDATA_WRAPPING_NAME_PATTERN support to XmlEncoder
  [JsonPath] Fix parsing invalid Unicode codepoints
  [FrameworkBundle] Fix cache warmers tests
  [AssetMapper] Add support for loading JSON using import statements
  [BrowserKit] Add PHPUnit constraints: `BrowserHistoryIsOnFirstPage` and `BrowserHistoryIsOnLastPage`
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,7 +45,7 @@ CHANGELOG
  * added `LazyString` which provides memoizing stringable objects
  * The component is not marked as `@experimental` anymore
  * added the `s()` helper method to get either an `UnicodeString` or `ByteString` instance,
-   depending of the input string UTF-8 compliancy
+   depending of the input string UTF-8 compliance
  * added `$cut` parameter to `Symfony\Component\String\AbstractString::truncate()`
  * added `AbstractString::containsAny()`
  * allow passing a string of custom characters to `ByteString::fromRandom()`
