fix conflicts

Author: taylorotwell

src/Illuminate/Console/BufferedConsoleOutput.php

@@ -27,6 +27,8 @@ public function fetch()
 
     /**
      * {@inheritdoc}
+     *
+     * @return void
      */
     protected function doWrite(string $message, bool $newline)
     {

src/Illuminate/Console/OutputStyle.php

@@ -39,6 +39,8 @@ public function __construct(InputInterface $input, OutputInterface $output)
 
     /**
      * {@inheritdoc}
+     *
+     * @return void
      */
     public function write(string|iterable $messages, bool $newline = false, int $options = 0)
     {
@@ -49,6 +51,8 @@ public function write(string|iterable $messages, bool $newline = false, int $opt
 
     /**
      * {@inheritdoc}
+     *
+     * @return void
      */
     public function writeln(string|iterable $messages, int $type = self::OUTPUT_NORMAL)
     {
@@ -59,6 +63,8 @@ public function writeln(string|iterable $messages, int $type = self::OUTPUT_NORM
 
     /**
      * {@inheritdoc}
+     *
+     * @return void
      */
     public function newLine(int $count = 1)
     {

src/Illuminate/Console/QuestionHelper.php

@@ -14,6 +14,8 @@ class QuestionHelper extends SymfonyQuestionHelper
 {
     /**
      * {@inheritdoc}
+     *
+     * @return void
      */
     protected function writePrompt(OutputInterface $output, Question $question)
     {

src/Illuminate/Database/DBAL/TimestampType.php

@@ -92,6 +92,8 @@ protected function getSqlServerPlatformSQLDeclaration(array $column): string
 
     /**
      * {@inheritdoc}
+     *
+     * @return string
      */
     public function getName()
     {

src/Illuminate/Http/Client/Response.php

@@ -85,7 +85,7 @@ public function json($key = null, $default = null)
     /**
      * Get the JSON decoded body of the response as an object.
      *
-     * @return object|array
+     * @return object|null
      */
     public function object()
     {

src/Illuminate/Session/SymfonySessionDecorator.php

@@ -46,6 +46,8 @@ public function getId(): string
 
     /**
      * {@inheritdoc}
+     *
+     * @return void
      */
     public function setId(string $id)
     {
@@ -62,6 +64,8 @@ public function getName(): string
 
     /**
      * {@inheritdoc}
+     *
+     * @return void
      */
     public function setName(string $name)
     {
@@ -90,6 +94,8 @@ public function migrate(bool $destroy = false, int $lifetime = null): bool
 
     /**
      * {@inheritdoc}
+     *
+     * @return void
      */
     public function save()
     {
@@ -114,6 +120,8 @@ public function get(string $name, mixed $default = null): mixed
 
     /**
      * {@inheritdoc}
+     *
+     * @return void
      */
     public function set(string $name, mixed $value)
     {
@@ -130,6 +138,8 @@ public function all(): array
 
     /**
      * {@inheritdoc}
+     *
+     * @return void
      */
     public function replace(array $attributes)
     {
@@ -146,6 +156,8 @@ public function remove(string $name): mixed
 
     /**
      * {@inheritdoc}
+     *
+     * @return void
      */
     public function clear()
     {
@@ -162,6 +174,8 @@ public function isStarted(): bool
 
     /**
      * {@inheritdoc}
+     *
+     * @return void
      */
     public function registerBag(SessionBagInterface $bag)
     {