8000 cs fix · symfony/symfony@644edb0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 644edb0

Browse files
nicolas-grekasnicolas-grekas
committed
cs fix
1 parent f23d139 commit 644edb0

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

‎phpunit

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ if (!file_exists(__DIR__.'/vendor/symfony/phpunit-bridge/bin/simple-phpunit')) {
99
}
1010
if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
1111
if (\PHP_VERSION_ID >= 70200) {
12+
if (false === getenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT') && false !== strpos(@file_get_contents(__DIR__.'/src/Symfony/Component/HttpKernel/Kernel.php'), 'const MAJOR_VERSION = 3;')) {
13+
putenv('SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1');
14+
}
1215
putenv('SYMFONY_PHPUNIT_VERSION=8.3');
1316
} elseif (\PHP_VERSION_ID >= 70000) {
1417
putenv('SYMFONY_PHPUNIT_VERSION=6.5');

‎src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@ protected function assertOrderedIterator($expected, \Traversable $iterator)
4444
* $a and $b such that $a goes before $b in $expected, the method
4545
* asserts that any element of $a goes before any element of $b
4646
* in the sequence generated by $iterator
47-
* @param \Traversable $iterator
4847
*/
49-
protected function assertOrderedIteratorForGroups($expected, \Traversable $iterator)
48+
protected function assertOrderedIteratorForGroups(array $expected, \Traversable $iterator)
5049
{
5150
$values = array_values(array_map(function (\SplFileInfo $fileinfo) { return $fileinfo->getPathname(); }, iterator_to_array($iterator)));
5251

@@ -63,11 +62,8 @@ protected function assertOrderedIteratorForGroups($expected, \Traversable $itera
6362

6463
/**
6564
* Same as IteratorTestCase::assertIterator with foreach usage.
66-
*
67-
* @param array $expected
68-
* @param \Traversable $iterator
6965
*/
70-
protected function assertIteratorInForeach($expected, \Traversable $iterator)
66+
protected function assertIteratorInForeach(array $expected, \Traversable $iterator)
7167
{
7268
$values = [];
7369
foreach ($iterator as $file) {
@@ -83,11 +79,8 @@ protected function assertIteratorInForeach($expected, \Traversable $iterator)
8379

8480
/**
8581
* Same as IteratorTestCase::assertOrderedIterator with foreach usage.
86-
*
87-
* @param array $expected
88-
* @param \Traversable $iterator
8982
*/
90-
protected function assertOrderedIteratorInForeach($expected, \Traversable $iterator)
83+
protected function assertOrderedIteratorInForeach(array $expected, \Traversable $iterator)
9184
{
9285
$values = [];
9386
foreach ($iterator as $file) {

0 commit comments

Comments
 (0)
0