[9.x] Fix Symfony v6 breaking changes

src/Illuminate/Console/Application.php

@@ -15,6 +15,7 @@
 use Symfony\Component\Console\Exception\CommandNotFoundException;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\StringInput;
@@ -84,7 +85,7 @@ public function __construct(Container $laravel, Dispatcher $events, $version)
     /**
      * {@inheritdoc}
      */
-    public function run(InputInterface $input = null, OutputInterface $output = null)
+    public function run(InputInterface $input = null, OutputInterface $output = null): int
     {
         $commandName = $this->getCommandName(
             $input = $input ?: new ArgvInput
@@ -309,7 +310,7 @@ public function setContainerCommandLoader()
      *
      * @return \Symfony\Component\Console\Input\InputDefinition
      */
-    protected function getDefaultInputDefinition()
+    protected function getDefaultInputDefinition(): InputDefinition
     {
         return tap(parent::getDefaultInputDefinition(), function ($definition) {
             $definition->addOption($this->getEnvironmentOption());

src/Illuminate/Console/Command.php

@@ -111,7 +111,7 @@ protected function configureUsingFluentDefinition()
      * @param  \Symfony\Component\Console\Output\OutputInterface  $output
      * @return int
      */
-    public function run(InputInterface $input, OutputInterface $output)
+    public function run(InputInterface $input, OutputInterface $output): int
     {
         $this->output = $this->laravel->make(
             OutputStyle::class, ['input' => $input, 'output' => $output]
@@ -164,7 +164,7 @@ protected function resolveCommand($command)
     /**
      * {@inheritdoc}
      */
-    public function isHidden()
+    public function isHidden(): bool
     {
         return $this->hidden;
     }

src/Illuminate/Console/ContainerCommandLoader.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Console;
 
 use Psr\Container\ContainerInterface;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\CommandLoader\CommandLoaderInterface;
 use Symfony\Component\Console\Exception\CommandNotFoundException;
 
@@ -43,7 +44,7 @@ public function __construct(ContainerInterface $container, array $commandMap)
      *
      * @throws \Symfony\Component\Console\Exception\CommandNotFoundException
      */
-    public function get(string $name)
+    public function get(string $name): Command
     {
         if (! $this->has($name)) {
             throw new CommandNotFoundException(sprintf('Command "%s" does not exist.', $name));
@@ -58,7 +59,7 @@ public function get(string $name)
      * @param  string  $name
      * @return bool
      */
-    public function has(string $name)
+    public function has(string $name): bool
     {
         return $name && isset($this->commandMap[$name]);
     }
@@ -68,7 +69,7 @@ public function has(string $name)
      *
      * @return string[]
      */
-    public function getNames()
+    public function getNames(): array
     {
         return array_keys($this->commandMap);
     }

src/Illuminate/Console/OutputStyle.php

@@ -34,7 +34,7 @@ public function __construct(InputInterface $input, OutputInterface $output)
      *
      * @return bool
      */
-    public function isQuiet()
+    public function isQuiet(): bool
     {
         return $this->output->isQuiet();
     }
@@ -44,7 +44,7 @@ public function isQuiet()
      *
      * @return bool
      */
-    public function isVerbose()
+    public function isVerbose(): bool
     {
         return $this->output->isVerbose();
     }
@@ -54,7 +54,7 @@ public function isVerbose()
      *
      * @return bool
      */
-    public function isVeryVerbose()
+    public function isVeryVerbose(): bool
     {
         return $this->output->isVeryVerbose();
     }
@@ -64,7 +64,7 @@ public function isVeryVerbose()
      *
      * @return bool
      */
-    public function isDebug()
+    public function isDebug(): bool
     {
         return $this->output->isDebug();
     }

src/Illuminate/Http/JsonResponse.php

@@ -35,7 +35,7 @@ public function __construct($data = null, $status = 200, $headers = [], $options
     /**
      * {@inheritdoc}
      */
-    public static function fromJsonString(?string $data = null, int $status = 200, array $headers = [])
+    public static function fromJsonString(?string $data = null, int $status = 200, array $headers = []): static
     {
         return new static($data, $status, $headers, 0, true);
     }
@@ -66,7 +66,7 @@ public function getData($assoc = false, $depth = 512)
     /**
      * {@inheritdoc}
      */
-    public function setData($data = [])
+    public function setData($data = []): static
     {
         $this->original = $data;
 
@@ -110,7 +110,7 @@ protected function hasValidJson($jsonError)
     /**
      * {@inheritdoc}
      */
-    public function setEncodingOptions($options)
+    public function setEncodingOptions($options): static
     {
         $this->encodingOptions = (int) $options;
 

src/Illuminate/Http/Request.php

@@ -336,7 +336,7 @@ public function replace(array $input)
      * @param  mixed  $default
      * @return mixed
      */
-    public function get(string $key, $default = null)
+    public function get(string $key, mixed $default = null): mixed
     {
         return parent::get($key, $default);
     }
@@ -404,7 +404,7 @@ public static function createFrom(self $from, $to = null)
 
         $request->setJson($from->json());
 
-        if ($session = $from->getSession()) {
+        if ($from->hasSession() && $session = $from->getSession()) {
             $request->setLaravelSession($session);
         }
 
@@ -442,7 +442,7 @@ public static function createFromBase(SymfonyRequest $request)
     /**
      * {@inheritdoc}
      */
-    public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null)
+    public function duplicate(array $query = null, array $request = null, array $attributes = null, array $cookies = null, array $files = null, array $server = null): static
     {
         return parent::duplicate($query, $request, $attributes, $cookies, $this->filterFiles($files), $server);
     }
@@ -488,16 +488,6 @@ public function session()
         return $this->session;
     }
 
-    /**
-     * Get the session associated with the request.
-     *
-     * @return \Illuminate\Session\Store|null
-     */
-    public function getSession()
-    {
-        return $this->session;
-    }
-
     /**
      * Set the session instance on the request.
      *
@@ -625,7 +615,7 @@ public function setRouteResolver(Closure $callback)
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         return $this->all();
     }

src/Illuminate/Http/Response.php

@@ -45,7 +45,7 @@ public function __construct($content = '', $status = 200, array $headers = [])
      *
      * @throws \InvalidArgumentException
      */
-    public function setContent($content)
+    public function setContent(mixed $content): static
     {
         $this->original = $content;
 

src/Illuminate/Http/Testing/File.php

@@ -131,7 +131,7 @@ public function mimeType($mimeType)
      *
      * @return string
      */
-    public function getMimeType()
+    public function getMimeType(): string
     {
         return $this->mimeTypeToReport ?: MimeType::from($this->name);
     }