Ver código fonte

Merge remote branch 'pborreli/process-typo'

* pborreli/process-typo:
  [Process] Fixed namespace typo and windows test
Fabien Potencier 14 anos atrás
pai
commit
4a801b5cd5

+ 0 - 2
src/Symfony/Component/Process/PhpExecutableFinder.php

@@ -11,8 +11,6 @@
 
 
 namespace Symfony\Component\Process;
 namespace Symfony\Component\Process;
 
 
-use Symfony\Component\Process\Exception\RuntimeException;
-
 /**
 /**
  * An executable finder specifically designed for the PHP executable.
  * An executable finder specifically designed for the PHP executable.
  *
  *

+ 3 - 1
tests/Symfony/Tests/Component/Process/PhpExecutableFinderTest.php

@@ -48,7 +48,9 @@ class PhpExecutableFinderTest extends \PHPUnit_Framework_TestCase
         $current = $f->find();
         $current = $f->find();
         
         
         //TODO maybe php executable is custom or even windows
         //TODO maybe php executable is custom or even windows
-        $this->assertEquals($f->find(), PHP_BINDIR.DIRECTORY_SEPARATOR.'php', '::find() returns the executable php with suffixes');
+        if (false === strstr(PHP_OS, 'WIN')) {
+            $this->assertEquals($current, PHP_BINDIR.DIRECTORY_SEPARATOR.'php', '::find() returns the executable php with suffixes');
+        }
     }
     }
     
     
     /**
     /**