Skip to content

Commit 545c467

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [HttpFoundation] Use the correct syntax for session gc based on Pdo driver Revert "bug #24987 [Console] Fix global console flag when used in chain (Simperfit)" Revert "bug #25487 [Console] Fix a bug when passing a letter that could be an alias (Simperfit)" Disable CSP header on exception pages only in debug Fixed submitting disabled buttons Fixed Button::setParent() when already submitted Improve assertions SCA: get rid of repetitive calls allow null values for root nodes in YAML configs [VarDumper] Fix docblock Improve phpdoc to make it more explicit
2 parents 64ba4a1 + 5b0eac4 commit 545c467

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Tests/FinderTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Finder\Tests;
1313

1414
use Symfony\Component\Finder\Adapter\AdapterInterface;
15-
use Symfony\Component\Finder\Adapter\GnuFindAdapter;
1615
use Symfony\Component\Finder\Adapter\PhpAdapter;
1716
use Symfony\Component\Finder\Finder;
1817

@@ -620,15 +619,15 @@ public function testAdapterSelection()
620619
{
621620
// test that by default, PhpAdapter is selected
622621
$adapters = Finder::create()->getAdapters();
623-
$this->assertTrue($adapters[0] instanceof PhpAdapter);
622+
$this->assertInstanceOf('Symfony\Component\Finder\Adapter\PhpAdapter', $adapters[0]);
624623

625624
// test another adapter selection
626625
$adapters = Finder::create()->setAdapter('gnu_find')->getAdapters();
627-
$this->assertTrue($adapters[0] instanceof GnuFindAdapter);
626+
$this->assertInstanceOf('Symfony\Component\Finder\Adapter\GnuFindAdapter', $adapters[0]);
628627

629628
// test that useBestAdapter method removes selection
630629
$adapters = Finder::create()->useBestAdapter()->getAdapters();
631-
$this->assertFalse($adapters[0] instanceof PhpAdapter);
630+
$this->assertNotInstanceOf('Symfony\Component\Finder\Adapter\PhpAdapter', $adapters[0]);
632631
}
633632

634633
public function getTestPathData()

0 commit comments

Comments
 (0)