diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch aboks/process_test_windows (PR #1783)

Browse Source 
Commits
-------

0635548 [Process] Fixed tests on Windows by using escapeshellarg to escape argument

Discussion
----------

[Process] Changed tests to use escapeshellarg for escaping arguments

To make the `ProcessTest` work on Windows, the code to pass to `php` needs to be escaped using `escapeshellarg` rather than using hardcoded single quotes. Also, since `escapeshellarg` escapes double quotes incorrectly on Windows, I changed the quotes in the code-to-be-executed to single quotes only.

I have checked that the test still runs correctly on Unix (Ubuntu 10.04).
This commit is contained in:
Fabien Potencier 2011-07-24 09:50:51 +02:00
commit 858cce84d5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/Symfony/Tests/Component/Process/ProcessTest.php
View File

@ -42,7 +42,7 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
*/
public function testProcessResponses($expected, $getter, $code)
{
$p = new Process(sprintf('php -r \'%s\'', $code));
$p = new Process(sprintf('php -r %s', escapeshellarg($code)));
$p->run();
$this->assertSame($expected, $p->$getter());
@ -55,7 +55,7 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
*/
public function testProcessPipes($expected, $code)
{
$p = new Process(sprintf('php -r \'%s\'', $code));
$p = new Process(sprintf('php -r %s', escapeshellarg($code)));
$p->setStdin($expected);
$p->run();
@ -70,15 +70,15 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
//expected output / getter / code to execute
//array(1,'getExitCode','exit(1);'),
//array(true,'isSuccessful','exit();'),
array('output', 'getOutput', 'echo "output";'),
array('output', 'getOutput', 'echo \'output\';'),
);
}
public function pipesCodeProvider()
{
$variations = array(
'fwrite(STDOUT, $in = file_get_contents("php://stdin")); fwrite(STDERR, $in);',
'include "' . __DIR__ . '/ProcessTestHelper.php";',
'fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);',
'include \'' . __DIR__ . '/ProcessTestHelper.php\';',
);
$baseData = str_repeat('*', 1024);