Merge branch '7.4' into 8.0

* 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`

Author: xabbuh

Tests/FilesystemTestCase.php

@@ -103,7 +103,7 @@ protected function getFileOwner($filepath)
     {
         $this->markAsSkippedIfPosixIsMissing();
 
-        return ($datas = posix_getpwuid($this->getFileOwnerId($filepath))) ? $datas['name'] : null;
+        return ($data = posix_getpwuid($this->getFileOwnerId($filepath))) ? $data['name'] : null;
     }
 
     protected function getFileGroupId($filepath)
@@ -119,8 +119,8 @@ protected function getFileGroup($filepath)
     {
         $this->markAsSkippedIfPosixIsMissing();
 
-        if ($datas = posix_getgrgid($this->getFileGroupId($filepath))) {
-            return $datas['name'];
+        if ($data = posix_getgrgid($this->getFileGroupId($filepath))) {
+            return $data['name'];
         }
 
         $this->markTestSkipped('Unable to retrieve file group name');