Skip to content

Commit ba944c3

Browse files
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 c485ef4 + b0f37e0 commit ba944c3

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
@@ -89,8 +89,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
8989
['Architecture', (\PHP_INT_SIZE * 8).' bits'],
9090
['Intl locale', class_exists(\Locale::class, false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a'],
9191
['Timezone', date_default_timezone_get().' (<comment>'.(new \DateTime())->format(\DateTime::W3C).'</>)'],
92-
['OPcache', \extension_loaded('Zend OPcache') && filter_var(ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'],
93-
['APCu', \extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'],
92+
['OPcache', \extension_loaded('Zend OPcache') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'],
93+
['APCu', \extension_loaded('apcu') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) ? 'true' : 'false'],
9494
['Xdebug', \extension_loaded('xdebug') ? 'true' : 'false'],
9595
];
9696

Command/XliffLintCommand.php

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

6060
EOF
61-
);
61+
);
6262
}
6363
}

Routing/Router.php

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

181181
$resolved = ($this->paramFetcher)($match[1]);
182182

183-
if (is_scalar($resolved)) {
183+
if (\is_scalar($resolved)) {
184184
$this->collectedParameters[$match[1]] = $resolved;
185185

186186
if (\is_string($resolved)) {
187187
$resolved = $this->resolve($resolved);
188188
}
189189

190-
if (is_scalar($resolved)) {
190+
if (\is_scalar($resolved)) {
191191
return false === $resolved ? '0' : (string) $resolved;
192192
}
193193
}

Tests/DependencyInjection/FrameworkExtensionTest.php

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

11831183
public function testFileLinkFormat()
11841184
{
1185-
if (ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
1185+
if (\ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
11861186
$this->markTestSkipped('A custom file_link_format is defined.');
11871187
}
11881188

0 commit comments

Comments
 (0)