symfony · May 19, 2021 · May 19, 2021 · May 20, 2021 · May 21, 2021 · May 23, 2021
diff --git a/Caster/ArgsStub.php b/Caster/ArgsStub.php
@@ -20,7 +20,7 @@
  */
 class ArgsStub extends EnumStub
 {
-    private static $parameters = [];
+    private static array $parameters = [];
 
     public function __construct(array $args, string $function, ?string $class)
     {

diff --git a/Caster/ClassStub.php b/Caster/ClassStub.php
@@ -24,7 +24,7 @@ class ClassStub extends ConstStub
      * @param string   $identifier A PHP identifier, e.g. a class, method, interface, etc. name
      * @param callable $callable   The callable targeted by the identifier when it is ambiguous or not a real PHP identifier
      */
-    public function __construct(string $identifier, $callable = null)
+    public function __construct(string $identifier, callable|array|string $callable = null)
     {
         $this->value = $identifier;
 
@@ -87,7 +87,7 @@ public function __construct(string $identifier, $callable = null)
         }
     }
 
-    public static function wrapCallable($callable)
+    public static function wrapCallable(mixed $callable)
     {
         if (\is_object($callable) || !\is_callable($callable)) {
             return $callable;

diff --git a/Caster/ConstStub.php b/Caster/ConstStub.php
@@ -20,16 +20,13 @@
  */
 class ConstStub extends Stub
 {
-    public function __construct(string $name, $value = null)
+    public function __construct(string $name, string|int|float $value = null)
     {
         $this->class = $name;
         $this->value = 1 < \func_num_args() ? $value : $name;
     }
 
-    /**
-     * @return string
-     */
-    public function __toString()
+    public function __toString(): string
     {
         return (string) $this->value;
     }

diff --git a/Caster/CutStub.php b/Caster/CutStub.php
@@ -20,7 +20,7 @@
  */
 class CutStub extends Stub
 {
-    public function __construct($value)
+    public function __construct(mixed $value)
     {
         $this->value = $value;
 

diff --git a/Caster/DsPairStub.php b/Caster/DsPairStub.php
@@ -18,7 +18,7 @@
  */
 class DsPairStub extends Stub
 {
-    public function __construct($key, $value)
+    public function __construct(string|int $key, mixed $value)
     {
         $this->value = [
             Caster::PREFIX_VIRTUAL.'key' => $key,

diff --git a/Caster/ExceptionCaster.php b/Caster/ExceptionCaster.php
@@ -24,9 +24,9 @@
  */
 class ExceptionCaster
 {
-    public static $srcContext = 1;
-    public static $traceArgs = true;
-    public static $errorTypes = [
+    public static int $srcContext = 1;
+    public static bool $traceArgs = true;
+    public static array $errorTypes = [
         \E_DEPRECATED => 'E_DEPRECATED',
         \E_USER_DEPRECATED => 'E_USER_DEPRECATED',
         \E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR',
@@ -44,7 +44,7 @@ class ExceptionCaster
         \E_STRICT => 'E_STRICT',
     ];
 
-    private static $framesCache = [];
+    private static array $framesCache = [];
 
     public static function castError(\Error $e, array $a, Stub $stub, bool $isNested, int $filter = 0)
     {

diff --git a/Caster/LinkStub.php b/Caster/LinkStub.php
@@ -20,8 +20,8 @@ class LinkStub extends ConstStub
 {
     public $inVendor = false;
 
-    private static $vendorRoots;
-    private static $composerRoots;
+    private static array $vendorRoots;
+    private static array $composerRoots = [];
 
     public function __construct(string $label, int $line = 0, string $href = null)
     {
@@ -65,7 +65,7 @@ public function __construct(string $label, int $line = 0, string $href = null)
 
     private function getComposerRoot(string $file, bool &$inVendor)
     {
-        if (null === self::$vendorRoots) {
+        if (!isset(self::$vendorRoots)) {
             self::$vendorRoots = [];
 
             foreach (get_declared_classes() as $class) {

diff --git a/Caster/MemcachedCaster.php b/Caster/MemcachedCaster.php
@@ -20,8 +20,8 @@
  */
 class MemcachedCaster
 {
-    private static $optionConstants;
-    private static $defaultOptions;
+    private static array $optionConstants;
+    private static array $defaultOptions;
 
     public static function castMemcached(\Memcached $c, array $a, Stub $stub, bool $isNested)
     {

diff --git a/Caster/RdKafkaCaster.php b/Caster/RdKafkaCaster.php
@@ -166,7 +166,7 @@ public static function castBrokerMetadata(BrokerMetadata $c, array $a, Stub $stu
         return $a;
     }
 
-    private static function extractMetadata($c)
+    private static function extractMetadata(KafkaConsumer|\RdKafka $c)
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 

diff --git a/Caster/RedisCaster.php b/Caster/RedisCaster.php
@@ -102,10 +102,7 @@ public static function castRedisCluster(\RedisCluster $c, array $a, Stub $stub,
         return $a;
     }
 
-    /**
-     * @param \Redis|\RedisArray|\RedisCluster $redis
-     */
-    private static function getRedisOptions($redis, array $options = []): EnumStub
+    private static function getRedisOptions(\Redis|\RedisArray|\RedisCluster $redis, array $options = []): EnumStub
     {
         $serializer = $redis->getOption(\Redis::OPT_SERIALIZER);
         if (\is_array($serializer)) {

diff --git a/Caster/ReflectionCaster.php b/Caster/ReflectionCaster.php
@@ -96,7 +96,7 @@ public static function castType(\ReflectionType $c, array $a, Stub $stub, bool $
     {
         $prefix = Caster::PREFIX_VIRTUAL;
 
-        if ($c instanceof \ReflectionNamedType || \PHP_VERSION_ID < 80000) {
+        if ($c instanceof \ReflectionNamedType) {
             $a += [
                 $prefix.'name' => $c instanceof \ReflectionNamedType ? $c->getName() : (string) $c,
                 $prefix.'allowsNull' => $c->allowsNull(),
@@ -419,7 +419,7 @@ private static function addExtra(array &$a, \Reflector $c)
     private static function addMap(array &$a, object $c, array $map, string $prefix = Caster::PREFIX_VIRTUAL)
     {
         foreach ($map as $k => $m) {
-            if (\PHP_VERSION_ID >= 80000 && 'isDisabled' === $k) {
+            if ('isDisabled' === $k) {
                 continue;
             }
 
@@ -431,10 +431,8 @@ private static function addMap(array &$a, object $c, array $map, string $prefix
 
     private static function addAttributes(array &$a, \Reflector $c, string $prefix = Caster::PREFIX_VIRTUAL): void
     {
-        if (\PHP_VERSION_ID >= 80000) {
-            foreach ($c->getAttributes() as $n) {
-                $a[$prefix.'attributes'][] = $n;
-            }
+        foreach ($c->getAttributes() as $n) {
+            $a[$prefix.'attributes'][] = $n;
         }
     }
 }
diff --git a/Caster/ResourceCaster.php b/Caster/ResourceCaster.php
@@ -22,10 +22,7 @@
  */
 class ResourceCaster
 {
-    /**
-     * @param \CurlHandle|resource $h
-     */
-    public static function castCurl($h, array $a, Stub $stub, bool $isNested): array
+    public static function castCurl(\CurlHandle $h, array $a, Stub $stub, bool $isNested): array
     {
         return curl_getinfo($h);
     }

diff --git a/Caster/SplCaster.php b/Caster/SplCaster.php
@@ -94,32 +94,24 @@ public static function castFileInfo(\SplFileInfo $c, array $a, Stub $stub, bool
         unset($a["\0SplFileInfo\0fileName"]);
         unset($a["\0SplFileInfo\0pathName"]);
 
-        if (\PHP_VERSION_ID < 80000) {
-            if (false === $c->getPathname()) {
-                $a[$prefix.'⚠'] = 'The parent constructor was not called: the object is in an invalid state';
-
-                return $a;
+        try {
+            $c->isReadable();
+        } catch (\RuntimeException $e) {
+            if ('Object not initialized' !== $e->getMessage()) {
+                throw $e;
             }
-        } else {
-            try {
-                $c->isReadable();
-            } catch (\RuntimeException $e) {
-                if ('Object not initialized' !== $e->getMessage()) {
-                    throw $e;
-                }
 
-                $a[$prefix.'⚠'] = 'The parent constructor was not called: the object is in an invalid state';
+            $a[$prefix.'⚠'] = 'The parent constructor was not called: the object is in an invalid state';
 
-                return $a;
-            } catch (\Error $e) {
-                if ('Object not initialized' !== $e->getMessage()) {
-                    throw $e;
-                }
+            return $a;
+        } catch (\Error $e) {
+            if ('Object not initialized' !== $e->getMessage()) {
+                throw $e;
+            }
 
-                $a[$prefix.'⚠'] = 'The parent constructor was not called: the object is in an invalid state';
+            $a[$prefix.'⚠'] = 'The parent constructor was not called: the object is in an invalid state';
 
-                return $a;
-            }
+            return $a;
         }
 
         foreach ($map as $key => $accessor) {
@@ -219,7 +211,7 @@ public static function castWeakReference(\WeakReference $c, array $a, Stub $stub
         return $a;
     }
 
-    private static function castSplArray($c, array $a, Stub $stub, bool $isNested): array
+    private static function castSplArray(\ArrayObject|\ArrayIterator $c, array $a, Stub $stub, bool $isNested): array
     {
         $prefix = Caster::PREFIX_VIRTUAL;
         $flags = $c->getFlags();
@@ -229,9 +221,6 @@ private static function castSplArray($c, array $a, Stub $stub, bool $isNested):
             $a = Caster::castObject($c, \get_class($c), method_exists($c, '__debugInfo'), $stub->class);
             $c->setFlags($flags);
         }
-        if (\PHP_VERSION_ID < 70400) {
-            $a[$prefix.'storage'] = $c->getArrayCopy();
-        }
         $a += [
             $prefix.'flag::STD_PROP_LIST' => (bool) ($flags & \ArrayObject::STD_PROP_LIST),
             $prefix.'flag::ARRAY_AS_PROPS' => (bool) ($flags & \ArrayObject::ARRAY_AS_PROPS),

diff --git a/Cloner/AbstractCloner.php b/Cloner/AbstractCloner.php
@@ -154,7 +154,6 @@ abstract class AbstractCloner implements ClonerInterface
         'Symfony\Component\VarDumper\Caster\DsPairStub' => ['Symfony\Component\VarDumper\Caster\DsCaster', 'castPairStub'],
 
         'CurlHandle' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castCurl'],
-        ':curl' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castCurl'],
 
         ':dba' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castDba'],
         ':dba persistent' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castDba'],
@@ -199,15 +198,15 @@ abstract class AbstractCloner implements ClonerInterface
     /**
      * @var array<string, list<callable>>
      */
-    private $casters = [];
+    private array $casters = [];
 
     /**
      * @var callable|null
      */
     private $prevErrorHandler;
 
-    private $classInfo = [];
-    private $filter = 0;
+    private array $classInfo = [];
+    private int $filter = 0;
 
     /**
      * @param callable[]|null $casters A map of casters
@@ -267,12 +266,9 @@ public function setMinDepth(int $minDepth)
     /**
      * Clones a PHP variable.
      *
-     * @param mixed $var    Any PHP variable
-     * @param int   $filter A bit field of Caster::EXCLUDE_* constants
-     *
-     * @return Data
+     * @param int $filter A bit field of Caster::EXCLUDE_* constants
      */
-    public function cloneVar($var, int $filter = 0)
+    public function cloneVar(mixed $var, int $filter = 0): Data
     {
         $this->prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) {
             if (\E_RECOVERABLE_ERROR === $type || \E_USER_ERROR === $type) {
@@ -304,26 +300,20 @@ public function cloneVar($var, int $filter = 0)
 
     /**
      * Effectively clones the PHP variable.
-     *
-     * @param mixed $var Any PHP variable
-     *
-     * @return array
      */
-    abstract protected function doClone($var);
+    abstract protected function doClone(mixed $var): array;
 
     /**
      * Casts an object to an array representation.
      *
      * @param bool $isNested True if the object is nested in the dumped structure
-     *
-     * @return array
      */
-    protected function castObject(Stub $stub, bool $isNested)
+    protected function castObject(Stub $stub, bool $isNested): array
     {
         $obj = $stub->value;
         $class = $stub->class;
 
-        if (\PHP_VERSION_ID < 80000 ? "\0" === ($class[15] ?? null) : str_contains($class, "@anonymous\0")) {
+        if (str_contains($class, "@anonymous\0")) {
             $stub->class = get_debug_type($obj);
         }
         if (isset($this->classInfo[$class])) {
@@ -374,10 +364,8 @@ protected function castObject(Stub $stub, bool $isNested)
      * Casts a resource to an array representation.
      *
      * @param bool $isNested True if the object is nested in the dumped structure
-     *
-     * @return array
      */
-    protected function castResource(Stub $stub, bool $isNested)
+    protected function castResource(Stub $stub, bool $isNested): array
     {
         $a = [];
         $res = $stub->value;

diff --git a/Cloner/ClonerInterface.php b/Cloner/ClonerInterface.php
@@ -18,10 +18,6 @@ interface ClonerInterface
 {
     /**
      * Clones a PHP variable.
-     *
-     * @param mixed $var Any PHP variable
-     *
-     * @return Data
      */
-    public function cloneVar($var);
+    public function cloneVar(mixed $var): Data;
 }