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

[Process] Fix conflicts between latest 2.3 fix and 2.5 deprecation

Browse Source
This commit is contained in:
Romain Neutron 2014-05-22 22:31:58 +02:00
parent ad348a9b07
commit 3454d6084f
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
View File

@ -173,17 +173,17 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
} }
/** /**
* @dataProvider provideInvalidStdinValues * @dataProvider provideInvalidInputValues
* @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
* @expectedExceptionMessage Symfony\Component\Process\Process::setStdin only accepts strings. * @expectedExceptionMessage Symfony\Component\Process\Process::setInput only accepts strings.
*/ */
public function testInvalidStdin($value) public function testInvalidInput($value)
{ {
$process = $this->getProcess('php -v'); $process = $this->getProcess('php -v');
$process->setStdin($value); $process->setInput($value);
} }
public function provideInvalidStdinValues() public function provideInvalidInputValues()
{ {
return array( return array(
array(array()), array(array()),
@ -193,16 +193,16 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
} }
/** /**
* @dataProvider provideStdinValues * @dataProvider provideInputValues
*/ */
public function testValidStdin($expected, $value) public function testValidInput($expected, $value)
{ {
$process = $this->getProcess('php -v'); $process = $this->getProcess('php -v');
$process->setStdin($value); $process->setInput($value);
$this->assertSame($expected, $process->getStdin()); $this->assertSame($expected, $process->getInput());
} }
public function provideStdinValues() public function provideInputValues()
{ {
return array( return array(
array(null, null), array(null, null),

4
src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
View File

@ -230,9 +230,9 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected function getProcess($commandline, $cwd = null, array $env = null, $stdin = null, $timeout = 60, array $options = array()) protected function getProcess($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = array())
{ {
$process = new ProcessInSigchildEnvironment($commandline, $cwd, $env, $stdin, $timeout, $options); $process = new ProcessInSigchildEnvironment($commandline, $cwd, $env, $input, $timeout, $options);
$process->setEnhanceSigchildCompatibility(false); $process->setEnhanceSigchildCompatibility(false);
return $process; return $process;

4
src/Symfony/Component/Process/Tests/SigchildEnabledProcessTest.php
View File

@ -123,9 +123,9 @@ class SigchildEnabledProcessTest extends AbstractProcessTest
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
protected function getProcess($commandline, $cwd = null, array $env = null, $stdin = null, $timeout = 60, array $options = array()) protected function getProcess($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = array())
{ {
$process = new ProcessInSigchildEnvironment($commandline, $cwd, $env, $stdin, $timeout, $options); $process = new ProcessInSigchildEnvironment($commandline, $cwd, $env, $input, $timeout, $options);
$process->setEnhanceSigchildCompatibility(true); $process->setEnhanceSigchildCompatibility(true);
return $process; return $process;