Merge branch '4.2'
* 4.2: fix merge
This commit is contained in:
commit
3969948cbc
@ -1,6 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
return new class() {
|
return new class
|
||||||
|
{
|
||||||
public $proxyClass;
|
public $proxyClass;
|
||||||
private $privates = [];
|
private $privates = [];
|
||||||
|
|
||||||
|
@ -427,10 +427,51 @@ class FinderTest extends Iterator\RealIteratorTestCase
|
|||||||
$finder->in(self::$tmpDir);
|
$finder->in(self::$tmpDir);
|
||||||
$finder->ignoreDotFiles(false);
|
$finder->ignoreDotFiles(false);
|
||||||
|
|
||||||
$this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', '.bar', '.foo', '.foo/.bar', '.foo/bar', 'foo bar']), $finder->getIterator());
|
$this->assertIterator($this->toAbsolute([
|
||||||
|
'foo',
|
||||||
|
'foo/bar.tmp',
|
||||||
|
'qux',
|
||||||
|
'qux/baz_100_1.py',
|
||||||
|
'qux/baz_1_2.py',
|
||||||
|
'qux_0_1.php',
|
||||||
|
'qux_1000_1.php',
|
||||||
|
'qux_1002_0.php',
|
||||||
|
'qux_10_2.php',
|
||||||
|
'qux_12_0.php',
|
||||||
|
'qux_2_0.php',
|
||||||
|
'test.php',
|
||||||
|
'test.py',
|
||||||
|
'toto',
|
||||||
|
'.bar',
|
||||||
|
'.foo',
|
||||||
|
'.foo/.bar',
|
||||||
|
'.foo/bar',
|
||||||
|
'foo bar',
|
||||||
|
]), $finder->getIterator());
|
||||||
|
|
||||||
$finder->ignoreVCS(false);
|
$finder->ignoreVCS(false);
|
||||||
$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());
|
$this->assertIterator($this->toAbsolute(['.git',
|
||||||
|
'foo',
|
||||||
|
'foo/bar.tmp',
|
||||||
|
'qux',
|
||||||
|
'qux/baz_100_1.py',
|
||||||
|
'qux/baz_1_2.py',
|
||||||
|
'qux_0_1.php',
|
||||||
|
'qux_1000_1.php',
|
||||||
|
'qux_1002_0.php',
|
||||||
|
'qux_10_2.php',
|
||||||
|
'qux_12_0.php',
|
||||||
|
'qux_2_0.php',
|
||||||
|
'test.php',
|
||||||
|
'test.py',
|
||||||
|
'toto',
|
||||||
|
'toto/.git',
|
||||||
|
'.bar',
|
||||||
|
'.foo',
|
||||||
|
'.foo/.bar',
|
||||||
|
'.foo/bar',
|
||||||
|
'foo bar',
|
||||||
|
]), $finder->getIterator());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testIgnoreDotFiles()
|
public function testIgnoreDotFiles()
|
||||||
@ -513,10 +554,46 @@ class FinderTest extends Iterator\RealIteratorTestCase
|
|||||||
$finder = $this->buildFinder();
|
$finder = $this->buildFinder();
|
||||||
$finder->in(self::$tmpDir);
|
$finder->in(self::$tmpDir);
|
||||||
|
|
||||||
$this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', 'foo bar']), $finder->getIterator());
|
$this->assertIterator($this->toAbsolute([
|
||||||
|
'foo',
|
||||||
|
'foo/bar.tmp',
|
||||||
|
'qux',
|
||||||
|
'qux/baz_100_1.py',
|
||||||
|
'qux/baz_1_2.py',
|
||||||
|
'qux_0_1.php',
|
||||||
|
'qux_1000_1.php',
|
||||||
|
'qux_1002_0.php',
|
||||||
|
'qux_10_2.php',
|
||||||
|
'qux_12_0.php',
|
||||||
|
'qux_2_0.php',
|
||||||
|
'test.php',
|
||||||
|
'test.py',
|
||||||
|
'toto',
|
||||||
|
'foo bar',
|
||||||
|
]), $finder->getIterator());
|
||||||
|
|
||||||
$finder->ignoreDotFiles(false);
|
$finder->ignoreDotFiles(false);
|
||||||
$this->assertIterator($this->toAbsolute(['foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', '.bar', '.foo', '.foo/.bar', '.foo/bar', 'foo bar']), $finder->getIterator());
|
$this->assertIterator($this->toAbsolute([
|
||||||
|
'foo',
|
||||||
|
'foo/bar.tmp',
|
||||||
|
'qux',
|
||||||
|
'qux/baz_100_1.py',
|
||||||
|
'qux/baz_1_2.py',
|
||||||
|
'qux_0_1.php',
|
||||||
|
'qux_1000_1.php',
|
||||||
|
'qux_1002_0.php',
|
||||||
|
'qux_10_2.php',
|
||||||
|
'qux_12_0.php',
|
||||||
|
'qux_2_0.php',
|
||||||
|
'test.php',
|
||||||
|
'test.py',
|
||||||
|
'toto',
|
||||||
|
'.bar',
|
||||||
|
'.foo',
|
||||||
|
'.foo/.bar',
|
||||||
|
'.foo/bar',
|
||||||
|
'foo bar',
|
||||||
|
]), $finder->getIterator());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSortByName()
|
public function testSortByName()
|
||||||
|
@ -126,10 +126,10 @@ class IntegerToLocalizedStringTransformerTest extends TestCase
|
|||||||
|
|
||||||
$transformer = new IntegerToLocalizedStringTransformer(true);
|
$transformer = new IntegerToLocalizedStringTransformer(true);
|
||||||
|
|
||||||
$this->assertEquals(1234, $transformer->reverseTransform('1.234,5'));
|
$this->assertEquals(1234, $transformer->reverseTransform('1.234'));
|
||||||
$this->assertEquals(12345, $transformer->reverseTransform('12.345,912'));
|
$this->assertEquals(12345, $transformer->reverseTransform('12.345'));
|
||||||
$this->assertEquals(1234, $transformer->reverseTransform('1234,5'));
|
$this->assertEquals(1234, $transformer->reverseTransform('1234'));
|
||||||
$this->assertEquals(12345, $transformer->reverseTransform('12345,912'));
|
$this->assertEquals(12345, $transformer->reverseTransform('12345'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user