Merge branch '2.4'
* 2.4: [Process] Fix Process test suite [Form] Fixed infinite tests when ICU is available
This commit is contained in:
commit
b7be0b86b9
@ -433,8 +433,8 @@ class DateTimeTypeTest extends TypeTestCase
|
|||||||
|
|
||||||
$form['date']->addError($error);
|
$form['date']->addError($error);
|
||||||
|
|
||||||
$this->assertSame(array(), $form['date']->getErrors());
|
$this->assertSame(array(), iterator_to_array($form['date']->getErrors()));
|
||||||
$this->assertSame(array($error), $form->getErrors());
|
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testDateTypeSingleTextErrorsBubbleUp()
|
public function testDateTypeSingleTextErrorsBubbleUp()
|
||||||
@ -446,8 +446,8 @@ class DateTimeTypeTest extends TypeTestCase
|
|||||||
|
|
||||||
$form['date']->addError($error);
|
$form['date']->addError($error);
|
||||||
|
|
||||||
$this->assertSame(array(), $form['date']->getErrors());
|
$this->assertSame(array(), iterator_to_array($form['date']->getErrors()));
|
||||||
$this->assertSame(array($error), $form->getErrors());
|
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testTimeTypeChoiceErrorsBubbleUp()
|
public function testTimeTypeChoiceErrorsBubbleUp()
|
||||||
@ -457,8 +457,8 @@ class DateTimeTypeTest extends TypeTestCase
|
|||||||
|
|
||||||
$form['time']->addError($error);
|
$form['time']->addError($error);
|
||||||
|
|
||||||
$this->assertSame(array(), $form['time']->getErrors());
|
$this->assertSame(array(), iterator_to_array($form['time']->getErrors()));
|
||||||
$this->assertSame(array($error), $form->getErrors());
|
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testTimeTypeSingleTextErrorsBubbleUp()
|
public function testTimeTypeSingleTextErrorsBubbleUp()
|
||||||
@ -470,8 +470,8 @@ class DateTimeTypeTest extends TypeTestCase
|
|||||||
|
|
||||||
$form['time']->addError($error);
|
$form['time']->addError($error);
|
||||||
|
|
||||||
$this->assertSame(array(), $form['time']->getErrors());
|
$this->assertSame(array(), iterator_to_array($form['time']->getErrors()));
|
||||||
$this->assertSame(array($error), $form->getErrors());
|
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -745,8 +745,8 @@ class DateTypeTest extends TypeTestCase
|
|||||||
));
|
));
|
||||||
$form['year']->addError($error);
|
$form['year']->addError($error);
|
||||||
|
|
||||||
$this->assertSame(array(), $form['year']->getErrors());
|
$this->assertSame(array(), iterator_to_array($form['year']->getErrors()));
|
||||||
$this->assertSame(array($error), $form->getErrors());
|
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -760,8 +760,8 @@ class DateTypeTest extends TypeTestCase
|
|||||||
));
|
));
|
||||||
$form['month']->addError($error);
|
$form['month']->addError($error);
|
||||||
|
|
||||||
$this->assertSame(array(), $form['month']->getErrors());
|
$this->assertSame(array(), iterator_to_array($form['month']->getErrors()));
|
||||||
$this->assertSame(array($error), $form->getErrors());
|
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -775,8 +775,8 @@ class DateTypeTest extends TypeTestCase
|
|||||||
));
|
));
|
||||||
$form['day']->addError($error);
|
$form['day']->addError($error);
|
||||||
|
|
||||||
$this->assertSame(array(), $form['day']->getErrors());
|
$this->assertSame(array(), iterator_to_array($form['day']->getErrors()));
|
||||||
$this->assertSame(array($error), $form->getErrors());
|
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testYearsFor32BitsMachines()
|
public function testYearsFor32BitsMachines()
|
||||||
|
@ -601,8 +601,8 @@ class TimeTypeTest extends TypeTestCase
|
|||||||
));
|
));
|
||||||
$form['hour']->addError($error);
|
$form['hour']->addError($error);
|
||||||
|
|
||||||
$this->assertSame(array(), $form['hour']->getErrors());
|
$this->assertSame(array(), iterator_to_array($form['hour']->getErrors()));
|
||||||
$this->assertSame(array($error), $form->getErrors());
|
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -616,8 +616,8 @@ class TimeTypeTest extends TypeTestCase
|
|||||||
));
|
));
|
||||||
$form['minute']->addError($error);
|
$form['minute']->addError($error);
|
||||||
|
|
||||||
$this->assertSame(array(), $form['minute']->getErrors());
|
$this->assertSame(array(), iterator_to_array($form['minute']->getErrors()));
|
||||||
$this->assertSame(array($error), $form->getErrors());
|
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -632,8 +632,8 @@ class TimeTypeTest extends TypeTestCase
|
|||||||
));
|
));
|
||||||
$form['second']->addError($error);
|
$form['second']->addError($error);
|
||||||
|
|
||||||
$this->assertSame(array(), $form['second']->getErrors());
|
$this->assertSame(array(), iterator_to_array($form['second']->getErrors()));
|
||||||
$this->assertSame(array($error), $form->getErrors());
|
$this->assertSame(array($error), iterator_to_array($form->getErrors()));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -313,10 +313,15 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
public function testMustRun()
|
public function testMustRun()
|
||||||
{
|
{
|
||||||
$process = $this->getProcess('echo "foo"');
|
$process = $this->getProcess('echo foo');
|
||||||
|
|
||||||
$this->assertSame($process, $process->mustRun());
|
$this->assertSame($process, $process->mustRun());
|
||||||
$this->assertEquals("foo\n", $process->getOutput());
|
$this->assertEquals("foo".PHP_EOL, $process->getOutput());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSuccessfulMustRunHasCorrectExitCode()
|
||||||
|
{
|
||||||
|
$process = $this->getProcess('echo foo')->mustRun();
|
||||||
$this->assertEquals(0, $process->getExitCode());
|
$this->assertEquals(0, $process->getExitCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -612,7 +617,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
|
|||||||
*/
|
*/
|
||||||
public function testIdleTimeout()
|
public function testIdleTimeout()
|
||||||
{
|
{
|
||||||
$process = $this->getProcess('sleep 3');
|
$process = $this->getProcess('php -r "sleep(3);"');
|
||||||
$process->setTimeout(10);
|
$process->setTimeout(10);
|
||||||
$process->setIdleTimeout(0.5);
|
$process->setIdleTimeout(0.5);
|
||||||
|
|
||||||
@ -632,7 +637,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
|
|||||||
*/
|
*/
|
||||||
public function testIdleTimeoutNotExceededWhenOutputIsSent()
|
public function testIdleTimeoutNotExceededWhenOutputIsSent()
|
||||||
{
|
{
|
||||||
$process = $this->getProcess('echo "foo" && sleep 1 && echo "foo" && sleep 1 && echo "foo" && sleep 1');
|
$process = $this->getProcess('php -r "echo \'foo\'; sleep(1); echo \'foo\'; sleep(1); echo \'foo\'; sleep(1); "');
|
||||||
$process->setTimeout(2);
|
$process->setTimeout(2);
|
||||||
$process->setIdleTimeout(1.5);
|
$process->setIdleTimeout(1.5);
|
||||||
|
|
||||||
|
@ -51,11 +51,11 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
|
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
|
||||||
* @expectedExceptionMessage his PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.
|
* @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
|
||||||
*/
|
*/
|
||||||
public function testMustRun()
|
public function testSuccessfulMustRunHasCorrectExitCode()
|
||||||
{
|
{
|
||||||
parent::testMustRun();
|
parent::testSuccessfulMustRunHasCorrectExitCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user