Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '2.3' into 2.4

* 2.3:
  changed some PHPUnit assertions to more specific ones
  fixed Kernel::stripComments() normalizing new-lines
  added a BC comment
  Update FileLoader to fix issue #10339
  • Loading branch information...
commit ab301c7d21f536c34ab6c2c79dba8d465104c518 2 parents d712f4a + 09ca26e
@fabpot fabpot authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 Tests/FinderTest.php
View
4 Tests/FinderTest.php
@@ -554,7 +554,7 @@ public function testMultipleLocations(Adapter\AdapterInterface $adapter)
$finder = $this->buildFinder($adapter);
$finder->in($locations)->depth('< 1')->name('test.php');
- $this->assertEquals(1, count($finder));
+ $this->assertCount(1, $finder);
}
/**
@@ -735,7 +735,7 @@ public function testAccessDeniedException(Adapter\AdapterInterface $adapter)
$this->assertIterator($this->toAbsolute(array('foo bar', 'test.php', 'test.py')), $finder->getIterator());
$this->fail('Finder should throw an exception when opening a non-readable directory.');
} catch (\Exception $e) {
- $this->assertEquals('Symfony\\Component\\Finder\\Exception\\AccessDeniedException', get_class($e));
+ $this->assertInstanceOf('Symfony\\Component\\Finder\\Exception\\AccessDeniedException', $e);
}
// restore original permissions
Please sign in to comment.
Something went wrong with that request. Please try again.