Merge branch '5.4' into 6.3

* 5.4: Fix implicitly-required parameters List CS fix in .git-blame-ignore-revs Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value [Messenger][AmazonSqs] Allow async-aws/sqs version 2
symfony · Jan 23, 2024 · ea6fe0e · ea6fe0e
2 parents a8a93f0 + abb0a15
commit ea6fe0e
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/Exception/ClassNotFoundException.php b/Exception/ClassNotFoundException.php
@@ -13,7 +13,7 @@
 
 class ClassNotFoundException extends \Exception implements ExceptionInterface
 {
-    public function __construct(string $class, \Throwable $previous = null)
+    public function __construct(string $class, ?\Throwable $previous = null)
     {
         parent::__construct(sprintf('Class "%s" not found.', $class), 0, $previous);
     }

diff --git a/Exception/NotInstantiableTypeException.php b/Exception/NotInstantiableTypeException.php
@@ -13,7 +13,7 @@
 
 class NotInstantiableTypeException extends \Exception implements ExceptionInterface
 {
-    public function __construct(string $type, \Throwable $previous = null)
+    public function __construct(string $type, ?\Throwable $previous = null)
     {
         parent::__construct(sprintf('Type "%s" is not instantiable.', $type), 0, $previous);
     }

diff --git a/LazyGhostTrait.php b/LazyGhostTrait.php
@@ -44,7 +44,7 @@ trait LazyGhostTrait
      *                                                    that the initializer doesn't set when its a closure
      * @param static|null              $instance
      */
-    public static function createLazyGhost(\Closure|array $initializer, array $skippedProperties = null, object $instance = null): static
+    public static function createLazyGhost(\Closure|array $initializer, ?array $skippedProperties = null, ?object $instance = null): static
     {
         $onlyProperties = null === $skippedProperties && \is_array($initializer) ? $initializer : null;
 

diff --git a/LazyProxyTrait.php b/LazyProxyTrait.php
@@ -27,7 +27,7 @@ trait LazyProxyTrait
      * @param \Closure():object $initializer Returns the proxied object
      * @param static|null       $instance
      */
-    public static function createLazyProxy(\Closure $initializer, object $instance = null): static
+    public static function createLazyProxy(\Closure $initializer, ?object $instance = null): static
     {
         if (self::class !== $class = $instance ? $instance::class : static::class) {
             $skippedProperties = ["\0".self::class."\0lazyObjectState" => true];

diff --git a/ProxyHelper.php b/ProxyHelper.php
@@ -213,7 +213,7 @@ class_exists(\Symfony\Component\VarExporter\Internal\LazyObjectState::class);
             EOPHP;
     }
 
-    public static function exportSignature(\ReflectionFunctionAbstract $function, bool $withParameterTypes = true, string &$args = null): string
+    public static function exportSignature(\ReflectionFunctionAbstract $function, bool $withParameterTypes = true, ?string &$args = null): string
     {
         $byRefIndex = 0;
         $args = '';
@@ -270,7 +270,7 @@ public static function exportSignature(\ReflectionFunctionAbstract $function, bo
         return $signature;
     }
 
-    public static function exportType(\ReflectionFunctionAbstract|\ReflectionProperty|\ReflectionParameter $owner, bool $noBuiltin = false, \ReflectionType $type = null): ?string
+    public static function exportType(\ReflectionFunctionAbstract|\ReflectionProperty|\ReflectionParameter $owner, bool $noBuiltin = false, ?\ReflectionType $type = null): ?string
     {
         if (!$type ??= $owner instanceof \ReflectionFunctionAbstract ? $owner->getReturnType() : $owner->getType()) {
             return null;

diff --git a/Tests/LazyGhostTraitTest.php b/Tests/LazyGhostTraitTest.php
@@ -427,7 +427,7 @@ public function testReadOnlyClass()
      *
      * @return T
      */
-    private function createLazyGhost(string $class, \Closure|array $initializer, array $skippedProperties = null): object
+    private function createLazyGhost(string $class, \Closure|array $initializer, ?array $skippedProperties = null): object
     {
         $r = new \ReflectionClass($class);
 

diff --git a/VarExporter.php b/VarExporter.php
@@ -37,7 +37,7 @@ final class VarExporter
      *
      * @throws ExceptionInterface When the provided value cannot be serialized
      */
-    public static function export(mixed $value, bool &$isStaticValue = null, array &$foundClasses = []): string
+    public static function export(mixed $value, ?bool &$isStaticValue = null, array &$foundClasses = []): string
     {
         $isStaticValue = true;