symfony · Jun 27, 2022 · Jun 27, 2022 · Jun 27, 2022 · Jun 27, 2022 · Jul 18, 2022
diff --git a/Caster/ArgsStub.php b/Caster/ArgsStub.php
@@ -28,7 +28,7 @@ public function __construct(array $args, string $function, ?string $class)
 
         $values = [];
         foreach ($args as $k => $v) {
-            $values[$k] = !is_scalar($v) && !$v instanceof Stub ? new CutStub($v) : $v;
+            $values[$k] = !\is_scalar($v) && !$v instanceof Stub ? new CutStub($v) : $v;
         }
         if (null === $params) {
             parent::__construct($values, false);

diff --git a/Caster/IntlCaster.php b/Caster/IntlCaster.php
@@ -102,7 +102,7 @@ public static function castNumberFormatter(\NumberFormatter $c, array $a, Stub $
                     'SIGNIFICANT_DIGIT_SYMBOL' => $c->getSymbol(\NumberFormatter::SIGNIFICANT_DIGIT_SYMBOL),
                     'MONETARY_GROUPING_SEPARATOR_SYMBOL' => $c->getSymbol(\NumberFormatter::MONETARY_GROUPING_SEPARATOR_SYMBOL),
                 ]
-             ),
+            ),
         ];
 
         return self::castError($c, $a);

diff --git a/Dumper/AbstractDumper.php b/Dumper/AbstractDumper.php
@@ -45,7 +45,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
     public function __construct($output = null, string $charset = null, int $flags = 0)
     {
         $this->flags = $flags;
-        $this->setCharset($charset ?: ini_get('php.output_encoding') ?: ini_get('default_charset') ?: 'UTF-8');
+        $this->setCharset($charset ?: \ini_get('php.output_encoding') ?: \ini_get('default_charset') ?: 'UTF-8');
         $this->setOutput($output ?: static::$defaultOutput);
         if (!$output && \is_string(static::$defaultOutput)) {
             static::$defaultOutput = $this->outputStream;

diff --git a/Dumper/CliDumper.php b/Dumper/CliDumper.php
@@ -83,7 +83,7 @@ public function __construct($output = null, string $charset = null, int $flags =
             ]);
         }
 
