Skip to content

Commit b8542b3

Browse files
committed
Merge branch '3.4' into 4.4
* 3.4: Fix CS [Validator] Add Polish translation for ISIN constraint
2 parents a3d083f + 3ab83d2 commit b8542b3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DataCollector/ConfigDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function collect(Request $request, Response $response/*, \Throwable $exce
6868
'env' => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a',
6969
'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a',
7070
'php_version' => PHP_VERSION,
71-
'php_architecture' => PHP_INT_SIZE * 8,
71+
'php_architecture' => \PHP_INT_SIZE * 8,
7272
'php_intl_locale' => class_exists('Locale', false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a',
7373
'php_timezone' => date_default_timezone_get(),
7474
'xdebug_enabled' => \extension_loaded('xdebug'),

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)