symfony
diff --git a/‎src/Symfony/Component/VarDumper/CHANGELOG.md
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/VarDumper/CHANGELOG.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/VarDumper/Caster/CurlCaster.php
Lines changed: 0 additions & 30 deletions b/‎src/Symfony/Component/VarDumper/Caster/CurlCaster.php
Lines changed: 0 additions & 30 deletions
diff --git a/‎src/Symfony/Component/VarDumper/Caster/DbaCaster.php
Lines changed: 0 additions & 35 deletions b/‎src/Symfony/Component/VarDumper/Caster/DbaCaster.php
Lines changed: 0 additions & 35 deletions
diff --git a/‎src/Symfony/Component/VarDumper/Caster/OpenSslCaster.php
Lines changed: 0 additions & 92 deletions b/‎src/Symfony/Component/VarDumper/Caster/OpenSslCaster.php
Lines changed: 0 additions & 92 deletions
diff --git a/‎src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
Lines changed: 78 additions & 0 deletions b/‎src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
Lines changed: 78 additions & 0 deletions
diff --git a/‎src/Symfony/Component/VarDumper/Caster/SocketCaster.php
Lines changed: 8 additions & 22 deletions b/‎src/Symfony/Component/VarDumper/Caster/SocketCaster.php
Lines changed: 8 additions & 22 deletions
diff --git a/‎src/Symfony/Component/VarDumper/Caster/SqliteCaster.php
Lines changed: 7 additions & 4 deletions b/‎src/Symfony/Component/VarDumper/Caster/SqliteCaster.php
Lines changed: 7 additions & 4 deletions
diff --git a/‎src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
Lines changed: 7 additions & 15 deletions b/‎src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
Lines changed: 7 additions & 15 deletions
@@ -4,7 +4,7 @@ CHANGELOG
 7.3
 ---
 
- * Add `CurlCaster`, `OpenSslCaster`, `SqliteCaster`, `SocketCaster` and `DbaCaster`
+ * Add casters for `Dba\Connection`, `SQLite3Result`, `OpenSSLAsymmetricKey` and `OpenSSLCertificateSigningRequest`
 
 7.2
 ---
 
