Skip to content

Commit f2ae1e2

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 5c68ed9 + e41d6ce commit f2ae1e2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Command/DebugCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,18 @@ protected function configure()
7070
7171
<info>php %command.full_name%</info>
7272
73-
The command lists all built-in types, services types, type extensions and
73+
The command lists all built-in types, services types, type extensions and
7474
guessers currently available.
7575
7676
<info>php %command.full_name% Symfony\Component\Form\Extension\Core\Type\ChoiceType</info>
7777
<info>php %command.full_name% ChoiceType</info>
7878
79-
The command lists all defined options that contains the given form type,
79+
The command lists all defined options that contains the given form type,
8080
as well as their parents and type extensions.
8181
8282
<info>php %command.full_name% ChoiceType choice_value</info>
8383
84-
Use the <info>--show-deprecated</info> option to display form types with
84+
Use the <info>--show-deprecated</info> option to display form types with
8585
deprecated options or the deprecated options of the given form type:
8686
8787
<info>php %command.full_name% --show-deprecated</info>

Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public function reverseTransform($value)
154154
if (false !== strpos($value, $decSep)) {
155155
$type = \NumberFormatter::TYPE_DOUBLE;
156156
} else {
157-
$type = PHP_INT_SIZE === 8
157+
$type = \PHP_INT_SIZE === 8
158158
? \NumberFormatter::TYPE_INT64
159159
: \NumberFormatter::TYPE_INT32;
160160
}

Tests/Extension/Core/Type/DateTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ public function testDayErrorsBubbleUp($widget)
928928

929929
public function testYearsFor32BitsMachines()
930930
{
931-
if (4 !== PHP_INT_SIZE) {
931+
if (4 !== \PHP_INT_SIZE) {
932932
$this->markTestSkipped('PHP 32 bit is required.');
933933
}
934934

0 commit comments

Comments
 (0)