[VarDumper] Fix SocketCaster

alexandre-daubois · alexandre-daubois · commit 1ff8865bbd10 · 2024-11-29T11:29:16.000+01:00
diff --git a/src/Symfony/Component/VarDumper/CHANGELOG.md b/src/Symfony/Component/VarDumper/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.3
+---
+
+ * Add `CurlCaster`, `OpenSslCaster`, `SqliteCaster`, `SocketCaster` and `DbaCaster`
+
 7.2
 ---
 
diff --git a/src/Symfony/Component/VarDumper/Caster/DbaCaster.php b/src/Symfony/Component/VarDumper/Caster/DbaCaster.php
@@ -20,6 +20,8 @@ class DbaCaster
 {
     public static function castDbaConnection(\Dba\Connection $dba, array $a, Stub $stub, bool $isNested): array
     {
+        // not yet possible to gather information about the connection object
+
         return $a;
     }
 
diff --git a/src/Symfony/Component/VarDumper/Caster/SocketCaster.php b/src/Symfony/Component/VarDumper/Caster/SocketCaster.php
@@ -21,23 +21,26 @@ class SocketCaster
     public static function castSocket(\Socket $h, array $a, Stub $stub, bool $isNested): array
     {
         socket_getsockname($h, $addr, $port);
-        $info = socket_get_status(socket_export_stream($h));
+        $info = stream_get_meta_data(socket_export_stream($h));
 
         $a += [
             Caster::PREFIX_VIRTUAL.'address' => $addr,
             Caster::PREFIX_VIRTUAL.'port' => $port,
-            Caster::PREFIX_VIRTUAL.'info' => new EnumStub([
-                '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']),
-            ]),
+            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'] ?? ''),
+                ]
+            )),
         ];
 
         return $a;
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/OpenSslCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/OpenSslCasterTest.php
@@ -25,7 +25,7 @@ public function testAsymmetricKey()
     {
         $key = openssl_pkey_new([
             'private_key_bits' => 1024,
-            'private_key_type' => OPENSSL_KEYTYPE_RSA,
+            'private_key_type' => \OPENSSL_KEYTYPE_RSA,
         ]);
 
         $this->assertDumpMatchesFormat(
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/SocketCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/SocketCasterTest.php
@@ -23,7 +23,7 @@ class SocketCasterTest extends TestCase
 
     public function testCastSocket()
     {
-        $socket = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
+        $socket = socket_create(\AF_INET, \SOCK_DGRAM, \SOL_UDP);
         @socket_connect($socket, '127.0.0.1', 80);
 
         $this->assertDumpMatchesFormat(
@@ -35,14 +35,11 @@ public function testCastSocket()
     timed_out: false
     blocked: true
     eof: false
+    stream_type: "udp_socket"
+    mode: "r+"
     unread_bytes: 0
-    stream_type: udp_socket
-    wrapper_type: ?
-    wrapper_data: ?
-    mode: r+
     seekable: false
-    uri: udp://
-  }
+%A}
 }
 EODUMP, $socket);
     }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ class DbaCaster`
`20`	`20`	`{`
`21`	`21`	`public static function castDbaConnection(\Dba\Connection $dba, array $a, Stub $stub, bool $isNested): array`
`22`	`22`	`{`
	`23`	`+ // not yet possible to gather information about the connection object`
	`24`	`+`
`23`	`25`	`return $a;`
`24`	`26`	`}`
`25`	`27`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function testAsymmetricKey()`
`25`	`25`	`{`
`26`	`26`	`$key = openssl_pkey_new([`
`27`	`27`	`'private_key_bits' => 1024,`
`28`		`- 'private_key_type' => OPENSSL_KEYTYPE_RSA,`
	`28`	`+ 'private_key_type' => \OPENSSL_KEYTYPE_RSA,`
`29`	`29`	`]);`
`30`	`30`
`31`	`31`	`$this->assertDumpMatchesFormat(`