Skip to content

Commit 3730500

Browse files
Merge branch '5.4' into 6.0
* 5.4: CS fixes Bump Symfony version to 5.4.11 Update VERSION for 5.4.10 Update CHANGELOG for 5.4.10 Bump Symfony version to 4.4.44 Update VERSION for 4.4.43 Update CONTRIBUTORS for 4.4.43 Update CHANGELOG for 4.4.43
2 parents ac81072 + a09f9fc commit 3730500

File tree

11 files changed

+13
-13
lines changed

11 files changed

+13
-13
lines changed

Caster/ArgsStub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function __construct(array $args, string $function, ?string $class)
2828

2929
$values = [];
3030
foreach ($args as $k => $v) {
31-
$values[$k] = !is_scalar($v) && !$v instanceof Stub ? new CutStub($v) : $v;
31+
$values[$k] = !\is_scalar($v) && !$v instanceof Stub ? new CutStub($v) : $v;
3232
}
3333
if (null === $params) {
3434
parent::__construct($values, false);

Caster/IntlCaster.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static function castNumberFormatter(\NumberFormatter $c, array $a, Stub $
102102
'SIGNIFICANT_DIGIT_SYMBOL' => $c->getSymbol(\NumberFormatter::SIGNIFICANT_DIGIT_SYMBOL),
103103
'MONETARY_GROUPING_SEPARATOR_SYMBOL' => $c->getSymbol(\NumberFormatter::MONETARY_GROUPING_SEPARATOR_SYMBOL),
104104
]
105-
),
105+
),
106106
];
107107

108108
return self::castError($c, $a);

Dumper/AbstractDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
4545
public function __construct($output = null, string $charset = null, int $flags = 0)
4646
{
4747
$this->flags = $flags;
48-
$this->setCharset($charset ?: ini_get('php.output_encoding') ?: ini_get('default_charset') ?: 'UTF-8');
48+
$this->setCharset($charset ?: \ini_get('php.output_encoding') ?: \ini_get('default_charset') ?: 'UTF-8');
4949
$this->setOutput($output ?: static::$defaultOutput);
5050
if (!$output && \is_string(static::$defaultOutput)) {
5151
static::$defaultOutput = $this->outputStream;

Dumper/CliDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function __construct($output = null, string $charset = null, int $flags =
8383
]);
8484
}
8585

86-
$this->displayOptions['fileLinkFormat'] = ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: 'file://%f#L%l';
86+
$this->displayOptions['fileLinkFormat'] = \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: 'file://%f#L%l';
8787
}
8888

8989
/**

Dumper/HtmlDumper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function __construct($output = null, string $charset = null, int $flags =
8181
{
8282
AbstractDumper::__construct($output, $charset, $flags);
8383
$this->dumpId = 'sf-dump-'.mt_rand();
84-
$this->displayOptions['fileLinkFormat'] = ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
84+
$this->displayOptions['fileLinkFormat'] = \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
8585
$this->styles = static::$themes['dark'] ?? self::$themes['dark'];
8686
}
8787

@@ -864,7 +864,7 @@ protected function style(string $style, string $value, array $attr = []): string
864864
}
865865

866866
if ('const' === $style && isset($attr['value'])) {
867-
$style .= sprintf(' title="%s"', esc(is_scalar($attr['value']) ? $attr['value'] : json_encode($attr['value'])));
867+
$style .= sprintf(' title="%s"', esc(\is_scalar($attr['value']) ? $attr['value'] : json_encode($attr['value'])));
868868
} elseif ('public' === $style) {
869869
$style .= sprintf(' title="%s"', empty($attr['dynamic']) ? 'Public property' : 'Runtime added dynamic property');
870870
} elseif ('str' === $style && 1 < $attr['length']) {

Tests/Caster/ExceptionCasterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public function testShouldReturnTraceForConcreteTwigWithError()
151151

152152
public function testHtmlDump()
153153
{
154-
if (ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
154+
if (\ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
155155
$this->markTestSkipped('A custom file_link_format is defined.');
156156
}
157157

Tests/Caster/ReflectionCasterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public function testReflectionParameter()
147147
typeHint: "Symfony\Component\VarDumper\Tests\Fixtures\NotLoadableClass"
148148
}
149149
EOTXT
150-
, $var
150+
, $var
151151
);
152152
}
153153

Tests/Caster/XmlReaderCasterTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class XmlReaderCasterTest extends TestCase
2626

2727
protected function setUp(): void
2828
{
29-
$this->reader = new \XmlReader();
29+
$this->reader = new \XMLReader();
3030
$this->reader->open(__DIR__.'/../Fixtures/xml_reader.xml');
3131
}
3232

@@ -248,7 +248,7 @@ public function provideNodes()
248248

249249
public function testWithUninitializedXMLReader()
250250
{
251-
$this->reader = new \XmlReader();
251+
$this->reader = new \XMLReader();
252252

253253
$expectedDump = <<<'EODUMP'
254254
XMLReader {

Tests/Cloner/VarClonerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ public function testLimits()
330330

331331
public function testJsonCast()
332332
{
333-
if (2 == ini_get('xdebug.overload_var_dump')) {
333+
if (2 == \ini_get('xdebug.overload_var_dump')) {
334334
$this->markTestSkipped('xdebug is active');
335335
}
336336

Tests/Dumper/HtmlDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class HtmlDumperTest extends TestCase
2323
{
2424
public function testGet()
2525
{
26-
if (ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
26+
if (\ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
2727
$this->markTestSkipped('A custom file_link_format is defined.');
2828
}
2929

0 commit comments

Comments
 (0)