Merge branch '7.4' into 8.0

* 7.4: [FrameworkBundle] Expose share directory in AboutCommand Move readonly keyword from class to properties

Author: nicolas-grekas

TypeResolver/PhpDocAwareReflectionTypeResolver.php

@@ -30,15 +30,15 @@
  *
  * @author Mathias Arlaud <mathias.arlaud@gmail.com>
  */
-final readonly class PhpDocAwareReflectionTypeResolver implements TypeResolverInterface
+final class PhpDocAwareReflectionTypeResolver implements TypeResolverInterface
 {
- private PhpDocParser $phpDocParser;
- private Lexer $lexer;
+ private readonly PhpDocParser $phpDocParser;
+ private readonly Lexer $lexer;
 
  public function __construct(
- private TypeResolverInterface $reflectionTypeResolver,
- private TypeResolverInterface $stringTypeResolver,
- private TypeContextFactory $typeContextFactory,
+ private readonly TypeResolverInterface $reflectionTypeResolver,
+ private readonly TypeResolverInterface $stringTypeResolver,
+ private readonly TypeContextFactory $typeContextFactory,
  ?PhpDocParser $phpDocParser = null,
  ?Lexer $lexer = null,
  ) {

TypeResolver/ReflectionParameterTypeResolver.php

@@ -22,11 +22,11 @@
  * @author Mathias Arlaud <mathias.arlaud@gmail.com>
  * @author Baptiste Leduc <baptiste.leduc@gmail.com>
  */
-final readonly class ReflectionParameterTypeResolver implements TypeResolverInterface
+final class ReflectionParameterTypeResolver implements TypeResolverInterface
 {
  public function __construct(
- private ReflectionTypeResolver $reflectionTypeResolver,
- private TypeContextFactory $typeContextFactory,
+ private readonly ReflectionTypeResolver $reflectionTypeResolver,
+ private readonly TypeContextFactory $typeContextFactory,
  ) {
  }
 

TypeResolver/ReflectionPropertyTypeResolver.php

@@ -22,11 +22,11 @@
  * @author Mathias Arlaud <mathias.arlaud@gmail.com>
  * @author Baptiste Leduc <baptiste.leduc@gmail.com>
  */
-final readonly class ReflectionPropertyTypeResolver implements TypeResolverInterface
+final class ReflectionPropertyTypeResolver implements TypeResolverInterface
 {
  public function __construct(
- private ReflectionTypeResolver $reflectionTypeResolver,
- private TypeContextFactory $typeContextFactory,
+ private readonly ReflectionTypeResolver $reflectionTypeResolver,
+ private readonly TypeContextFactory $typeContextFactory,
  ) {
  }
 

TypeResolver/ReflectionReturnTypeResolver.php

@@ -22,11 +22,11 @@
  * @author Mathias Arlaud <mathias.arlaud@gmail.com>
  * @author Baptiste Leduc <baptiste.leduc@gmail.com>
  */
-final readonly class ReflectionReturnTypeResolver implements TypeResolverInterface
+final class ReflectionReturnTypeResolver implements TypeResolverInterface
 {
  public function __construct(
- private ReflectionTypeResolver $reflectionTypeResolver,
- private TypeContextFactory $typeContextFactory,
+ private readonly ReflectionTypeResolver $reflectionTypeResolver,
+ private readonly TypeContextFactory $typeContextFactory,
  ) {
  }
 

TypeResolver/TypeResolver.php

@@ -24,13 +24,13 @@
  * @author Mathias Arlaud <mathias.arlaud@gmail.com>
  * @author Baptiste Leduc <baptiste.leduc@gmail.com>
  */
-final readonly class TypeResolver implements TypeResolverInterface
+final class TypeResolver implements TypeResolverInterface
 {
  /**
  * @param ContainerInterface $resolvers Locator of type resolvers, keyed by supported subject type
  */
  public function __construct(
- private ContainerInterface $resolvers,
+ private readonly ContainerInterface $resolvers,
  ) {
  }