Skip to content

Commit 98018c8

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 a596727 + ba944c3 commit 98018c8

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Command/AboutCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
8787
['Architecture', (\PHP_INT_SIZE * 8).' bits'],
8888
['Intl locale', class_exists(\Locale::class, false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a'],
8989
['Timezone', date_default_timezone_get().' (<comment>'.(new \DateTime())->format(\DateTime::W3C).'</>)'],
90-
['OPcache', \extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'],
91-
['APCu', \extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'],
90+
['OPcache', \extension_loaded('Zend OPcache') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'],
91+
['APCu', \extension_loaded('apcu') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'],
9292
['Xdebug', \extension_loaded('xdebug') ? 'true' : 'false'],
9393
];
9494

Command/XliffLintCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ protected function configure()
5757
<info>php %command.full_name% @AcmeDemoBundle</info>
5858

5959
EOF
60-
);
60+
);
6161
}
6262
}

Routing/Router.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,14 +175,14 @@ private function resolve(mixed $value): mixed
175175

176176
$resolved = ($this->paramFetcher)($match[1]);
177177

178-
if (is_scalar($resolved)) {
178+
if (\is_scalar($resolved)) {
179179
$this->collectedParameters[$match[1]] = $resolved;
180180

181181
if (\is_string($resolved)) {
182182
$resolved = $this->resolve($resolved);
183183
}
184184

185-
if (is_scalar($resolved)) {
185+
if (\is_scalar($resolved)) {
186186
return false === $resolved ? '0' : (string) $resolved;
187187
}
188188
}

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,7 @@ public function testAnnotations()
11091109

11101110
public function testFileLinkFormat()
11111111
{
1112-
if (ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
1112+
if (\ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
11131113
$this->markTestSkipped('A custom file_link_format is defined.');
11141114
}
11151115

0 commit comments

Comments
 (0)