Skip to content

Commit eb2a953

Browse files
Merge branch '6.4' into 7.2
* 6.4: [Console] Table counts wrong column width when using colspan and `setColumnMaxWidth()` [Console] Table counts wrong number of padding symbols in `renderCell()` method when cell contain unicode variant selector [Cache] Fix using a `ChainAdapter` as an adapter for a pool [Serializer] Fix collect_denormalization_errors flag in defaultContext [VarDumper] Avoid deprecated call in PgSqlCaster Fix command option mode (InputOption::VALUE_REQUIRED) [Uid] Improve entropy of the increment for UUIDv7
2 parents af9b469 + d55b183 commit eb2a953

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Caster/PgSqlCaster.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\VarDumper\Cloner\Stub;
1515

1616
/**
17-
* Casts pqsql resources to array representation.
17+
* Casts pgsql resources to array representation.
1818
*
1919
* @author Nicolas Grekas <[email protected]>
2020
*
@@ -133,9 +133,9 @@ public static function castResult($result, array $a, Stub $stub, bool $isNested)
133133
'name' => pg_field_name($result, $i),
134134
'table' => \sprintf('%s (OID: %s)', pg_field_table($result, $i), pg_field_table($result, $i, true)),
135135
'type' => \sprintf('%s (OID: %s)', pg_field_type($result, $i), pg_field_type_oid($result, $i)),
136-
'nullable' => (bool) pg_field_is_null($result, $i),
136+
'nullable' => (bool) (\PHP_VERSION_ID >= 80300 ? pg_field_is_null($result, null, $i) : pg_field_is_null($result, $i)),
137137
'storage' => pg_field_size($result, $i).' bytes',
138-
'display' => pg_field_prtlen($result, $i).' chars',
138+
'display' => (\PHP_VERSION_ID >= 80300 ? pg_field_prtlen($result, null, $i) : pg_field_prtlen($result, $i)).' chars',
139139
];
140140
if (' (OID: )' === $field['table']) {
141141
$field['table'] = null;

0 commit comments

Comments
 (0)