Skip to content

Commit 24ceb7f

Browse files
Merge branch '6.2' into 6.3
* 6.2: CS fix Fix test provider
2 parents 9c04306 + 49f4edc commit 24ceb7f

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Command/TranslationUpdateCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
145145
$format = $input->getOption('format');
146146
$xliffVersion = '1.2';
147147

148-
if (array_key_exists($format, self::FORMATS)) {
148+
if (\array_key_exists($format, self::FORMATS)) {
149149
[$format, $xliffVersion] = self::FORMATS[$format];
150150
}
151151

DependencyInjection/FrameworkExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,9 +265,9 @@ class FrameworkExtension extends Extension
265265
/**
266266
* Responds to the app.config configuration parameter.
267267
*
268-
* @throws LogicException
269-
*
270268
* @return void
269+
*
270+
* @throws LogicException
271271
*/
272272
public function load(array $configs, ContainerBuilder $container)
273273
{

Tests/Functional/CachePoolsTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public function testCachePools()
2626

2727
/**
2828
* @requires extension redis
29+
*
2930
* @group integration
3031
*/
3132
public function testRedisCachePools()
@@ -49,6 +50,7 @@ public function testRedisCachePools()
4950

5051
/**
5152
* @requires extension redis
53+
*
5254
* @group integration
5355
*/
5456
public function testRedisCustomCachePools()

0 commit comments

Comments
 (0)