[VarDumper] Backport type fixes

Signed-off-by: Alexander M. Turek <[email protected]>

Author: derrabus

Cloner/AbstractCloner.php

@@ -194,8 +194,16 @@ abstract class AbstractCloner implements ClonerInterface
     protected $maxString = -1;
     protected $minDepth = 1;
 
+    /**
+     * @var array<string, list<callable>>
+     */
     private $casters = [];
+
+    /**
+     * @var callable|null
+     */
     private $prevErrorHandler;
+
     private $classInfo = [];
     private $filter = 0;
 

Command/Descriptor/CliDescriptor.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\VarDumper\Command\Descriptor;
 
-use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
@@ -29,12 +28,10 @@ class CliDescriptor implements DumpDescriptorInterface
 {
     private $dumper;
     private $lastIdentifier;
-    private $supportsHref;
 
     public function __construct(CliDumper $dumper)
     {
         $this->dumper = $dumper;
-        $this->supportsHref = method_exists(OutputFormatterStyle::class, 'setHref');
     }
 
     public function describe(OutputInterface $output, Data $data, array $context, int $clientId): void
@@ -66,8 +63,7 @@ public function describe(OutputInterface $output, Data $data, array $context, in
         if (isset($context['source'])) {
             $source = $context['source'];
             $sourceInfo = sprintf('%s on line %d', $source['name'], $source['line']);
-            $fileLink = $source['file_link'] ?? null;
-            if ($this->supportsHref && $fileLink) {
+            if ($fileLink = $source['file_link'] ?? null) {
                 $sourceInfo = sprintf('<href=%s>%s</>', $fileLink, $sourceInfo);
             }
             $rows[] = ['source', $sourceInfo];
@@ -77,11 +73,6 @@ public function describe(OutputInterface $output, Data $data, array $context, in
 
         $io->table([], $rows);
 
-        if (!$this->supportsHref && isset($fileLink)) {
-            $io->writeln(['<info>Open source in your IDE/browser:</info>', $fileLink]);
-            $io->newLine();
-        }
-
         $this->dumper->dump($data);
         $io->newLine();
     }

Server/Connection.php

@@ -23,6 +23,10 @@ class Connection
 {
     private $host;
     private $contextProviders;
+
+    /**
+     * @var resource|null
+     */
     private $socket;
 
     /**

Server/DumpServer.php

@@ -25,9 +25,13 @@
 class DumpServer
 {
     private $host;
-    private $socket;
     private $logger;
 
+    /**
+     * @var resource|null
+     */
+    private $socket;
+
     public function __construct(string $host, LoggerInterface $logger = null)
     {
         if (!str_contains($host, '://')) {

VarDumper.php

@@ -32,6 +32,9 @@
  */
 class VarDumper
 {
+    /**
+     * @var callable|null
+     */
     private static $handler;
 
     public static function dump($var)
@@ -43,6 +46,9 @@ public static function dump($var)
         return (self::$handler)($var);
     }
 
+    /**
+     * @return callable|null
+     */
     public static function setHandler(callable $callable = null)
     {
         $prevHandler = self::$handler;