Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
This commit is contained in:
parent
e28f6b44e5
commit
e9f3faf840
@ -23,7 +23,7 @@ class PdoCacheTest extends CacheTestCase
|
||||
public static function setupBeforeClass()
|
||||
{
|
||||
if (!extension_loaded('pdo_sqlite')) {
|
||||
throw new \PHPUnit_Framework_SkippedTestError('Extension pdo_sqlite required.');
|
||||
self::markTestSkipped('Extension pdo_sqlite required.');
|
||||
}
|
||||
|
||||
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
|
||||
|
@ -24,7 +24,7 @@ class PdoDbalCacheTest extends CacheTestCase
|
||||
public static function setupBeforeClass()
|
||||
{
|
||||
if (!extension_loaded('pdo_sqlite')) {
|
||||
throw new \PHPUnit_Framework_SkippedTestError('Extension pdo_sqlite required.');
|
||||
self::markTestSkipped('Extension pdo_sqlite required.');
|
||||
}
|
||||
|
||||
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
|
||||
|
@ -221,7 +221,14 @@ class ApplicationTest extends TestCase
|
||||
$application->add(new \Foo2Command());
|
||||
|
||||
$expectedMsg = "The namespace \"f\" is ambiguous.\nDid you mean one of these?\n foo\n foo1";
|
||||
$this->setExpectedException(CommandNotFoundException::class, $expectedMsg);
|
||||
|
||||
if (method_exists($this, 'expectException')) {
|
||||
$this->expectException(CommandNotFoundException::class);
|
||||
$this->expectExceptionMessage($expectedMsg);
|
||||
} else {
|
||||
$this->setExpectedException(CommandNotFoundException::class, $expectedMsg);
|
||||
}
|
||||
|
||||
$application->findNamespace('f');
|
||||
}
|
||||
|
||||
|
@ -933,7 +933,13 @@ class ContainerBuilderTest extends TestCase
|
||||
$container = include __DIR__.'/Fixtures/containers/container30.php';
|
||||
$container->getDefinition($id)->setOverriddenGetter($getter, 123);
|
||||
|
||||
$this->setExpectedException(RuntimeException::class, $expectedMessage);
|
||||
if (method_exists($this, 'expectException')) {
|
||||
$this->expectException(RuntimeException::class);
|
||||
$this->expectExceptionMessage($expectedMessage);
|
||||
} else {
|
||||
$this->setExpectedException(RuntimeException::class, $expectedMessage);
|
||||
}
|
||||
|
||||
$container->get($id);
|
||||
}
|
||||
|
||||
|
@ -388,7 +388,13 @@ class PhpDumperTest extends TestCase
|
||||
$container->compile();
|
||||
$dumper = new PhpDumper($container);
|
||||
|
||||
$this->setExpectedException(RuntimeException::class, $expectedMessage);
|
||||
if (method_exists($this, 'expectException')) {
|
||||
$this->expectException(RuntimeException::class);
|
||||
$this->expectExceptionMessage($expectedMessage);
|
||||
} else {
|
||||
$this->setExpectedException(RuntimeException::class, $expectedMessage);
|
||||
}
|
||||
|
||||
$dumper->dump();
|
||||
}
|
||||
|
||||
|
@ -11,6 +11,7 @@
|
||||
|
||||
namespace Symfony\Component\ExpressionLanguage\Tests;
|
||||
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\ExpressionLanguage\ExpressionFunction;
|
||||
|
||||
/**
|
||||
@ -18,7 +19,7 @@ use Symfony\Component\ExpressionLanguage\ExpressionFunction;
|
||||
*
|
||||
* @author Dany Maillard <danymaillard93b@gmail.com>
|
||||
*/
|
||||
class ExpressionFunctionTest extends \PHPUnit_Framework_TestCase
|
||||
class ExpressionFunctionTest extends TestCase
|
||||
{
|
||||
/**
|
||||
* @expectedException \InvalidArgumentException
|
||||
|
@ -36,7 +36,7 @@ class SerializerPassTest extends TestCase
|
||||
->with('serializer.normalizer')
|
||||
->will($this->returnValue(array()));
|
||||
|
||||
$this->setExpectedException('RuntimeException');
|
||||
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\RuntimeException::class);
|
||||
|
||||
$serializerPass = new SerializerPass();
|
||||
$serializerPass->process($container);
|
||||
@ -63,7 +63,7 @@ class SerializerPassTest extends TestCase
|
||||
->method('getDefinition')
|
||||
->will($this->returnValue($definition));
|
||||
|
||||
$this->setExpectedException('RuntimeException');
|
||||
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\RuntimeException::class);
|
||||
|
||||
$serializerPass = new SerializerPass();
|
||||
$serializerPass->process($container);
|
||||
|
Reference in New Issue
Block a user