Skip to content

Commit b1974e7

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.4
* 4.4: CS fixes 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 3b8592e + 3503e3e commit b1974e7

10 files changed

+16
-16
lines changed

‎DataCollector/ConfigDataCollector.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public function collect(Request $request, Response $response, \Throwable $except
6060
'php_intl_locale' => class_exists(\Locale::class, false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a',
6161
'php_timezone' => date_default_timezone_get(),
6262
'xdebug_enabled' => \extension_loaded('xdebug'),
63-
'apcu_enabled' => \extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN),
64-
'zend_opcache_enabled' => \extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN),
63+
'apcu_enabled' => \extension_loaded('apcu') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN),
64+
'zend_opcache_enabled' => \extension_loaded('Zend OPcache') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN),
6565
'bundles' => [],
6666
'sapi_name' => \PHP_SAPI,
6767
];

‎DataCollector/DumpDataCollector.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
5050
public function __construct(Stopwatch $stopwatch = null, $fileLinkFormat = null, string $charset = null, RequestStack $requestStack = null, $dumper = null)
5151
{
5252
$this->stopwatch = $stopwatch;
53-
$this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
54-
$this->charset = $charset ?: ini_get('php.output_encoding') ?: ini_get('default_charset') ?: 'UTF-8';
53+
$this->fileLinkFormat = $fileLinkFormat ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
54+
$this->charset = $charset ?: \ini_get('php.output_encoding') ?: \ini_get('default_charset') ?: 'UTF-8';
5555
$this->requestStack = $requestStack;
5656
$this->dumper = $dumper;
5757

@@ -232,7 +232,7 @@ public function __destruct()
232232

233233
$h = headers_list();
234234
$i = \count($h);
235-
array_unshift($h, 'Content-Type: '.ini_get('default_mimetype'));
235+
array_unshift($h, 'Content-Type: '.\ini_get('default_mimetype'));
236236
while (0 !== stripos($h[$i], 'Content-Type:')) {
237237
--$i;
238238
}

‎DataCollector/MemoryDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function reset()
4141
{
4242
$this->data = [
4343
'memory' => 0,
44-
'memory_limit' => $this->convertToBytes(ini_get('memory_limit')),
44+
'memory_limit' => $this->convertToBytes(\ini_get('memory_limit')),
4545
];
4646
}
4747

‎Debug/FileLinkFormatter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class FileLinkFormatter
4444
*/
4545
public function __construct(string $fileLinkFormat = null, RequestStack $requestStack = null, string $baseDir = null, $urlFormat = null)
4646
{
47-
$fileLinkFormat = (self::FORMATS[$fileLinkFormat] ?? $fileLinkFormat) ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
47+
$fileLinkFormat = (self::FORMATS[$fileLinkFormat] ?? $fileLinkFormat) ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
4848
if ($fileLinkFormat && !\is_array($fileLinkFormat)) {
4949
$i = strpos($f = $fileLinkFormat, '&', max(strrpos($f, '%f'), strrpos($f, '%l'))) ?: \strlen($f);
5050
$fileLinkFormat = [substr($f, 0, $i)] + preg_split('/&([^>]++)>/', substr($f, $i), -1, \PREG_SPLIT_DELIM_CAPTURE);

‎Fragment/AbstractSurrogateFragmentRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private function containsNonScalars(array $values): bool
9191
foreach ($values as $value) {
9292
if (\is_array($value)) {
9393
return $this->containsNonScalars($value);
94-
} elseif (!is_scalar($value) && null !== $value) {
94+
} elseif (!\is_scalar($value) && null !== $value) {
9595
return true;
9696
}
9797
}

‎Fragment/FragmentUriGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private function checkNonScalar(array $values): void
8585
foreach ($values as $key => $value) {
8686
if (\is_array($value)) {
8787
$this->checkNonScalar($value);
88-
} elseif (!is_scalar($value) && null !== $value) {
88+
} elseif (!\is_scalar($value) && null !== $value) {
8989
throw new \LogicException(sprintf('Controller attributes cannot contain non-scalar/non-null values (value for key "%s" is not a scalar or null).', $key));
9090
}
9191
}

‎Log/Logger.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private function format(string $level, string $message, array $context, bool $pr
9696
if (str_contains($message, '{')) {
9797
$replacements = [];
9898
foreach ($context as $key => $val) {
99-
if (null === $val || is_scalar($val) || (\is_object($val) && method_exists($val, '__toString'))) {
99+
if (null === $val || \is_scalar($val) || (\is_object($val) && method_exists($val, '__toString'))) {
100100
$replacements["{{$key}}"] = $val;
101101
} elseif ($val instanceof \DateTimeInterface) {
102102
$replacements["{{$key}}"] = $val->format(\DateTime::RFC3339);

‎Tests/DataCollector/ConfigDataCollectorTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public function testCollect()
3939
$this->assertSame(4 === Kernel::MINOR_VERSION, $c->isSymfonyLts());
4040
$this->assertNull($c->getToken());
4141
$this->assertSame(\extension_loaded('xdebug'), $c->hasXDebug());
42-
$this->assertSame(\extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN), $c->hasZendOpcache());
43-
$this->assertSame(\extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN), $c->hasApcu());
42+
$this->assertSame(\extension_loaded('Zend OPcache') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN), $c->hasZendOpcache());
43+
$this->assertSame(\extension_loaded('apcu') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN), $c->hasApcu());
4444
$this->assertSame(sprintf('%s.%s', Kernel::MAJOR_VERSION, Kernel::MINOR_VERSION), $c->getSymfonyMinorVersion());
4545
$this->assertContains($c->getSymfonyState(), ['eol', 'eom', 'dev', 'stable']);
4646

@@ -67,8 +67,8 @@ public function testCollectWithoutKernel()
6767
$this->assertSame(4 === Kernel::MINOR_VERSION, $c->isSymfonyLts());
6868
$this->assertNull($c->getToken());
6969
$this->assertSame(\extension_loaded('xdebug'), $c->hasXDebug());
70-
$this->assertSame(\extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN), $c->hasZendOpcache());
71-
$this->assertSame(\extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN), $c->hasApcu());
70+
$this->assertSame(\extension_loaded('Zend OPcache') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN), $c->hasZendOpcache());
71+
$this->assertSame(\extension_loaded('apcu') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN), $c->hasApcu());
7272
$this->assertSame(sprintf('%s.%s', Kernel::MAJOR_VERSION, Kernel::MINOR_VERSION), $c->getSymfonyMinorVersion());
7373
$this->assertContains($c->getSymfonyState(), ['eol', 'eom', 'dev', 'stable']);
7474

‎Tests/KernelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ public function testKernelStartTimeIsResetWhileBootingAlreadyBootedKernel()
596596
$kernel->boot();
597597
$preReBoot = $kernel->getStartTime();
598598

599-
sleep(3600); //Intentionally large value to detect if ClockMock ever breaks
599+
sleep(3600); // Intentionally large value to detect if ClockMock ever breaks
600600
$kernel->reboot(null);
601601

602602
$this->assertGreaterThan($preReBoot, $kernel->getStartTime());

‎Tests/Profiler/FileProfilerStorageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public function testDuplicates()
297297
$profile->setUrl('http://example.net/');
298298
$profile->setMethod('GET');
299299

300-
///three duplicates
300+
// three duplicates
301301
$this->storage->write($profile);
302302
$this->storage->write($profile);
303303
$this->storage->write($profile);

0 commit comments

Comments
 (0)