Skip to content

Commit 4a801b5

Browse files
committed
Merge remote branch 'pborreli/process-typo'
* pborreli/process-typo: [Process] Fixed namespace typo and windows test
2 parents 9afcaad + 7f089c0 commit 4a801b5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/Symfony/Component/Process/PhpExecutableFinder.php

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Symfony\Component\Process;
1313

14-
use Symfony\Component\Process\Exception\RuntimeException;
15-
1614
/**
1715
* An executable finder specifically designed for the PHP executable.
1816
*

tests/Symfony/Tests/Component/Process/PhpExecutableFinderTest.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ public function testFindWithSuffix()
4848
$current = $f->find();
4949

5050
//TODO maybe php executable is custom or even windows
51-
$this->assertEquals($f->find(), PHP_BINDIR.DIRECTORY_SEPARATOR.'php', '::find() returns the executable php with suffixes');
51+
if (false === strstr(PHP_OS, 'WIN')) {
52+
$this->assertEquals($current, PHP_BINDIR.DIRECTORY_SEPARATOR.'php', '::find() returns the executable php with suffixes');
53+
}
5254
}
5355

5456
/**

0 commit comments

Comments
 (0)