@@ -22,6 +22,32 @@
  */
 class ResourceCaster
 {
+    public static function castCurl(\CurlHandle $h, array $a, Stub $stub, bool $isNested): array
+    {
+        $info = curl_getinfo($h);
+        foreach ($info as $key => $val) {
+            $a[Caster::PREFIX_VIRTUAL.$key] = $val;
+        }
+
+        return $a;
+    }
+
+    /**
+     * @param resource|\Dba\Connection $dba
+     */
+    public static function castDba($dba, array $a, Stub $stub, bool $isNested): array
+    {
+        if (\PHP_VERSION_ID < 80402 && !\is_resource($dba)) {
+            // @see https://github.com/php/php-src/issues/16990
+            return $a;
+        }
+
+        $list = dba_list();
+        $a['file'] = $list[(int) $dba];
+
+        return $a;
+    }
+
     public static function castProcess($process, array $a, Stub $stub, bool $isNested): array
     {
         return proc_get_status($process);
@@ -42,11 +68,63 @@ public static function castStreamContext($stream, array $a, Stub $stub, bool $is
         return @stream_context_get_params($stream) ?: $a;
     }
 
+    /**
+     * @param \GdImage $gd
+     */
     public static function castGd($gd, array $a, Stub $stub, bool $isNested): array
     {
         $a['size'] = imagesx($gd).'x'.imagesy($gd);
         $a['trueColor'] = imageistruecolor($gd);
 
         return $a;
     }
+
+    /**
+     * @param \OpenSSLCertificate $h
+     */
+    public static function castOpensslX509($h, array $a, Stub $stub, bool $isNested): array
+    {
+        $stub->cut = -1;
+        $info = openssl_x509_parse($h, false);
+
+        $pin = openssl_pkey_get_public($h);
+        $pin = openssl_pkey_get_details($pin)['key'];
+        $pin = \array_slice(explode("\n", $pin), 1, -2);
+        $pin = base64_decode(implode('', $pin));
+        $pin = base64_encode(hash('sha256', $pin, true));
+
+        $a += [
+            'subject' => new EnumStub(array_intersect_key($info['subject'], ['organizationName' => true, 'commonName' => true])),
+            'issuer' => new EnumStub(array_intersect_key($info['issuer'], ['organizationName' => true, 'commonName' => true])),
+            'expiry' => new ConstStub(date(\DateTimeInterface::ISO8601, $info['validTo_time_t']), $info['validTo_time_t']),
+            'fingerprint' => new EnumStub([
+                'md5' => new ConstStub(wordwrap(strtoupper(openssl_x509_fingerprint($h, 'md5')), 2, ':', true)),
+                'sha1' => new ConstStub(wordwrap(strtoupper(openssl_x509_fingerprint($h, 'sha1')), 2, ':', true)),
+                'sha256' => new ConstStub(wordwrap(strtoupper(openssl_x509_fingerprint($h, 'sha256')), 2, ':', true)),
+                'pin-sha256' => new ConstStub($pin),
+            ]),
+        ];
+
+        return $a;
+    }
+
+    public static function castOpensslAsymmetricKey(\OpenSSLAsymmetricKey $key, array $a, Stub $stub, bool $isNested): array
+    {
+        foreach (openssl_pkey_get_details($key) as $k => $v) {
+            $a[Caster::PREFIX_VIRTUAL.$k] = $v;
+        }
+
+        unset($a[Caster::PREFIX_VIRTUAL.'rsa']); // binary data
+
+        return $a;
+    }
+
+    public static function castOpensslCsr(\OpenSSLCertificateSigningRequest $csr, array $a, Stub $stub, bool $isNested): array
+    {
+        foreach (openssl_csr_get_subject($csr, false) as $k => $v) {
+            $a[Caster::PREFIX_VIRTUAL.$k] = $v;
+        }
+
+        return $a;
+    }
 }
@@ -13,36 +13,22 @@
 
 use Symfony\Component\VarDumper\Cloner\Stub;
 
-/**
- * @author Alexandre Daubois <alex.daubois@gmail.com>
- */
-class SocketCaster
+final class SocketCaster
 {
-    public static function castSocket(\Socket $h, array $a, Stub $stub, bool $isNested): array
+    public static function castSocket(\Socket $socket, array $a, Stub $stub, bool $isNested): array
     {
-        socket_getsockname($h, $addr, $port);
-        $info = stream_get_meta_data(socket_export_stream($h));
+        socket_getsockname($socket, $addr, $port);
+        $info = stream_get_meta_data(socket_export_stream($socket));
 
         $a += [
             Caster::PREFIX_VIRTUAL.'address' => $addr,
             Caster::PREFIX_VIRTUAL.'port' => $port,
-            Caster::PREFIX_VIRTUAL.'info' => new EnumStub(array_intersect_key(
-                $info,
-                [
-                    'timed_out' => new ConstStub($info['timed_out'] ? 'true' : 'false'),
-                    'blocked' => new ConstStub($info['blocked'] ? 'true' : 'false'),
-                    'eof' => new ConstStub($info['eof'] ? 'true' : 'false'),
-                    'unread_bytes' => new ScalarStub($info['unread_bytes']),
-                    'stream_type' => new ConstStub($info['stream_type']),
-                    'wrapper_type' => new ConstStub($info['wrapper_type'] ?? ''),
-                    'wrapper_data' => new ConstStub($info['wrapper_data'] ?? ''),
-                    'mode' => new ConstStub($info['mode']),
-                    'seekable' => new ConstStub($info['seekable'] ? 'true' : 'false'),
-                    'uri' => new ConstStub($info['uri'] ?? ''),
-                ]
-            )),
         ];
 
+        foreach ($info as $key => $val) {
+            $a[Caster::PREFIX_VIRTUAL.$key] = $val;
+        }
+
         return $a;
     }
 }
@@ -16,15 +16,18 @@
 /**
  * @author Alexandre Daubois <alex.daubois@gmail.com>
  */
-class SqliteCaster
+final class SqliteCaster
 {
-    public static function castSqlite3Result(\SQLite3Result $c, array $a, Stub $stub, bool $isNested): array
+    public static function castSqlite3Result(\SQLite3Result $result, array $a, Stub $stub, bool $isNested): array
     {
         $a += [
-            Caster::PREFIX_VIRTUAL.'numColumns' => $c->numColumns(),
-            Caster::PREFIX_VIRTUAL.'result' => $c->fetchArray(\SQLITE3_ASSOC),
+            Caster::PREFIX_VIRTUAL.'numColumns' => $result->numColumns(),
         ];
 
+        for ($i = 0; $i < $result->numColumns(); ++$i) {
+            $a[Caster::PREFIX_VIRTUAL.'columnName'][$i] = $result->columnName($i);
+        }
+
         return $a;
     }
 }
@@ -176,39 +176,31 @@ abstract class AbstractCloner implements ClonerInterface
 
         'mysqli_driver' => ['Symfony\Component\VarDumper\Caster\MysqliCaster', 'castMysqliDriver'],
 
-        'CurlHandle' => ['Symfony\Component\VarDumper\Caster\CurlCaster', 'castCurl'],
-        'CurlMultiHandle' => ['Symfony\Component\VarDumper\Caster\CurlCaster', 'castCurlMulti'],
+        'CurlHandle' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castCurl'],
 
-        'Dba\Connection' => ['Symfony\Component\VarDumper\Caster\DbaCaster', 'castDbaConnection'],
-        ':dba' => ['Symfony\Component\VarDumper\Caster\DbaCaster', 'castDbaResource'],
-        ':dba persistent' => ['Symfony\Component\VarDumper\Caster\DbaCaster', 'castDbaResource'],
+        'Dba\Connection' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castDba'],
+        ':dba' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castDba'],
+        ':dba persistent' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castDba'],
 
         'GdImage' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castGd'],
-        ':gd' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castGd'],
 
         'SQLite3Result' => ['Symfony\Component\VarDumper\Caster\SqliteCaster', 'castSqlite3Result'],
 
         'PgSql\Lob' => ['Symfony\Component\VarDumper\Caster\PgSqlCaster', 'castLargeObject'],
-        ':pgsql large object' => ['Symfony\Component\VarDumper\Caster\PgSqlCaster', 'castLargeObject'],
         'PgSql\Connection' => ['Symfony\Component\VarDumper\Caster\PgSqlCaster', 'castLink'],
-        ':pgsql link' => ['Symfony\Component\VarDumper\Caster\PgSqlCaster', 'castLink'],
-        ':pgsql link persistent' => ['Symfony\Component\VarDumper\Caster\PgSqlCaster', 'castLink'],
         'PgSql\Result' => ['Symfony\Component\VarDumper\Caster\PgSqlCaster', 'castResult'],
-        ':pgsql result' => ['Symfony\Component\VarDumper\Caster\PgSqlCaster', 'castResult'],
 
         ':process' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castProcess'],
         ':stream' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castStream'],
 
-        'OpenSSLAsymmetricKey' => ['Symfony\Component\VarDumper\Caster\OpenSslCaster', 'castOpensslAsymmetricKey'],
-        'OpenSSLCertificateSigningRequest' => ['Symfony\Component\VarDumper\Caster\OpenSslCaster', 'castOpensslCsr'],
-        'OpenSSLCertificate' => ['Symfony\Component\VarDumper\Caster\OpenSslCaster', 'castOpensslX509'],
-        ':OpenSSL X.509' => ['Symfony\Component\VarDumper\Caster\OpenSslCaster', 'castOpensslX509'],
+        'OpenSSLAsymmetricKey' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castOpensslAsymmetricKey'],
+        'OpenSSLCertificateSigningRequest' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castOpensslCsr'],
+        'OpenSSLCertificate' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castOpensslX509'],
 
         ':persistent stream' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castStream'],
         ':stream-context' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castStreamContext'],
 
         'XmlParser' => ['Symfony\Component\VarDumper\Caster\XmlResourceCaster', 'castXml'],
-        ':xml' => ['Symfony\Component\VarDumper\Caster\XmlResourceCaster', 'castXml'],
 
         'Socket' => ['Symfony\Component\VarDumper\Caster\SocketCaster', 'castSocket'],