Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '2.4'

* 2.4:
  [Form][2.3] Fixes empty file-inputs getting treated as extra field.
  changed some PHPUnit assertions to more specific ones
  fixed Kernel::stripComments() normalizing new-lines
  added a BC comment
  Update FileLoader to fix issue #10339
  bumped Symfony version to 2.3.12
  updated VERSION for 2.3.11
  update CONTRIBUTORS for 2.3.11
  updated CHANGELOG for 2.3.11
  Throw exception when unable to normalize embedded object
  Fixed evaluation of short circuit operators
  Follow-up to #10312: Fixed minor performance related issues in Yaml\Inline.
  [2.4][HttpKernel] Fix issue #10209 When the profiler has `only_exception` option activated and a subrequest throw an exception, the parent profile cannot be found.
  • Loading branch information...
commit d45faef922df8438cce99b5ee226bf06c32d145e 2 parents a708807 + ab301c7
Fabien Potencier fabpot authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 Tests/FinderTest.php
4 Tests/FinderTest.php
View
@@ -565,7 +565,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);
}
/**
@@ -746,7 +746,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.