Skip to content

Commit 41ad53e

Browse files
erge branch '3.1'
* 3.1: Remove trailing space CS fixes Remove trailing space CS: apply rules [Yaml] Clean some messages + add test case [Console] simplified code [Form] Fix UrlType transforms valid protocols [SecurityBundle] Changed encoder configuration example to bcrypt
2 parents af554a7 + f2c8aaf commit 41ad53e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Tests/Iterator/PathFilterIteratorTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ public function getTestFilterData()
7777
array($inner, array('copy/A'), array(), array('abc.dat.copy', 'ab.dat.copy', 'a.dat.copy')),
7878
array($inner, array('copy/A/B'), array(), array('abc.dat.copy', 'ab.dat.copy')),
7979
array($inner, array('copy/A/B/C'), array(), array('abc.dat.copy')),
80-
8180
);
8281
}
8382
}

Tests/Iterator/SortableIteratorTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function testAccept($mode, $expected)
3232
{
3333
if (!is_callable($mode)) {
3434
switch ($mode) {
35-
case SortableIterator::SORT_BY_ACCESSED_TIME :
35+
case SortableIterator::SORT_BY_ACCESSED_TIME:
3636
if ('\\' === DIRECTORY_SEPARATOR) {
3737
touch(self::toAbsolute('.git'));
3838
} else {
@@ -41,12 +41,12 @@ public function testAccept($mode, $expected)
4141
sleep(1);
4242
file_get_contents(self::toAbsolute('.bar'));
4343
break;
44-
case SortableIterator::SORT_BY_CHANGED_TIME :
44+
case SortableIterator::SORT_BY_CHANGED_TIME:
4545
file_put_contents(self::toAbsolute('test.php'), 'foo');
4646
sleep(1);
4747
file_put_contents(self::toAbsolute('test.py'), 'foo');
4848
break;
49-
case SortableIterator::SORT_BY_MODIFIED_TIME :
49+
case SortableIterator::SORT_BY_MODIFIED_TIME:
5050
file_put_contents(self::toAbsolute('test.php'), 'foo');
5151
sleep(1);
5252
file_put_contents(self::toAbsolute('test.py'), 'foo');

0 commit comments

Comments
 (0)