Skip to content

Commit ba620ba

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: Fix CS Fix CS [Validator] Add Polish translation for ISIN constraint
2 parents 72f4dea + ce729cd commit ba620ba

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

DataCollector/ConfigDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function collect(Request $request, Response $response, \Throwable $except
4949
'env' => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a',
5050
'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a',
5151
'php_version' => PHP_VERSION,
52-
'php_architecture' => PHP_INT_SIZE * 8,
52+
'php_architecture' => \PHP_INT_SIZE * 8,
5353
'php_intl_locale' => class_exists('Locale', false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a',
5454
'php_timezone' => date_default_timezone_get(),
5555
'xdebug_enabled' => \extension_loaded('xdebug'),

Tests/Controller/ContainerControllerResolverTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Psr\Log\LoggerInterface;
1616
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
1717
use Symfony\Component\DependencyInjection\Container;
18-
use Symfony\Component\DependencyInjection\ContainerBuilder;
1918
use Symfony\Component\HttpFoundation\Request;
2019
use Symfony\Component\HttpKernel\Controller\ContainerControllerResolver;
2120

Tests/DataCollector/ConfigDataCollectorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testCollect()
3232
$this->assertSame('config', $c->getName());
3333
$this->assertMatchesRegularExpression('~^'.preg_quote($c->getPhpVersion(), '~').'~', PHP_VERSION);
3434
$this->assertMatchesRegularExpression('~'.preg_quote((string) $c->getPhpVersionExtra(), '~').'$~', PHP_VERSION);
35-
$this->assertSame(PHP_INT_SIZE * 8, $c->getPhpArchitecture());
35+
$this->assertSame(\PHP_INT_SIZE * 8, $c->getPhpArchitecture());
3636
$this->assertSame(class_exists('Locale', false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a', $c->getPhpIntlLocale());
3737
$this->assertSame(date_default_timezone_get(), $c->getPhpTimezone());
3838
$this->assertSame(Kernel::VERSION, $c->getSymfonyVersion());

0 commit comments

Comments
 (0)