Merge branch '4.1'
* 4.1: fix merge
This commit is contained in:
commit
124d07d878
@ -153,7 +153,7 @@ class DoctrineDataCollectorTest extends TestCase
|
|||||||
|
|
||||||
if (version_compare(Version::VERSION, '2.6', '>=')) {
|
if (version_compare(Version::VERSION, '2.6', '>=')) {
|
||||||
$tests[] = array('this is not a date', array('date'), 'this is not a date', false);
|
$tests[] = array('this is not a date', array('date'), 'this is not a date', false);
|
||||||
$tests[] = array(new \stdClass(), array('date'), 'Object(stdClass)', false);
|
$tests[] = array(new \stdClass(), array('date'), '/* Object(stdClass) */', false);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $tests;
|
return $tests;
|
||||||
|
@ -380,15 +380,13 @@ class ClientTest extends TestCase
|
|||||||
'password' => 'new password',
|
'password' => 'new password',
|
||||||
), 'PUT', array(
|
), 'PUT', array(
|
||||||
'HTTP_USER_AGENT' => 'Symfony User Agent',
|
'HTTP_USER_AGENT' => 'Symfony User Agent',
|
||||||
'HTTPS' => true,
|
|
||||||
));
|
));
|
||||||
|
|
||||||
$this->assertEquals('https://www.example.com/foo', $client->getRequest()->getUri(), '->submitForm() submit forms');
|
$this->assertEquals('http://www.example.com/foo', $client->getRequest()->getUri(), '->submitForm() submit forms');
|
||||||
$this->assertEquals('PUT', $client->getRequest()->getMethod(), '->submitForm() allows to change the method');
|
$this->assertEquals('PUT', $client->getRequest()->getMethod(), '->submitForm() allows to change the method');
|
||||||
$this->assertEquals('new username', $client->getRequest()->getParameters()['username'], '->submitForm() allows to override the form values');
|
$this->assertEquals('new username', $client->getRequest()->getParameters()['username'], '->submitForm() allows to override the form values');
|
||||||
$this->assertEquals('new password', $client->getRequest()->getParameters()['password'], '->submitForm() allows to override the form values');
|
$this->assertEquals('new password', $client->getRequest()->getParameters()['password'], '->submitForm() allows to override the form values');
|
||||||
$this->assertEquals('Symfony User Agent', $client->getRequest()->getServer()['HTTP_USER_AGENT'], '->submitForm() allows to change the $_SERVER parameters');
|
$this->assertEquals('Symfony User Agent', $client->getRequest()->getServer()['HTTP_USER_AGENT'], '->submitForm() allows to change the $_SERVER parameters');
|
||||||
$this->assertTrue($client->getRequest()->getServer()['HTTPS'], '->submitForm() allows to change the $_SERVER parameters');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testSubmitFormNotFound()
|
public function testSubmitFormNotFound()
|
||||||
|
Reference in New Issue
Block a user