Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c98cfb6

Browse files
nicolas-grekasnicolas-grekas
committed
feature #59035 [VarDumper] Add casters for object-converted resources (alexandre-daubois)
This PR was squashed before being merged into the 7.3 branch. Discussion ---------- [VarDumper] Add casters for object-converted resources | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | no | New feature? | yes | Deprecations? | yes | Issues | - | License | MIT This PR makes up for the backlog of resources transformed into objects in the latest versions of PHP. ✅ Support added (or already existing with an update in `AbstractCloner`): - ext-curl - `CurlMultiHandle`: **no information to gather** - ext-openssl - `OpenSSLCertificateSigningRequest` - `OpenSSLAsymmetricKey` - ext-finfo - **No information to gather** - ext-sqlite3 - `Sqlite3Result` - ext-sockets - `Sockets` (to rebase on #59026) - ext-pgsql - `PgSql\Lob` - `PgSql\Connection` - `PgSql\Result` ⚠️ Remaining classes I couldn't test/find enough info yet (introduced in PHP 8.4): - `Odbc\Connection` - `Odbc\Result` - `Soap\Url` - `Soap\Sdl` Commits ------- 7be6483 [VarDumper] Add casters for object-converted resources
2 parents 8f04a56 + 7be6483 commit c98cfb6

38 files changed

+696
-41
lines changed

‎UPGRADE-7.3.md

+6
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,9 @@ Serializer
1919
----------
2020

2121
* Deprecate the `CompiledClassMetadataFactory` and `CompiledClassMetadataCacheWarmer` classes
22+
23+
VarDumper
24+
---------
25+
26+
* Deprecate `ResourceCaster::castCurl()`, `ResourceCaster::castGd()` and `ResourceCaster::castOpensslX509()`
27+
* Mark all casters as `@internal`

‎src/Symfony/Component/VarDumper/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
CHANGELOG
22
=========
33

4+
7.3
5+
---
6+
7+
* Add casters for `Dba\Connection`, `SQLite3Result`, `OpenSSLAsymmetricKey` and `OpenSSLCertificateSigningRequest`
8+
* Deprecate `ResourceCaster::castCurl()`, `ResourceCaster::castGd()` and `ResourceCaster::castOpensslX509()`
9+
* Mark all casters as `@internal`
10+
411
7.2
512
---
613

‎src/Symfony/Component/VarDumper/Caster/AddressInfoCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
/**
1717
* @author Nicolas Grekas <[email protected]>
18+
*
19+
* @internal since Symfony 7.3
1820
*/
1921
final class AddressInfoCaster
2022
{

‎src/Symfony/Component/VarDumper/Caster/AmqpCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
* @author Grégoire Pineau <[email protected]>
2020
*
2121
* @final
22+
*
23+
* @internal since Symfony 7.3
2224
*/
2325
class AmqpCaster
2426
{

‎src/Symfony/Component/VarDumper/Caster/Caster.php

+5
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ class Caster
4646
* Casts objects to arrays and adds the dynamic property prefix.
4747
*
4848
* @param bool $hasDebugInfo Whether the __debugInfo method exists on $obj or not
49+
*
50+
* @internal since Symfony 7.3
4951
*/
5052
public static function castObject(object $obj, string $class, bool $hasDebugInfo = false, ?string $debugClass = null): array
5153
{
@@ -162,6 +164,9 @@ public static function filter(array $a, int $filter, array $listedProperties = [
162164
return $a;
163165
}
164166

167+
/**
168+
* @internal since Symfony 7.3
169+
*/
165170
public static function castPhpIncompleteClass(\__PHP_Incomplete_Class $c, array $a, Stub $stub, bool $isNested): array
166171
{
167172
if (isset($a['__PHP_Incomplete_Class_Name'])) {

‎src/Symfony/Component/VarDumper/Caster/CurlCaster.php

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\VarDumper\Caster;
13+
14+
use Symfony\Component\VarDumper\Cloner\Stub;
15+
16+
/**
17+
* @author Nicolas Grekas <[email protected]>
18+
*
19+
* @internal
20+
*/
21+
final class CurlCaster
22+
{
23+
public static function castCurl(\CurlHandle $h, array $a, Stub $stub, bool $isNested): array
24+
{
25+
foreach (curl_getinfo($h) as $key => $val) {
26+
$a[Caster::PREFIX_VIRTUAL.$key] = $val;
27+
}
28+
29+
return $a;
30+
}
31+
}

‎src/Symfony/Component/VarDumper/Caster/DOMCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
* @author Nicolas Grekas <[email protected]>
2020
*
2121
* @final
22+
*
23+
* @internal since Symfony 7.3
2224
*/
2325
class DOMCaster
2426
{

‎src/Symfony/Component/VarDumper/Caster/DateCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
* @author Dany Maillard <[email protected]>
2020
*
2121
* @final
22+
*
23+
* @internal since Symfony 7.3
2224
*/
2325
class DateCaster
2426
{

‎src/Symfony/Component/VarDumper/Caster/DoctrineCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
* @author Nicolas Grekas <[email protected]>
2323
*
2424
* @final
25+
*
26+
* @internal since Symfony 7.3
2527
*/
2628
class DoctrineCaster
2729
{

‎src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
* @author Nicolas Grekas <[email protected]>
2323
*
2424
* @final
25+
*
26+
* @internal since Symfony 7.3
2527
*/
2628
class ExceptionCaster
2729
{

‎src/Symfony/Component/VarDumper/Caster/GdCaster.php

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\VarDumper\Caster;
13+
14+
use Symfony\Component\VarDumper\Cloner\Stub;
15+
16+
/**
17+
* @author Nicolas Grekas <[email protected]>
18+
*
19+
* @internal
20+
*/
21+
final class GdCaster
22+
{
23+
public static function castGd(\GdImage $gd, array $a, Stub $stub, bool $isNested): array
24+
{
25+
$a[Caster::PREFIX_VIRTUAL.'size'] = imagesx($gd).'x'.imagesy($gd);
26+
$a[Caster::PREFIX_VIRTUAL.'trueColor'] = imageistruecolor($gd);
27+
28+
return $a;
29+
}
30+
}

‎src/Symfony/Component/VarDumper/Caster/GmpCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
* @author Nicolas Grekas <[email protected]>
2121
*
2222
* @final
23+
*
24+
* @internal since Symfony 7.3
2325
*/
2426
class GmpCaster
2527
{

‎src/Symfony/Component/VarDumper/Caster/ImagineCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
/**
1818
* @author Grégoire Pineau <[email protected]>
19+
*
20+
* @internal since Symfony 7.3
1921
*/
2022
final class ImagineCaster
2123
{

‎src/Symfony/Component/VarDumper/Caster/IntlCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
* @author Jan Schädlich <[email protected]>
1919
*
2020
* @final
21+
*
22+
* @internal since Symfony 7.3
2123
*/
2224
class IntlCaster
2325
{

‎src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* @author Jan Schädlich <[email protected]>
1818
*
1919
* @final
20+
*
21+
* @internal since Symfony 7.3
2022
*/
2123
class MemcachedCaster
2224
{

‎src/Symfony/Component/VarDumper/Caster/OpenSSLCaster.php

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\VarDumper\Caster;
13+
14+
use Symfony\Component\VarDumper\Cloner\Stub;
15+
16+
/**
17+
* @author Nicolas Grekas <[email protected]>
18+
* @author Alexandre Daubois <[email protected]>
19+
*
20+
* @internal
21+
*/
22+
final class OpenSSLCaster
23+
{
24+
public static function castOpensslX509(\OpenSSLCertificate $h, array $a, Stub $stub, bool $isNested): array
25+
{
26+
$stub->cut = -1;
27+
$info = openssl_x509_parse($h, false);
28+
29+
$pin = openssl_pkey_get_public($h);
30+
$pin = openssl_pkey_get_details($pin)['key'];
31+
$pin = \array_slice(explode("\n", $pin), 1, -2);
32+
$pin = base64_decode(implode('', $pin));
33+
$pin = base64_encode(hash('sha256', $pin, true));
34+
35+
$a += [
36+
Caster::PREFIX_VIRTUAL.'subject' => new EnumStub(array_intersect_key($info['subject'], ['organizationName' => true, 'commonName' => true])),
37+
Caster::PREFIX_VIRTUAL.'issuer' => new EnumStub(array_intersect_key($info['issuer'], ['organizationName' => true, 'commonName' => true])),
38+
Caster::PREFIX_VIRTUAL.'expiry' => new ConstStub(date(\DateTimeInterface::ISO8601, $info['validTo_time_t']), $info['validTo_time_t']),
39+
Caster::PREFIX_VIRTUAL.'fingerprint' => new EnumStub([
40+
'md5' => new ConstStub(wordwrap(strtoupper(openssl_x509_fingerprint($h, 'md5')), 2, ':', true)),
41+
'sha1' => new ConstStub(wordwrap(strtoupper(openssl_x509_fingerprint($h, 'sha1')), 2, ':', true)),
42+
'sha256' => new ConstStub(wordwrap(strtoupper(openssl_x509_fingerprint($h, 'sha256')), 2, ':', true)),
43+
'pin-sha256' => new ConstStub($pin),
44+
]),
45+
];
46+
47+
return $a;
48+
}
49+
50+
public static function castOpensslAsymmetricKey(\OpenSSLAsymmetricKey $key, array $a, Stub $stub, bool $isNested): array
51+
{
52+
foreach (openssl_pkey_get_details($key) as $k => $v) {
53+
$a[Caster::PREFIX_VIRTUAL.$k] = $v;
54+
}
55+
56+
unset($a[Caster::PREFIX_VIRTUAL.'rsa']); // binary data
57+
58+
return $a;
59+
}
60+
61+
public static function castOpensslCsr(\OpenSSLCertificateSigningRequest $csr, array $a, Stub $stub, bool $isNested): array
62+
{
63+
foreach (openssl_csr_get_subject($csr, false) as $k => $v) {
64+
$a[Caster::PREFIX_VIRTUAL.$k] = $v;
65+
}
66+
67+
return $a;
68+
}
69+
}

‎src/Symfony/Component/VarDumper/Caster/PdoCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
* @author Nicolas Grekas <[email protected]>
2020
*
2121
* @final
22+
*
23+
* @internal since Symfony 7.3
2224
*/
2325
class PdoCaster
2426
{

‎src/Symfony/Component/VarDumper/Caster/PgSqlCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
* @author Nicolas Grekas <[email protected]>
2020
*
2121
* @final
22+
*
23+
* @internal since Symfony 7.3
2224
*/
2325
class PgSqlCaster
2426
{

‎src/Symfony/Component/VarDumper/Caster/ProxyManagerCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
* @author Nicolas Grekas <[email protected]>
1919
*
2020
* @final
21+
*
22+
* @internal since Symfony 7.3
2123
*/
2224
class ProxyManagerCaster
2325
{

‎src/Symfony/Component/VarDumper/Caster/RdKafkaCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
* Casts RdKafka related classes to array representation.
2929
*
3030
* @author Romain Neutron <[email protected]>
31+
*
32+
* @internal since Symfony 7.3
3133
*/
3234
class RdKafkaCaster
3335
{

‎src/Symfony/Component/VarDumper/Caster/RedisCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
* @author Nicolas Grekas <[email protected]>
2121
*
2222
* @final
23+
*
24+
* @internal since Symfony 7.3
2325
*/
2426
class RedisCaster
2527
{

‎src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
* @author Nicolas Grekas <[email protected]>
2020
*
2121
* @final
22+
*
23+
* @internal since Symfony 7.3
2224
*/
2325
class ReflectionCaster
2426
{

0 commit comments

Comments
 (0)