Merge branch '6.4' into 7.0

* 6.4:
  fix tests
  fix merge
  [VarDumper] Fix generator dump on PHP 8.4
  keep boolean options when their value is false

Author: xabbuh

src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php

@@ -81,7 +81,7 @@ protected function doSend(MessageInterface $message): SlackSentMessage
         }
 
         $response = $this->client->request('POST', 'https://'.$this->getEndpoint().'/api/'.$apiMethod, [
-            'json' => array_filter($options),
+            'json' => array_filter($options, function ($value): bool { return !\in_array($value, ['', [], null], true); }),
             'auth_bearer' => $this->accessToken,
             'headers' => [
                 'Content-Type' => 'application/json; charset=utf-8',

src/Symfony/Component/Notifier/Bridge/Slack/Tests/SlackTransportTest.php

@@ -167,6 +167,56 @@ public function testSendWithNotification()
         $this->assertSame('1503435956.000247', $sentMessage->getMessageId());
     }
 
+    /**
+     * @testWith [true]
+     *           [false]
+     */
+    public function testSendWithBooleanOptionValue(bool $value)
+    {
+        $channel = 'testChannel';
+        $message = 'testMessage';
+
+        $response = $this->createMock(ResponseInterface::class);
+
+        $response->expects($this->exactly(2))
+            ->method('getStatusCode')
+            ->willReturn(200);
+
+        $response->expects($this->once())
+            ->method('getContent')
+            ->willReturn(json_encode(['ok' => true, 'ts' => '1503435956.000247', 'channel' => 'C123456']));
+
+        $options = new SlackOptions();
+        $options->asUser($value);
+        $options->linkNames($value);
+        $options->mrkdwn($value);
+        $options->unfurlLinks($value);
+        $options->unfurlMedia($value);
+        $notification = new Notification($message);
+        $chatMessage = ChatMessage::fromNotification($notification);
+        $chatMessage->options($options);
+
+        $expectedBody = json_encode([
+            'as_user' => $value,
+            'channel' => $channel,
+            'link_names' => $value,
+            'mrkdwn' => $value,
+            'text' => $message,
+            'unfurl_links' => $value,
+            'unfurl_media' => $value,
+        ]);
+
+        $client = new MockHttpClient(function (string $method, string $url, array $options = []) use ($response, $expectedBody): ResponseInterface {
+            $this->assertJsonStringEqualsJsonString($expectedBody, $options['body']);
+
+            return $response;
+        });
+
+        $transport = self::createTransport($client, $channel);
+
+        $transport->send($chatMessage);
+    }
+
     public function testSendWith200ResponseButNotOk()
     {
         $channel = 'testChannel';

src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php

@@ -83,13 +83,13 @@ public static function castGenerator(\Generator $c, array $a, Stub $stub, bool $
         // Cannot create ReflectionGenerator based on a terminated Generator
         try {
             $reflectionGenerator = new \ReflectionGenerator($c);
+
+            return self::castReflectionGenerator($reflectionGenerator, $a, $stub, $isNested);
         } catch (\Exception) {
             $a[Caster::PREFIX_VIRTUAL.'closed'] = true;
 
             return $a;
         }
-
-        return self::castReflectionGenerator($reflectionGenerator, $a, $stub, $isNested);
     }
 
     public static function castType(\ReflectionType $c, array $a, Stub $stub, bool $isNested): array

src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php

@@ -460,6 +460,84 @@ class: "Symfony\Component\VarDumper\Tests\Caster\ReflectionCasterTest"
         );
     }
 
+    /**
+     * @requires PHP < 8.4
+     */
+    public function testGeneratorPriorTo84()
+    {
+        if (\extension_loaded('xdebug')) {
+            $this->markTestSkipped('xdebug is active');
+        }
+
+        $generator = new GeneratorDemo();
+        $generator = $generator->baz();
+
+        $expectedDump = <<<'EODUMP'
+Generator {
+  this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
+  %s: {
+    %sGeneratorDemo.php:14 {
+      Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz()
+      › {
+      ›     yield from bar();
+      › }
+    }
+%A}
+  closed: false
+}
+EODUMP;
+
+        $this->assertDumpMatchesFormat($expectedDump, $generator);
+
+        foreach ($generator as $v) {
+            break;
+        }
+
+        $expectedDump = <<<'EODUMP'
+array:2 [
+  0 => ReflectionGenerator {
+    this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
+    %s: {
+      %s%eTests%eFixtures%eGeneratorDemo.php:%d {
+        Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo()
+%A      ›     yield 1;
+%A    }
+      %s%eTests%eFixtures%eGeneratorDemo.php:20 { …}
+      %s%eTests%eFixtures%eGeneratorDemo.php:14 { …}
+%A  }
+    closed: false
+  }
+  1 => Generator {
+    %s: {
+      %s%eTests%eFixtures%eGeneratorDemo.php:%d {
+        Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo()
+        ›     yield 1;
+        › }
+        › 
+      }
+%A  }
+    closed: false
+  }
+]
+EODUMP;
+
+        $r = new \ReflectionGenerator($generator);
+        $this->assertDumpMatchesFormat($expectedDump, [$r, $r->getExecutingGenerator()]);
+
+        foreach ($generator as $v) {
+        }
+
+        $expectedDump = <<<'EODUMP'
+Generator {
+  closed: true
+}
+EODUMP;
+        $this->assertDumpMatchesFormat($expectedDump, $generator);
+    }
+
+    /**
+     * @requires PHP 8.4
+     */
     public function testGenerator()
     {
         if (\extension_loaded('xdebug')) {
@@ -471,6 +549,7 @@ public function testGenerator()
 
         $expectedDump = <<<'EODUMP'
 Generator {
+  function: "Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::baz"
   this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
   %s: {
     %sGeneratorDemo.php:14 {
@@ -479,6 +558,7 @@ public function testGenerator()
       ›     yield from bar();
       › }
     }
+    Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz() {}
 %A}
   closed: false
 }
@@ -505,6 +585,7 @@ public function testGenerator()
     closed: false
   }
   1 => Generator {
+    function: "Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo"
     %s: {
       %s%eTests%eFixtures%eGeneratorDemo.php:%d {
         Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo()
@@ -526,6 +607,7 @@ public function testGenerator()
 
         $expectedDump = <<<'EODUMP'
 Generator {
+  function: "Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::baz"
   closed: true
 }
 EODUMP;