-        $this->displayOptions['fileLinkFormat'] = ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: 'file://%f#L%l';
+        $this->displayOptions['fileLinkFormat'] = \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: 'file://%f#L%l';
     }
 
     /**

diff --git a/Dumper/HtmlDumper.php b/Dumper/HtmlDumper.php
@@ -81,7 +81,7 @@ public function __construct($output = null, string $charset = null, int $flags =
     {
         AbstractDumper::__construct($output, $charset, $flags);
         $this->dumpId = 'sf-dump-'.mt_rand();
-        $this->displayOptions['fileLinkFormat'] = ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
+        $this->displayOptions['fileLinkFormat'] = \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
         $this->styles = static::$themes['dark'] ?? self::$themes['dark'];
     }
 
@@ -864,7 +864,7 @@ protected function style(string $style, string $value, array $attr = []): string
         }
 
         if ('const' === $style && isset($attr['value'])) {
-            $style .= sprintf(' title="%s"', esc(is_scalar($attr['value']) ? $attr['value'] : json_encode($attr['value'])));
+            $style .= sprintf(' title="%s"', esc(\is_scalar($attr['value']) ? $attr['value'] : json_encode($attr['value'])));
         } elseif ('public' === $style) {
             $style .= sprintf(' title="%s"', empty($attr['dynamic']) ? 'Public property' : 'Runtime added dynamic property');
         } elseif ('str' === $style && 1 < $attr['length']) {

diff --git a/Tests/Caster/ExceptionCasterTest.php b/Tests/Caster/ExceptionCasterTest.php
@@ -151,7 +151,7 @@ public function testShouldReturnTraceForConcreteTwigWithError()
 
     public function testHtmlDump()
     {
-        if (ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
+        if (\ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
             $this->markTestSkipped('A custom file_link_format is defined.');
         }
 

diff --git a/Tests/Caster/RdKafkaCasterTest.php b/Tests/Caster/RdKafkaCasterTest.php
@@ -181,7 +181,7 @@ public function testDumpProducerTopic()
         $producer->addBrokers($this->broker);
 
         $topic = $producer->newTopic('test');
-        $topic->produce(RD_KAFKA_PARTITION_UA, 0, '{}');
+        $topic->produce(\RD_KAFKA_PARTITION_UA, 0, '{}');
 
         $expectedDump = <<<EODUMP
 RdKafka\ProducerTopic {

diff --git a/Tests/Caster/ReflectionCasterTest.php b/Tests/Caster/ReflectionCasterTest.php
@@ -21,6 +21,7 @@
 use Symfony\Component\VarDumper\Tests\Fixtures\ReflectionIntersectionTypeFixture;
 use Symfony\Component\VarDumper\Tests\Fixtures\ReflectionNamedTypeFixture;
 use Symfony\Component\VarDumper\Tests\Fixtures\ReflectionUnionTypeFixture;
+use Symfony\Component\VarDumper\Tests\Fixtures\ReflectionUnionTypeWithIntersectionFixture;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
@@ -94,7 +95,7 @@ public function testClosureCaster()
     $b: & 123
   }
   file: "%sReflectionCasterTest.php"
-  line: "87 to 87"
+  line: "88 to 88"
 }
 EOTXT
             , $var
@@ -147,7 +148,7 @@ public function testReflectionParameter()
   typeHint: "Symfony\Component\VarDumper\Tests\Fixtures\NotLoadableClass"
 }
 EOTXT
-                , $var
+            , $var
         );
     }
 
@@ -318,6 +319,44 @@ public function testReflectionIntersectionType()
         );
     }
 
+    /**
+     * @requires PHP 8.2
+     */
+    public function testReflectionUnionTypeWithIntersection()
+    {
+        $var = (new \ReflectionProperty(ReflectionUnionTypeWithIntersectionFixture::class, 'a'))->getType();
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+ReflectionUnionType {
+  allowsNull: true
+  types: array:2 [
+    0 => ReflectionIntersectionType {
+      allowsNull: false
+      types: array:2 [
+        0 => ReflectionNamedType {
+          name: "Traversable"
+          allowsNull: false
+          isBuiltin: false
+        }
+        1 => ReflectionNamedType {
+          name: "Countable"
+          allowsNull: false
+          isBuiltin: false
+        }
+      ]
+    }
+    1 => ReflectionNamedType {
+      name: "null"
+      allowsNull: true
+      isBuiltin: true
+    }
+  ]
+}
+EOTXT
+            , $var
+        );
+    }
+
     public function testExtendsReflectionType()
     {
         $var = new ExtendsReflectionTypeFixture();
@@ -333,7 +372,7 @@ public function testExtendsReflectionType()
 
     public function testReturnType()
     {
-        $f = function ():int {};
+        $f = function (): int {};
 
         $this->assertDumpMatchesFormat(
             <<<EOTXT

diff --git a/Tests/Caster/XmlReaderCasterTest.php b/Tests/Caster/XmlReaderCasterTest.php
@@ -26,7 +26,7 @@ class XmlReaderCasterTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->reader = new \XmlReader();
+        $this->reader = new \XMLReader();
         $this->reader->open(__DIR__.'/../Fixtures/xml_reader.xml');
     }
 
@@ -248,7 +248,7 @@ public function provideNodes()
 
     public function testWithUninitializedXMLReader()
     {
-        $this->reader = new \XmlReader();
+        $this->reader = new \XMLReader();
 
         $expectedDump = <<<'EODUMP'
 XMLReader {

diff --git a/Tests/Cloner/VarClonerTest.php b/Tests/Cloner/VarClonerTest.php
@@ -330,7 +330,7 @@ public function testLimits()
 
     public function testJsonCast()
     {
-        if (2 == ini_get('xdebug.overload_var_dump')) {
+        if (2 == \ini_get('xdebug.overload_var_dump')) {
             $this->markTestSkipped('xdebug is active');
         }
 

diff --git a/Tests/Dumper/HtmlDumperTest.php b/Tests/Dumper/HtmlDumperTest.php
@@ -23,7 +23,7 @@ class HtmlDumperTest extends TestCase
 {
     public function testGet()
     {
-        if (ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
+        if (\ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
             $this->markTestSkipped('A custom file_link_format is defined.');
         }
 

diff --git a/Tests/Dumper/ServerDumperTest.php b/Tests/Dumper/ServerDumperTest.php
@@ -79,7 +79,7 @@ public function getContext(): ?array
 ]
 %d
 DUMP
-        , $dumped);
+            , $dumped);
     }
 
     private function getServerProcess(): Process

diff --git a/Tests/Fixtures/ReflectionUnionTypeWithIntersectionFixture.php b/Tests/Fixtures/ReflectionUnionTypeWithIntersectionFixture.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\VarDumper\Tests\Fixtures;
+
+class ReflectionUnionTypeWithIntersectionFixture
+{
+    public (\Traversable&\Countable)|null $a;
+}
diff --git a/Tests/Server/ConnectionTest.php b/Tests/Server/ConnectionTest.php
@@ -62,7 +62,7 @@ public function getContext(): ?array
 %d
 
 DUMP
-        , $dumped);
+            , $dumped);
     }
 
     public function testNoServer()

diff --git a/Tests/Test/VarDumperTestTraitTest.php b/Tests/Test/VarDumperTestTraitTest.php
@@ -68,7 +68,7 @@ public function testItCanBeConfigured()
   }
 ]
 DUMP
-        , [1, 2, new \DateTime('2019-07-09T0:00:00+00:00')]);
+            , [1, 2, new \DateTime('2019-07-09T0:00:00+00:00')]);
 
         $this->tearDownVarDumper();
 

diff --git a/VarDumper.php b/VarDumper.php
@@ -96,7 +96,7 @@ private static function getDefaultContextProviders(): array
     {
         $contextProviders = [];
 
-        if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && (class_exists(Request::class))) {
+        if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && class_exists(Request::class)) {
             $requestStack = new RequestStack();
             $requestStack->push(Request::createFromGlobals());
             $contextProviders['request'] = new RequestContextProvider($requestStack);