Merge branch '5.2' into 5.3

* 5.2:
  [ErrorHandler] fix parsing `@return array<foo>` annotations
  [HttpFoundation] Fix return types of SessionHandler::gc()
  [Cache] Support decorated Dbal drivers in PdoAdapter
  [VarDumper] Support for intersection types

Author: nicolas-grekas

Caster/ReflectionCaster.php

@@ -102,7 +102,7 @@ public static function castType(\ReflectionType $c, array $a, Stub $stub, bool $
                 $prefix.'allowsNull' => $c->allowsNull(),
                 $prefix.'isBuiltin' => $c->isBuiltin(),
             ];
-        } elseif ($c instanceof \ReflectionUnionType) {
+        } elseif ($c instanceof \ReflectionUnionType || $c instanceof \ReflectionIntersectionType) {
             $a[$prefix.'allowsNull'] = $c->allowsNull();
             self::addMap($a, $c, [
                 'types' => 'getTypes',

Tests/Caster/ReflectionCasterTest.php

@@ -18,6 +18,7 @@
 use Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo;
 use Symfony\Component\VarDumper\Tests\Fixtures\LotsOfAttributes;
 use Symfony\Component\VarDumper\Tests\Fixtures\NotLoadableClass;
+use Symfony\Component\VarDumper\Tests\Fixtures\ReflectionIntersectionTypeFixture;
 use Symfony\Component\VarDumper\Tests\Fixtures\ReflectionNamedTypeFixture;
 use Symfony\Component\VarDumper\Tests\Fixtures\ReflectionUnionTypeFixture;
 
@@ -94,7 +95,7 @@ public function testClosureCaster()
     $b: & 123
   }
   file: "%sReflectionCasterTest.php"
-  line: "87 to 87"
+  line: "88 to 88"
 }
 EOTXT
             , $var
@@ -244,6 +245,26 @@ public function testReflectionParameterNullableUnion()
         );
     }
 
+    /**
+     * @requires PHP 8.1
+     */
+    public function testReflectionParameterIntersection()
+    {
+        $f = eval('return function (Traversable&Countable $a) {};');
+        $var = new \ReflectionParameter($f, 0);
+
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+ReflectionParameter {
+  +name: "a"
+  position: 0
+  typeHint: "Traversable&Countable"
+}
+EOTXT
+            , $var
+        );
+    }
+
     /**
      * @requires PHP 7.4
      */
@@ -308,6 +329,34 @@ public function testReflectionUnionType()
         );
     }
 
+    /**
+     * @requires PHP 8.1
+     */
+    public function testReflectionIntersectionType()
+    {
+        $var = (new \ReflectionProperty(ReflectionIntersectionTypeFixture::class, 'a'))->getType();
+        $this->assertDumpMatchesFormat(
+            <<<'EOTXT'
+ReflectionIntersectionType {
+  allowsNull: false
+  types: array:2 [
+    0 => ReflectionNamedType {
+      name: "Traversable"
+      allowsNull: false
+      isBuiltin: false
+    }
+    1 => ReflectionNamedType {
+      name: "Countable"
+      allowsNull: false
+      isBuiltin: false
+    }
+  ]
+}
+EOTXT
+            , $var
+        );
+    }
+
     /**
      * @requires PHP 8
      */

Tests/Fixtures/ReflectionIntersectionTypeFixture.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\VarDumper\Tests\Fixtures;
+
+class ReflectionIntersectionTypeFixture
+{
+    public \Traversable&\Countable $a;
+}