Merge branch '6.4' into 7.0

OskarStark · OskarStark · commit dfae75578bbd · 2023-08-24T22:23:40.000+02:00
* 6.4:
  Minor
  [Serializer] Fix the subject agreement mistake - grammar
  [Serializer] Use correct property types in example
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -401,7 +401,7 @@ It is also possible to serialize only a set of specific attributes::
     {
         public string $familyName;
         public string $givenName;
-        public string $company;
+        public Company $company;
     }
 
     class Company
@@ -427,7 +427,7 @@ It is also possible to serialize only a set of specific attributes::
 Only attributes that are not ignored (see below) are available.
 If some serialization groups are set, only attributes allowed by those groups can be used.
 
-As for groups, attributes can be selected during both the serialization and deserialization process.
+As for groups, attributes can be selected during both the serialization and deserialization processes.
 
 .. _serializer_ignoring-attributes:
 

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ It is also possible to serialize only a set of specific attributes::`
`401`	`401`	`{`
`402`	`402`	`public string $familyName;`
`403`	`403`	`public string $givenName;`
`404`		`- public string $company;`
	`404`	`+ public Company $company;`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`class Company`
`@@ -427,7 +427,7 @@ It is also possible to serialize only a set of specific attributes::`
`427`	`427`	`Only attributes that are not ignored (see below) are available.`
`428`	`428`	`If some serialization groups are set, only attributes allowed by those groups can be used.`
`429`	`429`
`430`		`-As for groups, attributes can be selected during both the serialization and deserialization process.`
	`430`	`+As for groups, attributes can be selected during both the serialization and deserialization processes.`
`431`	`431`
`432`	`432`	`.. _serializer_ignoring-attributes:`
`433`	`433`