minor #21695 Refactored other PHPUnit method calls to work with namespaced PHPUnit 6 (peterrehm)
This PR was merged into the 2.8 branch.
Discussion
----------
Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
| Q | A
| ------------- | ---
| Branch? | 2.8
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | no
| Fixed tickets | -
| License | MIT
| Doc PR | -
Continued work to make Symfony PHPUnit 6 compatible.
Commits
-------
dbe8898
Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
This commit is contained in:
commit
f6893c7cc1
@ -227,7 +227,12 @@ class FormPassTest extends TestCase
|
|||||||
$container->setDefinition('form.extension', $extDefinition);
|
$container->setDefinition('form.extension', $extDefinition);
|
||||||
$container->register($id, 'stdClass')->setPublic(false)->addTag($tagName);
|
$container->register($id, 'stdClass')->setPublic(false)->addTag($tagName);
|
||||||
|
|
||||||
$this->setExpectedException('\InvalidArgumentException', $expectedExceptionMessage);
|
if (method_exists($this, 'expectException')) {
|
||||||
|
$this->expectException('InvalidArgumentException');
|
||||||
|
$this->expectExceptionMessage($expectedExceptionMessage);
|
||||||
|
} else {
|
||||||
|
$this->setExpectedException('InvalidArgumentException', $expectedExceptionMessage);
|
||||||
|
}
|
||||||
|
|
||||||
$container->compile();
|
$container->compile();
|
||||||
}
|
}
|
||||||
|
@ -55,8 +55,13 @@ class ArrayNodeTest extends TestCase
|
|||||||
public function testIgnoreAndRemoveBehaviors($ignore, $remove, $expected, $message = '')
|
public function testIgnoreAndRemoveBehaviors($ignore, $remove, $expected, $message = '')
|
||||||
{
|
{
|
||||||
if ($expected instanceof \Exception) {
|
if ($expected instanceof \Exception) {
|
||||||
|
if (method_exists($this, 'expectException')) {
|
||||||
|
$this->expectException(get_class($expected));
|
||||||
|
$this->expectExceptionMessage($expected->getMessage());
|
||||||
|
} else {
|
||||||
$this->setExpectedException(get_class($expected), $expected->getMessage());
|
$this->setExpectedException(get_class($expected), $expected->getMessage());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
$node = new ArrayNode('root');
|
$node = new ArrayNode('root');
|
||||||
$node->setIgnoreExtraKeys($ignore, $remove);
|
$node->setIgnoreExtraKeys($ignore, $remove);
|
||||||
$result = $node->normalize(array('foo' => 'bar'));
|
$result = $node->normalize(array('foo' => 'bar'));
|
||||||
|
@ -2424,6 +2424,8 @@ abstract class AbstractLayoutTest extends \Symfony\Component\Form\Test\FormInteg
|
|||||||
// compare plain HTML to check the whitespace
|
// compare plain HTML to check the whitespace
|
||||||
try {
|
try {
|
||||||
$this->assertSame('<input type="text" id="text" name="text" readonly="readonly" disabled="disabled" required="required" maxlength="10" pattern="\d+" class="foobar" data-foo="bar" value="value" />', $html);
|
$this->assertSame('<input type="text" id="text" name="text" readonly="readonly" disabled="disabled" required="required" maxlength="10" pattern="\d+" class="foobar" data-foo="bar" value="value" />', $html);
|
||||||
|
} catch (\PHPUnit\Framework\AssertionFailedError $e) {
|
||||||
|
$this->assertSame('<input type="text" id="text" name="text" disabled="disabled" required="required" readonly="readonly" maxlength="10" pattern="\d+" class="foobar" data-foo="bar" value="value" />', $html);
|
||||||
} catch (\PHPUnit_Framework_AssertionFailedError $e) {
|
} catch (\PHPUnit_Framework_AssertionFailedError $e) {
|
||||||
$this->assertSame('<input type="text" id="text" name="text" disabled="disabled" required="required" readonly="readonly" maxlength="10" pattern="\d+" class="foobar" data-foo="bar" value="value" />', $html);
|
$this->assertSame('<input type="text" id="text" name="text" disabled="disabled" required="required" readonly="readonly" maxlength="10" pattern="\d+" class="foobar" data-foo="bar" value="value" />', $html);
|
||||||
}
|
}
|
||||||
|
@ -20,7 +20,11 @@ class TranslationFilesTest extends TestCase
|
|||||||
*/
|
*/
|
||||||
public function testTranslationFileIsValid($filePath)
|
public function testTranslationFileIsValid($filePath)
|
||||||
{
|
{
|
||||||
|
if (class_exists('PHPUnit_Util_XML')) {
|
||||||
\PHPUnit_Util_XML::loadfile($filePath, false, false, true);
|
\PHPUnit_Util_XML::loadfile($filePath, false, false, true);
|
||||||
|
} else {
|
||||||
|
\PHPUnit\Util\XML::loadfile($filePath, false, false, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function provideTranslationFiles()
|
public function provideTranslationFiles()
|
||||||
|
Reference in New Issue
Block a user