Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit f24e2568376e · 2024-01-23T16:02:46.000+01:00
* 6.4:
  Fix implicitly-required parameters
  minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench)
  Fix bad merge
  List CS fix in .git-blame-ignore-revs
  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
diff --git a/BinaryFileResponse.php b/BinaryFileResponse.php
@@ -42,7 +42,7 @@ class BinaryFileResponse extends Response
      * @param bool                $autoEtag           Whether the ETag header should be automatically set
      * @param bool                $autoLastModified   Whether the Last-Modified header should be automatically set
      */
-    public function __construct(\SplFileInfo|string $file, int $status = 200, array $headers = [], bool $public = true, string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true)
+    public function __construct(\SplFileInfo|string $file, int $status = 200, array $headers = [], bool $public = true, ?string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true)
     {
         parent::__construct(null, $status, $headers);
 
@@ -60,7 +60,7 @@ public function __construct(\SplFileInfo|string $file, int $status = 200, array
      *
      * @throws FileException
      */
-    public function setFile(\SplFileInfo|string $file, string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true): static
+    public function setFile(\SplFileInfo|string $file, ?string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true): static
     {
         if (!$file instanceof File) {
             if ($file instanceof \SplFileInfo) {
diff --git a/Cookie.php b/Cookie.php
@@ -76,7 +76,7 @@ public static function fromString(string $cookie, bool $decode = false): static
      *
      * @param self::SAMESITE_*|''|null $sameSite
      */
-    public static function create(string $name, string $value = null, int|string|\DateTimeInterface $expire = 0, ?string $path = '/', string $domain = null, bool $secure = null, bool $httpOnly = true, bool $raw = false, ?string $sameSite = self::SAMESITE_LAX, bool $partitioned = false): self
+    public static function create(string $name, ?string $value = null, int|string|\DateTimeInterface $expire = 0, ?string $path = '/', ?string $domain = null, ?bool $secure = null, bool $httpOnly = true, bool $raw = false, ?string $sameSite = self::SAMESITE_LAX, bool $partitioned = false): self
     {
         return new self($name, $value, $expire, $path, $domain, $secure, $httpOnly, $raw, $sameSite, $partitioned);
     }
@@ -94,7 +94,7 @@ public static function create(string $name, string $value = null, int|string|\Da
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(string $name, string $value = null, int|string|\DateTimeInterface $expire = 0, ?string $path = '/', string $domain = null, bool $secure = null, bool $httpOnly = true, bool $raw = false, ?string $sameSite = self::SAMESITE_LAX, bool $partitioned = false)
+    public function __construct(string $name, ?string $value = null, int|string|\DateTimeInterface $expire = 0, ?string $path = '/', ?string $domain = null, ?bool $secure = null, bool $httpOnly = true, bool $raw = false, ?string $sameSite = self::SAMESITE_LAX, bool $partitioned = false)
     {
         // from PHP source code
         if ($raw && false !== strpbrk($name, self::RESERVED_CHARS_LIST)) {
diff --git a/Exception/SessionNotFoundException.php b/Exception/SessionNotFoundException.php
@@ -20,7 +20,7 @@
  */
 class SessionNotFoundException extends \LogicException implements RequestExceptionInterface
 {
-    public function __construct(string $message = 'There is currently no session available.', int $code = 0, \Throwable $previous = null)
+    public function __construct(string $message = 'There is currently no session available.', int $code = 0, ?\Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
diff --git a/File/File.php b/File/File.php
@@ -82,7 +82,7 @@ public function getMimeType(): ?string
      *
      * @throws FileException if the target file could not be created
      */
-    public function move(string $directory, string $name = null): self
+    public function move(string $directory, ?string $name = null): self
     {
         $target = $this->getTargetFile($directory, $name);
 
@@ -112,7 +112,7 @@ public function getContent(): string
         return $content;
     }
 
-    protected function getTargetFile(string $directory, string $name = null): self
+    protected function getTargetFile(string $directory, ?string $name = null): self
     {
         if (!is_dir($directory)) {
             if (false === @mkdir($directory, 0777, true) && !is_dir($directory)) {
diff --git a/File/UploadedFile.php b/File/UploadedFile.php
@@ -60,7 +60,7 @@ class UploadedFile extends File
      * @throws FileException         If file_uploads is disabled
      * @throws FileNotFoundException If the file does not exist
      */
-    public function __construct(string $path, string $originalName, string $mimeType = null, int $error = null, bool $test = false)
+    public function __construct(string $path, string $originalName, ?string $mimeType = null, ?int $error = null, bool $test = false)
     {
         $this->originalName = $this->getName($originalName);
         $this->mimeType = $mimeType ?: 'application/octet-stream';
@@ -158,7 +158,7 @@ public function isValid(): bool
      *
      * @throws FileException if, for any reason, the file could not have been moved
      */
-    public function move(string $directory, string $name = null): File
+    public function move(string $directory, ?string $name = null): File
     {
         if ($this->isValid()) {
             if ($this->test) {
diff --git a/HeaderBag.php b/HeaderBag.php
@@ -65,7 +65,7 @@ public function __toString(): string
      *
      * @return ($key is null ? array<string, list<string|null>> : list<string|null>)
      */
-    public function all(string $key = null): array
+    public function all(?string $key = null): array
     {
         if (null !== $key) {
             return $this->headers[strtr($key, self::UPPER, self::LOWER)] ?? [];
@@ -106,7 +106,7 @@ public function add(array $headers): void
     /**
      * Returns the first header by name or the default one.
      */
-    public function get(string $key, string $default = null): ?string
+    public function get(string $key, ?string $default = null): ?string
     {
         $headers = $this->all($key);
 
@@ -187,7 +187,7 @@ public function remove(string $key): void
      *
      * @throws \RuntimeException When the HTTP header is not parseable
      */
-    public function getDate(string $key, \DateTimeInterface $default = null): ?\DateTimeImmutable
+    public function getDate(string $key, ?\DateTimeInterface $default = null): ?\DateTimeImmutable
     {
         if (null === $value = $this->get($key)) {
             return null !== $default ? \DateTimeImmutable::createFromInterface($default) : null;
diff --git a/InputBag.php b/InputBag.php
@@ -84,7 +84,7 @@ public function set(string $key, mixed $value): void
      *
      * @return ?T
      */
-    public function getEnum(string $key, string $class, \BackedEnum $default = null): ?\BackedEnum
+    public function getEnum(string $key, string $class, ?\BackedEnum $default = null): ?\BackedEnum
     {
         try {
             return parent::getEnum($key, $class, $default);
diff --git a/ParameterBag.php b/ParameterBag.php
@@ -35,7 +35,7 @@ public function __construct(array $parameters = [])
      *
      * @param string|null $key The name of the parameter to return or null to get them all
      */
-    public function all(string $key = null): array
+    public function all(?string $key = null): array
     {
         if (null === $key) {
             return $this->parameters;
@@ -161,7 +161,7 @@ public function getBoolean(string $key, bool $default = false): bool
      *
      * @return ?T
      */
-    public function getEnum(string $key, string $class, \BackedEnum $default = null): ?\BackedEnum
+    public function getEnum(string $key, string $class, ?\BackedEnum $default = null): ?\BackedEnum
     {
         $value = $this->get($key);
 
diff --git a/Request.php b/Request.php
@@ -395,7 +395,7 @@ public static function setFactory(?callable $callable): void
      * @param array|null $files      The FILES parameters
      * @param array|null $server     The SERVER parameters
      */
-    public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null): static
+    public function duplicate(?array $query = null, ?array $request = null, ?array $attributes = null, ?array $cookies = null, ?array $files = null, ?array $server = null): static
     {
         $dup = clone $this;
         if (null !== $query) {
@@ -1524,7 +1524,7 @@ public function getPreferredFormat(?string $default = 'html'): ?string
      *
      * @param string[] $locales An array of ordered available locales
      */
-    public function getPreferredLanguage(array $locales = null): ?string
+    public function getPreferredLanguage(?array $locales = null): ?string
     {
         $preferredLanguages = $this->getLanguages();
 
@@ -1917,7 +1917,7 @@ public function isFromTrustedProxy(): bool
      * getPort(), isSecure(), getHost(), getClientIps(), getBaseUrl() etc. Thus, we try to cache the results for
      * best performance.
      */
-    private function getTrustedValues(int $type, string $ip = null): array
+    private function getTrustedValues(int $type, ?string $ip = null): array
     {
         $cacheKey = $type."\0".((self::$trustedHeaderSet & $type) ? $this->headers->get(self::TRUSTED_HEADERS[$type]) : '');
         $cacheKey .= "\0".$ip."\0".$this->headers->get(self::TRUSTED_HEADERS[self::HEADER_FORWARDED]);
diff --git a/Response.php b/Response.php
@@ -311,7 +311,7 @@ public function prepare(Request $request): static
      *
      * @return $this
      */
-    public function sendHeaders(int $statusCode = null): static
+    public function sendHeaders(?int $statusCode = null): static
     {
         // headers have already been sent by the developer
         if (headers_sent()) {
@@ -471,7 +471,7 @@ public function getProtocolVersion(): string
      *
      * @final
      */
-    public function setStatusCode(int $code, string $text = null): static
+    public function setStatusCode(int $code, ?string $text = null): static
     {
         $this->statusCode = $code;
         if ($this->isInvalid()) {
@@ -1249,7 +1249,7 @@ public function isNotFound(): bool
      *
      * @final
      */
-    public function isRedirect(string $location = null): bool
+    public function isRedirect(?string $location = null): bool
     {
         return \in_array($this->statusCode, [201, 301, 302, 303, 307, 308]) && (null === $location ?: $location == $this->headers->get('Location'));
     }
diff --git a/ResponseHeaderBag.php b/ResponseHeaderBag.php
@@ -80,7 +80,7 @@ public function replace(array $headers = []): void
         }
     }
 
-    public function all(string $key = null): array
+    public function all(?string $key = null): array
     {
         $headers = parent::all();
 
@@ -166,7 +166,7 @@ public function setCookie(Cookie $cookie): void
     /**
      * Removes a cookie from the array, but does not unset it in the browser.
      */
-    public function removeCookie(string $name, ?string $path = '/', string $domain = null): void
+    public function removeCookie(string $name, ?string $path = '/', ?string $domain = null): void
     {
         $path ??= '/';
 
@@ -217,7 +217,7 @@ public function getCookies(string $format = self::COOKIES_FLAT): array
     /**
      * Clears a cookie in the browser.
      */
-    public function clearCookie(string $name, ?string $path = '/', string $domain = null, bool $secure = false, bool $httpOnly = true, string $sameSite = null): void
+    public function clearCookie(string $name, ?string $path = '/', ?string $domain = null, bool $secure = false, bool $httpOnly = true, ?string $sameSite = null): void
     {
         $this->setCookie(new Cookie($name, null, 1, $path, $domain, $secure, $httpOnly, false, $sameSite));
     }
diff --git a/Session/Session.php b/Session/Session.php
@@ -40,7 +40,7 @@ class Session implements FlashBagAwareSessionInterface, \IteratorAggregate, \Cou
     private int $usageIndex = 0;
     private ?\Closure $usageReporter;
 
-    public function __construct(SessionStorageInterface $storage = null, AttributeBagInterface $attributes = null, FlashBagInterface $flashes = null, callable $usageReporter = null)
+    public function __construct(?SessionStorageInterface $storage = null, ?AttributeBagInterface $attributes = null, ?FlashBagInterface $flashes = null, ?callable $usageReporter = null)
     {
         $this->storage = $storage ?? new NativeSessionStorage();
         $this->usageReporter = null === $usageReporter ? null : $usageReporter(...);
@@ -142,14 +142,14 @@ public function isEmpty(): bool
         return true;
     }
 
-    public function invalidate(int $lifetime = null): bool
+    public function invalidate(?int $lifetime = null): bool
     {
         $this->storage->clear();
 
         return $this->migrate(true, $lifetime);
     }
 
-    public function migrate(bool $destroy = false, int $lifetime = null): bool
+    public function migrate(bool $destroy = false, ?int $lifetime = null): bool
     {
         return $this->storage->regenerate($destroy, $lifetime);
     }
diff --git a/Session/SessionFactory.php b/Session/SessionFactory.php
@@ -26,7 +26,7 @@ class SessionFactory implements SessionFactoryInterface
     private SessionStorageFactoryInterface $storageFactory;
     private ?\Closure $usageReporter;
 
-    public function __construct(RequestStack $requestStack, SessionStorageFactoryInterface $storageFactory, callable $usageReporter = null)
+    public function __construct(RequestStack $requestStack, SessionStorageFactoryInterface $storageFactory, ?callable $usageReporter = null)
     {
         $this->requestStack = $requestStack;
         $this->storageFactory = $storageFactory;
diff --git a/Session/SessionInterface.php b/Session/SessionInterface.php
@@ -58,7 +58,7 @@ public function setName(string $name): void;
      *                           to expire with browser session. Time is in seconds, and is
      *                           not a Unix timestamp.
      */
-    public function invalidate(int $lifetime = null): bool;
+    public function invalidate(?int $lifetime = null): bool;
 
     /**
      * Migrates the current session to a new session id while maintaining all
@@ -70,7 +70,7 @@ public function invalidate(int $lifetime = null): bool;
      *                           to expire with browser session. Time is in seconds, and is
      *                           not a Unix timestamp.
      */
-    public function migrate(bool $destroy = false, int $lifetime = null): bool;
+    public function migrate(bool $destroy = false, ?int $lifetime = null): bool;
 
     /**
      * Force the session to be saved and closed.
diff --git a/Session/Storage/Handler/NativeFileSessionHandler.php b/Session/Storage/Handler/NativeFileSessionHandler.php
@@ -28,7 +28,7 @@ class NativeFileSessionHandler extends \SessionHandler
      * @throws \InvalidArgumentException On invalid $savePath
      * @throws \RuntimeException         When failing to create the save directory
      */
-    public function __construct(string $savePath = null)
+    public function __construct(?string $savePath = null)
     {
         $baseDir = $savePath ??= \ini_get('session.save_path');
 
diff --git a/Session/Storage/Handler/PdoSessionHandler.php b/Session/Storage/Handler/PdoSessionHandler.php
@@ -151,7 +151,7 @@ class PdoSessionHandler extends AbstractSessionHandler
      *
      * @throws \InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      */
-    public function __construct(#[\SensitiveParameter] \PDO|string $pdoOrDsn = null, #[\SensitiveParameter] array $options = [])
+    public function __construct(#[\SensitiveParameter] \PDO|string|null $pdoOrDsn = null, #[\SensitiveParameter] array $options = [])
     {
         if ($pdoOrDsn instanceof \PDO) {
             if (\PDO::ERRMODE_EXCEPTION !== $pdoOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) {
@@ -181,7 +181,7 @@ public function __construct(#[\SensitiveParameter] \PDO|string $pdoOrDsn = null,
     /**
      * Adds the Table to the Schema if it doesn't exist.
      */
-    public function configureSchema(Schema $schema, \Closure $isSameDatabase = null): void
+    public function configureSchema(Schema $schema, ?\Closure $isSameDatabase = null): void
     {
         if ($schema->hasTable($this->table) || ($isSameDatabase && !$isSameDatabase($this->getConnection()->exec(...)))) {
             return;
diff --git a/Session/Storage/MetadataBag.php b/Session/Storage/MetadataBag.php
@@ -75,7 +75,7 @@ public function getLifetime(): int
      *                           to expire with browser session. Time is in seconds, and is
      *                           not a Unix timestamp.
      */
-    public function stampNew(int $lifetime = null): void
+    public function stampNew(?int $lifetime = null): void
     {
         $this->stampCreated($lifetime);
     }
@@ -124,7 +124,7 @@ public function setName(string $name): void
         $this->name = $name;
     }
 
-    private function stampCreated(int $lifetime = null): void
+    private function stampCreated(?int $lifetime = null): void
     {
         $timeStamp = time();
         $this->meta[self::CREATED] = $this->meta[self::UPDATED] = $this->lastUsed = $timeStamp;
diff --git a/Session/Storage/MockArraySessionStorage.php b/Session/Storage/MockArraySessionStorage.php
@@ -39,7 +39,7 @@ class MockArraySessionStorage implements SessionStorageInterface
      */
     protected array $bags = [];
 
-    public function __construct(string $name = 'MOCKSESSID', MetadataBag $metaBag = null)
+    public function __construct(string $name = 'MOCKSESSID', ?MetadataBag $metaBag = null)
     {
         $this->name = $name;
         $this->setMetadataBag($metaBag);
@@ -65,7 +65,7 @@ public function start(): bool
         return true;
     }
 
-    public function regenerate(bool $destroy = false, int $lifetime = null): bool
+    public function regenerate(bool $destroy = false, ?int $lifetime = null): bool
     {
         if (!$this->started) {
             $this->start();
diff --git a/Session/Storage/MockFileSessionStorage.php b/Session/Storage/MockFileSessionStorage.php
@@ -30,7 +30,7 @@ class MockFileSessionStorage extends MockArraySessionStorage
     /**
      * @param string|null $savePath Path of directory to save session files
      */
-    public function __construct(string $savePath = null, string $name = 'MOCKSESSID', MetadataBag $metaBag = null)
+    public function __construct(?string $savePath = null, string $name = 'MOCKSESSID', ?MetadataBag $metaBag = null)
     {
         $savePath ??= sys_get_temp_dir();
 
@@ -60,7 +60,7 @@ public function start(): bool
         return true;
     }
 
-    public function regenerate(bool $destroy = false, int $lifetime = null): bool
+    public function regenerate(bool $destroy = false, ?int $lifetime = null): bool
     {
         if (!$this->started) {
             $this->start();
diff --git a/Session/Storage/MockFileSessionStorageFactory.php b/Session/Storage/MockFileSessionStorageFactory.php
@@ -28,7 +28,7 @@ class MockFileSessionStorageFactory implements SessionStorageFactoryInterface
     /**
      * @see MockFileSessionStorage constructor.
      */
-    public function __construct(string $savePath = null, string $name = 'MOCKSESSID', MetadataBag $metaBag = null)
+    public function __construct(?string $savePath = null, string $name = 'MOCKSESSID', ?MetadataBag $metaBag = null)
     {
         $this->savePath = $savePath;
         $this->name = $name;
diff --git a/Session/Storage/NativeSessionStorage.php b/Session/Storage/NativeSessionStorage.php
@@ -73,7 +73,7 @@ class NativeSessionStorage implements SessionStorageInterface
      * trans_sid_hosts, $_SERVER['HTTP_HOST']
      * trans_sid_tags, "a=href,area=href,frame=src,form="
      */
-    public function __construct(array $options = [], AbstractProxy|\SessionHandlerInterface $handler = null, MetadataBag $metaBag = null)
+    public function __construct(array $options = [], AbstractProxy|\SessionHandlerInterface|null $handler = null, ?MetadataBag $metaBag = null)
     {
         if (!\extension_loaded('session')) {
             throw new \LogicException('PHP extension "session" is required.');
@@ -182,7 +182,7 @@ public function setName(string $name): void
         $this->saveHandler->setName($name);
     }
 
-    public function regenerate(bool $destroy = false, int $lifetime = null): bool
+    public function regenerate(bool $destroy = false, ?int $lifetime = null): bool
     {
         // Cannot regenerate the session ID for non-active sessions.
         if (\PHP_SESSION_ACTIVE !== session_status()) {
@@ -382,7 +382,7 @@ public function setSaveHandler(AbstractProxy|\SessionHandlerInterface|null $save
      * PHP takes the return value from the read() handler, unserializes it
      * and populates $_SESSION with the result automatically.
      */
-    protected function loadSession(array &$session = null): void
+    protected function loadSession(?array &$session = null): void
     {
         if (null === $session) {
             $session = &$_SESSION;
diff --git a/Session/Storage/NativeSessionStorageFactory.php b/Session/Storage/NativeSessionStorageFactory.php
@@ -30,7 +30,7 @@ class NativeSessionStorageFactory implements SessionStorageFactoryInterface
     /**
      * @see NativeSessionStorage constructor.
      */
-    public function __construct(array $options = [], AbstractProxy|\SessionHandlerInterface $handler = null, MetadataBag $metaBag = null, bool $secure = false)
+    public function __construct(array $options = [], AbstractProxy|\SessionHandlerInterface|null $handler = null, ?MetadataBag $metaBag = null, bool $secure = false)
     {
         $this->options = $options;
         $this->handler = $handler;
diff --git a/Session/Storage/PhpBridgeSessionStorage.php b/Session/Storage/PhpBridgeSessionStorage.php
diff --git a/Session/Storage/PhpBridgeSessionStorageFactory.php b/Session/Storage/PhpBridgeSessionStorageFactory.php
diff --git a/Session/Storage/SessionStorageInterface.php b/Session/Storage/SessionStorageInterface.php
diff --git a/StreamedResponse.php b/StreamedResponse.php
diff --git a/Test/Constraint/ResponseCookieValueSame.php b/Test/Constraint/ResponseCookieValueSame.php
diff --git a/Test/Constraint/ResponseHasCookie.php b/Test/Constraint/ResponseHasCookie.php
diff --git a/Tests/HeaderUtilsTest.php b/Tests/HeaderUtilsTest.php
diff --git a/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class BinaryFileResponse extends Response`
`42`	`42`	`* @param bool $autoEtag Whether the ETag header should be automatically set`
`43`	`43`	`* @param bool $autoLastModified Whether the Last-Modified header should be automatically set`
`44`	`44`	`*/`
`45`		`- public function __construct(\SplFileInfo\|string $file, int $status = 200, array $headers = [], bool $public = true, string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true)`
	`45`	`+ public function __construct(\SplFileInfo\|string $file, int $status = 200, array $headers = [], bool $public = true, ?string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true)`
`46`	`46`	`{`
`47`	`47`	`parent::__construct(null, $status, $headers);`
`48`	`48`
`@@ -60,7 +60,7 @@ public function __construct(\SplFileInfo\|string $file, int $status = 200, array`
`60`	`60`	`*`
`61`	`61`	`* @throws FileException`
`62`	`62`	`*/`
`63`		`- public function setFile(\SplFileInfo\|string $file, string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true): static`
	`63`	`+ public function setFile(\SplFileInfo\|string $file, ?string $contentDisposition = null, bool $autoEtag = false, bool $autoLastModified = true): static`
`64`	`64`	`{`
`65`	`65`	`if (!$file instanceof File) {`
`66`	`66`	`if ($file instanceof \SplFileInfo) {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public static function fromString(string $cookie, bool $decode = false): static`
`76`	`76`	`*`
`77`	`77`	`* @param self::SAMESITE_*\|''\|null $sameSite`
`78`	`78`	`*/`
`79`		`- public static function create(string $name, string $value = null, int\|string\|\DateTimeInterface $expire = 0, ?string $path = '/', string $domain = null, bool $secure = null, bool $httpOnly = true, bool $raw = false, ?string $sameSite = self::SAMESITE_LAX, bool $partitioned = false): self`
	`79`	`+ public static function create(string $name, ?string $value = null, int\|string\|\DateTimeInterface $expire = 0, ?string $path = '/', ?string $domain = null, ?bool $secure = null, bool $httpOnly = true, bool $raw = false, ?string $sameSite = self::SAMESITE_LAX, bool $partitioned = false): self`
`80`	`80`	`{`
`81`	`81`	`return new self($name, $value, $expire, $path, $domain, $secure, $httpOnly, $raw, $sameSite, $partitioned);`
`82`	`82`	`}`
`@@ -94,7 +94,7 @@ public static function create(string $name, string $value = null, int\|string\|\Da`
`94`	`94`	`*`
`95`	`95`	`* @throws \InvalidArgumentException`
`96`	`96`	`*/`
`97`		`- public function __construct(string $name, string $value = null, int\|string\|\DateTimeInterface $expire = 0, ?string $path = '/', string $domain = null, bool $secure = null, bool $httpOnly = true, bool $raw = false, ?string $sameSite = self::SAMESITE_LAX, bool $partitioned = false)`
	`97`	`+ public function __construct(string $name, ?string $value = null, int\|string\|\DateTimeInterface $expire = 0, ?string $path = '/', ?string $domain = null, ?bool $secure = null, bool $httpOnly = true, bool $raw = false, ?string $sameSite = self::SAMESITE_LAX, bool $partitioned = false)`
`98`	`98`	`{`
`99`	`99`	`// from PHP source code`
`100`	`100`	`if ($raw && false !== strpbrk($name, self::RESERVED_CHARS_LIST)) {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`class SessionNotFoundException extends \LogicException implements RequestExceptionInterface`
`22`	`22`	`{`
`23`		`- public function __construct(string $message = 'There is currently no session available.', int $code = 0, \Throwable $previous = null)`
	`23`	`+ public function __construct(string $message = 'There is currently no session available.', int $code = 0, ?\Throwable $previous = null)`
`24`	`24`	`{`
`25`	`25`	`parent::__construct($message, $code, $previous);`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function getMimeType(): ?string`
`82`	`82`	`*`
`83`	`83`	`* @throws FileException if the target file could not be created`
`84`	`84`	`*/`
`85`		`- public function move(string $directory, string $name = null): self`
	`85`	`+ public function move(string $directory, ?string $name = null): self`
`86`	`86`	`{`
`87`	`87`	`$target = $this->getTargetFile($directory, $name);`
`88`	`88`
`@@ -112,7 +112,7 @@ public function getContent(): string`
`112`	`112`	`return $content;`
`113`	`113`	`}`
`114`	`114`
`115`		`- protected function getTargetFile(string $directory, string $name = null): self`
	`115`	`+ protected function getTargetFile(string $directory, ?string $name = null): self`
`116`	`116`	`{`
`117`	`117`	`if (!is_dir($directory)) {`
`118`	`118`	`if (false === @mkdir($directory, 0777, true) && !is_dir($directory)) {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class UploadedFile extends File`
`60`	`60`	`* @throws FileException If file_uploads is disabled`
`61`	`61`	`* @throws FileNotFoundException If the file does not exist`
`62`	`62`	`*/`
`63`		`- public function __construct(string $path, string $originalName, string $mimeType = null, int $error = null, bool $test = false)`
	`63`	`+ public function __construct(string $path, string $originalName, ?string $mimeType = null, ?int $error = null, bool $test = false)`
`64`	`64`	`{`
`65`	`65`	`$this->originalName = $this->getName($originalName);`
`66`	`66`	`$this->mimeType = $mimeType ?: 'application/octet-stream';`
`@@ -158,7 +158,7 @@ public function isValid(): bool`
`158`	`158`	`*`
`159`	`159`	`* @throws FileException if, for any reason, the file could not have been moved`
`160`	`160`	`*/`
`161`		`- public function move(string $directory, string $name = null): File`
	`161`	`+ public function move(string $directory, ?string $name = null): File`
`162`	`162`	`{`
`163`	`163`	`if ($this->isValid()) {`
`164`	`164`	`if ($this->test) {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function __toString(): string`
`65`	`65`	`*`
`66`	`66`	`* @return ($key is null ? array<string, list<string\|null>> : list<string\|null>)`
`67`	`67`	`*/`
`68`		`- public function all(string $key = null): array`
	`68`	`+ public function all(?string $key = null): array`
`69`	`69`	`{`
`70`	`70`	`if (null !== $key) {`
`71`	`71`	`return $this->headers[strtr($key, self::UPPER, self::LOWER)] ?? [];`
`@@ -106,7 +106,7 @@ public function add(array $headers): void`
`106`	`106`	`/**`
`107`	`107`	`* Returns the first header by name or the default one.`
`108`	`108`	`*/`
`109`		`- public function get(string $key, string $default = null): ?string`
	`109`	`+ public function get(string $key, ?string $default = null): ?string`
`110`	`110`	`{`
`111`	`111`	`$headers = $this->all($key);`
`112`	`112`
`@@ -187,7 +187,7 @@ public function remove(string $key): void`
`187`	`187`	`*`
`188`	`188`	`* @throws \RuntimeException When the HTTP header is not parseable`
`189`	`189`	`*/`
`190`		`- public function getDate(string $key, \DateTimeInterface $default = null): ?\DateTimeImmutable`
	`190`	`+ public function getDate(string $key, ?\DateTimeInterface $default = null): ?\DateTimeImmutable`
`191`	`191`	`{`
`192`	`192`	`if (null === $value = $this->get($key)) {`
`193`	`193`	`return null !== $default ? \DateTimeImmutable::createFromInterface($default) : null;`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function set(string $key, mixed $value): void`
`84`	`84`	`*`
`85`	`85`	`* @return ?T`
`86`	`86`	`*/`
`87`		`- public function getEnum(string $key, string $class, \BackedEnum $default = null): ?\BackedEnum`
	`87`	`+ public function getEnum(string $key, string $class, ?\BackedEnum $default = null): ?\BackedEnum`
`88`	`88`	`{`
`89`	`89`	`try {`
`90`	`90`	`return parent::getEnum($key, $class, $default);`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function __construct(array $parameters = [])`
`35`	`35`	`*`
`36`	`36`	`* @param string\|null $key The name of the parameter to return or null to get them all`
`37`	`37`	`*/`
`38`		`- public function all(string $key = null): array`
	`38`	`+ public function all(?string $key = null): array`
`39`	`39`	`{`
`40`	`40`	`if (null === $key) {`
`41`	`41`	`return $this->parameters;`
`@@ -161,7 +161,7 @@ public function getBoolean(string $key, bool $default = false): bool`
`161`	`161`	`*`
`162`	`162`	`* @return ?T`
`163`	`163`	`*/`
`164`		`- public function getEnum(string $key, string $class, \BackedEnum $default = null): ?\BackedEnum`
	`164`	`+ public function getEnum(string $key, string $class, ?\BackedEnum $default = null): ?\BackedEnum`
`165`	`165`	`{`
`166`	`166`	`$value = $this->get($key);`
`167`	`167`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ public static function setFactory(?callable $callable): void`
`395`	`395`	`* @param array\|null $files The FILES parameters`
`396`	`396`	`* @param array\|null $server The SERVER parameters`
`397`	`397`	`*/`
`398`		`- public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null): static`
	`398`	`+ public function duplicate(?array $query = null, ?array $request = null, ?array $attributes = null, ?array $cookies = null, ?array $files = null, ?array $server = null): static`
`399`	`399`	`{`
`400`	`400`	`$dup = clone $this;`
`401`	`401`	`if (null !== $query) {`
`@@ -1524,7 +1524,7 @@ public function getPreferredFormat(?string $default = 'html'): ?string`
`1524`	`1524`	`*`
`1525`	`1525`	`* @param string[] $locales An array of ordered available locales`
`1526`	`1526`	`*/`
`1527`		`- public function getPreferredLanguage(array $locales = null): ?string`
	`1527`	`+ public function getPreferredLanguage(?array $locales = null): ?string`
`1528`	`1528`	`{`
`1529`	`1529`	`$preferredLanguages = $this->getLanguages();`
`1530`	`1530`
`@@ -1917,7 +1917,7 @@ public function isFromTrustedProxy(): bool`
`1917`	`1917`	`* getPort(), isSecure(), getHost(), getClientIps(), getBaseUrl() etc. Thus, we try to cache the results for`
`1918`	`1918`	`* best performance.`
`1919`	`1919`	`*/`
`1920`		`- private function getTrustedValues(int $type, string $ip = null): array`
	`1920`	`+ private function getTrustedValues(int $type, ?string $ip = null): array`
`1921`	`1921`	`{`
`1922`	`1922`	`$cacheKey = $type."\0".((self::$trustedHeaderSet & $type) ? $this->headers->get(self::TRUSTED_HEADERS[$type]) : '');`
`1923`	`1923`	`$cacheKey .= "\0".$ip."\0".$this->headers->get(self::TRUSTED_HEADERS[self::HEADER_FORWARDED]);`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ public function prepare(Request $request): static`
`311`	`311`	`*`
`312`	`312`	`* @return $this`
`313`	`313`	`*/`
`314`		`- public function sendHeaders(int $statusCode = null): static`
	`314`	`+ public function sendHeaders(?int $statusCode = null): static`
`315`	`315`	`{`
`316`	`316`	`// headers have already been sent by the developer`
`317`	`317`	`if (headers_sent()) {`
`@@ -471,7 +471,7 @@ public function getProtocolVersion(): string`
`471`	`471`	`*`
`472`	`472`	`* @final`
`473`	`473`	`*/`
`474`		`- public function setStatusCode(int $code, string $text = null): static`
	`474`	`+ public function setStatusCode(int $code, ?string $text = null): static`
`475`	`475`	`{`
`476`	`476`	`$this->statusCode = $code;`
`477`	`477`	`if ($this->isInvalid()) {`
`@@ -1249,7 +1249,7 @@ public function isNotFound(): bool`
`1249`	`1249`	`*`
`1250`	`1250`	`* @final`
`1251`	`1251`	`*/`
`1252`		`- public function isRedirect(string $location = null): bool`
	`1252`	`+ public function isRedirect(?string $location = null): bool`
`1253`	`1253`	`{`
`1254`	`1254`	`return \in_array($this->statusCode, [201, 301, 302, 303, 307, 308]) && (null === $location ?: $location == $this->headers->get('Location'));`
`1255`	`1255`	`}`