8000 fix merge · symfony/symfony@5b23a2b · GitHub
[go: up one dir, main page]
Skip to content

Commit 5b23a2b

Browse files
nicolas-grekasnicolas-grekas
committed
fix merge
1 parent 87f3c36 commit 5b23a2b

File tree

3 files changed

+87
-9
lines changed

3 files changed

+87
-9
lines changed

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-factory.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22

3-
return new class() {
3+
return new class
4+
{
45
public $proxyClass;
56
private $privates = [];
67

‎src/Symfony/Component/Finder/Tests/FinderTest.php

Lines changed: 81 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,10 +427,51 @@ public function testIgnoreVCSCanBeDisabledAfterFirstIteration()
427427
$finder->in(self::$tmpDir);
428428
$finder->ignoreDotFiles(false);
429429

430-
$this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', '.bar', '.foo', '.foo/.bar', '.foo/bar', 'foo bar']), $finder->getIterator());
430+
$this->assertIterator($this->toAbsolute([
431+
'foo',
432+
'foo/bar.tmp',
433+
'qux',
434+
'qux/baz_100_1.py',
435+
'qux/baz_1_2.py',
436+
'qux_0_1.php',
437+
'qux_1000_1.php',
438+
'qux_1002_0.php',
439+
'qux_10_2.php',
440+
'qux_12_0.php',
441+
'qux_2_0.php',
442+
'test.php',
443+
'test.py',
444+
'toto',
445+
'.bar',
446+
'.foo',
447+
'.foo/.bar',
448+
'.foo/bar',
449+
'foo bar',
450+
]), $finder->getIterator());
431451

432452
$finder->ignoreVCS(false);
433-
$this->assertIterator($this->toAbsolute(['.git', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', 'toto/.git', '.bar', '.foo', '.foo/.bar', '.foo/bar', 'foo bar']), $finder->getIterator());
453+
$this->assertIterator($this->toAbsolute(['.git',
454+
'foo',
455+
'foo/bar.tmp',
456+
'qux',
457+
'qux/baz_100_1.py',
458+
'qux/baz_1_2.py',
459+
'qux_0_1.php',
460+
'qux_1000_1.php',
461+
'qux_1002_0.php',
462+
'qux_10_2.php',
463+
'qux_12_0.php',
464+
'qux_2_0.php',
465+
'test.php',
466+
'test.py',
467+
'toto',
468+
'toto/.git',
469+
'.bar',
470+
'.foo',
471+
'.foo/.bar',
472+
'.foo/bar',
473+
'foo bar',
474+
]), $finder->getIterator());
434475
}
435476

436477
public function testIgnoreDotFiles()
@@ -513,10 +554,46 @@ public function testIgnoreDotFilesCanBeDisabledAfterFirstIteration()
513554
$finder = $this->buildFinder();
514555
$finder->in(self::$tmpDir);
515556

516-
$this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', 'foo bar']), $finder->getIterator());
557+
$this->assertIterator($this->toAbsolute([
558+
'foo',
559+
'foo/bar.tmp',
560+
'qux',
561+
'qux/baz_100_1.py',
562+
'qux/baz_1_2.py',
563+
'qux_0_1.php',
564+
'qux_1000_1.php',
565+
'qux_1002_0.php',
566+
'qux_10_2.php',
567+
'qux_12_0.php',
568+
'qux_2_0.php',
569+
'test.php',
570+
'test.py',
571+
'toto',
572+
'foo bar',
573+
]), $finder->getIterator());
517574

518575
$finder->ignoreDotFiles(false);
519-
$this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', '.bar', '.foo', '.foo/.bar', '.foo/bar', 'foo bar']), $finder->getIterator());
576+
$this->assertIterator($this->toAbsolute([
577+
'foo',
578+
'foo/bar.tmp',
579+
'qux',
580+
'qux/baz_100_1.py',
581+
'qux/baz_1_2.py',
582+
'qux_0_1.php',
583+
'qux_1000_1.php',
584+
'qux_1002_0.php',
585+
'qux_10_2.php',
586+
'qux_12_0.php',
587+
'qux_2_0.php',
588+
'test.php',
589+
'test.py',
590+
'toto',
591+
'.bar',
592+
'.foo',
593+
'.foo/.bar',
594+
'.foo/bar',
595+
'foo bar',
596+
]), $finder->getIterator());
520597
}
521598

522599
public function testSortByName()

‎src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ public function testReverseTransformWithGrouping()
126126

127127
$transformer = new IntegerToLocalizedStringTransformer(true);
128128

129-
$this->assertEquals(1234, $transformer->reverseTransform('1.234,5'));
130-
$this->assertEquals(12345, $transformer->reverseTransform('12.345,912'));
131-
$this->assertEquals(1234, $transformer->reverseTransform('1234,5'));
132-
$this->assertEquals(12345, $transformer->reverseTransform('12345,912'));
129+
$this->assertEquals(1234, $transformer->reverseTransform('1.234'));
130+
$this->assertEquals(12345, $transformer->reverseTransform('12.345'));
131+
$this->assertEquals(1234, $transformer->reverseTransform('1234'));
132+
$this->assertEquals(12345, $transformer->reverseTransform('12345'));
133133
}
134134

135135
/**

0 commit comments

Comments
 (0)
0