');
new Link($dom->getElementsByTagName('div')->item(0), 'http://www.example.com/');
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testConstructorWithAnInvalidCurrentUri()
{
+ $this->expectException('InvalidArgumentException');
$dom = new \DOMDocument();
$dom->loadHTML('
foo');
diff --git a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
index 97ae5090c973..69badc9bc2cb 100644
--- a/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
+++ b/src/Symfony/Component/Dotenv/Tests/DotenvTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Dotenv\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Dotenv\Dotenv;
use Symfony\Component\Dotenv\Exception\FormatException;
class DotenvTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
/**
* @dataProvider getEnvDataWithFormatErrors
*/
@@ -200,11 +203,9 @@ public function testLoad()
$this->assertSame('BAZ', $bar);
}
- /**
- * @expectedException \Symfony\Component\Dotenv\Exception\PathException
- */
public function testLoadDirectory()
{
+ $this->expectException('Symfony\Component\Dotenv\Exception\PathException');
$dotenv = new Dotenv();
$dotenv->load(__DIR__);
}
diff --git a/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php b/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
index 801471b47b6e..847105b079f9 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\EventDispatcher\Tests\DependencyInjection;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
@@ -19,14 +20,15 @@
class RegisterListenersPassTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
/**
* Tests that event subscribers not implementing EventSubscriberInterface
* trigger an exception.
- *
- * @expectedException \InvalidArgumentException
*/
public function testEventSubscriberWithoutInterface()
{
+ $this->expectException('InvalidArgumentException');
$builder = new ContainerBuilder();
$builder->register('event_dispatcher');
$builder->register('my_event_subscriber', 'stdClass')
@@ -63,12 +65,10 @@ public function testValidEventSubscriber()
$this->assertEquals($expectedCalls, $eventDispatcherDefinition->getMethodCalls());
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The service "foo" tagged "kernel.event_listener" must not be abstract.
- */
public function testAbstractEventListener()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The service "foo" tagged "kernel.event_listener" must not be abstract.');
$container = new ContainerBuilder();
$container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_listener', []);
$container->register('event_dispatcher', 'stdClass');
@@ -77,12 +77,10 @@ public function testAbstractEventListener()
$registerListenersPass->process($container);
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The service "foo" tagged "kernel.event_subscriber" must not be abstract.
- */
public function testAbstractEventSubscriber()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The service "foo" tagged "kernel.event_subscriber" must not be abstract.');
$container = new ContainerBuilder();
$container->register('foo', 'stdClass')->setAbstract(true)->addTag('kernel.event_subscriber', []);
$container->register('event_dispatcher', 'stdClass');
@@ -128,12 +126,10 @@ public function testHotPathEvents()
$this->assertTrue($container->getDefinition('foo')->hasTag('container.hot_path'));
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage You have requested a non-existent parameter "subscriber.class"
- */
public function testEventSubscriberUnresolvableClassName()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('You have requested a non-existent parameter "subscriber.class"');
$container = new ContainerBuilder();
$container->register('foo', '%subscriber.class%')->addTag('kernel.event_subscriber', []);
$container->register('event_dispatcher', 'stdClass');
diff --git a/src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php b/src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php
index dfcd2431ecb4..fb9e1620a7c5 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php
@@ -81,11 +81,9 @@ public function testGetArgument()
$this->assertEquals('Event', $this->event->getArgument('name'));
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testGetArgException()
{
+ $this->expectException('\InvalidArgumentException');
$this->event->getArgument('nameNotExist');
}
diff --git a/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
index 6eebf621e3f7..a786ee2b9b33 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
@@ -71,37 +71,29 @@ public function testHasListenersDelegates()
$this->assertSame('result', $this->dispatcher->hasListeners('event'));
}
- /**
- * @expectedException \BadMethodCallException
- */
public function testAddListenerDisallowed()
{
+ $this->expectException('\BadMethodCallException');
$this->dispatcher->addListener('event', function () { return 'foo'; });
}
- /**
- * @expectedException \BadMethodCallException
- */
public function testAddSubscriberDisallowed()
{
+ $this->expectException('\BadMethodCallException');
$subscriber = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventSubscriberInterface')->getMock();
$this->dispatcher->addSubscriber($subscriber);
}
- /**
- * @expectedException \BadMethodCallException
- */
public function testRemoveListenerDisallowed()
{
+ $this->expectException('\BadMethodCallException');
$this->dispatcher->removeListener('event', function () { return 'foo'; });
}
- /**
- * @expectedException \BadMethodCallException
- */
public function testRemoveSubscriberDisallowed()
{
+ $this->expectException('\BadMethodCallException');
$subscriber = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventSubscriberInterface')->getMock();
$this->dispatcher->removeSubscriber($subscriber);
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionFunctionTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionFunctionTest.php
index f2710fb1e5e8..8d81c2b9d94d 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionFunctionTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionFunctionTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\ExpressionLanguage\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\ExpressionLanguage\ExpressionFunction;
/**
@@ -21,21 +22,19 @@
*/
class ExpressionFunctionTest extends TestCase
{
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage PHP function "fn_does_not_exist" does not exist.
- */
+ use ForwardCompatTestTrait;
+
public function testFunctionDoesNotExist()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('PHP function "fn_does_not_exist" does not exist.');
ExpressionFunction::fromPhp('fn_does_not_exist');
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage An expression function name must be defined when PHP function "Symfony\Component\ExpressionLanguage\Tests\fn_namespaced" is namespaced.
- */
public function testFunctionNamespaced()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('An expression function name must be defined when PHP function "Symfony\Component\ExpressionLanguage\Tests\fn_namespaced" is namespaced.');
ExpressionFunction::fromPhp('Symfony\Component\ExpressionLanguage\Tests\fn_namespaced');
}
}
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
index 83b608b2b995..348b37115794 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\ExpressionLanguage\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\ExpressionLanguage\ExpressionFunction;
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
use Symfony\Component\ExpressionLanguage\ParsedExpression;
@@ -19,6 +20,8 @@
class ExpressionLanguageTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testCachedParse()
{
$cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemPoolInterface')->getMock();
@@ -94,12 +97,10 @@ public function testCachedParseWithDeprecatedParserCacheInterface()
$this->assertSame($savedParsedExpression, $parsedExpression);
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Cache argument has to implement Psr\Cache\CacheItemPoolInterface.
- */
public function testWrongCacheImplementation()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('Cache argument has to implement Psr\Cache\CacheItemPoolInterface.');
$cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemSpoolInterface')->getMock();
$expressionLanguage = new ExpressionLanguage($cacheMock);
}
@@ -146,12 +147,10 @@ public function testShortCircuitOperatorsCompile($expression, array $names, $exp
$this->assertSame($expected, $result);
}
- /**
- * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
- * @expectedExceptionMessage Unexpected end of expression around position 6 for expression `node.`.
- */
public function testParseThrowsInsteadOfNotice()
{
+ $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+ $this->expectExceptionMessage('Unexpected end of expression around position 6 for expression `node.`.');
$expressionLanguage = new ExpressionLanguage();
$expressionLanguage->parse('node.', ['node']);
}
@@ -240,10 +239,10 @@ public function testCachingWithDifferentNamesOrder()
/**
* @dataProvider getRegisterCallbacks
- * @expectedException \LogicException
*/
public function testRegisterAfterParse($registerCallback)
{
+ $this->expectException('LogicException');
$el = new ExpressionLanguage();
$el->parse('1 + 1', []);
$registerCallback($el);
@@ -251,31 +250,29 @@ public function testRegisterAfterParse($registerCallback)
/**
* @dataProvider getRegisterCallbacks
- * @expectedException \LogicException
*/
public function testRegisterAfterEval($registerCallback)
{
+ $this->expectException('LogicException');
$el = new ExpressionLanguage();
$el->evaluate('1 + 1');
$registerCallback($el);
}
- /**
- * @expectedException \RuntimeException
- * @expectedExceptionMessageRegExp /Unable to call method "\w+" of object "\w+"./
- */
public function testCallBadCallable()
{
+ $this->expectException('RuntimeException');
+ $this->expectExceptionMessageRegExp('/Unable to call method "\w+" of object "\w+"./');
$el = new ExpressionLanguage();
$el->evaluate('foo.myfunction()', ['foo' => new \stdClass()]);
}
/**
* @dataProvider getRegisterCallbacks
- * @expectedException \LogicException
*/
public function testRegisterAfterCompile($registerCallback)
{
+ $this->expectException('LogicException');
$el = new ExpressionLanguage();
$el->compile('1 + 1');
$registerCallback($el);
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php
index d94dd74f06e6..b26f925cf0f7 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/LexerTest.php
@@ -40,22 +40,18 @@ public function testTokenize($tokens, $expression)
$this->assertEquals(new TokenStream($tokens, $expression), $this->lexer->tokenize($expression));
}
- /**
- * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
- * @expectedExceptionMessage Unexpected character "'" around position 33 for expression `service(faulty.expression.example').dummyMethod()`.
- */
public function testTokenizeThrowsErrorWithMessage()
{
+ $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+ $this->expectExceptionMessage('Unexpected character "\'" around position 33 for expression `service(faulty.expression.example\').dummyMethod()`.');
$expression = "service(faulty.expression.example').dummyMethod()";
$this->lexer->tokenize($expression);
}
- /**
- * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
- * @expectedExceptionMessage Unclosed "(" around position 7 for expression `service(unclosed.expression.dummyMethod()`.
- */
public function testTokenizeThrowsErrorOnUnclosedBrace()
{
+ $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+ $this->expectExceptionMessage('Unclosed "(" around position 7 for expression `service(unclosed.expression.dummyMethod()`.');
$expression = 'service(unclosed.expression.dummyMethod()';
$this->lexer->tokenize($expression);
}
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php
index d030600fe8fe..8fcddeb606f6 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/ParserTest.php
@@ -12,29 +12,28 @@
namespace Symfony\Component\ExpressionLanguage\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\ExpressionLanguage\Lexer;
use Symfony\Component\ExpressionLanguage\Node;
use Symfony\Component\ExpressionLanguage\Parser;
class ParserTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
- * @expectedExceptionMessage Variable "foo" is not valid around position 1 for expression `foo`.
- */
+ use ForwardCompatTestTrait;
+
public function testParseWithInvalidName()
{
+ $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+ $this->expectExceptionMessage('Variable "foo" is not valid around position 1 for expression `foo`.');
$lexer = new Lexer();
$parser = new Parser([]);
$parser->parse($lexer->tokenize('foo'));
}
- /**
- * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
- * @expectedExceptionMessage Variable "foo" is not valid around position 1 for expression `foo`.
- */
public function testParseWithZeroInNames()
{
+ $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+ $this->expectExceptionMessage('Variable "foo" is not valid around position 1 for expression `foo`.');
$lexer = new Lexer();
$parser = new Parser([]);
$parser->parse($lexer->tokenize('foo'), [0]);
@@ -165,10 +164,10 @@ private function createGetAttrNode($node, $item, $type)
/**
* @dataProvider getInvalidPostfixData
- * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
*/
public function testParseWithInvalidPostfixData($expr, $names = [])
{
+ $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
$lexer = new Lexer();
$parser = new Parser([]);
$parser->parse($lexer->tokenize($expr), $names);
@@ -196,12 +195,10 @@ public function getInvalidPostfixData()
];
}
- /**
- * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
- * @expectedExceptionMessage Did you mean "baz"?
- */
public function testNameProposal()
{
+ $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
+ $this->expectExceptionMessage('Did you mean "baz"?');
$lexer = new Lexer();
$parser = new Parser([]);
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index 186b2ef3642d..e8dedf72ac5d 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -11,11 +11,15 @@
namespace Symfony\Component\Filesystem\Tests;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
+
/**
* Test class for Filesystem.
*/
class FilesystemTest extends FilesystemTestCase
{
+ use ForwardCompatTestTrait;
+
public function testCopyCreatesNewFile()
{
$sourceFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_source_file';
@@ -29,22 +33,18 @@ public function testCopyCreatesNewFile()
$this->assertStringEqualsFile($targetFilePath, 'SOURCE FILE');
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testCopyFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$sourceFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_source_file';
$targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
$this->filesystem->copy($sourceFilePath, $targetFilePath);
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testCopyUnreadableFileFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
// skip test on Windows; PHP can't easily set file as unreadable on Windows
if ('\\' === \DIRECTORY_SEPARATOR) {
$this->markTestSkipped('This test cannot run on Windows.');
@@ -118,11 +118,9 @@ public function testCopyOverridesExistingFileIfForced()
$this->assertStringEqualsFile($targetFilePath, 'SOURCE FILE');
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testCopyWithOverrideWithReadOnlyTargetFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
// skip test on Windows; PHP can't easily set file as unwritable on Windows
if ('\\' === \DIRECTORY_SEPARATOR) {
$this->markTestSkipped('This test cannot run on Windows.');
@@ -222,11 +220,9 @@ public function testMkdirCreatesDirectoriesFromTraversableObject()
$this->assertTrue(is_dir($basePath.'3'));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testMkdirCreatesDirectoriesFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$basePath = $this->workspace.\DIRECTORY_SEPARATOR;
$dir = $basePath.'2';
@@ -244,11 +240,9 @@ public function testTouchCreatesEmptyFile()
$this->assertFileExists($file);
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testTouchFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$file = $this->workspace.\DIRECTORY_SEPARATOR.'1'.\DIRECTORY_SEPARATOR.'2';
$this->filesystem->touch($file);
@@ -380,11 +374,9 @@ public function testFilesExists()
$this->assertTrue($this->filesystem->exists($basePath.'folder'));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testFilesExistsFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
if ('\\' !== \DIRECTORY_SEPARATOR) {
$this->markTestSkipped('Long file names are an issue on Windows');
}
@@ -613,11 +605,9 @@ public function testChownLink()
$this->assertSame($owner, $this->getFileOwner($link));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testChownSymlinkFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$this->markAsSkippedIfSymlinkIsMissing();
$file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
@@ -630,11 +620,9 @@ public function testChownSymlinkFails()
$this->filesystem->chown($link, 'user'.time().mt_rand(1000, 9999));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testChownLinkFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$this->markAsSkippedIfLinkIsMissing();
$file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
@@ -647,11 +635,9 @@ public function testChownLinkFails()
$this->filesystem->chown($link, 'user'.time().mt_rand(1000, 9999));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testChownFail()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$this->markAsSkippedIfPosixIsMissing();
$dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
@@ -722,11 +708,9 @@ public function testChgrpLink()
$this->assertSame($group, $this->getFileGroup($link));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testChgrpSymlinkFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$this->markAsSkippedIfSymlinkIsMissing();
$file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
@@ -739,11 +723,9 @@ public function testChgrpSymlinkFails()
$this->filesystem->chgrp($link, 'user'.time().mt_rand(1000, 9999));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testChgrpLinkFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$this->markAsSkippedIfLinkIsMissing();
$file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
@@ -756,11 +738,9 @@ public function testChgrpLinkFails()
$this->filesystem->chgrp($link, 'user'.time().mt_rand(1000, 9999));
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testChgrpFail()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$this->markAsSkippedIfPosixIsMissing();
$dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
@@ -781,11 +761,9 @@ public function testRename()
$this->assertFileExists($newPath);
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testRenameThrowsExceptionIfTargetAlreadyExists()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
$newPath = $this->workspace.\DIRECTORY_SEPARATOR.'new_file';
@@ -809,11 +787,9 @@ public function testRenameOverwritesTheTargetIfItAlreadyExists()
$this->assertFileExists($newPath);
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testRenameThrowsExceptionOnError()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$file = $this->workspace.\DIRECTORY_SEPARATOR.uniqid('fs_test_', true);
$newPath = $this->workspace.\DIRECTORY_SEPARATOR.'new_file';
@@ -1420,11 +1396,9 @@ public function testTempnamWithMockScheme()
$this->assertFileExists($filename);
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testTempnamWithZlibSchemeFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$scheme = 'compress.zlib://';
$dirname = $scheme.$this->workspace;
@@ -1445,11 +1419,9 @@ public function testTempnamWithPHPTempSchemeFails()
$this->assertFileNotExists($filename);
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testTempnamWithPharSchemeFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
// Skip test if Phar disabled phar.readonly must be 0 in php.ini
if (!\Phar::canWrite()) {
$this->markTestSkipped('This test cannot run when phar.readonly is 1.');
@@ -1464,11 +1436,9 @@ public function testTempnamWithPharSchemeFails()
$this->filesystem->tempnam($dirname, $pharname.'/bar');
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- */
public function testTempnamWithHTTPSchemeFails()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
$scheme = 'http://';
$dirname = $scheme.$this->workspace;
diff --git a/src/Symfony/Component/Filesystem/Tests/LockHandlerTest.php b/src/Symfony/Component/Filesystem/Tests/LockHandlerTest.php
index 14eabc021edb..5048d99849ff 100644
--- a/src/Symfony/Component/Filesystem/Tests/LockHandlerTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/LockHandlerTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Filesystem\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Filesystem\Exception\IOException;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Filesystem\LockHandler;
@@ -21,24 +22,22 @@
*/
class LockHandlerTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- * @expectedExceptionMessage Failed to create "/a/b/c/d/e": mkdir(): Permission denied.
- */
+ use ForwardCompatTestTrait;
+
public function testConstructWhenRepositoryDoesNotExist()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+ $this->expectExceptionMessage('Failed to create "/a/b/c/d/e": mkdir(): Permission denied.');
if (!getenv('USER') || 'root' === getenv('USER')) {
$this->markTestSkipped('This test will fail if run under superuser');
}
new LockHandler('lock', '/a/b/c/d/e');
}
- /**
- * @expectedException \Symfony\Component\Filesystem\Exception\IOException
- * @expectedExceptionMessage The directory "/" is not writable.
- */
public function testConstructWhenRepositoryIsNotWriteable()
{
+ $this->expectException('Symfony\Component\Filesystem\Exception\IOException');
+ $this->expectExceptionMessage('The directory "/" is not writable.');
if (!getenv('USER') || 'root' === getenv('USER')) {
$this->markTestSkipped('This test will fail if run under superuser');
}
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
index c0eac6da12b5..0f2f47caa37d 100644
--- a/src/Symfony/Component/Finder/Tests/FinderTest.php
+++ b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -11,10 +11,13 @@
namespace Symfony\Component\Finder\Tests;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Finder\Finder;
class FinderTest extends Iterator\RealIteratorTestCase
{
+ use ForwardCompatTestTrait;
+
public function testCreate()
{
$this->assertInstanceOf('Symfony\Component\Finder\Finder', Finder::create());
@@ -311,11 +314,9 @@ public function testIn()
$this->assertIterator($expected, $iterator);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testInWithNonExistentDirectory()
{
+ $this->expectException('InvalidArgumentException');
$finder = new Finder();
$finder->in('foobar');
}
@@ -328,11 +329,9 @@ public function testInWithGlob()
$this->assertIterator($this->toAbsoluteFixtures(['A/B/C/abc.dat', 'copy/A/B/C/abc.dat.copy']), $finder);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testInWithNonDirectoryGlob()
{
+ $this->expectException('InvalidArgumentException');
$finder = new Finder();
$finder->in(__DIR__.'/Fixtures/A/a*');
}
@@ -349,11 +348,9 @@ public function testInWithGlobBrace()
$this->assertIterator($this->toAbsoluteFixtures(['A/B/C/abc.dat', 'copy/A/B/C/abc.dat.copy']), $finder);
}
- /**
- * @expectedException \LogicException
- */
public function testGetIteratorWithoutIn()
{
+ $this->expectException('LogicException');
$finder = Finder::create();
$finder->getIterator();
}
@@ -481,11 +478,9 @@ public function testCountFiles()
$this->assertCount($i, $files);
}
- /**
- * @expectedException \LogicException
- */
public function testCountWithoutIn()
{
+ $this->expectException('LogicException');
$finder = Finder::create()->files();
\count($finder);
}
@@ -710,7 +705,7 @@ public function testAccessDeniedException()
$this->fail('Finder should throw an exception when opening a non-readable directory.');
} catch (\Exception $e) {
$expectedExceptionClass = 'Symfony\\Component\\Finder\\Exception\\AccessDeniedException';
- if ($e instanceof \PHPUnit_Framework_ExpectationFailedException) {
+ if ($e instanceof \PHPUnit\Framework\ExpectationFailedException) {
$this->fail(sprintf("Expected exception:\n%s\nGot:\n%s\nWith comparison failure:\n%s", $expectedExceptionClass, 'PHPUnit_Framework_ExpectationFailedException', $e->getComparisonFailure()->getExpectedAsString()));
}
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php
index ad0187e032af..9c6e7db03f9c 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php
@@ -11,15 +11,16 @@
namespace Symfony\Component\Finder\Tests\Iterator;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Finder\Iterator\CustomFilterIterator;
class CustomFilterIteratorTest extends IteratorTestCase
{
- /**
- * @expectedException \InvalidArgumentException
- */
+ use ForwardCompatTestTrait;
+
public function testWithInvalidFilter()
{
+ $this->expectException('InvalidArgumentException');
new CustomFilterIterator(new Iterator(), ['foo']);
}
diff --git a/src/Symfony/Component/Form/Tests/ButtonTest.php b/src/Symfony/Component/Form/Tests/ButtonTest.php
index 7f4344fe63e1..92430069954f 100644
--- a/src/Symfony/Component/Form/Tests/ButtonTest.php
+++ b/src/Symfony/Component/Form/Tests/ButtonTest.php
@@ -33,11 +33,9 @@ private function doSetUp()
$this->factory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\AlreadySubmittedException
- */
public function testSetParentOnSubmittedButton()
{
+ $this->expectException('Symfony\Component\Form\Exception\AlreadySubmittedException');
$button = $this->getButtonBuilder('button')
->getForm()
;
diff --git a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
index 77ab8e73b041..b36b45d9b536 100644
--- a/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
+++ b/src/Symfony/Component/Form/Tests/Command/DebugCommandTest.php
@@ -51,12 +51,10 @@ public function testDebugFormTypeOption()
$this->assertContains('Symfony\Component\Form\Extension\Core\Type\FormType (method)', $tester->getDisplay());
}
- /**
- * @expectedException \Symfony\Component\Console\Exception\InvalidArgumentException
- * @expectedExceptionMessage Could not find type "NonExistentType"
- */
public function testDebugSingleFormTypeNotFound()
{
+ $this->expectException('Symfony\Component\Console\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Could not find type "NonExistentType"');
$tester = $this->createCommandTester();
$tester->execute(['class' => 'NonExistentType'], ['decorated' => false, 'interactive' => false]);
}
@@ -108,11 +106,9 @@ public function testDebugAmbiguousFormTypeInteractive()
, $output);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testDebugInvalidFormType()
{
+ $this->expectException('InvalidArgumentException');
$this->createCommandTester()->execute(['class' => 'test']);
}
diff --git a/src/Symfony/Component/Form/Tests/CompoundFormTest.php b/src/Symfony/Component/Form/Tests/CompoundFormTest.php
index 7657056b7ada..516bd52d6871 100644
--- a/src/Symfony/Component/Form/Tests/CompoundFormTest.php
+++ b/src/Symfony/Component/Form/Tests/CompoundFormTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Form\Tests;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper;
use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
@@ -26,6 +27,8 @@
class CompoundFormTest extends AbstractFormTest
{
+ use ForwardCompatTestTrait;
+
public function testValidIfAllChildrenAreValid()
{
$this->form->add($this->getBuilder('firstName')->getForm());
@@ -269,11 +272,9 @@ public function testAddUsingNameButNoTypeAndOptions()
$this->assertSame(['foo' => $child], $this->form->all());
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\AlreadySubmittedException
- */
public function testAddThrowsExceptionIfAlreadySubmitted()
{
+ $this->expectException('Symfony\Component\Form\Exception\AlreadySubmittedException');
$this->form->submit([]);
$this->form->add($this->getBuilder('foo')->getForm());
}
@@ -288,11 +289,9 @@ public function testRemove()
$this->assertCount(0, $this->form);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\AlreadySubmittedException
- */
public function testRemoveThrowsExceptionIfAlreadySubmitted()
{
+ $this->expectException('Symfony\Component\Form\Exception\AlreadySubmittedException');
$this->form->add($this->getBuilder('foo')->setCompound(false)->getForm());
$this->form->submit(['foo' => 'bar']);
$this->form->remove('foo');
diff --git a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
index 1e756ac5cfe2..4dba3e1737ce 100644
--- a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
+++ b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Form\Tests\DependencyInjection;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -27,6 +28,8 @@
*/
class FormPassTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testDoNothingIfFormExtensionNotLoaded()
{
$container = $this->createContainerBuilder();
@@ -156,12 +159,10 @@ public function addTaggedTypeExtensionsDataProvider()
];
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage extended-type attribute, none was configured for the "my.type_extension" service
- */
public function testAddTaggedFormTypeExtensionWithoutExtendedTypeAttribute()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('extended-type attribute, none was configured for the "my.type_extension" service');
$container = $this->createContainerBuilder();
$container->setDefinition('form.extension', $this->createExtensionDefinition());
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php
index 09b81fc5e1bb..e1e7ad0eeeab 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php
@@ -71,11 +71,9 @@ public function testTransformEmpty()
$this->assertSame($output, $this->transformer->transform(null));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testTransformRequiresArray()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->transformer->transform('12345');
}
@@ -126,11 +124,9 @@ public function testReverseTransformCompletelyNull()
$this->assertNull($this->transformer->reverseTransform($input));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformPartiallyNull()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$input = [
'first' => [
'a' => '1',
@@ -143,11 +139,9 @@ public function testReverseTransformPartiallyNull()
$this->transformer->reverseTransform($input);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformRequiresArray()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->transformer->reverseTransform('12345');
}
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php
index 283dd4a81d1b..d3dc7e3a2647 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BaseDateTimeTransformerTest.php
@@ -12,24 +12,23 @@
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
class BaseDateTimeTransformerTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
- * @expectedExceptionMessage this_timezone_does_not_exist
- */
+ use ForwardCompatTestTrait;
+
public function testConstructFailsIfInputTimezoneIsInvalid()
{
+ $this->expectException('Symfony\Component\Form\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('this_timezone_does_not_exist');
$this->getMockBuilder('Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer')->setConstructorArgs(['this_timezone_does_not_exist'])->getMock();
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
- * @expectedExceptionMessage that_timezone_does_not_exist
- */
public function testConstructFailsIfOutputTimezoneIsInvalid()
{
+ $this->expectException('Symfony\Component\Form\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('that_timezone_does_not_exist');
$this->getMockBuilder('Symfony\Component\Form\Extension\Core\DataTransformer\BaseDateTimeTransformer')->setConstructorArgs([null, 'that_timezone_does_not_exist'])->getMock();
}
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php
index 5c1582eb04ad..02cc314e837d 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/BooleanToStringTransformerTest.php
@@ -48,19 +48,15 @@ public function testTransformAcceptsNull()
$this->assertNull($this->transformer->transform(null));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testTransformFailsIfString()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->transformer->transform('1');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformFailsIfInteger()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->transformer->reverseTransform(1);
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
index 37d383490f96..ee007b40d1a8 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
@@ -91,10 +91,10 @@ public function reverseTransformExpectsStringOrNullProvider()
/**
* @dataProvider reverseTransformExpectsStringOrNullProvider
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
*/
public function testReverseTransformExpectsStringOrNull($value)
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->transformer->reverseTransform($value);
}
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php
index e741a3e11f0c..6f008ba18714 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php
@@ -56,11 +56,9 @@ public function testTransformNull()
$this->assertSame([], $this->transformer->transform(null));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testTransformExpectsArray()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->transformer->transform('foobar');
}
@@ -84,11 +82,9 @@ public function testReverseTransformNull()
$this->assertSame([], $this->transformerWithNull->reverseTransform(null));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformExpectsArray()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->transformer->reverseTransform('foobar');
}
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
index 2669d3d4af42..5460203fc6c4 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToArrayTransformer;
class DateTimeToArrayTransformerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testTransform()
{
$transformer = new DateTimeToArrayTransformer('UTC', 'UTC');
@@ -137,11 +140,9 @@ public function testTransformDateTimeImmutable()
$this->assertSame($output, $transformer->transform($input));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testTransformRequiresDateTime()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform('12345');
}
@@ -211,11 +212,9 @@ public function testReverseTransformCompletelyEmptySubsetOfFields()
$this->assertNull($transformer->reverseTransform($input));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformPartiallyEmptyYear()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'month' => '2',
@@ -226,11 +225,9 @@ public function testReverseTransformPartiallyEmptyYear()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformPartiallyEmptyMonth()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -241,11 +238,9 @@ public function testReverseTransformPartiallyEmptyMonth()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformPartiallyEmptyDay()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -256,11 +251,9 @@ public function testReverseTransformPartiallyEmptyDay()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformPartiallyEmptyHour()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -271,11 +264,9 @@ public function testReverseTransformPartiallyEmptyHour()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformPartiallyEmptyMinute()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -286,11 +277,9 @@ public function testReverseTransformPartiallyEmptyMinute()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformPartiallyEmptySecond()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -346,20 +335,16 @@ public function testReverseTransformToDifferentTimezone()
$this->assertEquals($output, $transformer->reverseTransform($input));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformRequiresArray()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform('12345');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithNegativeYear()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '-1',
@@ -371,11 +356,9 @@ public function testReverseTransformWithNegativeYear()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithNegativeMonth()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -387,11 +370,9 @@ public function testReverseTransformWithNegativeMonth()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithNegativeDay()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -403,11 +384,9 @@ public function testReverseTransformWithNegativeDay()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithNegativeHour()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -419,11 +398,9 @@ public function testReverseTransformWithNegativeHour()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithNegativeMinute()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -435,11 +412,9 @@ public function testReverseTransformWithNegativeMinute()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithNegativeSecond()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -451,11 +426,9 @@ public function testReverseTransformWithNegativeSecond()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithInvalidMonth()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -467,11 +440,9 @@ public function testReverseTransformWithInvalidMonth()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithInvalidDay()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -483,11 +454,9 @@ public function testReverseTransformWithInvalidDay()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithStringDay()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -499,11 +468,9 @@ public function testReverseTransformWithStringDay()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithStringMonth()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -515,11 +482,9 @@ public function testReverseTransformWithStringMonth()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithStringYear()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => 'bazinga',
@@ -531,11 +496,9 @@ public function testReverseTransformWithStringYear()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithEmptyStringHour()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -547,11 +510,9 @@ public function testReverseTransformWithEmptyStringHour()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithEmptyStringMinute()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
@@ -563,11 +524,9 @@ public function testReverseTransformWithEmptyStringMinute()
]);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithEmptyStringSecond()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToArrayTransformer();
$transformer->reverseTransform([
'year' => '2010',
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
index 6388bf2a8d5e..facbe9510e90 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
@@ -12,11 +12,13 @@
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToHtml5LocalDateTimeTransformer;
use Symfony\Component\Form\Tests\Extension\Core\DataTransformer\Traits\DateTimeEqualsTrait;
class DateTimeToHtml5LocalDateTimeTransformerTest extends TestCase
{
+ use ForwardCompatTestTrait;
use DateTimeEqualsTrait;
public function transformProvider()
@@ -72,11 +74,9 @@ public function testTransformDateTimeImmutable($fromTz, $toTz, $from, $to)
$this->assertSame($to, $transformer->transform(null !== $from ? new \DateTimeImmutable($from) : null));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testTransformRequiresValidDateTime()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToHtml5LocalDateTimeTransformer();
$transformer->transform('2010-01-01');
}
@@ -95,30 +95,24 @@ public function testReverseTransform($toTz, $fromTz, $to, $from)
}
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformRequiresString()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToHtml5LocalDateTimeTransformer();
$transformer->reverseTransform(12345);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithNonExistingDate()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToHtml5LocalDateTimeTransformer('UTC', 'UTC');
$transformer->reverseTransform('2010-04-31T04:05');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformExpectsValidDateString()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToHtml5LocalDateTimeTransformer('UTC', 'UTC');
$transformer->reverseTransform('2010-2010-2010');
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
index c074fe88d170..a13182ddeb43 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -175,11 +175,9 @@ public function testTransformDateTimeImmutableTimezones()
$this->assertEquals($dateTime->format('d.m.Y, H:i'), $transformer->transform($input));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testTransformRequiresValidDateTime()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToLocalizedStringTransformer();
$transformer->transform('2010-01-01');
}
@@ -285,73 +283,57 @@ public function testReverseTransformEmpty()
$this->assertNull($transformer->reverseTransform(''));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformRequiresString()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToLocalizedStringTransformer();
$transformer->reverseTransform(12345);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWrapsIntlErrors()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToLocalizedStringTransformer();
$transformer->reverseTransform('12345');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
- */
public function testValidateDateFormatOption()
{
+ $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
new DateTimeToLocalizedStringTransformer(null, null, 'foobar');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
- */
public function testValidateTimeFormatOption()
{
+ $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
new DateTimeToLocalizedStringTransformer(null, null, null, 'foobar');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithNonExistingDate()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', \IntlDateFormatter::SHORT);
$this->assertDateTimeEquals($this->dateTimeWithoutSeconds, $transformer->reverseTransform('31.04.10 04:05'));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformOutOfTimestampRange()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
$transformer->reverseTransform('1789-07-14');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformFiveDigitYears()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, null, \IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd');
$transformer->reverseTransform('20107-03-21');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformFiveDigitYearsWithTimestamp()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, null, \IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd HH:mm:ss');
$transformer->reverseTransform('20107-03-21 12:34:56');
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
index ec251d8f35c1..3a2d9ab8bbca 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
@@ -87,11 +87,9 @@ public function testTransformDateTimeImmutable($fromTz, $toTz, $from, $to)
$this->assertSame($to, $transformer->transform(null !== $from ? new \DateTimeImmutable($from) : null));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testTransformRequiresValidDateTime()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToRfc3339Transformer();
$transformer->transform('2010-01-01');
}
@@ -110,20 +108,16 @@ public function testReverseTransform($toTz, $fromTz, $to, $from)
}
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformRequiresString()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToRfc3339Transformer();
$transformer->reverseTransform(12345);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformWithNonExistingDate()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToRfc3339Transformer('UTC', 'UTC');
$transformer->reverseTransform('2010-04-31T04:05Z');
@@ -131,10 +125,10 @@ public function testReverseTransformWithNonExistingDate()
/**
* @dataProvider invalidDateStringProvider
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
*/
public function testReverseTransformExpectsValidDateString($date)
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new DateTimeToRfc3339Transformer('UTC', 'UTC');
$transformer->reverseTransform($date);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeZoneToStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeZoneToStringTransformerTest.php
index 6aefe3cab53f..6bc0cd9a54f7 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeZoneToStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeZoneToStringTransformerTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeZoneToStringTransformer;
class DateTimeZoneToStringTransformerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testSingle()
{
$transformer = new DateTimeZoneToStringTransformer();
@@ -38,19 +41,15 @@ public function testMultiple()
$this->assertEquals([new \DateTimeZone('Europe/Amsterdam')], $transformer->reverseTransform(['Europe/Amsterdam']));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testInvalidTimezone()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
(new DateTimeZoneToStringTransformer())->transform(1);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testUnknownTimezone()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
(new DateTimeZoneToStringTransformer(true))->reverseTransform(['Foo/Bar']);
}
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
index c7b60d1e57e8..33e560951098 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
@@ -190,21 +190,17 @@ public function testReverseTransformWithRounding($input, $output, $roundingMode)
$this->assertEquals($output, $transformer->reverseTransform($input));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformExpectsString()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new IntegerToLocalizedStringTransformer();
$transformer->reverseTransform(1);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformExpectsValidNumber()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new IntegerToLocalizedStringTransformer();
$transformer->reverseTransform('foo');
@@ -212,10 +208,10 @@ public function testReverseTransformExpectsValidNumber()
/**
* @dataProvider floatNumberProvider
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
*/
public function testReverseTransformExpectsInteger($number, $locale)
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
IntlTestHelper::requireFullIntl($this, false);
\Locale::setDefault($locale);
@@ -233,41 +229,33 @@ public function floatNumberProvider()
];
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformDisallowsNaN()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new IntegerToLocalizedStringTransformer();
$transformer->reverseTransform('NaN');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformDisallowsNaN2()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new IntegerToLocalizedStringTransformer();
$transformer->reverseTransform('nan');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformDisallowsInfinity()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new IntegerToLocalizedStringTransformer();
$transformer->reverseTransform('∞');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformDisallowsNegativeInfinity()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new IntegerToLocalizedStringTransformer();
$transformer->reverseTransform('-∞');
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
index fd3f570d4c74..c4e8c7a3d6ab 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
@@ -400,11 +400,9 @@ public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
$this->assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
// Since we test against "de_DE", we need the full implementation
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
@@ -415,11 +413,9 @@ public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
$transformer->reverseTransform('1.234.5');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGroupSep()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
// Since we test against "de_DE", we need the full implementation
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
@@ -459,11 +455,9 @@ public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsNotComma()
$this->assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
$transformer = new NumberToLocalizedStringTransformer(null, true);
@@ -471,11 +465,9 @@ public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma()
$transformer->reverseTransform('1,234,5');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsCommaWithNoGroupSep()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
$transformer = new NumberToLocalizedStringTransformer(null, true);
@@ -491,44 +483,37 @@ public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsCommaButNoGro
$this->assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testTransformExpectsNumeric()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new NumberToLocalizedStringTransformer();
$transformer->transform('foo');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformExpectsString()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new NumberToLocalizedStringTransformer();
$transformer->reverseTransform(1);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformExpectsValidNumber()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new NumberToLocalizedStringTransformer();
$transformer->reverseTransform('foo');
}
/**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
* @dataProvider nanRepresentationProvider
- *
* @see https://github.com/symfony/symfony/issues/3161
*/
public function testReverseTransformDisallowsNaN($nan)
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new NumberToLocalizedStringTransformer();
$transformer->reverseTransform($nan);
@@ -543,63 +528,51 @@ public function nanRepresentationProvider()
];
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformDisallowsInfinity()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new NumberToLocalizedStringTransformer();
$transformer->reverseTransform('∞');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformDisallowsInfinity2()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new NumberToLocalizedStringTransformer();
$transformer->reverseTransform('∞,123');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformDisallowsNegativeInfinity()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new NumberToLocalizedStringTransformer();
$transformer->reverseTransform('-∞');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformDisallowsLeadingExtraCharacters()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new NumberToLocalizedStringTransformer();
$transformer->reverseTransform('foo123');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- * @expectedExceptionMessage The number contains unrecognized characters: "foo3"
- */
public function testReverseTransformDisallowsCenteredExtraCharacters()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $this->expectExceptionMessage('The number contains unrecognized characters: "foo3"');
$transformer = new NumberToLocalizedStringTransformer();
$transformer->reverseTransform('12foo3');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- * @expectedExceptionMessage The number contains unrecognized characters: "foo8"
- */
public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $this->expectExceptionMessage('The number contains unrecognized characters: "foo8"');
// Since we test against other locales, we need the full implementation
IntlTestHelper::requireFullIntl($this, false);
@@ -610,12 +583,10 @@ public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
$transformer->reverseTransform("12\xc2\xa0345,67foo8");
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- * @expectedExceptionMessage The number contains unrecognized characters: "foo8"
- */
public function testReverseTransformIgnoresTrailingSpacesInExceptionMessage()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $this->expectExceptionMessage('The number contains unrecognized characters: "foo8"');
// Since we test against other locales, we need the full implementation
IntlTestHelper::requireFullIntl($this, false);
@@ -626,23 +597,19 @@ public function testReverseTransformIgnoresTrailingSpacesInExceptionMessage()
$transformer->reverseTransform("12\xc2\xa0345,67foo8 \xc2\xa0\t");
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- * @expectedExceptionMessage The number contains unrecognized characters: "foo"
- */
public function testReverseTransformDisallowsTrailingExtraCharacters()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $this->expectExceptionMessage('The number contains unrecognized characters: "foo"');
$transformer = new NumberToLocalizedStringTransformer();
$transformer->reverseTransform('123foo');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- * @expectedExceptionMessage The number contains unrecognized characters: "foo"
- */
public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $this->expectExceptionMessage('The number contains unrecognized characters: "foo"');
// Since we test against other locales, we need the full implementation
IntlTestHelper::requireFullIntl($this, false);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
index e2dfc481b351..06ef6cc73634 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
@@ -145,11 +145,9 @@ public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot()
$this->assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
// Since we test against "de_DE", we need the full implementation
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
@@ -160,11 +158,9 @@ public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
$transformer->reverseTransform('1.234.5');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGroupSep()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
// Since we test against "de_DE", we need the full implementation
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
@@ -204,11 +200,9 @@ public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsNotComma()
$this->assertEquals(1234.5, $transformer->reverseTransform('1234,5'));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
$transformer = new PercentToLocalizedStringTransformer(1, 'integer');
@@ -216,11 +210,9 @@ public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsComma()
$transformer->reverseTransform('1,234,5');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testDecimalSeparatorMayNotBeCommaIfGroupingSeparatorIsCommaWithNoGroupSep()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
IntlTestHelper::requireFullIntl($this, '4.8.1.1');
$transformer = new PercentToLocalizedStringTransformer(1, 'integer');
@@ -246,34 +238,30 @@ public function testDecimalSeparatorMayBeCommaIfGroupingSeparatorIsCommaButNoGro
$this->assertEquals(1234.5, $transformer->reverseTransform('1234.5'));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformDisallowsLeadingExtraCharacters()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer = new PercentToLocalizedStringTransformer();
$transformer->reverseTransform('foo123');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- * @expectedExceptionMessage The number contains unrecognized characters: "foo3"
- */
public function testReverseTransformDisallowsCenteredExtraCharacters()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $this->expectExceptionMessage('The number contains unrecognized characters: "foo3"');
$transformer = new PercentToLocalizedStringTransformer();
$transformer->reverseTransform('12foo3');
}
/**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- * @expectedExceptionMessage The number contains unrecognized characters: "foo8"
* @requires extension mbstring
*/
public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $this->expectExceptionMessage('The number contains unrecognized characters: "foo8"');
// Since we test against other locales, we need the full implementation
IntlTestHelper::requireFullIntl($this, false);
@@ -284,24 +272,22 @@ public function testReverseTransformDisallowsCenteredExtraCharactersMultibyte()
$transformer->reverseTransform("12\xc2\xa0345,67foo8");
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- * @expectedExceptionMessage The number contains unrecognized characters: "foo"
- */
public function testReverseTransformDisallowsTrailingExtraCharacters()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $this->expectExceptionMessage('The number contains unrecognized characters: "foo"');
$transformer = new PercentToLocalizedStringTransformer();
$transformer->reverseTransform('123foo');
}
/**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- * @expectedExceptionMessage The number contains unrecognized characters: "foo"
* @requires extension mbstring
*/
public function testReverseTransformDisallowsTrailingExtraCharactersMultibyte()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $this->expectExceptionMessage('The number contains unrecognized characters: "foo"');
// Since we test against other locales, we need the full implementation
IntlTestHelper::requireFullIntl($this, false);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php
index 179ace5a6cf6..c02eb3573e69 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php
@@ -108,11 +108,9 @@ public function testReverseTransformZeroString()
$this->assertSame('0', $this->transformer->reverseTransform($input));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformPartiallyNull()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$input = [
'a' => 'Foo',
'b' => 'Foo',
@@ -122,11 +120,9 @@ public function testReverseTransformPartiallyNull()
$this->transformer->reverseTransform($input);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformDifferences()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$input = [
'a' => 'Foo',
'b' => 'Bar',
@@ -136,11 +132,9 @@ public function testReverseTransformDifferences()
$this->transformer->reverseTransform($input);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- */
public function testReverseTransformRequiresArray()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->transformer->reverseTransform('12345');
}
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
index daf5d60d3788..67545d6f2910 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/MergeCollectionListenerTest.php
@@ -185,10 +185,10 @@ public function testDoNothingIfNotAllowDelete($allowAdd)
/**
* @dataProvider getBooleanMatrix2
- * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
*/
public function testRequireArrayOrTraversable($allowAdd, $allowDelete)
{
+ $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
$newData = 'no array or traversable';
$event = new FormEvent($this->form, $newData);
$listener = new MergeCollectionListener($allowAdd, $allowDelete);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
index a1775efe9f8f..4c3ff17b4c98 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/EventListener/ResizeFormListenerTest.php
@@ -69,11 +69,9 @@ public function testPreSetDataResizesForm()
$this->assertTrue($this->form->has('2'));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
- */
public function testPreSetDataRequiresArrayOrTraversable()
{
+ $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
$data = 'no array or traversable';
$event = new FormEvent($this->form, $data);
$listener = new ResizeFormListener('text', [], false, false);
@@ -204,11 +202,9 @@ public function testOnSubmitNormDataDoesNothingIfNotAllowDelete()
$this->assertEquals($data, $event->getData());
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
- */
public function testOnSubmitNormDataRequiresArrayOrTraversable()
{
+ $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
$data = 'no array or traversable';
$event = new FormEvent($this->form, $data);
$listener = new ResizeFormListener('text', [], false, false);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php
index ffadf8c844dc..01e08d09ff11 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BirthdayTypeTest.php
@@ -11,18 +11,20 @@
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
+
/**
* @author Stepan Anchugov
*/
class BirthdayTypeTest extends DateTypeTest
{
+ use ForwardCompatTestTrait;
+
const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\BirthdayType';
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testSetInvalidYearsOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'years' => 'bad value',
]);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ButtonTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ButtonTypeTest.php
index 350602306f64..98df91d7e873 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ButtonTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ButtonTypeTest.php
@@ -11,11 +11,15 @@
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
+
/**
* @author Bernhard Schussek
*/
class ButtonTypeTest extends BaseTypeTest
{
+ use ForwardCompatTestTrait;
+
const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\ButtonType';
public function testCreateButtonInstances()
@@ -24,14 +28,14 @@ public function testCreateButtonInstances()
}
/**
- * @expectedException \Symfony\Component\Form\Exception\BadMethodCallException
- * @expectedExceptionMessage Buttons do not support empty data.
*
* @param string $emptyData
* @param null $expectedData
*/
public function testSubmitNullUsesDefaultEmptyData($emptyData = 'empty', $expectedData = null)
{
+ $this->expectException('Symfony\Component\Form\Exception\BadMethodCallException');
+ $this->expectExceptionMessage('Buttons do not support empty data.');
parent::testSubmitNullUsesDefaultEmptyData($emptyData, $expectedData);
}
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
index 544f4442f19e..5b47bc4212ba 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -83,21 +83,17 @@ private function doTearDown()
$this->objectChoices = null;
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testChoicesOptionExpectsArrayOrTraversable()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'choices' => new \stdClass(),
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testChoiceLoaderOptionExpectsChoiceLoaderInterface()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'choice_loader' => new \stdClass(),
]);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
index 6e9059d2cdb3..a1c1c356509f 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -38,21 +38,17 @@ private function doTearDown()
\Locale::setDefault($this->defaultLocale);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testInvalidWidgetOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'widget' => 'fake_widget',
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testInvalidInputOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'input' => 'fake_input',
]);
@@ -344,11 +340,10 @@ public function provideDateFormats()
/**
* This test is to check that the strings '0', '1', '2', '3' are not accepted
* as valid IntlDateFormatter constants for FULL, LONG, MEDIUM or SHORT respectively.
- *
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
*/
public function testThrowExceptionIfFormatIsNoPattern()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'format' => '0',
'widget' => 'single_text',
@@ -356,75 +351,61 @@ public function testThrowExceptionIfFormatIsNoPattern()
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The "format" option should contain the letters "y", "M" and "d". Its current value is "yy".
- */
public function testThrowExceptionIfFormatDoesNotContainYearMonthAndDay()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The "format" option should contain the letters "y", "M" and "d". Its current value is "yy".');
$this->factory->create(static::TESTED_TYPE, null, [
'months' => [6, 7],
'format' => 'yy',
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The "format" option should contain the letters "y", "M" or "d". Its current value is "wrong".
- */
public function testThrowExceptionIfFormatMissesYearMonthAndDayWithSingleTextWidget()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The "format" option should contain the letters "y", "M" or "d". Its current value is "wrong".');
$this->factory->create(static::TESTED_TYPE, null, [
'widget' => 'single_text',
'format' => 'wrong',
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testThrowExceptionIfFormatIsNoConstant()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'format' => 105,
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testThrowExceptionIfFormatIsInvalid()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'format' => [],
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testThrowExceptionIfYearsIsInvalid()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'years' => 'bad value',
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testThrowExceptionIfMonthsIsInvalid()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'months' => 'bad value',
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testThrowExceptionIfDaysIsInvalid()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'days' => 'bad value',
]);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
index 960d94ebb49f..7b1b7d05f773 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/FormTypeTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Form\CallbackTransformer;
use Symfony\Component\Form\FormError;
use Symfony\Component\Form\Tests\Fixtures\Author;
@@ -51,6 +52,8 @@ public function setReferenceCopy($reference)
class FormTypeTest extends BaseTypeTest
{
+ use ForwardCompatTestTrait;
+
const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\FormType';
public function testCreateFormInstances()
@@ -160,11 +163,9 @@ public function testDataClassMayBeInterface()
]));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
- */
public function testDataClassMustBeValidClassOrInterface()
{
+ $this->expectException('Symfony\Component\Form\Exception\InvalidArgumentException');
$this->factory->createBuilder(static::TESTED_TYPE, null, [
'data_class' => 'foobar',
]);
@@ -329,11 +330,9 @@ public function testSubmitWithEmptyDataUsesEmptyDataOption()
$this->assertEquals('Bernhard', $author->firstName);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testAttributesException()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, ['attr' => '']);
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php
index de99a9b9f16e..3d49ae83f8cc 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/RepeatedTypeTest.php
@@ -81,33 +81,27 @@ public function testSetRequired()
$this->assertFalse($form['second']->isRequired());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testSetInvalidOptions()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'type' => TextTypeTest::TESTED_TYPE,
'options' => 'bad value',
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testSetInvalidFirstOptions()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'type' => TextTypeTest::TESTED_TYPE,
'first_options' => 'bad value',
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testSetInvalidSecondOptions()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'type' => TextTypeTest::TESTED_TYPE,
'second_options' => 'bad value',
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
index b445c8c5bfec..f1cd2d7f436e 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
@@ -11,11 +11,14 @@
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Form\ChoiceList\View\ChoiceView;
use Symfony\Component\Form\FormError;
class TimeTypeTest extends BaseTypeTest
{
+ use ForwardCompatTestTrait;
+
const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\TimeType';
public function testSubmitDateTime()
@@ -683,42 +686,34 @@ public function testSecondErrorsBubbleUp($widget)
$this->assertSame([$error], iterator_to_array($form->getErrors()));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\InvalidConfigurationException
- */
public function testInitializeWithSecondsAndWithoutMinutes()
{
+ $this->expectException('Symfony\Component\Form\Exception\InvalidConfigurationException');
$this->factory->create(static::TESTED_TYPE, null, [
'with_minutes' => false,
'with_seconds' => true,
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testThrowExceptionIfHoursIsInvalid()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'hours' => 'bad value',
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testThrowExceptionIfMinutesIsInvalid()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'minutes' => 'bad value',
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testThrowExceptionIfSecondsIsInvalid()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'seconds' => 'bad value',
]);
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
index a5608557dd1d..4ea231dc3aa0 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/UrlTypeTest.php
@@ -11,8 +11,12 @@
namespace Symfony\Component\Form\Tests\Extension\Core\Type;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
+
class UrlTypeTest extends TextTypeTest
{
+ use ForwardCompatTestTrait;
+
const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\UrlType';
public function testSubmitAddsDefaultProtocolIfNoneIsIncluded()
@@ -73,11 +77,9 @@ public function testSubmitAddsNoDefaultProtocolIfSetToNull()
$this->assertSame('www.domain.com', $form->getViewData());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testThrowExceptionIfDefaultProtocolIsInvalid()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->factory->create(static::TESTED_TYPE, null, [
'default_protocol' => [],
]);
diff --git a/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php
index 375fbfc7021a..1d1b10959b2c 100644
--- a/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Form\Tests\Extension\DependencyInjection;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\Form\AbstractTypeExtension;
use Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension;
@@ -20,6 +21,8 @@
class DependencyInjectionExtensionTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testGetTypeExtensions()
{
$typeExtension1 = new DummyExtension('test');
@@ -40,11 +43,9 @@ public function testGetTypeExtensions()
$this->assertSame([$typeExtension3], $extension->getTypeExtensions('other'));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
- */
public function testThrowExceptionForInvalidExtendedType()
{
+ $this->expectException('Symfony\Component\Form\Exception\InvalidArgumentException');
$extensions = [
'test' => new \ArrayIterator([new DummyExtension('unmatched')]),
];
@@ -79,11 +80,11 @@ public function testLegacyGetTypeExtensions()
/**
* @group legacy
- * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
* @expectedDeprecation Passing four arguments to the Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension::__construct() method is deprecated since Symfony 3.3 and will be disallowed in Symfony 4.0. The new constructor only accepts three arguments.
*/
public function testLegacyThrowExceptionForInvalidExtendedType()
{
+ $this->expectException('Symfony\Component\Form\Exception\InvalidArgumentException');
$formTypeExtension = new DummyExtension('unmatched');
$container = new ContainerBuilder();
diff --git a/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php b/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php
index 0e5389568e5c..4fba518b9533 100644
--- a/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Form\Tests\Extension\HttpFoundation;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Form\Extension\HttpFoundation\HttpFoundationRequestHandler;
use Symfony\Component\Form\Tests\AbstractRequestHandlerTest;
use Symfony\Component\HttpFoundation\File\UploadedFile;
@@ -21,19 +22,17 @@
*/
class HttpFoundationRequestHandlerTest extends AbstractRequestHandlerTest
{
- /**
- * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
- */
+ use ForwardCompatTestTrait;
+
public function testRequestShouldNotBeNull()
{
+ $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
$this->requestHandler->handleRequest($this->createForm('name', 'GET'));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
- */
public function testRequestShouldBeInstanceOfRequest()
{
+ $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
$this->requestHandler->handleRequest($this->createForm('name', 'GET'), new \stdClass());
}
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php
index 7a6602d27e93..889cc6bd8e7b 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/ViolationMapper/ViolationPathTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Form\Tests\Extension\Validator\ViolationMapper;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Form\Extension\Validator\ViolationMapper\ViolationPath;
/**
@@ -19,6 +20,8 @@
*/
class ViolationPathTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function providePaths()
{
return [
@@ -140,21 +143,17 @@ public function testGetElement()
$this->assertEquals('street', $path->getElement(1));
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testGetElementDoesNotAcceptInvalidIndices()
{
+ $this->expectException('OutOfBoundsException');
$path = new ViolationPath('children[address].data[street].name');
$path->getElement(3);
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testGetElementDoesNotAcceptNegativeIndices()
{
+ $this->expectException('OutOfBoundsException');
$path = new ViolationPath('children[address].data[street].name');
$path->getElement(-1);
@@ -168,21 +167,17 @@ public function testIsProperty()
$this->assertTrue($path->isProperty(2));
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testIsPropertyDoesNotAcceptInvalidIndices()
{
+ $this->expectException('OutOfBoundsException');
$path = new ViolationPath('children[address].data[street].name');
$path->isProperty(3);
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testIsPropertyDoesNotAcceptNegativeIndices()
{
+ $this->expectException('OutOfBoundsException');
$path = new ViolationPath('children[address].data[street].name');
$path->isProperty(-1);
@@ -196,21 +191,17 @@ public function testIsIndex()
$this->assertFalse($path->isIndex(2));
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testIsIndexDoesNotAcceptInvalidIndices()
{
+ $this->expectException('OutOfBoundsException');
$path = new ViolationPath('children[address].data[street].name');
$path->isIndex(3);
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testIsIndexDoesNotAcceptNegativeIndices()
{
+ $this->expectException('OutOfBoundsException');
$path = new ViolationPath('children[address].data[street].name');
$path->isIndex(-1);
@@ -225,21 +216,17 @@ public function testMapsForm()
$this->assertFalse($path->mapsForm(2));
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testMapsFormDoesNotAcceptInvalidIndices()
{
+ $this->expectException('OutOfBoundsException');
$path = new ViolationPath('children[address].data[street].name');
$path->mapsForm(3);
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testMapsFormDoesNotAcceptNegativeIndices()
{
+ $this->expectException('OutOfBoundsException');
$path = new ViolationPath('children[address].data[street].name');
$path->mapsForm(-1);
diff --git a/src/Symfony/Component/Form/Tests/FormConfigTest.php b/src/Symfony/Component/Form/Tests/FormConfigTest.php
index 55405f0f1470..db6c056f4a22 100644
--- a/src/Symfony/Component/Form/Tests/FormConfigTest.php
+++ b/src/Symfony/Component/Form/Tests/FormConfigTest.php
@@ -139,11 +139,9 @@ public function testSetMethodAllowsPatch()
self::assertSame('PATCH', $formConfigBuilder->getMethod());
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
- */
public function testSetMethodDoesNotAllowOtherValues()
{
+ $this->expectException('Symfony\Component\Form\Exception\InvalidArgumentException');
$this->getConfigBuilder()->setMethod('foo');
}
diff --git a/src/Symfony/Component/Form/Tests/FormFactoryTest.php b/src/Symfony/Component/Form/Tests/FormFactoryTest.php
index 965485cf2c7e..9250ee4cf2aa 100644
--- a/src/Symfony/Component/Form/Tests/FormFactoryTest.php
+++ b/src/Symfony/Component/Form/Tests/FormFactoryTest.php
@@ -149,21 +149,17 @@ public function testCreateNamedBuilderDoesNotOverrideExistingDataOption()
$this->assertSame($this->builder, $this->factory->createNamedBuilder('name', 'type', 'DATA', $options));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
- * @expectedExceptionMessage Expected argument of type "string", "stdClass" given
- */
public function testCreateNamedBuilderThrowsUnderstandableException()
{
+ $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+ $this->expectExceptionMessage('Expected argument of type "string", "stdClass" given');
$this->factory->createNamedBuilder('name', new \stdClass());
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
- * @expectedExceptionMessage Expected argument of type "string", "stdClass" given
- */
public function testCreateThrowsUnderstandableException()
{
+ $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
+ $this->expectExceptionMessage('Expected argument of type "string", "stdClass" given');
$this->factory->create(new \stdClass());
}
diff --git a/src/Symfony/Component/Form/Tests/FormRegistryTest.php b/src/Symfony/Component/Form/Tests/FormRegistryTest.php
index 8d72db339107..21096b746d2f 100644
--- a/src/Symfony/Component/Form/Tests/FormRegistryTest.php
+++ b/src/Symfony/Component/Form/Tests/FormRegistryTest.php
@@ -105,19 +105,15 @@ public function testLoadUnregisteredType()
$this->assertSame($resolvedType, $this->registry->getType('Symfony\Component\Form\Tests\Fixtures\FooType'));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
- */
public function testFailIfUnregisteredTypeNoClass()
{
+ $this->expectException('Symfony\Component\Form\Exception\InvalidArgumentException');
$this->registry->getType('Symfony\Blubb');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
- */
public function testFailIfUnregisteredTypeNoFormType()
{
+ $this->expectException('Symfony\Component\Form\Exception\InvalidArgumentException');
$this->registry->getType('stdClass');
}
@@ -163,12 +159,10 @@ public function testGetTypeConnectsParent()
$this->assertSame($resolvedType, $this->registry->getType(\get_class($type)));
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\LogicException
- * @expectedExceptionMessage Circular reference detected for form type "Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType" (Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType > Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType).
- */
public function testFormCannotHaveItselfAsAParent()
{
+ $this->expectException('Symfony\Component\Form\Exception\LogicException');
+ $this->expectExceptionMessage('Circular reference detected for form type "Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType" (Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType > Symfony\Component\Form\Tests\Fixtures\FormWithSameParentType).');
$type = new FormWithSameParentType();
$this->extension2->addType($type);
@@ -176,12 +170,10 @@ public function testFormCannotHaveItselfAsAParent()
$this->registry->getType(FormWithSameParentType::class);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\LogicException
- * @expectedExceptionMessage Circular reference detected for form type "Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo" (Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeBar > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeBaz > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo).
- */
public function testRecursiveFormDependencies()
{
+ $this->expectException('Symfony\Component\Form\Exception\LogicException');
+ $this->expectExceptionMessage('Circular reference detected for form type "Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo" (Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeBar > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeBaz > Symfony\Component\Form\Tests\Fixtures\RecursiveFormTypeFoo).');
$foo = new RecursiveFormTypeFoo();
$bar = new RecursiveFormTypeBar();
$baz = new RecursiveFormTypeBaz();
@@ -193,11 +185,9 @@ public function testRecursiveFormDependencies()
$this->registry->getType(RecursiveFormTypeFoo::class);
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\InvalidArgumentException
- */
public function testGetTypeThrowsExceptionIfTypeNotFound()
{
+ $this->expectException('Symfony\Component\Form\Exception\InvalidArgumentException');
$this->registry->getType('bar');
}
diff --git a/src/Symfony/Component/Form/Tests/Guess/GuessTest.php b/src/Symfony/Component/Form/Tests/Guess/GuessTest.php
index eea423bb9dc0..304eba3fa693 100644
--- a/src/Symfony/Component/Form/Tests/Guess/GuessTest.php
+++ b/src/Symfony/Component/Form/Tests/Guess/GuessTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Form\Tests\Guess;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Form\Guess\Guess;
class TestGuess extends Guess
@@ -20,6 +21,8 @@ class TestGuess extends Guess
class GuessTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testGetBestGuessReturnsGuessWithHighestConfidence()
{
$guess1 = new TestGuess(Guess::MEDIUM_CONFIDENCE);
@@ -29,11 +32,9 @@ public function testGetBestGuessReturnsGuessWithHighestConfidence()
$this->assertSame($guess3, Guess::getBestGuess([$guess1, $guess2, $guess3]));
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testGuessExpectsValidConfidence()
{
+ $this->expectException('\InvalidArgumentException');
new TestGuess(5);
}
}
diff --git a/src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php b/src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php
index ab6690461784..12230a803dac 100644
--- a/src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php
+++ b/src/Symfony/Component/Form/Tests/NativeRequestHandlerTest.php
@@ -51,11 +51,9 @@ private function doTearDown()
$_SERVER = self::$serverBackup;
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\UnexpectedTypeException
- */
public function testRequestShouldBeNull()
{
+ $this->expectException('Symfony\Component\Form\Exception\UnexpectedTypeException');
$this->requestHandler->handleRequest($this->createForm('name', 'GET'), 'request');
}
diff --git a/src/Symfony/Component/Form/Tests/SimpleFormTest.php b/src/Symfony/Component/Form/Tests/SimpleFormTest.php
index f88902dc8ced..d8877ec4b633 100644
--- a/src/Symfony/Component/Form/Tests/SimpleFormTest.php
+++ b/src/Symfony/Component/Form/Tests/SimpleFormTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Form\Tests;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Form;
@@ -54,6 +55,8 @@ public function getIterator()
class SimpleFormTest extends AbstractFormTest
{
+ use ForwardCompatTestTrait;
+
/**
* @dataProvider provideFormNames
*/
@@ -94,12 +97,10 @@ public function testDataIsInitializedToConfiguredValue()
$this->assertSame('bar', $form->getViewData());
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
- * @expectedExceptionMessage Unable to transform data for property path "name": No mapping for value "arg"
- */
public function testDataTransformationFailure()
{
+ $this->expectException('Symfony\Component\Form\Exception\TransformationFailedException');
+ $this->expectExceptionMessage('Unable to transform data for property path "name": No mapping for value "arg"');
$model = new FixedDataTransformer([
'default' => 'foo',
]);
@@ -160,11 +161,9 @@ public function testFalseIsConvertedToNull()
$this->assertNull($form->getData());
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\AlreadySubmittedException
- */
public function testSubmitThrowsExceptionIfAlreadySubmitted()
{
+ $this->expectException('Symfony\Component\Form\Exception\AlreadySubmittedException');
$this->form->submit([]);
$this->form->submit([]);
}
@@ -363,11 +362,9 @@ public function testHasNoErrors()
$this->assertCount(0, $this->form->getErrors());
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\AlreadySubmittedException
- */
public function testSetParentThrowsExceptionIfAlreadySubmitted()
{
+ $this->expectException('Symfony\Component\Form\Exception\AlreadySubmittedException');
$this->form->submit([]);
$this->form->setParent($this->getBuilder('parent')->getForm());
}
@@ -385,11 +382,9 @@ public function testNotSubmitted()
$this->assertFalse($this->form->isSubmitted());
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\AlreadySubmittedException
- */
public function testSetDataThrowsExceptionIfAlreadySubmitted()
{
+ $this->expectException('Symfony\Component\Form\Exception\AlreadySubmittedException');
$this->form->submit([]);
$this->form->setData(null);
}
@@ -788,12 +783,10 @@ public function testSetNullParentWorksWithEmptyName()
$this->assertNull($form->getParent());
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\LogicException
- * @expectedExceptionMessage A form with an empty name cannot have a parent form.
- */
public function testFormCannotHaveEmptyNameNotInRootLevel()
{
+ $this->expectException('Symfony\Component\Form\Exception\LogicException');
+ $this->expectExceptionMessage('A form with an empty name cannot have a parent form.');
$this->getBuilder()
->setCompound(true)
->setDataMapper($this->getDataMapper())
@@ -900,11 +893,9 @@ public function testViewDataMayBeArrayAccessIfDataClassIsNull()
$this->assertSame($arrayAccess, $form->getViewData());
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\LogicException
- */
public function testViewDataMustBeObjectIfDataClassIsSet()
{
+ $this->expectException('Symfony\Component\Form\Exception\LogicException');
$config = new FormConfigBuilder('name', 'stdClass', $this->dispatcher);
$config->addViewTransformer(new FixedDataTransformer([
'' => '',
@@ -915,12 +906,10 @@ public function testViewDataMustBeObjectIfDataClassIsSet()
$form->setData('foo');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\RuntimeException
- * @expectedExceptionMessage A cycle was detected. Listeners to the PRE_SET_DATA event must not call setData(). You should call setData() on the FormEvent object instead.
- */
public function testSetDataCannotInvokeItself()
{
+ $this->expectException('Symfony\Component\Form\Exception\RuntimeException');
+ $this->expectExceptionMessage('A cycle was detected. Listeners to the PRE_SET_DATA event must not call setData(). You should call setData() on the FormEvent object instead.');
// Cycle detection to prevent endless loops
$config = new FormConfigBuilder('name', 'stdClass', $this->dispatcher);
$config->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
@@ -989,11 +978,9 @@ public function testFormInheritsParentData()
$this->assertSame('view[foo]', $parent->get('child')->getViewData());
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\RuntimeException
- */
public function testInheritDataDisallowsSetData()
{
+ $this->expectException('Symfony\Component\Form\Exception\RuntimeException');
$form = $this->getBuilder()
->setInheritData(true)
->getForm();
@@ -1001,11 +988,9 @@ public function testInheritDataDisallowsSetData()
$form->setData('foo');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\RuntimeException
- */
public function testGetDataRequiresParentToBeSetIfInheritData()
{
+ $this->expectException('Symfony\Component\Form\Exception\RuntimeException');
$form = $this->getBuilder()
->setInheritData(true)
->getForm();
@@ -1013,11 +998,9 @@ public function testGetDataRequiresParentToBeSetIfInheritData()
$form->getData();
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\RuntimeException
- */
public function testGetNormDataRequiresParentToBeSetIfInheritData()
{
+ $this->expectException('Symfony\Component\Form\Exception\RuntimeException');
$form = $this->getBuilder()
->setInheritData(true)
->getForm();
@@ -1025,11 +1008,9 @@ public function testGetNormDataRequiresParentToBeSetIfInheritData()
$form->getNormData();
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\RuntimeException
- */
public function testGetViewDataRequiresParentToBeSetIfInheritData()
{
+ $this->expectException('Symfony\Component\Form\Exception\RuntimeException');
$form = $this->getBuilder()
->setInheritData(true)
->getForm();
@@ -1077,11 +1058,9 @@ public function testInitializeSetsDefaultData()
$form->initialize();
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\RuntimeException
- */
public function testInitializeFailsIfParent()
{
+ $this->expectException('Symfony\Component\Form\Exception\RuntimeException');
$parent = $this->getBuilder()->setRequired(false)->getForm();
$child = $this->getBuilder()->setRequired(true)->getForm();
@@ -1090,12 +1069,10 @@ public function testInitializeFailsIfParent()
$child->initialize();
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\RuntimeException
- * @expectedExceptionMessage A cycle was detected. Listeners to the PRE_SET_DATA event must not call getData() if the form data has not already been set. You should call getData() on the FormEvent object instead.
- */
public function testCannotCallGetDataInPreSetDataListenerIfDataHasNotAlreadyBeenSet()
{
+ $this->expectException('Symfony\Component\Form\Exception\RuntimeException');
+ $this->expectExceptionMessage('A cycle was detected. Listeners to the PRE_SET_DATA event must not call getData() if the form data has not already been set. You should call getData() on the FormEvent object instead.');
$config = new FormConfigBuilder('name', 'stdClass', $this->dispatcher);
$config->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
$event->getForm()->getData();
@@ -1105,12 +1082,10 @@ public function testCannotCallGetDataInPreSetDataListenerIfDataHasNotAlreadyBeen
$form->setData('foo');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\RuntimeException
- * @expectedExceptionMessage A cycle was detected. Listeners to the PRE_SET_DATA event must not call getNormData() if the form data has not already been set.
- */
public function testCannotCallGetNormDataInPreSetDataListener()
{
+ $this->expectException('Symfony\Component\Form\Exception\RuntimeException');
+ $this->expectExceptionMessage('A cycle was detected. Listeners to the PRE_SET_DATA event must not call getNormData() if the form data has not already been set.');
$config = new FormConfigBuilder('name', 'stdClass', $this->dispatcher);
$config->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
$event->getForm()->getNormData();
@@ -1120,12 +1095,10 @@ public function testCannotCallGetNormDataInPreSetDataListener()
$form->setData('foo');
}
- /**
- * @expectedException \Symfony\Component\Form\Exception\RuntimeException
- * @expectedExceptionMessage A cycle was detected. Listeners to the PRE_SET_DATA event must not call getViewData() if the form data has not already been set.
- */
public function testCannotCallGetViewDataInPreSetDataListener()
{
+ $this->expectException('Symfony\Component\Form\Exception\RuntimeException');
+ $this->expectExceptionMessage('A cycle was detected. Listeners to the PRE_SET_DATA event must not call getViewData() if the form data has not already been set.');
$config = new FormConfigBuilder('name', 'stdClass', $this->dispatcher);
$config->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
$event->getForm()->getViewData();
diff --git a/src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php b/src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php
index 01e76d87eb7e..649cb05adaee 100644
--- a/src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php
+++ b/src/Symfony/Component/Form/Tests/Util/OrderedHashMapTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Form\Tests\Util;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Form\Util\OrderedHashMap;
/**
@@ -19,6 +20,8 @@
*/
class OrderedHashMapTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testGet()
{
$map = new OrderedHashMap();
@@ -27,11 +30,9 @@ public function testGet()
$this->assertSame(1, $map['first']);
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testGetNonExistingFails()
{
+ $this->expectException('OutOfBoundsException');
$map = new OrderedHashMap();
$map['first'];
diff --git a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
index 74d3e81622c7..9e27c7313507 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
@@ -49,11 +49,9 @@ public function testConstructWithNonAsciiFilename()
$this->assertSame('fööö.html', $response->getFile()->getFilename());
}
- /**
- * @expectedException \LogicException
- */
public function testSetContent()
{
+ $this->expectException('LogicException');
$response = new BinaryFileResponse(__FILE__);
$response->setContent('foo');
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
index aaf2edb38580..2d69d9ace16c 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpFoundation\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Cookie;
/**
@@ -24,6 +25,8 @@
*/
class CookieTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function invalidNames()
{
return [
@@ -41,18 +44,16 @@ public function invalidNames()
/**
* @dataProvider invalidNames
- * @expectedException \InvalidArgumentException
*/
public function testInstantiationThrowsExceptionIfCookieNameContainsInvalidCharacters($name)
{
+ $this->expectException('InvalidArgumentException');
new Cookie($name);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testInvalidExpiration()
{
+ $this->expectException('InvalidArgumentException');
new Cookie('MyCookie', 'foo', 'bar');
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ExpressionRequestMatcherTest.php b/src/Symfony/Component/HttpFoundation/Tests/ExpressionRequestMatcherTest.php
index 2afdade67d9c..e750f39e680f 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ExpressionRequestMatcherTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ExpressionRequestMatcherTest.php
@@ -12,17 +12,18 @@
namespace Symfony\Component\HttpFoundation\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
use Symfony\Component\HttpFoundation\ExpressionRequestMatcher;
use Symfony\Component\HttpFoundation\Request;
class ExpressionRequestMatcherTest extends TestCase
{
- /**
- * @expectedException \LogicException
- */
+ use ForwardCompatTestTrait;
+
public function testWhenNoExpressionIsSet()
{
+ $this->expectException('LogicException');
$expressionRequestMatcher = new ExpressionRequestMatcher();
$expressionRequestMatcher->matches(new Request());
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
index 3a203b4dac49..9b48da7a22d2 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
@@ -145,11 +145,9 @@ public function testGetClientOriginalExtension()
$this->assertEquals('gif', $file->getClientOriginalExtension());
}
- /**
- * @expectedException \Symfony\Component\HttpFoundation\File\Exception\FileException
- */
public function testMoveLocalFileIsNotAllowed()
{
+ $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileException');
$file = new UploadedFile(
__DIR__.'/Fixtures/test.gif',
'original.gif',
diff --git a/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php
index 3ef868eafe27..289c12bd3ef5 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/FileBagTest.php
@@ -26,11 +26,9 @@ class FileBagTest extends TestCase
{
use ForwardCompatTestTrait;
- /**
- * @expectedException \InvalidArgumentException
- */
public function testFileMustBeAnArrayOrUploadedFile()
{
+ $this->expectException('InvalidArgumentException');
new FileBag(['file' => 'foo']);
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php
index 6c4915f2e43b..3eff56840969 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\HttpFoundation\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\HeaderBag;
class HeaderBagTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testConstructor()
{
$bag = new HeaderBag(['foo' => 'bar']);
@@ -48,11 +51,9 @@ public function testGetDate()
$this->assertInstanceOf('DateTime', $headerDate);
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetDateException()
{
+ $this->expectException('RuntimeException');
$bag = new HeaderBag(['foo' => 'Tue']);
$headerDate = $bag->getDate('foo');
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
index c7f76b5de292..338da1d25cad 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\HttpFoundation\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\IpUtils;
class IpUtilsTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
/**
* @dataProvider getIpv4Data
*/
@@ -73,11 +76,11 @@ public function getIpv6Data()
}
/**
- * @expectedException \RuntimeException
* @requires extension sockets
*/
public function testAnIpv6WithOptionDisabledIpv6()
{
+ $this->expectException('RuntimeException');
if (\defined('AF_INET6')) {
$this->markTestSkipped('Only works when PHP is compiled with the option "disable-ipv6".');
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
index d19620530975..2e2645dab6de 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/JsonResponseTest.php
@@ -219,29 +219,23 @@ public function testItAcceptsJsonAsString()
$this->assertSame('{"foo":"bar"}', $response->getContent());
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testSetCallbackInvalidIdentifier()
{
+ $this->expectException('InvalidArgumentException');
$response = new JsonResponse('foo');
$response->setCallback('+invalid');
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testSetContent()
{
+ $this->expectException('InvalidArgumentException');
JsonResponse::create("\xB1\x31");
}
- /**
- * @expectedException \Exception
- * @expectedExceptionMessage This error is expected
- */
public function testSetContentJsonSerializeError()
{
+ $this->expectException('Exception');
+ $this->expectExceptionMessage('This error is expected');
if (!interface_exists('JsonSerializable', false)) {
$this->markTestSkipped('JsonSerializable is required.');
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php
index 5f6a8ac0883f..1e4b7a6ca629 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RedirectResponseTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\HttpFoundation\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\RedirectResponse;
class RedirectResponseTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testGenerateMetaRedirect()
{
$response = new RedirectResponse('foo.bar');
@@ -26,19 +29,15 @@ public function testGenerateMetaRedirect()
));
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testRedirectResponseConstructorNullUrl()
{
+ $this->expectException('InvalidArgumentException');
$response = new RedirectResponse(null);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testRedirectResponseConstructorWrongStatusCode()
{
+ $this->expectException('InvalidArgumentException');
$response = new RedirectResponse('foo.bar', 404);
}
@@ -65,11 +64,9 @@ public function testSetTargetUrl()
$this->assertEquals('baz.beep', $response->getTargetUrl());
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testSetTargetUrlNull()
{
+ $this->expectException('InvalidArgumentException');
$response = new RedirectResponse('foo.bar');
$response->setTargetUrl(null);
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
index e0e719d38c50..dad3f0bf2d89 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -889,11 +889,9 @@ public function testGetPort()
$this->assertEquals(80, $port, 'With only PROTO set and value is not recognized, getPort() defaults to 80.');
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetHostWithFakeHttpHostValue()
{
+ $this->expectException('RuntimeException');
$request = new Request();
$request->initialize([], [], [], [], [], ['HTTP_HOST' => 'www.host.com?query=string']);
$request->getHost();
@@ -1058,11 +1056,11 @@ public function getClientIpsProvider()
}
/**
- * @expectedException \Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException
* @dataProvider getClientIpsWithConflictingHeadersProvider
*/
public function testGetClientIpsWithConflictingHeaders($httpForwarded, $httpXForwardedFor)
{
+ $this->expectException('Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException');
$request = new Request();
$server = [
@@ -1182,11 +1180,11 @@ public function testContentAsResource()
}
/**
- * @expectedException \LogicException
* @dataProvider getContentCantBeCalledTwiceWithResourcesProvider
*/
public function testGetContentCantBeCalledTwiceWithResources($first, $second)
{
+ $this->expectException('LogicException');
if (\PHP_VERSION_ID >= 50600) {
$this->markTestSkipped('PHP >= 5.6 allows to open php://input several times.');
}
@@ -1971,20 +1969,20 @@ public function testTrustedProxiesForwarded()
/**
* @group legacy
- * @expectedException \InvalidArgumentException
*/
public function testSetTrustedProxiesInvalidHeaderName()
{
+ $this->expectException('InvalidArgumentException');
Request::create('http://example.com/');
Request::setTrustedHeaderName('bogus name', 'X_MY_FOR');
}
/**
* @group legacy
- * @expectedException \InvalidArgumentException
*/
public function testGetTrustedProxiesInvalidHeaderName()
{
+ $this->expectException('InvalidArgumentException');
Request::create('http://example.com/');
Request::getTrustedHeaderName('bogus name');
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
index 93aacf24d799..17be3cb604e3 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpFoundation\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Cookie;
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
@@ -20,6 +21,8 @@
*/
class ResponseHeaderBagTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testAllPreserveCase()
{
$headers = [
@@ -240,21 +243,17 @@ public function testSetCookieHeader()
$this->assertEquals([], $bag->getCookies());
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testGetCookiesWithInvalidArgument()
{
+ $this->expectException('InvalidArgumentException');
$bag = new ResponseHeaderBag();
$bag->getCookies('invalid_argument');
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testMakeDispositionInvalidDisposition()
{
+ $this->expectException('InvalidArgumentException');
$headers = new ResponseHeaderBag();
$headers->makeDisposition('invalid', 'foo.html');
@@ -298,10 +297,10 @@ public function provideMakeDisposition()
/**
* @dataProvider provideMakeDispositionFail
- * @expectedException \InvalidArgumentException
*/
public function testMakeDispositionFail($disposition, $filename)
{
+ $this->expectException('InvalidArgumentException');
$headers = new ResponseHeaderBag();
$headers->makeDisposition($disposition, $filename);
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
index 40200ee31d0d..7515a7a9e4de 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\HttpFoundation\Tests;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -19,6 +20,8 @@
*/
class ResponseTest extends ResponseTestCase
{
+ use ForwardCompatTestTrait;
+
public function testCreate()
{
$response = Response::create('foo', 301, ['Foo' => 'bar']);
@@ -846,11 +849,11 @@ public function testSetContent($content)
}
/**
- * @expectedException \UnexpectedValueException
* @dataProvider invalidContentProvider
*/
public function testSetContentInvalid($content)
{
+ $this->expectException('UnexpectedValueException');
$response = new Response();
$response->setContent($content);
}
@@ -928,11 +931,11 @@ protected function provideResponse()
}
/**
- * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @see http://github.com/zendframework/zend-diactoros for the canonical source repository
*
- * @author Fábio Pacheco
+ * @author Fábio Pacheco
* @copyright Copyright (c) 2015-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ * @license https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
*/
public function ianaCodesReasonPhrasesProvider()
{
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
index a762de01c130..8fd72a91f5b5 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -65,19 +65,15 @@ private function doSetUp()
$this->storage = new MongoDbSessionHandler($this->mongo, $this->options);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testConstructorShouldThrowExceptionForInvalidMongo()
{
+ $this->expectException('InvalidArgumentException');
new MongoDbSessionHandler(new \stdClass(), $this->options);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testConstructorShouldThrowExceptionForMissingOptions()
{
+ $this->expectException('InvalidArgumentException');
new MongoDbSessionHandler($this->mongo, []);
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
index dc827d8ab03c..303ad302645a 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/NativeFileSessionHandlerTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler;
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
@@ -25,6 +26,8 @@
*/
class NativeFileSessionHandlerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testConstruct()
{
$storage = new NativeSessionStorage(['name' => 'TESTING'], new NativeFileSessionHandler(sys_get_temp_dir()));
@@ -59,11 +62,9 @@ public function savePathDataProvider()
];
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testConstructException()
{
+ $this->expectException('InvalidArgumentException');
$handler = new NativeFileSessionHandler('something;invalid;with;too-many-args');
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
index e9439c3da49f..0571306ab6dc 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
@@ -51,22 +51,18 @@ protected function getMemorySqlitePdo()
return $pdo;
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testWrongPdoErrMode()
{
+ $this->expectException('InvalidArgumentException');
$pdo = $this->getMemorySqlitePdo();
$pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_SILENT);
$storage = new PdoSessionHandler($pdo);
}
- /**
- * @expectedException \RuntimeException
- */
public function testInexistentTable()
{
+ $this->expectException('RuntimeException');
$storage = new PdoSessionHandler($this->getMemorySqlitePdo(), ['db_table' => 'inexistent_table']);
$storage->open('', 'sid');
$storage->read('id');
@@ -74,11 +70,9 @@ public function testInexistentTable()
$storage->close();
}
- /**
- * @expectedException \RuntimeException
- */
public function testCreateTableTwice()
{
+ $this->expectException('RuntimeException');
$storage = new PdoSessionHandler($this->getMemorySqlitePdo());
$storage->createTable();
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php
index c60a78910bc5..1285dbf1ad77 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php
@@ -124,11 +124,9 @@ public function testClearWithNoBagsStartsSession()
$this->assertTrue($storage->isStarted());
}
- /**
- * @expectedException \RuntimeException
- */
public function testUnstartedSave()
{
+ $this->expectException('RuntimeException');
$this->storage->save();
}
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php
index 36b4e605b2c9..9a5ef1ca8580 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockFileSessionStorageTest.php
@@ -110,11 +110,9 @@ public function testMultipleInstances()
$this->assertEquals('bar', $storage2->getBag('attributes')->get('foo'), 'values persist between instances');
}
- /**
- * @expectedException \RuntimeException
- */
public function testSaveWithoutStart()
{
+ $this->expectException('RuntimeException');
$storage1 = $this->getStorage();
$storage1->save();
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
index 18540264dbe6..886a5f9c9de3 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -75,20 +75,16 @@ public function testBag()
$this->assertSame($bag, $storage->getBag($bag->getName()));
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testRegisterBagException()
{
+ $this->expectException('InvalidArgumentException');
$storage = $this->getStorage();
$storage->getBag('non_existing');
}
- /**
- * @expectedException \LogicException
- */
public function testRegisterBagForAStartedSessionThrowsException()
{
+ $this->expectException('LogicException');
$storage = $this->getStorage();
$storage->start();
$storage->registerBag(new AttributeBag());
@@ -204,11 +200,9 @@ public function testSessionOptions()
$this->assertSame('200', ini_get('session.cache_expire'));
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testSetSaveHandlerException()
{
+ $this->expectException('InvalidArgumentException');
$storage = $this->getStorage();
$storage->setSaveHandler(new \stdClass());
}
@@ -231,11 +225,9 @@ public function testSetSaveHandler()
$this->assertInstanceOf('Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy', $storage->getSaveHandler());
}
- /**
- * @expectedException \RuntimeException
- */
public function testStarted()
{
+ $this->expectException('RuntimeException');
$storage = $this->getStorage();
$this->assertFalse($storage->getSaveHandler()->isActive());
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
index 499a54a8ed7b..dcd30036457f 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/AbstractProxyTest.php
@@ -83,10 +83,10 @@ public function testName()
/**
* @runInSeparateProcess
* @preserveGlobalState disabled
- * @expectedException \LogicException
*/
public function testNameException()
{
+ $this->expectException('LogicException');
session_start();
$this->proxy->setName('foo');
}
@@ -106,10 +106,10 @@ public function testId()
/**
* @runInSeparateProcess
* @preserveGlobalState disabled
- * @expectedException \LogicException
*/
public function testIdException()
{
+ $this->expectException('LogicException');
session_start();
$this->proxy->setId('foo');
}
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
index 63b3c8afb3a1..d6459e10d6f9 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -28,7 +28,7 @@ class SessionHandlerProxyTest extends TestCase
use ForwardCompatTestTrait;
/**
- * @var \PHPUnit_Framework_MockObject_Matcher
+ * @var \PHPUnit\Framework\MockObject\Matcher
*/
private $mock;
diff --git a/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
index 62dfc9bc94a7..96ab63d496bc 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/StreamedResponseTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\HttpFoundation\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\StreamedResponse;
class StreamedResponseTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testConstructor()
{
$response = new StreamedResponse(function () { echo 'foo'; }, 404, ['Content-Type' => 'text/plain']);
@@ -81,20 +84,16 @@ public function testSendContent()
$this->assertEquals(1, $called);
}
- /**
- * @expectedException \LogicException
- */
public function testSendContentWithNonCallable()
{
+ $this->expectException('LogicException');
$response = new StreamedResponse(null);
$response->sendContent();
}
- /**
- * @expectedException \LogicException
- */
public function testSetContent()
{
+ $this->expectException('LogicException');
$response = new StreamedResponse(function () { echo 'foo'; });
$response->setContent('foo');
}
diff --git a/src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php b/src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
index 3408d7acd6c0..73e95473742f 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests\Bundle;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Bundle\Bundle;
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionAbsentBundle\ExtensionAbsentBundle;
@@ -21,6 +22,8 @@
class BundleTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testGetContainerExtension()
{
$bundle = new ExtensionPresentBundle();
@@ -49,12 +52,10 @@ public function testRegisterCommands()
$this->assertNull($bundle2->registerCommands($app));
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface
- */
public function testGetContainerExtensionWithInvalidClass()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('must implement Symfony\Component\DependencyInjection\Extension\ExtensionInterface');
$bundle = new ExtensionNotValidBundle();
$bundle->getContainerExtension();
}
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheClearer/Psr6CacheClearerTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheClearer/Psr6CacheClearerTest.php
index 297ede6a3602..1f68e2c7f3ff 100644
--- a/src/Symfony/Component/HttpKernel/Tests/CacheClearer/Psr6CacheClearerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/CacheClearer/Psr6CacheClearerTest.php
@@ -13,10 +13,13 @@
use PHPUnit\Framework\TestCase;
use Psr\Cache\CacheItemPoolInterface;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer;
class Psr6CacheClearerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testClearPoolsInjectedInConstructor()
{
$pool = $this->getMockBuilder(CacheItemPoolInterface::class)->getMock();
@@ -37,12 +40,10 @@ public function testClearPool()
(new Psr6CacheClearer(['pool' => $pool]))->clearPool('pool');
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Cache pool not found: unknown
- */
public function testClearPoolThrowsExceptionOnUnreferencedPool()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('Cache pool not found: unknown');
(new Psr6CacheClearer())->clearPool('unknown');
}
diff --git a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php
index ea2c1788c47c..8b11d90dfa7f 100644
--- a/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/CacheWarmer/CacheWarmerTest.php
@@ -39,11 +39,9 @@ public function testWriteCacheFileCreatesTheFile()
$this->assertFileExists(self::$cacheFile);
}
- /**
- * @expectedException \RuntimeException
- */
public function testWriteNonWritableCacheFileThrowsARuntimeException()
{
+ $this->expectException('RuntimeException');
$nonWritableFile = '/this/file/is/very/probably/not/writable';
$warmer = new TestCacheWarmer($nonWritableFile);
$warmer->warmUp(\dirname($nonWritableFile));
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
index 8fefbd771692..be3670f5f497 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolverTest.php
@@ -170,10 +170,10 @@ public function testGetVariadicArguments()
/**
* @requires PHP 5.6
- * @expectedException \InvalidArgumentException
*/
public function testGetVariadicArgumentsWithoutArrayInRequest()
{
+ $this->expectException('InvalidArgumentException');
$request = Request::create('/');
$request->attributes->set('foo', 'foo');
$request->attributes->set('bar', 'foo');
@@ -184,10 +184,10 @@ public function testGetVariadicArgumentsWithoutArrayInRequest()
/**
* @requires PHP 5.6
- * @expectedException \InvalidArgumentException
*/
public function testGetArgumentWithoutArray()
{
+ $this->expectException('InvalidArgumentException');
$factory = new ArgumentMetadataFactory();
$valueResolver = $this->getMockBuilder(ArgumentValueResolverInterface::class)->getMock();
$resolver = new ArgumentResolver($factory, [$valueResolver]);
@@ -202,11 +202,9 @@ public function testGetArgumentWithoutArray()
$resolver->getArguments($request, $controller);
}
- /**
- * @expectedException \RuntimeException
- */
public function testIfExceptionIsThrownWhenMissingAnArgument()
{
+ $this->expectException('RuntimeException');
$request = Request::create('/');
$controller = [$this, 'controllerWithFoo'];
@@ -269,11 +267,9 @@ public function testGetSessionArgumentsWithInterface()
$this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetSessionMissMatchWithInterface()
{
+ $this->expectException('RuntimeException');
$session = $this->getMockBuilder(SessionInterface::class)->getMock();
$request = Request::create('/');
$request->setSession($session);
@@ -282,11 +278,9 @@ public function testGetSessionMissMatchWithInterface()
self::$resolver->getArguments($request, $controller);
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetSessionMissMatchWithImplementation()
{
+ $this->expectException('RuntimeException');
$session = new Session(new MockArraySessionStorage());
$request = Request::create('/');
$request->setSession($session);
@@ -295,11 +289,9 @@ public function testGetSessionMissMatchWithImplementation()
self::$resolver->getArguments($request, $controller);
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetSessionMissMatchOnNull()
{
+ $this->expectException('RuntimeException');
$request = Request::create('/');
$controller = [$this, 'controllerWithExtendingSession'];
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php
index ea26738e7c2f..f10c806534b7 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php
@@ -115,12 +115,10 @@ public function testNonInstantiableController()
$this->assertSame([NonInstantiableController::class, 'action'], $controller);
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage Controller "Symfony\Component\HttpKernel\Tests\Controller\ImpossibleConstructController" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?
- */
public function testNonConstructController()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('Controller "Symfony\Component\HttpKernel\Tests\Controller\ImpossibleConstructController" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?');
$container = $this->getMockBuilder(Container::class)->getMock();
$container->expects($this->at(0))
->method('has')
@@ -182,12 +180,10 @@ public function testNonInstantiableControllerWithCorrespondingService()
$this->assertSame([$service, 'action'], $controller);
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage Controller "app.my_controller" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?
- */
public function testExceptionWhenUsingRemovedControllerService()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('Controller "app.my_controller" cannot be fetched from the container because it is private. Did you forget to tag the service with "controller.service_arguments"?');
$container = $this->getMockBuilder(Container::class)->getMock();
$container->expects($this->at(0))
->method('has')
@@ -208,12 +204,10 @@ public function testExceptionWhenUsingRemovedControllerService()
$resolver->getController($request);
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage Controller "app.my_controller" cannot be called without a method name. Did you forget an "__invoke" method?
- */
public function testExceptionWhenUsingControllerWithoutAnInvokeMethod()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('Controller "app.my_controller" cannot be called without a method name. Did you forget an "__invoke" method?');
$container = $this->getMockBuilder(Container::class)->getMock();
$container->expects($this->once())
->method('has')
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
index 8912f151eb45..6e48bf09abc8 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
@@ -93,11 +93,9 @@ public function testGetControllerWithClassAndInvokeMethod()
$this->assertInstanceOf('Symfony\Component\HttpKernel\Tests\Controller\ControllerResolverTest', $controller);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testGetControllerOnObjectWithoutInvokeMethod()
{
+ $this->expectException('InvalidArgumentException');
$resolver = $this->createControllerResolver();
$request = Request::create('/');
@@ -233,11 +231,11 @@ public function testCreateControllerCanReturnAnyCallable()
}
/**
- * @expectedException \RuntimeException
* @group legacy
*/
public function testIfExceptionIsThrownWhenMissingAnArgument()
{
+ $this->expectException('RuntimeException');
$resolver = new ControllerResolver();
$request = Request::create('/');
diff --git a/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataTest.php b/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataTest.php
index 05351445e00a..fb6894bbf4f6 100644
--- a/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/ControllerMetadata/ArgumentMetadataTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\HttpKernel\Tests\ControllerMetadata;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
class ArgumentMetadataTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testWithBcLayerWithDefault()
{
$argument = new ArgumentMetadata('foo', 'string', false, true, 'default value');
@@ -32,11 +35,9 @@ public function testDefaultValueAvailable()
$this->assertSame('default value', $argument->getDefaultValue());
}
- /**
- * @expectedException \LogicException
- */
public function testDefaultValueUnavailable()
{
+ $this->expectException('LogicException');
$argument = new ArgumentMetadata('foo', 'string', false, false, null, false);
$this->assertFalse($argument->isNullable());
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php
index 087c66659633..9b49bd2d995e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/FragmentRendererPassTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests\DependencyInjection;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
@@ -22,14 +23,15 @@
class FragmentRendererPassTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
/**
* Tests that content rendering not implementing FragmentRendererInterface
* triggers an exception.
- *
- * @expectedException \InvalidArgumentException
*/
public function testContentRendererWithoutInterface()
{
+ $this->expectException('InvalidArgumentException');
$builder = new ContainerBuilder();
$fragmentHandlerDefinition = $builder->register('fragment.handler');
$builder->register('my_content_renderer', 'Symfony\Component\DependencyInjection\Definition')
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
index 6d0da5fcf868..b70d259e6e4a 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests\DependencyInjection;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
use Symfony\Component\DependencyInjection\ChildDefinition;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -25,12 +26,12 @@
class RegisterControllerArgumentLocatorsPassTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Class "Symfony\Component\HttpKernel\Tests\DependencyInjection\NotFound" used for service "foo" cannot be found.
- */
+ use ForwardCompatTestTrait;
+
public function testInvalidClass()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Class "Symfony\Component\HttpKernel\Tests\DependencyInjection\NotFound" used for service "foo" cannot be found.');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -42,12 +43,10 @@ public function testInvalidClass()
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Missing "action" attribute on tag "controller.service_arguments" {"argument":"bar"} for service "foo".
- */
public function testNoAction()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Missing "action" attribute on tag "controller.service_arguments" {"argument":"bar"} for service "foo".');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -59,12 +58,10 @@ public function testNoAction()
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Missing "argument" attribute on tag "controller.service_arguments" {"action":"fooAction"} for service "foo".
- */
public function testNoArgument()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Missing "argument" attribute on tag "controller.service_arguments" {"action":"fooAction"} for service "foo".');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -76,12 +73,10 @@ public function testNoArgument()
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Missing "id" attribute on tag "controller.service_arguments" {"action":"fooAction","argument":"bar"} for service "foo".
- */
public function testNoService()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Missing "id" attribute on tag "controller.service_arguments" {"action":"fooAction","argument":"bar"} for service "foo".');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -93,12 +88,10 @@ public function testNoService()
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Invalid "action" attribute on tag "controller.service_arguments" for service "foo": no public "barAction()" method found on class "Symfony\Component\HttpKernel\Tests\DependencyInjection\RegisterTestController".
- */
public function testInvalidMethod()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Invalid "action" attribute on tag "controller.service_arguments" for service "foo": no public "barAction()" method found on class "Symfony\Component\HttpKernel\Tests\DependencyInjection\RegisterTestController".');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -110,12 +103,10 @@ public function testInvalidMethod()
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Invalid "controller.service_arguments" tag for service "foo": method "fooAction()" has no "baz" argument on class "Symfony\Component\HttpKernel\Tests\DependencyInjection\RegisterTestController".
- */
public function testInvalidArgument()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Invalid "controller.service_arguments" tag for service "foo": method "fooAction()" has no "baz" argument on class "Symfony\Component\HttpKernel\Tests\DependencyInjection\RegisterTestController".');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -207,12 +198,10 @@ public function testSkipSetContainer()
$this->assertSame(['foo:fooAction'], array_keys($locator));
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Cannot determine controller argument for "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClassController::fooAction()": the $nonExistent argument is type-hinted with the non-existent class or interface: "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClass". Did you forget to add a use statement?
- */
public function testExceptionOnNonExistentTypeHint()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Cannot determine controller argument for "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClassController::fooAction()": the $nonExistent argument is type-hinted with the non-existent class or interface: "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClass". Did you forget to add a use statement?');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
@@ -223,12 +212,10 @@ public function testExceptionOnNonExistentTypeHint()
$pass->process($container);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
- * @expectedExceptionMessage Cannot determine controller argument for "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClassDifferentNamespaceController::fooAction()": the $nonExistent argument is type-hinted with the non-existent class or interface: "Acme\NonExistentClass".
- */
public function testExceptionOnNonExistentTypeHintDifferentNamespace()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Cannot determine controller argument for "Symfony\Component\HttpKernel\Tests\DependencyInjection\NonExistentClassDifferentNamespaceController::fooAction()": the $nonExistent argument is type-hinted with the non-existent class or interface: "Acme\NonExistentClass".');
$container = new ContainerBuilder();
$container->register('argument_resolver.service')->addArgument([]);
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php
index 9b23ad003d75..5d4ce0b8c26d 100644
--- a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/ResettableServicePassTest.php
@@ -3,6 +3,7 @@
namespace Symfony\Component\HttpKernel\Tests\DependencyInjection;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -14,6 +15,8 @@
class ResettableServicePassTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testCompilerPass()
{
$container = new ContainerBuilder();
@@ -48,12 +51,10 @@ public function testCompilerPass()
);
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage Tag kernel.reset requires the "method" attribute to be set.
- */
public function testMissingMethod()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('Tag kernel.reset requires the "method" attribute to be set.');
$container = new ContainerBuilder();
$container->register(ResettableService::class)
->addTag('kernel.reset');
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php
index 6408b1b21c7e..ee4a6a32f6e4 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/FragmentListenerTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests\EventListener;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\EventListener\FragmentListener;
@@ -20,6 +21,8 @@
class FragmentListenerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testOnlyTriggeredOnFragmentRoute()
{
$request = Request::create('http://example.com/foo?_path=foo%3Dbar%26_controller%3Dfoo');
@@ -50,11 +53,9 @@ public function testOnlyTriggeredIfControllerWasNotDefinedYet()
$this->assertEquals($expected, $request->attributes->all());
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
- */
public function testAccessDeniedWithNonSafeMethods()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException');
$request = Request::create('http://example.com/_fragment', 'POST');
$listener = new FragmentListener(new UriSigner('foo'));
@@ -63,11 +64,9 @@ public function testAccessDeniedWithNonSafeMethods()
$listener->onKernelRequest($event);
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
- */
public function testAccessDeniedWithWrongSignature()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException');
$request = Request::create('http://example.com/_fragment', 'GET', [], [], [], ['REMOTE_ADDR' => '10.0.0.1']);
$listener = new FragmentListener(new UriSigner('foo'));
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
index 94d7757f614f..f1012f986d75 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php
@@ -87,11 +87,9 @@ private function createGetResponseEventForUri($uri)
return new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testInvalidMatcher()
{
+ $this->expectException('InvalidArgumentException');
new RouterListener(new \stdClass(), $this->requestStack);
}
@@ -212,11 +210,9 @@ public function testNoRoutingConfigurationResponse()
$this->assertContains('Welcome', $response->getContent());
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
- */
public function testRequestWithBadHost()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
$request = Request::create('http://bad host %22/');
$event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php
index 709c60171385..b508a260b51f 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ValidateRequestListenerTest.php
@@ -29,11 +29,9 @@ private function doTearDown()
Request::setTrustedProxies([], -1);
}
- /**
- * @expectedException \Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException
- */
public function testListenerThrowsWhenMasterRequestHasInconsistentClientIps()
{
+ $this->expectException('Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException');
$dispatcher = new EventDispatcher();
$kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php
index 52d8551965a0..e7fd92f56274 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests\Fragment;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ControllerReference;
use Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer;
@@ -20,6 +21,8 @@
class EsiFragmentRendererTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testRenderFallbackToInlineStrategyIfEsiNotSupported()
{
$strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true));
@@ -77,11 +80,9 @@ public function testRenderControllerReference()
);
}
- /**
- * @expectedException \LogicException
- */
public function testRenderControllerReferenceWithoutSignerThrowsException()
{
+ $this->expectException('LogicException');
$strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy());
$request = Request::create('/');
@@ -91,11 +92,9 @@ public function testRenderControllerReferenceWithoutSignerThrowsException()
$strategy->render(new ControllerReference('main_controller'), $request);
}
- /**
- * @expectedException \LogicException
- */
public function testRenderAltControllerReferenceWithoutSignerThrowsException()
{
+ $this->expectException('LogicException');
$strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy());
$request = Request::create('/');
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
index b66041bcd23e..ff76ad51008e 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
@@ -39,31 +39,25 @@ private function doSetUp()
;
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testRenderWhenRendererDoesNotExist()
{
+ $this->expectException('InvalidArgumentException');
$handler = new FragmentHandler($this->requestStack);
$handler->render('/', 'foo');
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testRenderWithUnknownRenderer()
{
+ $this->expectException('InvalidArgumentException');
$handler = $this->getHandler($this->returnValue(new Response('foo')));
$handler->render('/', 'bar');
}
- /**
- * @expectedException \RuntimeException
- * @expectedExceptionMessage Error when rendering "http://localhost/" (Status code is 404).
- */
public function testDeliverWithUnsuccessfulResponse()
{
+ $this->expectException('RuntimeException');
+ $this->expectExceptionMessage('Error when rendering "http://localhost/" (Status code is 404).');
$handler = $this->getHandler($this->returnValue(new Response('foo', 404)));
$handler->render('/', 'foo');
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
index 6125d95ff4ca..8b5cafd66f2c 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/HIncludeFragmentRendererTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests\Fragment;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ControllerReference;
use Symfony\Component\HttpKernel\Fragment\HIncludeFragmentRenderer;
@@ -19,11 +20,11 @@
class HIncludeFragmentRendererTest extends TestCase
{
- /**
- * @expectedException \LogicException
- */
+ use ForwardCompatTestTrait;
+
public function testRenderExceptionWhenControllerAndNoSigner()
{
+ $this->expectException('LogicException');
$strategy = new HIncludeFragmentRenderer();
$strategy->render(new ControllerReference('main_controller', [], []), Request::create('/'));
}
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
index b2a2dcaef630..ac32c981ca6f 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests\Fragment;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
@@ -25,6 +26,8 @@
class InlineFragmentRendererTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testRender()
{
$strategy = new InlineFragmentRenderer($this->getKernel($this->returnValue(new Response('foo'))));
@@ -111,11 +114,9 @@ public function testRenderWithTrustedHeaderDisabled()
Request::setTrustedProxies([], -1);
}
- /**
- * @expectedException \RuntimeException
- */
public function testRenderExceptionNoIgnoreErrors()
{
+ $this->expectException('RuntimeException');
$dispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
$dispatcher->expects($this->never())->method('dispatch');
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
index c03e8c4a9233..dc4e59da83b6 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\HttpKernel\Tests\Fragment;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ControllerReference;
class RoutableFragmentRendererTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
/**
* @dataProvider getGenerateFragmentUriData
*/
@@ -56,11 +59,11 @@ public function testGenerateFragmentUriWithARequest()
}
/**
- * @expectedException \LogicException
- * @dataProvider getGenerateFragmentUriDataWithNonScalar
+ * @dataProvider getGenerateFragmentUriDataWithNonScalar
*/
public function testGenerateFragmentUriWithNonScalar($controller)
{
+ $this->expectException('LogicException');
$this->callGenerateFragmentUriMethod($controller, Request::create('/'));
}
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/SsiFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/SsiFragmentRendererTest.php
index b2181725edfd..fbf69610fbb4 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Fragment/SsiFragmentRendererTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Fragment/SsiFragmentRendererTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests\Fragment;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ControllerReference;
use Symfony\Component\HttpKernel\Fragment\SsiFragmentRenderer;
@@ -20,6 +21,8 @@
class SsiFragmentRendererTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testRenderFallbackToInlineStrategyIfSsiNotSupported()
{
$strategy = new SsiFragmentRenderer(new Ssi(), $this->getInlineStrategy(true));
@@ -56,11 +59,9 @@ public function testRenderControllerReference()
);
}
- /**
- * @expectedException \LogicException
- */
public function testRenderControllerReferenceWithoutSignerThrowsException()
{
+ $this->expectException('LogicException');
$strategy = new SsiFragmentRenderer(new Ssi(), $this->getInlineStrategy());
$request = Request::create('/');
@@ -70,11 +71,9 @@ public function testRenderControllerReferenceWithoutSignerThrowsException()
$strategy->render(new ControllerReference('main_controller'), $request);
}
- /**
- * @expectedException \LogicException
- */
public function testRenderAltControllerReferenceWithoutSignerThrowsException()
{
+ $this->expectException('LogicException');
$strategy = new SsiFragmentRenderer(new Ssi(), $this->getInlineStrategy());
$request = Request::create('/');
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
index 1fc8da8e2453..0cc85a0d743b 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
@@ -12,12 +12,15 @@
namespace Symfony\Component\HttpKernel\Tests\HttpCache;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\HttpCache\Esi;
class EsiTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testHasSurrogateEsiCapability()
{
$esi = new Esi();
@@ -153,11 +156,9 @@ public function testProcessEscapesPhpTags()
$this->assertEquals('php cript language=php>', $response->getContent());
}
- /**
- * @expectedException \RuntimeException
- */
public function testProcessWhenNoSrcInAnEsi()
{
+ $this->expectException('RuntimeException');
$esi = new Esi();
$request = Request::create('/');
@@ -193,11 +194,9 @@ public function testHandle()
$this->assertEquals('foo', $esi->handle($cache, '/', '/alt', true));
}
- /**
- * @expectedException \RuntimeException
- */
public function testHandleWhenResponseIsNot200()
{
+ $this->expectException('RuntimeException');
$esi = new Esi();
$response = new Response('foo');
$response->setStatusCode(404);
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
index 79ed48cd00f7..612dfc429e8f 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/SsiTest.php
@@ -12,12 +12,15 @@
namespace Symfony\Component\HttpKernel\Tests\HttpCache;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\HttpCache\Ssi;
class SsiTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testHasSurrogateSsiCapability()
{
$ssi = new Ssi();
@@ -120,11 +123,9 @@ public function testProcessEscapesPhpTags()
$this->assertEquals('php cript language=php>', $response->getContent());
}
- /**
- * @expectedException \RuntimeException
- */
public function testProcessWhenNoSrcInAnSsi()
{
+ $this->expectException('RuntimeException');
$ssi = new Ssi();
$request = Request::create('/');
@@ -160,11 +161,9 @@ public function testHandle()
$this->assertEquals('foo', $ssi->handle($cache, '/', '/alt', true));
}
- /**
- * @expectedException \RuntimeException
- */
public function testHandleWhenResponseIsNot200()
{
+ $this->expectException('RuntimeException');
$ssi = new Ssi();
$response = new Response('foo');
$response->setStatusCode(404);
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
index 01e32898e297..242dd8158dd8 100644
--- a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -30,21 +31,19 @@
class HttpKernelTest extends TestCase
{
- /**
- * @expectedException \RuntimeException
- */
+ use ForwardCompatTestTrait;
+
public function testHandleWhenControllerThrowsAnExceptionAndCatchIsTrue()
{
+ $this->expectException('RuntimeException');
$kernel = $this->getHttpKernel(new EventDispatcher(), function () { throw new \RuntimeException(); });
$kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true);
}
- /**
- * @expectedException \RuntimeException
- */
public function testHandleWhenControllerThrowsAnExceptionAndCatchIsFalseAndNoListenerIsRegistered()
{
+ $this->expectException('RuntimeException');
$kernel = $this->getHttpKernel(new EventDispatcher(), function () { throw new \RuntimeException(); });
$kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, false);
@@ -177,11 +176,9 @@ public function testHandleWhenAListenerReturnsAResponse()
$this->assertEquals('hello', $kernel->handle(new Request())->getContent());
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
- */
public function testHandleWhenNoControllerIsFound()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\NotFoundHttpException');
$dispatcher = new EventDispatcher();
$kernel = $this->getHttpKernel($dispatcher, false);
@@ -229,11 +226,9 @@ public function testHandleWhenTheControllerIsAStaticArray()
$this->assertResponseEquals(new Response('foo'), $kernel->handle(new Request()));
}
- /**
- * @expectedException \LogicException
- */
public function testHandleWhenTheControllerDoesNotReturnAResponse()
{
+ $this->expectException('LogicException');
$dispatcher = new EventDispatcher();
$kernel = $this->getHttpKernel($dispatcher, function () { return 'foo'; });
@@ -331,11 +326,9 @@ public function testVerifyRequestStackPushPopDuringHandle()
$kernel->handle($request, HttpKernelInterface::MASTER_REQUEST);
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
- */
public function testInconsistentClientIpsOnMasterRequests()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
$request = new Request();
$request->setTrustedProxies(['1.1.1.1'], Request::HEADER_X_FORWARDED_FOR | Request::HEADER_FORWARDED);
$request->server->set('REMOTE_ADDR', '1.1.1.1');
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
index 2682905eedc3..50c0c091b690 100644
--- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -391,35 +391,27 @@ public function testSerialize()
$this->assertEquals($expected, $kernel->serialize());
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testLocateResourceThrowsExceptionWhenNameIsNotValid()
{
+ $this->expectException('InvalidArgumentException');
$this->getKernel()->locateResource('Foo');
}
- /**
- * @expectedException \RuntimeException
- */
public function testLocateResourceThrowsExceptionWhenNameIsUnsafe()
{
+ $this->expectException('RuntimeException');
$this->getKernel()->locateResource('@FooBundle/../bar');
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testLocateResourceThrowsExceptionWhenBundleDoesNotExist()
{
+ $this->expectException('InvalidArgumentException');
$this->getKernel()->locateResource('@FooBundle/config/routing.xml');
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testLocateResourceThrowsExceptionWhenResourceDoesNotExist()
{
+ $this->expectException('InvalidArgumentException');
$kernel = $this->getKernel(['getBundle']);
$kernel
->expects($this->once())
@@ -675,11 +667,11 @@ public function testInitializeBundlesSupportInheritanceCascade()
/**
* @group legacy
- * @expectedException \LogicException
- * @expectedExceptionMessage Bundle "ChildCBundle" extends bundle "FooBar", which is not registered.
*/
public function testInitializeBundlesThrowsExceptionWhenAParentDoesNotExists()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('Bundle "ChildCBundle" extends bundle "FooBar", which is not registered.');
$child = $this->getBundle(null, 'FooBar', 'ChildCBundle');
$kernel = $this->getKernel([], [$child]);
$kernel->boot();
@@ -711,11 +703,11 @@ public function testInitializeBundlesSupportsArbitraryBundleRegistrationOrder()
/**
* @group legacy
- * @expectedException \LogicException
- * @expectedExceptionMessage Bundle "ParentCBundle" is directly extended by two bundles "ChildC2Bundle" and "ChildC1Bundle".
*/
public function testInitializeBundlesThrowsExceptionWhenABundleIsDirectlyExtendedByTwoBundles()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('Bundle "ParentCBundle" is directly extended by two bundles "ChildC2Bundle" and "ChildC1Bundle".');
$parent = $this->getBundle(null, null, 'ParentCBundle');
$child1 = $this->getBundle(null, 'ParentCBundle', 'ChildC1Bundle');
$child2 = $this->getBundle(null, 'ParentCBundle', 'ChildC2Bundle');
@@ -726,11 +718,11 @@ public function testInitializeBundlesThrowsExceptionWhenABundleIsDirectlyExtende
/**
* @group legacy
- * @expectedException \LogicException
- * @expectedExceptionMessage Trying to register two bundles with the same name "DuplicateName"
*/
public function testInitializeBundleThrowsExceptionWhenRegisteringTwoBundlesWithTheSameName()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('Trying to register two bundles with the same name "DuplicateName"');
$fooBundle = $this->getBundle(null, null, 'FooBundle', 'DuplicateName');
$barBundle = $this->getBundle(null, null, 'BarBundle', 'DuplicateName');
@@ -740,11 +732,11 @@ public function testInitializeBundleThrowsExceptionWhenRegisteringTwoBundlesWith
/**
* @group legacy
- * @expectedException \LogicException
- * @expectedExceptionMessage Bundle "CircularRefBundle" can not extend itself.
*/
public function testInitializeBundleThrowsExceptionWhenABundleExtendsItself()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('Bundle "CircularRefBundle" can not extend itself.');
$circularRef = $this->getBundle(null, 'CircularRefBundle', 'CircularRefBundle');
$kernel = $this->getKernel([], [$circularRef]);
diff --git a/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php b/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php
index 26e9a99abdbe..1c8c064c3de4 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php
@@ -110,27 +110,21 @@ public function testLogLevelDisabled()
$this->assertSame([], $this->getLogs());
}
- /**
- * @expectedException \Psr\Log\InvalidArgumentException
- */
public function testThrowsOnInvalidLevel()
{
+ $this->expectException('Psr\Log\InvalidArgumentException');
$this->logger->log('invalid level', 'Foo');
}
- /**
- * @expectedException \Psr\Log\InvalidArgumentException
- */
public function testThrowsOnInvalidMinLevel()
{
+ $this->expectException('Psr\Log\InvalidArgumentException');
new Logger('invalid');
}
- /**
- * @expectedException \Psr\Log\InvalidArgumentException
- */
public function testInvalidOutput()
{
+ $this->expectException('Psr\Log\InvalidArgumentException');
new Logger(LogLevel::DEBUG, '/');
}
diff --git a/src/Symfony/Component/Intl/Tests/Collator/CollatorTest.php b/src/Symfony/Component/Intl/Tests/Collator/CollatorTest.php
index 840d97532f09..b0efe8ed3222 100644
--- a/src/Symfony/Component/Intl/Tests/Collator/CollatorTest.php
+++ b/src/Symfony/Component/Intl/Tests/Collator/CollatorTest.php
@@ -11,33 +11,30 @@
namespace Symfony\Component\Intl\Tests\Collator;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Intl\Collator\Collator;
use Symfony\Component\Intl\Globals\IntlGlobals;
class CollatorTest extends AbstractCollatorTest
{
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException
- */
+ use ForwardCompatTestTrait;
+
public function testConstructorWithUnsupportedLocale()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
new Collator('pt_BR');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testCompare()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$collator = $this->getCollator('en');
$collator->compare('a', 'b');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetAttribute()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$collator = $this->getCollator('en');
$collator->getAttribute(Collator::NUMERIC_COLLATION);
}
@@ -66,38 +63,30 @@ public function testConstructWithoutLocale()
$this->assertInstanceOf('\Symfony\Component\Intl\Collator\Collator', $collator);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetSortKey()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$collator = $this->getCollator('en');
$collator->getSortKey('Hello');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetStrength()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$collator = $this->getCollator('en');
$collator->getStrength();
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testSetAttribute()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$collator = $this->getCollator('en');
$collator->setAttribute(Collator::NUMERIC_COLLATION, Collator::ON);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testSetStrength()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$collator = $this->getCollator('en');
$collator->setStrength(Collator::PRIMARY);
}
diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
index 02f9830de4a4..f20da714b5da 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
@@ -105,11 +105,9 @@ public function testReadExistingEntry()
$this->assertSame('Bar', $this->reader->readEntry(self::RES_DIR, 'root', ['Entries', 'Foo']));
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
- */
public function testReadNonExistingEntry()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MissingResourceException');
$this->readerImpl->expects($this->once())
->method('read')
->with(self::RES_DIR, 'root')
@@ -133,11 +131,9 @@ public function testFallbackIfEntryDoesNotExist()
$this->assertSame('Lah', $this->reader->readEntry(self::RES_DIR, 'en_GB', ['Entries', 'Bam']));
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
- */
public function testDontFallbackIfEntryDoesNotExistAndFallbackDisabled()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MissingResourceException');
$this->readerImpl->expects($this->once())
->method('read')
->with(self::RES_DIR, 'en_GB')
@@ -161,11 +157,9 @@ public function testFallbackIfLocaleDoesNotExist()
$this->assertSame('Lah', $this->reader->readEntry(self::RES_DIR, 'en_GB', ['Entries', 'Bam']));
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
- */
public function testDontFallbackIfLocaleDoesNotExistAndFallbackDisabled()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MissingResourceException');
$this->readerImpl->expects($this->once())
->method('read')
->with(self::RES_DIR, 'en_GB')
@@ -293,11 +287,9 @@ public function testMergeExistingEntryWithNonExistingFallbackEntry($childData, $
$this->assertSame($childData, $this->reader->readEntry(self::RES_DIR, 'en_GB', ['Foo', 'Bar'], true));
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
- */
public function testFailIfEntryFoundNeitherInParentNorChild()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MissingResourceException');
$this->readerImpl->expects($this->at(0))
->method('read')
->with(self::RES_DIR, 'en_GB')
diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/IntlBundleReaderTest.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/IntlBundleReaderTest.php
index bf149d39d381..08f2334d637d 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/IntlBundleReaderTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/IntlBundleReaderTest.php
@@ -84,27 +84,21 @@ public function testReadDoesNotFollowFallbackAlias()
$this->assertArrayNotHasKey('ExistsNot', $data);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\ResourceBundleNotFoundException
- */
public function testReadFailsIfNonExistingLocale()
{
+ $this->expectException('Symfony\Component\Intl\Exception\ResourceBundleNotFoundException');
$this->reader->read(__DIR__.'/Fixtures/res', 'foo');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\ResourceBundleNotFoundException
- */
public function testReadFailsIfNonExistingFallbackLocale()
{
+ $this->expectException('Symfony\Component\Intl\Exception\ResourceBundleNotFoundException');
$this->reader->read(__DIR__.'/Fixtures/res', 'ro_AT');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\RuntimeException
- */
public function testReadFailsIfNonExistingDirectory()
{
+ $this->expectException('Symfony\Component\Intl\Exception\RuntimeException');
$this->reader->read(__DIR__.'/foo', 'ro');
}
}
diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php
index cf9dac64b5bf..73697f0565f5 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/JsonBundleReaderTest.php
@@ -41,43 +41,33 @@ public function testReadReturnsArray()
$this->assertArrayNotHasKey('ExistsNot', $data);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\ResourceBundleNotFoundException
- */
public function testReadFailsIfNonExistingLocale()
{
+ $this->expectException('Symfony\Component\Intl\Exception\ResourceBundleNotFoundException');
$this->reader->read(__DIR__.'/Fixtures/json', 'foo');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\RuntimeException
- */
public function testReadFailsIfNonExistingDirectory()
{
+ $this->expectException('Symfony\Component\Intl\Exception\RuntimeException');
$this->reader->read(__DIR__.'/foo', 'en');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\RuntimeException
- */
public function testReadFailsIfNotAFile()
{
+ $this->expectException('Symfony\Component\Intl\Exception\RuntimeException');
$this->reader->read(__DIR__.'/Fixtures/NotAFile', 'en');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\RuntimeException
- */
public function testReadFailsIfInvalidJson()
{
+ $this->expectException('Symfony\Component\Intl\Exception\RuntimeException');
$this->reader->read(__DIR__.'/Fixtures/json', 'en_Invalid');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\ResourceBundleNotFoundException
- */
public function testReaderDoesNotBreakOutOfGivenPath()
{
+ $this->expectException('Symfony\Component\Intl\Exception\ResourceBundleNotFoundException');
$this->reader->read(__DIR__.'/Fixtures/json', '../invalid_directory/en');
}
}
diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php
index d4879b94793e..300f860aa15a 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/PhpBundleReaderTest.php
@@ -41,35 +41,27 @@ public function testReadReturnsArray()
$this->assertArrayNotHasKey('ExistsNot', $data);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\ResourceBundleNotFoundException
- */
public function testReadFailsIfNonExistingLocale()
{
+ $this->expectException('Symfony\Component\Intl\Exception\ResourceBundleNotFoundException');
$this->reader->read(__DIR__.'/Fixtures/php', 'foo');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\RuntimeException
- */
public function testReadFailsIfNonExistingDirectory()
{
+ $this->expectException('Symfony\Component\Intl\Exception\RuntimeException');
$this->reader->read(__DIR__.'/foo', 'en');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\RuntimeException
- */
public function testReadFailsIfNotAFile()
{
+ $this->expectException('Symfony\Component\Intl\Exception\RuntimeException');
$this->reader->read(__DIR__.'/Fixtures/NotAFile', 'en');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\ResourceBundleNotFoundException
- */
public function testReaderDoesNotBreakOutOfGivenPath()
{
+ $this->expectException('Symfony\Component\Intl\Exception\ResourceBundleNotFoundException');
$this->reader->read(__DIR__.'/Fixtures/php', '../invalid_directory/en');
}
}
diff --git a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php
index 99000f5eff58..a3ee95c8ff1b 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractCurrencyDataProviderTest.php
@@ -746,10 +746,10 @@ function ($value) { return [$value]; },
/**
* @dataProvider provideCurrenciesWithoutNumericEquivalent
- * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
*/
public function testGetNumericCodeFailsIfNoNumericEquivalent($currency)
{
+ $this->expectException('Symfony\Component\Intl\Exception\MissingResourceException');
$this->dataProvider->getNumericCode($currency);
}
@@ -791,10 +791,10 @@ function ($value) { return [$value]; },
/**
* @dataProvider provideInvalidNumericCodes
- * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
*/
public function testForNumericCodeFailsIfInvalidNumericCode($currency)
{
+ $this->expectException('Symfony\Component\Intl\Exception\MissingResourceException');
$this->dataProvider->forNumericCode($currency);
}
diff --git a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractLanguageDataProviderTest.php b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractLanguageDataProviderTest.php
index 0eda13fe4bd6..2bbab217ab81 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractLanguageDataProviderTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Provider/AbstractLanguageDataProviderTest.php
@@ -938,10 +938,10 @@ function ($value) { return [$value]; },
/**
* @dataProvider provideLanguagesWithoutAlpha3Equivalent
- * @expectedException \Symfony\Component\Intl\Exception\MissingResourceException
*/
public function testGetAlpha3CodeFailsIfNoAlpha3Equivalent($currency)
{
+ $this->expectException('Symfony\Component\Intl\Exception\MissingResourceException');
$this->dataProvider->getAlpha3Code($currency);
}
}
diff --git a/src/Symfony/Component/Intl/Tests/Data/Util/RingBufferTest.php b/src/Symfony/Component/Intl/Tests/Data/Util/RingBufferTest.php
index 425c0bba04f7..b990a9436254 100644
--- a/src/Symfony/Component/Intl/Tests/Data/Util/RingBufferTest.php
+++ b/src/Symfony/Component/Intl/Tests/Data/Util/RingBufferTest.php
@@ -55,11 +55,9 @@ public function testWritePastBuffer()
$this->assertSame('bam', $this->buffer[2]);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\OutOfBoundsException
- */
public function testReadNonExistingFails()
{
+ $this->expectException('Symfony\Component\Intl\Exception\OutOfBoundsException');
$this->buffer['foo'];
}
@@ -75,11 +73,9 @@ public function testUnsetNonExistingSucceeds()
$this->assertArrayNotHasKey('foo', $this->buffer);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\OutOfBoundsException
- */
public function testReadOverwrittenFails()
{
+ $this->expectException('Symfony\Component\Intl\Exception\OutOfBoundsException');
$this->buffer[0] = 'foo';
$this->buffer['bar'] = 'baz';
$this->buffer[2] = 'bam';
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php
index 29f8918be8b7..26816dcdb8e6 100644
--- a/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php
+++ b/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php
@@ -11,11 +11,14 @@
namespace Symfony\Component\Intl\Tests\DateFormatter;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Intl\DateFormatter\IntlDateFormatter;
use Symfony\Component\Intl\Globals\IntlGlobals;
class IntlDateFormatterTest extends AbstractIntlDateFormatterTest
{
+ use ForwardCompatTestTrait;
+
public function testConstructor()
{
$formatter = new IntlDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, 'y-M-d');
@@ -34,11 +37,9 @@ public function testConstructorWithoutCalendar()
$this->assertEquals('y-M-d', $formatter->getPattern());
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException
- */
public function testConstructorWithUnsupportedLocale()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
new IntlDateFormatter('pt_BR', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT);
}
@@ -73,21 +74,17 @@ public function testFormatWithUnsupportedTimestampArgument()
}
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\NotImplementedException
- */
public function testFormatWithUnimplementedChars()
{
+ $this->expectException('Symfony\Component\Intl\Exception\NotImplementedException');
$pattern = 'Y';
$formatter = new IntlDateFormatter('en', IntlDateFormatter::MEDIUM, IntlDateFormatter::SHORT, 'UTC', IntlDateFormatter::GREGORIAN, $pattern);
$formatter->format(0);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\NotImplementedException
- */
public function testFormatWithNonIntegerTimestamp()
{
+ $this->expectException('Symfony\Component\Intl\Exception\NotImplementedException');
$formatter = $this->getDefaultDateFormatter();
$formatter->format([]);
}
@@ -110,56 +107,44 @@ public function testIsLenient()
$this->assertFalse($formatter->isLenient());
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testLocaltime()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$formatter = $this->getDefaultDateFormatter();
$formatter->localtime('Wednesday, December 31, 1969 4:00:00 PM PT');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodArgumentNotImplementedException
- */
public function testParseWithNotNullPositionValue()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentNotImplementedException');
$position = 0;
$formatter = $this->getDefaultDateFormatter('y');
$this->assertSame(0, $formatter->parse('1970', $position));
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testSetCalendar()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$formatter = $this->getDefaultDateFormatter();
$formatter->setCalendar(IntlDateFormatter::GREGORIAN);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException
- */
public function testSetLenient()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
$formatter = $this->getDefaultDateFormatter();
$formatter->setLenient(true);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\NotImplementedException
- */
public function testFormatWithGmtTimeZoneAndMinutesOffset()
{
+ $this->expectException('Symfony\Component\Intl\Exception\NotImplementedException');
parent::testFormatWithGmtTimeZoneAndMinutesOffset();
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\NotImplementedException
- */
public function testFormatWithNonStandardTimezone()
{
+ $this->expectException('Symfony\Component\Intl\Exception\NotImplementedException');
parent::testFormatWithNonStandardTimezone();
}
diff --git a/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php b/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php
index d087094da1d5..b3b50a14c538 100644
--- a/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php
+++ b/src/Symfony/Component/Intl/Tests/Locale/LocaleTest.php
@@ -11,21 +11,21 @@
namespace Symfony\Component\Intl\Tests\Locale;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
+
class LocaleTest extends AbstractLocaleTest
{
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
+ use ForwardCompatTestTrait;
+
public function testAcceptFromHttp()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('acceptFromHttp', 'pt-br,en-us;q=0.7,en;q=0.5');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testComposeLocale()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$subtags = [
'language' => 'pt',
'script' => 'Latn',
@@ -34,99 +34,75 @@ public function testComposeLocale()
$this->call('composeLocale', $subtags);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testFilterMatches()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('filterMatches', 'pt-BR', 'pt-BR');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetAllVariants()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('getAllVariants', 'pt_BR_Latn');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetDisplayLanguage()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('getDisplayLanguage', 'pt-Latn-BR', 'en');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetDisplayName()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('getDisplayName', 'pt-Latn-BR', 'en');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetDisplayRegion()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('getDisplayRegion', 'pt-Latn-BR', 'en');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetDisplayScript()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('getDisplayScript', 'pt-Latn-BR', 'en');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetDisplayVariant()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('getDisplayVariant', 'pt-Latn-BR', 'en');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetKeywords()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('getKeywords', 'pt-BR@currency=BRL');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetPrimaryLanguage()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('getPrimaryLanguage', 'pt-Latn-BR');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetRegion()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('getRegion', 'pt-Latn-BR');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetScript()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('getScript', 'pt-Latn-BR');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testLookup()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$langtag = [
'pt-Latn-BR',
'pt-BR',
@@ -134,19 +110,15 @@ public function testLookup()
$this->call('lookup', $langtag, 'pt-BR-x-priv1');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testParseLocale()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('parseLocale', 'pt-Latn-BR');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testSetDefault()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$this->call('setDefault', 'pt_BR');
}
diff --git a/src/Symfony/Component/Intl/Tests/NumberFormatter/NumberFormatterTest.php b/src/Symfony/Component/Intl/Tests/NumberFormatter/NumberFormatterTest.php
index 8e20c81f13f7..8457364f38d1 100644
--- a/src/Symfony/Component/Intl/Tests/NumberFormatter/NumberFormatterTest.php
+++ b/src/Symfony/Component/Intl/Tests/NumberFormatter/NumberFormatterTest.php
@@ -23,44 +23,34 @@ class NumberFormatterTest extends AbstractNumberFormatterTest
{
use ForwardCompatTestTrait;
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException
- */
public function testConstructorWithUnsupportedLocale()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
new NumberFormatter('pt_BR');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException
- */
public function testConstructorWithUnsupportedStyle()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
new NumberFormatter('en', NumberFormatter::PATTERN_DECIMAL);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodArgumentNotImplementedException
- */
public function testConstructorWithPatternDifferentThanNull()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentNotImplementedException');
new NumberFormatter('en', NumberFormatter::DECIMAL, '');
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException
- */
public function testSetAttributeWithUnsupportedAttribute()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
$formatter->setAttribute(NumberFormatter::LENIENT_PARSE, null);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException
- */
public function testSetAttributeInvalidRoundingMode()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
$formatter->setAttribute(NumberFormatter::ROUNDING_MODE, null);
}
@@ -81,73 +71,69 @@ public function testCreate()
);
}
- /**
- * @expectedException \RuntimeException
- */
public function testFormatWithCurrencyStyle()
{
+ $this->expectException('RuntimeException');
parent::testFormatWithCurrencyStyle();
}
/**
* @dataProvider formatTypeInt32Provider
- * @expectedException \Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException
*/
public function testFormatTypeInt32($formatter, $value, $expected, $message = '')
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
parent::testFormatTypeInt32($formatter, $value, $expected, $message);
}
/**
* @dataProvider formatTypeInt32WithCurrencyStyleProvider
- * @expectedException \Symfony\Component\Intl\Exception\NotImplementedException
*/
public function testFormatTypeInt32WithCurrencyStyle($formatter, $value, $expected, $message = '')
{
+ $this->expectException('Symfony\Component\Intl\Exception\NotImplementedException');
parent::testFormatTypeInt32WithCurrencyStyle($formatter, $value, $expected, $message);
}
/**
* @dataProvider formatTypeInt64Provider
- * @expectedException \Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException
*/
public function testFormatTypeInt64($formatter, $value, $expected)
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
parent::testFormatTypeInt64($formatter, $value, $expected);
}
/**
* @dataProvider formatTypeInt64WithCurrencyStyleProvider
- * @expectedException \Symfony\Component\Intl\Exception\NotImplementedException
*/
public function testFormatTypeInt64WithCurrencyStyle($formatter, $value, $expected)
{
+ $this->expectException('Symfony\Component\Intl\Exception\NotImplementedException');
parent::testFormatTypeInt64WithCurrencyStyle($formatter, $value, $expected);
}
/**
* @dataProvider formatTypeDoubleProvider
- * @expectedException \Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException
*/
public function testFormatTypeDouble($formatter, $value, $expected)
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodArgumentValueNotImplementedException');
parent::testFormatTypeDouble($formatter, $value, $expected);
}
/**
* @dataProvider formatTypeDoubleWithCurrencyStyleProvider
- * @expectedException \Symfony\Component\Intl\Exception\NotImplementedException
*/
public function testFormatTypeDoubleWithCurrencyStyle($formatter, $value, $expected)
{
+ $this->expectException('Symfony\Component\Intl\Exception\NotImplementedException');
parent::testFormatTypeDoubleWithCurrencyStyle($formatter, $value, $expected);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testGetPattern()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
$formatter->getPattern();
}
@@ -158,38 +144,30 @@ public function testGetErrorCode()
$this->assertEquals(IntlGlobals::U_ZERO_ERROR, $formatter->getErrorCode());
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testParseCurrency()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
$formatter->parseCurrency(null, $currency);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testSetPattern()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
$formatter->setPattern(null);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testSetSymbol()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
$formatter->setSymbol(null, null);
}
- /**
- * @expectedException \Symfony\Component\Intl\Exception\MethodNotImplementedException
- */
public function testSetTextAttribute()
{
+ $this->expectException('Symfony\Component\Intl\Exception\MethodNotImplementedException');
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
$formatter->setTextAttribute(null, null);
}
diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/EntryManagerTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/EntryManagerTest.php
index 0617762ed6f0..8c9b1575114e 100644
--- a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/EntryManagerTest.php
+++ b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/EntryManagerTest.php
@@ -11,18 +11,19 @@
namespace Symfony\Component\Ldap\Tests\Adapter\ExtLdap;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Ldap\Adapter\ExtLdap\Connection;
use Symfony\Component\Ldap\Adapter\ExtLdap\EntryManager;
use Symfony\Component\Ldap\Entry;
class EntryManagerTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Ldap\Exception\NotBoundException
- * @expectedExceptionMessage Query execution is not possible without binding the connection first.
- */
+ use ForwardCompatTestTrait;
+
public function testGetResources()
{
+ $this->expectException('Symfony\Component\Ldap\Exception\NotBoundException');
+ $this->expectExceptionMessage('Query execution is not possible without binding the connection first.');
$connection = $this->getMockBuilder(Connection::class)->getMock();
$connection
->expects($this->once())
diff --git a/src/Symfony/Component/Lock/Tests/LockTest.php b/src/Symfony/Component/Lock/Tests/LockTest.php
index f461311db0ed..6b060bd088c3 100644
--- a/src/Symfony/Component/Lock/Tests/LockTest.php
+++ b/src/Symfony/Component/Lock/Tests/LockTest.php
@@ -13,6 +13,7 @@
use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Lock\Exception\LockConflictedException;
use Symfony\Component\Lock\Key;
use Symfony\Component\Lock\Lock;
@@ -23,6 +24,8 @@
*/
class LockTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testAcquireNoBlocking()
{
$key = new Key(uniqid(__METHOD__, true));
@@ -170,11 +173,9 @@ public function testNoAutoReleaseWhenNotConfigured()
unset($lock);
}
- /**
- * @expectedException \Symfony\Component\Lock\Exception\LockReleasingException
- */
public function testReleaseThrowsExceptionIfNotWellDeleted()
{
+ $this->expectException('Symfony\Component\Lock\Exception\LockReleasingException');
$key = new Key(uniqid(__METHOD__, true));
$store = $this->getMockBuilder(StoreInterface::class)->getMock();
$lock = new Lock($key, $store, 10);
@@ -193,11 +194,9 @@ public function testReleaseThrowsExceptionIfNotWellDeleted()
$lock->release();
}
- /**
- * @expectedException \Symfony\Component\Lock\Exception\LockReleasingException
- */
public function testReleaseThrowsAndLog()
{
+ $this->expectException('Symfony\Component\Lock\Exception\LockReleasingException');
$key = new Key(uniqid(__METHOD__, true));
$store = $this->getMockBuilder(StoreInterface::class)->getMock();
$logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
diff --git a/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php
index 4b9c81bd8e8c..1cc36eb5dc38 100644
--- a/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/AbstractRedisStoreTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Lock\Tests\Store;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Lock\Store\RedisStore;
/**
@@ -18,6 +19,7 @@
*/
abstract class AbstractRedisStoreTest extends AbstractStoreTest
{
+ use ForwardCompatTestTrait;
use ExpiringStoreTestTrait;
/**
diff --git a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
index 688620b677d4..a9f6c3c3df51 100644
--- a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
@@ -69,11 +69,9 @@ private function doSetUp()
$this->store = new CombinedStore([$this->store1, $this->store2], $this->strategy);
}
- /**
- * @expectedException \Symfony\Component\Lock\Exception\LockConflictedException
- */
public function testSaveThrowsExceptionOnFailure()
{
+ $this->expectException('Symfony\Component\Lock\Exception\LockConflictedException');
$key = new Key(uniqid(__METHOD__, true));
$this->store1
@@ -166,11 +164,9 @@ public function testSaveAbortWhenStrategyCantBeMet()
}
}
- /**
- * @expectedException \Symfony\Component\Lock\Exception\LockConflictedException
- */
public function testputOffExpirationThrowsExceptionOnFailure()
{
+ $this->expectException('Symfony\Component\Lock\Exception\LockConflictedException');
$key = new Key(uniqid(__METHOD__, true));
$ttl = random_int(1, 10);
diff --git a/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php b/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php
index bc96ff66f5df..a66061d4675c 100644
--- a/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php
+++ b/src/Symfony/Component/Lock/Tests/Store/ExpiringStoreTestTrait.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Lock\Tests\Store;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Lock\Exception\LockExpiredException;
use Symfony\Component\Lock\Key;
use Symfony\Component\Lock\StoreInterface;
@@ -57,11 +58,10 @@ public function testExpiration()
/**
* Tests the store thrown exception when TTL expires.
- *
- * @expectedException \Symfony\Component\Lock\Exception\LockExpiredException
*/
public function testAbortAfterExpiration()
{
+ $this->expectException('\Symfony\Component\Lock\Exception\LockExpiredException');
$key = new Key(uniqid(__METHOD__, true));
/** @var StoreInterface $store */
diff --git a/src/Symfony/Component/Lock/Tests/Store/FlockStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/FlockStoreTest.php
index ef3650c3124b..42f88390db89 100644
--- a/src/Symfony/Component/Lock/Tests/Store/FlockStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/FlockStoreTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Lock\Tests\Store;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Lock\Key;
use Symfony\Component\Lock\Store\FlockStore;
@@ -19,6 +20,7 @@
*/
class FlockStoreTest extends AbstractStoreTest
{
+ use ForwardCompatTestTrait;
use BlockingStoreTestTrait;
/**
@@ -29,12 +31,10 @@ protected function getStore()
return new FlockStore();
}
- /**
- * @expectedException \Symfony\Component\Lock\Exception\InvalidArgumentException
- * @expectedExceptionMessage The directory "/a/b/c/d/e" is not writable.
- */
public function testConstructWhenRepositoryDoesNotExist()
{
+ $this->expectException('Symfony\Component\Lock\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The directory "/a/b/c/d/e" is not writable.');
if (!getenv('USER') || 'root' === getenv('USER')) {
$this->markTestSkipped('This test will fail if run under superuser');
}
@@ -42,12 +42,10 @@ public function testConstructWhenRepositoryDoesNotExist()
new FlockStore('/a/b/c/d/e');
}
- /**
- * @expectedException \Symfony\Component\Lock\Exception\InvalidArgumentException
- * @expectedExceptionMessage The directory "/" is not writable.
- */
public function testConstructWhenRepositoryIsNotWriteable()
{
+ $this->expectException('Symfony\Component\Lock\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The directory "/" is not writable.');
if (!getenv('USER') || 'root' === getenv('USER')) {
$this->markTestSkipped('This test will fail if run under superuser');
}
diff --git a/src/Symfony/Component/OptionsResolver/Tests/Debug/OptionsResolverIntrospectorTest.php b/src/Symfony/Component/OptionsResolver/Tests/Debug/OptionsResolverIntrospectorTest.php
index 8dd7997ddf78..208fdba04d02 100644
--- a/src/Symfony/Component/OptionsResolver/Tests/Debug/OptionsResolverIntrospectorTest.php
+++ b/src/Symfony/Component/OptionsResolver/Tests/Debug/OptionsResolverIntrospectorTest.php
@@ -12,12 +12,15 @@
namespace Symfony\Component\OptionsResolver\Tests\Debug;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\OptionsResolver\Debug\OptionsResolverIntrospector;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver;
class OptionsResolverIntrospectorTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testGetDefault()
{
$resolver = new OptionsResolver();
@@ -36,12 +39,10 @@ public function testGetDefaultNull()
$this->assertNull($debug->getDefault($option));
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
- * @expectedExceptionMessage No default value was set for the "foo" option.
- */
public function testGetDefaultThrowsOnNoConfiguredValue()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\NoConfigurationException');
+ $this->expectExceptionMessage('No default value was set for the "foo" option.');
$resolver = new OptionsResolver();
$resolver->setDefined($option = 'foo');
@@ -49,12 +50,10 @@ public function testGetDefaultThrowsOnNoConfiguredValue()
$this->assertSame('bar', $debug->getDefault($option));
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
- * @expectedExceptionMessage The option "foo" does not exist.
- */
public function testGetDefaultThrowsOnNotDefinedOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException');
+ $this->expectExceptionMessage('The option "foo" does not exist.');
$resolver = new OptionsResolver();
$debug = new OptionsResolverIntrospector($resolver);
@@ -71,12 +70,10 @@ public function testGetLazyClosures()
$this->assertSame($closures, $debug->getLazyClosures($option));
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
- * @expectedExceptionMessage No lazy closures were set for the "foo" option.
- */
public function testGetLazyClosuresThrowsOnNoConfiguredValue()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\NoConfigurationException');
+ $this->expectExceptionMessage('No lazy closures were set for the "foo" option.');
$resolver = new OptionsResolver();
$resolver->setDefined($option = 'foo');
@@ -84,12 +81,10 @@ public function testGetLazyClosuresThrowsOnNoConfiguredValue()
$this->assertSame('bar', $debug->getLazyClosures($option));
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
- * @expectedExceptionMessage The option "foo" does not exist.
- */
public function testGetLazyClosuresThrowsOnNotDefinedOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException');
+ $this->expectExceptionMessage('The option "foo" does not exist.');
$resolver = new OptionsResolver();
$debug = new OptionsResolverIntrospector($resolver);
@@ -106,12 +101,10 @@ public function testGetAllowedTypes()
$this->assertSame($allowedTypes, $debug->getAllowedTypes($option));
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
- * @expectedExceptionMessage No allowed types were set for the "foo" option.
- */
public function testGetAllowedTypesThrowsOnNoConfiguredValue()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\NoConfigurationException');
+ $this->expectExceptionMessage('No allowed types were set for the "foo" option.');
$resolver = new OptionsResolver();
$resolver->setDefined($option = 'foo');
@@ -119,12 +112,10 @@ public function testGetAllowedTypesThrowsOnNoConfiguredValue()
$this->assertSame('bar', $debug->getAllowedTypes($option));
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
- * @expectedExceptionMessage The option "foo" does not exist.
- */
public function testGetAllowedTypesThrowsOnNotDefinedOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException');
+ $this->expectExceptionMessage('The option "foo" does not exist.');
$resolver = new OptionsResolver();
$debug = new OptionsResolverIntrospector($resolver);
@@ -141,12 +132,10 @@ public function testGetAllowedValues()
$this->assertSame($allowedValues, $debug->getAllowedValues($option));
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
- * @expectedExceptionMessage No allowed values were set for the "foo" option.
- */
public function testGetAllowedValuesThrowsOnNoConfiguredValue()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\NoConfigurationException');
+ $this->expectExceptionMessage('No allowed values were set for the "foo" option.');
$resolver = new OptionsResolver();
$resolver->setDefined($option = 'foo');
@@ -154,12 +143,10 @@ public function testGetAllowedValuesThrowsOnNoConfiguredValue()
$this->assertSame('bar', $debug->getAllowedValues($option));
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
- * @expectedExceptionMessage The option "foo" does not exist.
- */
public function testGetAllowedValuesThrowsOnNotDefinedOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException');
+ $this->expectExceptionMessage('The option "foo" does not exist.');
$resolver = new OptionsResolver();
$debug = new OptionsResolverIntrospector($resolver);
@@ -176,12 +163,10 @@ public function testGetNormalizer()
$this->assertSame($normalizer, $debug->getNormalizer($option));
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\NoConfigurationException
- * @expectedExceptionMessage No normalizer was set for the "foo" option.
- */
public function testGetNormalizerThrowsOnNoConfiguredValue()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\NoConfigurationException');
+ $this->expectExceptionMessage('No normalizer was set for the "foo" option.');
$resolver = new OptionsResolver();
$resolver->setDefined($option = 'foo');
@@ -189,12 +174,10 @@ public function testGetNormalizerThrowsOnNoConfiguredValue()
$this->assertSame('bar', $debug->getNormalizer($option));
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
- * @expectedExceptionMessage The option "foo" does not exist.
- */
public function testGetNormalizerThrowsOnNotDefinedOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException');
+ $this->expectExceptionMessage('The option "foo" does not exist.');
$resolver = new OptionsResolver();
$debug = new OptionsResolverIntrospector($resolver);
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
index 2f69cc14deec..c32a8b31e5a4 100644
--- a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
+++ b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -32,35 +32,29 @@ private function doSetUp()
$this->resolver = new OptionsResolver();
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
- * @expectedExceptionMessage The option "foo" does not exist. Defined options are: "a", "z".
- */
public function testResolveFailsIfNonExistingOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException');
+ $this->expectExceptionMessage('The option "foo" does not exist. Defined options are: "a", "z".');
$this->resolver->setDefault('z', '1');
$this->resolver->setDefault('a', '2');
$this->resolver->resolve(['foo' => 'bar']);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
- * @expectedExceptionMessage The options "baz", "foo", "ping" do not exist. Defined options are: "a", "z".
- */
public function testResolveFailsIfMultipleNonExistingOptions()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException');
+ $this->expectExceptionMessage('The options "baz", "foo", "ping" do not exist. Defined options are: "a", "z".');
$this->resolver->setDefault('z', '1');
$this->resolver->setDefault('a', '2');
$this->resolver->resolve(['ping' => 'pong', 'foo' => 'bar', 'baz' => 'bam']);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testResolveFailsFromLazyOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('foo', function (Options $options) {
$options->resolve([]);
});
@@ -84,11 +78,9 @@ public function testSetDefault()
], $this->resolver->resolve());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testFailIfSetDefaultFromLazyOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('lazy', function (Options $options) {
$options->setDefault('default', 42);
});
@@ -228,11 +220,9 @@ public function testSetRequiredReturnsThis()
$this->assertSame($this->resolver, $this->resolver->setRequired('foo'));
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testFailIfSetRequiredFromLazyOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('foo', function (Options $options) {
$options->setRequired('bar');
});
@@ -240,11 +230,9 @@ public function testFailIfSetRequiredFromLazyOption()
$this->resolver->resolve();
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\MissingOptionsException
- */
public function testResolveFailsIfRequiredOptionMissing()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\MissingOptionsException');
$this->resolver->setRequired('foo');
$this->resolver->resolve();
@@ -356,11 +344,9 @@ public function testGetMissingOptions()
$this->assertSame(['bar'], $this->resolver->getMissingOptions());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testFailIfSetDefinedFromLazyOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('foo', function (Options $options) {
$options->setDefined('bar');
});
@@ -453,11 +439,9 @@ public function testClearedOptionsAreNotDefined()
$this->assertFalse($this->resolver->isDefined('foo'));
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
- */
public function testSetAllowedTypesFailsIfUnknownOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException');
$this->resolver->setAllowedTypes('foo', 'string');
}
@@ -470,11 +454,9 @@ public function testResolveTypedArray()
$this->assertSame(['foo' => ['bar', 'baz']], $options);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testFailIfSetAllowedTypesFromLazyOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('foo', function (Options $options) {
$options->setAllowedTypes('bar', 'string');
});
@@ -484,36 +466,30 @@ public function testFailIfSetAllowedTypesFromLazyOption()
$this->resolver->resolve();
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[]", but one of the elements is of type "DateTime[]".
- */
public function testResolveFailsIfInvalidTypedArray()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value array is expected to be of type "int[]", but one of the elements is of type "DateTime[]".');
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'int[]');
$this->resolver->resolve(['foo' => [new \DateTime()]]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value "bar" is expected to be of type "int[]", but is of type "string".
- */
public function testResolveFailsWithNonArray()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value "bar" is expected to be of type "int[]", but is of type "string".');
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'int[]');
$this->resolver->resolve(['foo' => 'bar']);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[]", but one of the elements is of type "stdClass[]".
- */
public function testResolveFailsIfTypedArrayContainsInvalidTypes()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value array is expected to be of type "int[]", but one of the elements is of type "stdClass[]".');
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'int[]');
$values = range(1, 5);
@@ -525,12 +501,10 @@ public function testResolveFailsIfTypedArrayContainsInvalidTypes()
$this->resolver->resolve(['foo' => $values]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[][]", but one of the elements is of type "double[][]".
- */
public function testResolveFailsWithCorrectLevelsButWrongScalar()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value array is expected to be of type "int[][]", but one of the elements is of type "double[][]".');
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'int[][]');
@@ -577,12 +551,10 @@ public function testResolveSucceedsIfValidType()
$this->assertNotEmpty($this->resolver->resolve());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value 42 is expected to be of type "string" or "bool", but is of type "integer".
- */
public function testResolveFailsIfInvalidTypeMultiple()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value 42 is expected to be of type "string" or "bool", but is of type "integer".');
$this->resolver->setDefault('foo', 42);
$this->resolver->setAllowedTypes('foo', ['string', 'bool']);
@@ -620,30 +592,24 @@ public function testResolveSucceedsIfTypedArray()
$this->assertEquals($data, $result);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testResolveFailsIfNotInstanceOfClass()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->resolver->setDefault('foo', 'bar');
$this->resolver->setAllowedTypes('foo', '\stdClass');
$this->resolver->resolve();
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
- */
public function testAddAllowedTypesFailsIfUnknownOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException');
$this->resolver->addAllowedTypes('foo', 'string');
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testFailIfAddAllowedTypesFromLazyOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('foo', function (Options $options) {
$options->addAllowedTypes('bar', 'string');
});
@@ -653,11 +619,9 @@ public function testFailIfAddAllowedTypesFromLazyOption()
$this->resolver->resolve();
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testResolveFailsIfInvalidAddedType()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->resolver->setDefault('foo', 42);
$this->resolver->addAllowedTypes('foo', 'string');
@@ -672,11 +636,9 @@ public function testResolveSucceedsIfValidAddedType()
$this->assertNotEmpty($this->resolver->resolve());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testResolveFailsIfInvalidAddedTypeMultiple()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->resolver->setDefault('foo', 42);
$this->resolver->addAllowedTypes('foo', ['string', 'bool']);
@@ -713,19 +675,15 @@ public function testAddAllowedTypesDoesNotOverwrite2()
$this->assertNotEmpty($this->resolver->resolve());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
- */
public function testSetAllowedValuesFailsIfUnknownOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException');
$this->resolver->setAllowedValues('foo', 'bar');
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testFailIfSetAllowedValuesFromLazyOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('foo', function (Options $options) {
$options->setAllowedValues('bar', 'baz');
});
@@ -735,35 +693,29 @@ public function testFailIfSetAllowedValuesFromLazyOption()
$this->resolver->resolve();
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value 42 is invalid. Accepted values are: "bar".
- */
public function testResolveFailsIfInvalidValue()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value 42 is invalid. Accepted values are: "bar".');
$this->resolver->setDefined('foo');
$this->resolver->setAllowedValues('foo', 'bar');
$this->resolver->resolve(['foo' => 42]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value null is invalid. Accepted values are: "bar".
- */
public function testResolveFailsIfInvalidValueIsNull()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value null is invalid. Accepted values are: "bar".');
$this->resolver->setDefault('foo', null);
$this->resolver->setAllowedValues('foo', 'bar');
$this->resolver->resolve();
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testResolveFailsIfInvalidValueStrict()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->resolver->setDefault('foo', 42);
$this->resolver->setAllowedValues('foo', '42');
@@ -786,12 +738,10 @@ public function testResolveSucceedsIfValidValueIsNull()
$this->assertEquals(['foo' => null], $this->resolver->resolve());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value 42 is invalid. Accepted values are: "bar", false, null.
- */
public function testResolveFailsIfInvalidValueMultiple()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value 42 is invalid. Accepted values are: "bar", false, null.');
$this->resolver->setDefault('foo', 42);
$this->resolver->setAllowedValues('foo', ['bar', false, null]);
@@ -837,11 +787,9 @@ public function testResolveSucceedsIfClosureReturnsTrue()
$this->assertSame('bar', $passedValue);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testResolveFailsIfAllClosuresReturnFalse()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->resolver->setDefault('foo', 42);
$this->resolver->setAllowedValues('foo', [
function () { return false; },
@@ -864,19 +812,15 @@ function () { return false; },
$this->assertEquals(['foo' => 'bar'], $this->resolver->resolve());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
- */
public function testAddAllowedValuesFailsIfUnknownOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException');
$this->resolver->addAllowedValues('foo', 'bar');
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testFailIfAddAllowedValuesFromLazyOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('foo', function (Options $options) {
$options->addAllowedValues('bar', 'baz');
});
@@ -886,11 +830,9 @@ public function testFailIfAddAllowedValuesFromLazyOption()
$this->resolver->resolve();
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testResolveFailsIfInvalidAddedValue()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->resolver->setDefault('foo', 42);
$this->resolver->addAllowedValues('foo', 'bar');
@@ -913,11 +855,9 @@ public function testResolveSucceedsIfValidAddedValueIsNull()
$this->assertEquals(['foo' => null], $this->resolver->resolve());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testResolveFailsIfInvalidAddedValueMultiple()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->resolver->setDefault('foo', 42);
$this->resolver->addAllowedValues('foo', ['bar', 'baz']);
@@ -950,11 +890,9 @@ public function testAddAllowedValuesDoesNotOverwrite2()
$this->assertEquals(['foo' => 'baz'], $this->resolver->resolve());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testResolveFailsIfAllAddedClosuresReturnFalse()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->resolver->setDefault('foo', 42);
$this->resolver->setAllowedValues('foo', function () { return false; });
$this->resolver->addAllowedValues('foo', function () { return false; });
@@ -996,19 +934,15 @@ public function testSetNormalizerClosure()
$this->assertEquals(['foo' => 'normalized'], $this->resolver->resolve());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
- */
public function testSetNormalizerFailsIfUnknownOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException');
$this->resolver->setNormalizer('foo', function () {});
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testFailIfSetNormalizerFromLazyOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('foo', function (Options $options) {
$options->setNormalizer('foo', function () {});
});
@@ -1042,11 +976,9 @@ public function testNormalizerReceivesPassedOption()
$this->assertEquals(['foo' => 'normalized[baz]'], $resolved);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testValidateTypeBeforeNormalization()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->resolver->setDefault('foo', 'bar');
$this->resolver->setAllowedTypes('foo', 'int');
@@ -1058,11 +990,9 @@ public function testValidateTypeBeforeNormalization()
$this->resolver->resolve();
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- */
public function testValidateValueBeforeNormalization()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->resolver->setDefault('foo', 'bar');
$this->resolver->setAllowedValues('foo', 'baz');
@@ -1112,11 +1042,9 @@ public function testNormalizerCanAccessLazyOptions()
], $this->resolver->resolve());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\OptionDefinitionException
- */
public function testFailIfCyclicDependencyBetweenNormalizers()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\OptionDefinitionException');
$this->resolver->setDefault('norm1', 'bar');
$this->resolver->setDefault('norm2', 'baz');
@@ -1131,11 +1059,9 @@ public function testFailIfCyclicDependencyBetweenNormalizers()
$this->resolver->resolve();
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\OptionDefinitionException
- */
public function testFailIfCyclicDependencyBetweenNormalizerAndLazyOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\OptionDefinitionException');
$this->resolver->setDefault('lazy', function (Options $options) {
$options['norm'];
});
@@ -1253,11 +1179,9 @@ public function testSetDefaults()
], $this->resolver->resolve());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testFailIfSetDefaultsFromLazyOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('foo', function (Options $options) {
$options->setDefaults(['two' => '2']);
});
@@ -1334,11 +1258,9 @@ public function testRemoveAllowedValues()
$this->assertSame(['foo' => 'bar'], $this->resolver->resolve());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testFailIfRemoveFromLazyOption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('foo', function (Options $options) {
$options->remove('bar');
});
@@ -1410,11 +1332,9 @@ public function testClearAllowedValues()
$this->assertSame(['foo' => 'bar'], $this->resolver->resolve());
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testFailIfClearFromLazyption()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('foo', function (Options $options) {
$options->clear();
});
@@ -1469,50 +1389,40 @@ public function testArrayAccess()
$this->resolver->resolve(['default2' => 42, 'required' => 'value']);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testArrayAccessGetFailsOutsideResolve()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('default', 0);
$this->resolver['default'];
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testArrayAccessExistsFailsOutsideResolve()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('default', 0);
isset($this->resolver['default']);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testArrayAccessSetNotSupported()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver['default'] = 0;
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
- */
public function testArrayAccessUnsetNotSupported()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('default', 0);
unset($this->resolver['default']);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\NoSuchOptionException
- * @expectedExceptionMessage The option "undefined" does not exist. Defined options are: "foo", "lazy".
- */
public function testFailIfGetNonExisting()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\NoSuchOptionException');
+ $this->expectExceptionMessage('The option "undefined" does not exist. Defined options are: "foo", "lazy".');
$this->resolver->setDefault('foo', 'bar');
$this->resolver->setDefault('lazy', function (Options $options) {
@@ -1522,12 +1432,10 @@ public function testFailIfGetNonExisting()
$this->resolver->resolve();
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\NoSuchOptionException
- * @expectedExceptionMessage The optional option "defined" has no value set. You should make sure it is set with "isset" before reading it.
- */
public function testFailIfGetDefinedButUnset()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\NoSuchOptionException');
+ $this->expectExceptionMessage('The optional option "defined" has no value set. You should make sure it is set with "isset" before reading it.');
$this->resolver->setDefined('defined');
$this->resolver->setDefault('lazy', function (Options $options) {
@@ -1537,11 +1445,9 @@ public function testFailIfGetDefinedButUnset()
$this->resolver->resolve();
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\OptionDefinitionException
- */
public function testFailIfCyclicDependency()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\OptionDefinitionException');
$this->resolver->setDefault('lazy1', function (Options $options) {
$options['lazy2'];
});
@@ -1571,11 +1477,10 @@ public function testCount()
* In resolve() we count the options that are actually set (which may be
* only a subset of the defined options). Outside of resolve(), it's not
* clear what is counted.
- *
- * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
*/
public function testCountFailsOutsideResolve()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\AccessException');
$this->resolver->setDefault('foo', 0);
$this->resolver->setRequired('bar');
$this->resolver->setDefined('bar');
@@ -1630,12 +1535,10 @@ public function testNested2Arrays()
));
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value array is expected to be of type "float[][][][]", but one of the elements is of type "integer[][][][]".
- */
public function testNestedArraysException()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value array is expected to be of type "float[][][][]", but one of the elements is of type "integer[][][][]".');
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'float[][][][]');
@@ -1650,12 +1553,10 @@ public function testNestedArraysException()
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[][]", but one of the elements is of type "boolean[][]".
- */
public function testNestedArrayException1()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value array is expected to be of type "int[][]", but one of the elements is of type "boolean[][]".');
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'int[][]');
$this->resolver->resolve([
@@ -1665,12 +1566,10 @@ public function testNestedArrayException1()
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value array is expected to be of type "int[][]", but one of the elements is of type "boolean[][]".
- */
public function testNestedArrayException2()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value array is expected to be of type "int[][]", but one of the elements is of type "boolean[][]".');
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'int[][]');
$this->resolver->resolve([
@@ -1680,12 +1579,10 @@ public function testNestedArrayException2()
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value array is expected to be of type "string[][][]", but one of the elements is of type "string[][]".
- */
public function testNestedArrayException3()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value array is expected to be of type "string[][][]", but one of the elements is of type "string[][]".');
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'string[][][]');
$this->resolver->resolve([
@@ -1695,12 +1592,10 @@ public function testNestedArrayException3()
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value array is expected to be of type "string[][][]", but one of the elements is of type "integer[][][]".
- */
public function testNestedArrayException4()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value array is expected to be of type "string[][][]", but one of the elements is of type "integer[][][]".');
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'string[][][]');
$this->resolver->resolve([
@@ -1711,12 +1606,10 @@ public function testNestedArrayException4()
]);
}
- /**
- * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
- * @expectedExceptionMessage The option "foo" with value array is expected to be of type "string[]", but one of the elements is of type "array[]".
- */
public function testNestedArrayException5()
{
+ $this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The option "foo" with value array is expected to be of type "string[]", but one of the elements is of type "array[]".');
$this->resolver->setDefined('foo');
$this->resolver->setAllowedTypes('foo', 'string[]');
$this->resolver->resolve([
diff --git a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
index 349b197a415b..2a2379694b09 100644
--- a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Process\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Process\ProcessBuilder;
/**
@@ -19,6 +20,8 @@
*/
class ProcessBuilderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testInheritEnvironmentVars()
{
$proc = ProcessBuilder::create()
@@ -52,11 +55,9 @@ public function testAddEnvironmentVariables()
$this->assertSame($env, $proc->getEnv());
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
- */
public function testNegativeTimeoutFromSetter()
{
+ $this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException');
$pb = new ProcessBuilder();
$pb->setTimeout(-1);
}
@@ -149,11 +150,9 @@ public function testShouldEscapeArgumentsAndPrefix()
}
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\LogicException
- */
public function testShouldThrowALogicExceptionIfNoPrefixAndNoArgument()
{
+ $this->expectException('Symfony\Component\Process\Exception\LogicException');
ProcessBuilder::create()->getProcess();
}
@@ -201,12 +200,10 @@ public function testShouldReturnProcessWithEnabledOutput()
$this->assertFalse($process->isOutputDisabled());
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
- * @expectedExceptionMessage Symfony\Component\Process\ProcessBuilder::setInput only accepts strings, Traversable objects or stream resources.
- */
public function testInvalidInput()
{
+ $this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Symfony\Component\Process\ProcessBuilder::setInput only accepts strings, Traversable objects or stream resources.');
$builder = ProcessBuilder::create();
$builder->setInput([]);
}
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
index a8d21b354caa..4145924df4a3 100644
--- a/src/Symfony/Component/Process/Tests/ProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -82,19 +82,15 @@ public function testThatProcessDoesNotThrowWarningDuringRun()
$this->assertEquals(E_USER_NOTICE, $actualError['type']);
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
- */
public function testNegativeTimeoutFromConstructor()
{
+ $this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException');
$this->getProcess('', null, null, null, -1);
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
- */
public function testNegativeTimeoutFromSetter()
{
+ $this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException');
$p = $this->getProcess('');
$p->setTimeout(-1);
}
@@ -247,12 +243,10 @@ public function testLiveStreamAsInput()
$this->assertSame('hello', $p->getOutput());
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\LogicException
- * @expectedExceptionMessage Input can not be set while the process is running.
- */
public function testSetInputWhileRunningThrowsAnException()
{
+ $this->expectException('Symfony\Component\Process\Exception\LogicException');
+ $this->expectExceptionMessage('Input can not be set while the process is running.');
$process = $this->getProcessForCode('sleep(30);');
$process->start();
try {
@@ -268,11 +262,11 @@ public function testSetInputWhileRunningThrowsAnException()
/**
* @dataProvider provideInvalidInputValues
- * @expectedException \Symfony\Component\Process\Exception\InvalidArgumentException
- * @expectedExceptionMessage Symfony\Component\Process\Process::setInput only accepts strings, Traversable objects or stream resources.
*/
public function testInvalidInput($value)
{
+ $this->expectException('Symfony\Component\Process\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Symfony\Component\Process\Process::setInput only accepts strings, Traversable objects or stream resources.');
$process = $this->getProcess('foo');
$process->setInput($value);
}
@@ -479,12 +473,10 @@ public function testTTYCommandExitCode()
$this->assertTrue($process->isSuccessful());
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage TTY mode is not supported on Windows platform.
- */
public function testTTYInWindowsEnvironment()
{
+ $this->expectException('Symfony\Component\Process\Exception\RuntimeException');
+ $this->expectExceptionMessage('TTY mode is not supported on Windows platform.');
if ('\\' !== \DIRECTORY_SEPARATOR) {
$this->markTestSkipped('This test is for Windows platform only');
}
@@ -534,11 +526,9 @@ public function testSuccessfulMustRunHasCorrectExitCode()
$this->assertEquals(0, $process->getExitCode());
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\ProcessFailedException
- */
public function testMustRunThrowsException()
{
+ $this->expectException('Symfony\Component\Process\Exception\ProcessFailedException');
$this->skipIfNotEnhancedSigchild();
$process = $this->getProcess('exit 1');
@@ -707,12 +697,10 @@ public function testProcessIsSignaledIfStopped()
$this->assertEquals(15, $process->getTermSignal()); // SIGTERM
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage The process has been signaled
- */
public function testProcessThrowsExceptionWhenExternallySignaled()
{
+ $this->expectException('Symfony\Component\Process\Exception\RuntimeException');
+ $this->expectExceptionMessage('The process has been signaled');
if (!\function_exists('posix_kill')) {
$this->markTestSkipped('Function posix_kill is required.');
}
@@ -743,12 +731,10 @@ public function testRestart()
$this->assertNotEquals($process1->getOutput(), $process2->getOutput());
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\ProcessTimedOutException
- * @expectedExceptionMessage exceeded the timeout of 0.1 seconds.
- */
public function testRunProcessWithTimeout()
{
+ $this->expectException('Symfony\Component\Process\Exception\ProcessTimedOutException');
+ $this->expectExceptionMessage('exceeded the timeout of 0.1 seconds.');
$process = $this->getProcessForCode('sleep(30);');
$process->setTimeout(0.1);
$start = microtime(true);
@@ -763,12 +749,10 @@ public function testRunProcessWithTimeout()
throw $e;
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\ProcessTimedOutException
- * @expectedExceptionMessage exceeded the timeout of 0.1 seconds.
- */
public function testIterateOverProcessWithTimeout()
{
+ $this->expectException('Symfony\Component\Process\Exception\ProcessTimedOutException');
+ $this->expectExceptionMessage('exceeded the timeout of 0.1 seconds.');
$process = $this->getProcessForCode('sleep(30);');
$process->setTimeout(0.1);
$start = microtime(true);
@@ -797,12 +781,10 @@ public function testCheckTimeoutOnTerminatedProcess()
$this->assertNull($process->checkTimeout());
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\ProcessTimedOutException
- * @expectedExceptionMessage exceeded the timeout of 0.1 seconds.
- */
public function testCheckTimeoutOnStartedProcess()
{
+ $this->expectException('Symfony\Component\Process\Exception\ProcessTimedOutException');
+ $this->expectExceptionMessage('exceeded the timeout of 0.1 seconds.');
$process = $this->getProcessForCode('sleep(33);');
$process->setTimeout(0.1);
@@ -862,12 +844,10 @@ public function testIdleTimeoutNotExceededWhenOutputIsSent()
}
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\ProcessTimedOutException
- * @expectedExceptionMessage exceeded the timeout of 0.1 seconds.
- */
public function testStartAfterATimeout()
{
+ $this->expectException('Symfony\Component\Process\Exception\ProcessTimedOutException');
+ $this->expectExceptionMessage('exceeded the timeout of 0.1 seconds.');
$process = $this->getProcessForCode('sleep(35);');
$process->setTimeout(0.1);
@@ -943,12 +923,10 @@ public function testExitCodeIsAvailableAfterSignal()
$this->assertEquals(137, $process->getExitCode());
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\LogicException
- * @expectedExceptionMessage Can not send signal on a non running process.
- */
public function testSignalProcessNotRunning()
{
+ $this->expectException('Symfony\Component\Process\Exception\LogicException');
+ $this->expectExceptionMessage('Can not send signal on a non running process.');
$process = $this->getProcess('foo');
$process->signal(1); // SIGHUP
}
@@ -979,11 +957,11 @@ public function provideMethodsThatNeedARunningProcess()
/**
* @dataProvider provideMethodsThatNeedATerminatedProcess
- * @expectedException \Symfony\Component\Process\Exception\LogicException
- * @expectedExceptionMessage Process must be terminated before calling
*/
public function testMethodsThatNeedATerminatedProcess($method)
{
+ $this->expectException('Symfony\Component\Process\Exception\LogicException');
+ $this->expectExceptionMessage('Process must be terminated before calling');
$process = $this->getProcessForCode('sleep(37);');
$process->start();
try {
@@ -1009,10 +987,10 @@ public function provideMethodsThatNeedATerminatedProcess()
/**
* @dataProvider provideWrongSignal
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testWrongSignal($signal)
{
+ $this->expectException('Symfony\Component\Process\Exception\RuntimeException');
if ('\\' === \DIRECTORY_SEPARATOR) {
$this->markTestSkipped('POSIX signals do not work on Windows');
}
@@ -1047,23 +1025,19 @@ public function testDisableOutputDisablesTheOutput()
$this->assertFalse($p->isOutputDisabled());
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage Disabling output while the process is running is not possible.
- */
public function testDisableOutputWhileRunningThrowsException()
{
+ $this->expectException('Symfony\Component\Process\Exception\RuntimeException');
+ $this->expectExceptionMessage('Disabling output while the process is running is not possible.');
$p = $this->getProcessForCode('sleep(39);');
$p->start();
$p->disableOutput();
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\RuntimeException
- * @expectedExceptionMessage Enabling output while the process is running is not possible.
- */
public function testEnableOutputWhileRunningThrowsException()
{
+ $this->expectException('Symfony\Component\Process\Exception\RuntimeException');
+ $this->expectExceptionMessage('Enabling output while the process is running is not possible.');
$p = $this->getProcessForCode('sleep(40);');
$p->disableOutput();
$p->start();
@@ -1080,23 +1054,19 @@ public function testEnableOrDisableOutputAfterRunDoesNotThrowException()
$this->assertTrue($p->isOutputDisabled());
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\LogicException
- * @expectedExceptionMessage Output can not be disabled while an idle timeout is set.
- */
public function testDisableOutputWhileIdleTimeoutIsSet()
{
+ $this->expectException('Symfony\Component\Process\Exception\LogicException');
+ $this->expectExceptionMessage('Output can not be disabled while an idle timeout is set.');
$process = $this->getProcess('foo');
$process->setIdleTimeout(1);
$process->disableOutput();
}
- /**
- * @expectedException \Symfony\Component\Process\Exception\LogicException
- * @expectedExceptionMessage timeout can not be set while the output is disabled.
- */
public function testSetIdleTimeoutWhileOutputIsDisabled()
{
+ $this->expectException('Symfony\Component\Process\Exception\LogicException');
+ $this->expectExceptionMessage('timeout can not be set while the output is disabled.');
$process = $this->getProcess('foo');
$process->disableOutput();
$process->setIdleTimeout(1);
@@ -1111,11 +1081,11 @@ public function testSetNullIdleTimeoutWhileOutputIsDisabled()
/**
* @dataProvider provideOutputFetchingMethods
- * @expectedException \Symfony\Component\Process\Exception\LogicException
- * @expectedExceptionMessage Output has been disabled.
*/
public function testGetOutputWhileDisabled($fetchMethod)
{
+ $this->expectException('Symfony\Component\Process\Exception\LogicException');
+ $this->expectExceptionMessage('Output has been disabled.');
$p = $this->getProcessForCode('sleep(41);');
$p->disableOutput();
$p->start();
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTest.php
index 5749cfae6fc0..071f70d360bf 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorArrayAccessTest.php
@@ -48,11 +48,9 @@ public function testGetValue($collection, $path, $value)
$this->assertSame($value, $this->propertyAccessor->getValue($collection, $path));
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchIndexException
- */
public function testGetValueFailsIfNoSuchIndex()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchIndexException');
$this->propertyAccessor = PropertyAccess::createPropertyAccessorBuilder()
->enableExceptionOnInvalidIndex()
->getPropertyAccessor();
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
index f23239193e1e..97543cc91a20 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
@@ -11,8 +11,12 @@
namespace Symfony\Component\PropertyAccess\Tests;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
+
class PropertyAccessorCollectionTest_Car
{
+ use ForwardCompatTestTrait;
+
private $axes;
public function __construct($axes = null)
@@ -146,12 +150,10 @@ public function testSetValueCallsAdderAndRemoverForNestedCollections()
$this->propertyAccessor->setValue($car, 'structure.axes', $axesAfter);
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException
- * @expectedExceptionMessageRegExp /Could not determine access type for property "axes" in class "Mock_PropertyAccessorCollectionTest_CarNoAdderAndRemover_[^"]*"./
- */
public function testSetValueFailsIfNoAdderNorRemoverFound()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException');
+ $this->expectExceptionMessageRegExp('/Could not determine access type for property "axes" in class "Mock_PropertyAccessorCollectionTest_CarNoAdderAndRemover_[^"]*"./');
$car = $this->getMockBuilder(__CLASS__.'_CarNoAdderAndRemover')->getMock();
$axesBefore = $this->getContainer([1 => 'second', 3 => 'fourth']);
$axesAfter = $this->getContainer([0 => 'first', 1 => 'second', 2 => 'third']);
@@ -187,12 +189,10 @@ public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()
$this->assertFalse($this->propertyAccessor->isWritable($car, 'axes'));
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException
- * expectedExceptionMessageRegExp /The property "axes" in class "Mock_PropertyAccessorCollectionTest_Car[^"]*" can be defined with the methods "addAxis()", "removeAxis()" but the new value must be an array or an instance of \Traversable, "string" given./
- */
public function testSetValueFailsIfAdderAndRemoverExistButValueIsNotTraversable()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException');
+ $this->expectExceptionMessage('Could not determine access type for property "axes" in class "Symfony\Component\PropertyAccess\Tests\PropertyAccessorCollectionTest_Car".');
$car = new PropertyAccessorCollectionTest_Car();
$this->propertyAccessor->setValue($car, 'axes', 'Not an array or Traversable');
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
index b92e62c62997..15e810b1b2d7 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -96,10 +96,10 @@ public function testGetValue($objectOrArray, $path, $value)
/**
* @dataProvider getPathsWithMissingProperty
- * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException
*/
public function testGetValueThrowsExceptionIfPropertyNotFound($objectOrArray, $path)
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException');
$this->propertyAccessor->getValue($objectOrArray, $path);
}
@@ -113,19 +113,17 @@ public function testGetValueThrowsNoExceptionIfIndexNotFound($objectOrArray, $pa
/**
* @dataProvider getPathsWithMissingIndex
- * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchIndexException
*/
public function testGetValueThrowsExceptionIfIndexNotFoundAndIndexExceptionsEnabled($objectOrArray, $path)
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchIndexException');
$this->propertyAccessor = new PropertyAccessor(false, true);
$this->propertyAccessor->getValue($objectOrArray, $path);
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchIndexException
- */
public function testGetValueThrowsExceptionIfNotArrayAccess()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchIndexException');
$this->propertyAccessor->getValue(new \stdClass(), '[index]');
}
@@ -172,11 +170,9 @@ public function testGetValueNotModifyObjectException()
$this->assertSame(['Bernhard'], $object->firstName);
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException
- */
public function testGetValueDoesNotReadMagicCallByDefault()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException');
$this->propertyAccessor->getValue(new TestClassMagicCall('Bernhard'), 'magicCallProperty');
}
@@ -197,11 +193,11 @@ public function testGetValueReadsMagicCallThatReturnsConstant()
/**
* @dataProvider getPathsWithUnexpectedType
- * @expectedException \Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException
- * @expectedExceptionMessage PropertyAccessor requires a graph of objects or arrays to operate on
*/
public function testGetValueThrowsExceptionIfNotObjectOrArray($objectOrArray, $path)
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException');
+ $this->expectExceptionMessage('PropertyAccessor requires a graph of objects or arrays to operate on');
$this->propertyAccessor->getValue($objectOrArray, $path);
}
@@ -217,10 +213,10 @@ public function testSetValue($objectOrArray, $path)
/**
* @dataProvider getPathsWithMissingProperty
- * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException
*/
public function testSetValueThrowsExceptionIfPropertyNotFound($objectOrArray, $path)
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException');
$this->propertyAccessor->setValue($objectOrArray, $path, 'Updated');
}
@@ -245,11 +241,9 @@ public function testSetValueThrowsNoExceptionIfIndexNotFoundAndIndexExceptionsEn
$this->assertSame('Updated', $this->propertyAccessor->getValue($objectOrArray, $path));
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchIndexException
- */
public function testSetValueThrowsExceptionIfNotArrayAccess()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchIndexException');
$object = new \stdClass();
$this->propertyAccessor->setValue($object, '[index]', 'Updated');
@@ -264,21 +258,17 @@ public function testSetValueUpdatesMagicSet()
$this->assertEquals('Updated', $author->__get('magicProperty'));
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException
- */
public function testSetValueThrowsExceptionIfThereAreMissingParameters()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException');
$object = new TestClass('Bernhard');
$this->propertyAccessor->setValue($object, 'publicAccessorWithMoreRequiredParameters', 'Updated');
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException
- */
public function testSetValueDoesNotUpdateMagicCallByDefault()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException');
$author = new TestClassMagicCall('Bernhard');
$this->propertyAccessor->setValue($author, 'magicCallProperty', 'Updated');
@@ -297,11 +287,11 @@ public function testSetValueUpdatesMagicCallIfEnabled()
/**
* @dataProvider getPathsWithUnexpectedType
- * @expectedException \Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException
- * @expectedExceptionMessage PropertyAccessor requires a graph of objects or arrays to operate on
*/
public function testSetValueThrowsExceptionIfNotObjectOrArray($objectOrArray, $path)
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\UnexpectedTypeException');
+ $this->expectExceptionMessage('PropertyAccessor requires a graph of objects or arrays to operate on');
$this->propertyAccessor->setValue($objectOrArray, $path, 'value');
}
@@ -533,23 +523,19 @@ public function testIsWritableForReferenceChainIssue($object, $path, $value)
$this->assertEquals($value, $this->propertyAccessor->isWritable($object, $path));
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidArgumentException
- * @expectedExceptionMessage Expected argument of type "DateTime", "string" given
- */
public function testThrowTypeError()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Expected argument of type "DateTime", "string" given');
$object = new TypeHinted();
$this->propertyAccessor->setValue($object, 'date', 'This is a string, \DateTime expected.');
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidArgumentException
- * @expectedExceptionMessage Expected argument of type "DateTime", "NULL" given
- */
public function testThrowTypeErrorWithNullArgument()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Expected argument of type "DateTime", "NULL" given');
$object = new TypeHinted();
$this->propertyAccessor->setValue($object, 'date', null);
@@ -598,12 +584,10 @@ public function testAttributeWithSpecialChars()
$this->assertSame('2', $propertyAccessor->getValue($obj, 'a%2Fb'));
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidArgumentException
- * @expectedExceptionMessage Expected argument of type "Countable", "string" given
- */
public function testThrowTypeErrorWithInterface()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Expected argument of type "Countable", "string" given');
$object = new TypeHinted();
$this->propertyAccessor->setValue($object, 'countable', 'This is a string, \Countable expected.');
@@ -671,10 +655,10 @@ public function setFoo($foo)
/**
* @requires PHP 7.0
- * @expectedException \TypeError
*/
public function testThrowTypeErrorInsideSetterCall()
{
+ $this->expectException('TypeError');
$object = new TestClassTypeErrorInsideCall();
$this->propertyAccessor->setValue($object, 'property', 'foo');
@@ -682,11 +666,10 @@ public function testThrowTypeErrorInsideSetterCall()
/**
* @requires PHP 7
- *
- * @expectedException \TypeError
*/
public function testDoNotDiscardReturnTypeError()
{
+ $this->expectException('TypeError');
$object = new ReturnTyped();
$this->propertyAccessor->setValue($object, 'foos', [new \DateTime()]);
@@ -694,11 +677,10 @@ public function testDoNotDiscardReturnTypeError()
/**
* @requires PHP 7
- *
- * @expectedException \TypeError
*/
public function testDoNotDiscardReturnTypeErrorWhenWriterMethodIsMisconfigured()
{
+ $this->expectException('TypeError');
$object = new ReturnTyped();
$this->propertyAccessor->setValue($object, 'name', 'foo');
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php
index fcc400b8c527..e4ff36443954 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathBuilderTest.php
@@ -119,19 +119,15 @@ public function testReplaceByIndexWithoutName()
$this->assertEquals($path, $this->builder->getPropertyPath());
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testReplaceByIndexDoesNotAllowInvalidOffsets()
{
+ $this->expectException('OutOfBoundsException');
$this->builder->replaceByIndex(6, 'new1');
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testReplaceByIndexDoesNotAllowNegativeOffsets()
{
+ $this->expectException('OutOfBoundsException');
$this->builder->replaceByIndex(-1, 'new1');
}
@@ -153,19 +149,15 @@ public function testReplaceByPropertyWithoutName()
$this->assertEquals($path, $this->builder->getPropertyPath());
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testReplaceByPropertyDoesNotAllowInvalidOffsets()
{
+ $this->expectException('OutOfBoundsException');
$this->builder->replaceByProperty(6, 'new1');
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testReplaceByPropertyDoesNotAllowNegativeOffsets()
{
+ $this->expectException('OutOfBoundsException');
$this->builder->replaceByProperty(-1, 'new1');
}
@@ -198,10 +190,10 @@ public function testReplaceNegative()
/**
* @dataProvider provideInvalidOffsets
- * @expectedException \OutOfBoundsException
*/
public function testReplaceDoesNotAllowInvalidOffsets($offset)
{
+ $this->expectException('OutOfBoundsException');
$this->builder->replace($offset, 1, new PropertyPath('new1[new2].new3'));
}
@@ -273,19 +265,15 @@ public function testRemove()
$this->assertEquals($path, $this->builder->getPropertyPath());
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testRemoveDoesNotAllowInvalidOffsets()
{
+ $this->expectException('OutOfBoundsException');
$this->builder->remove(6);
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testRemoveDoesNotAllowNegativeOffsets()
{
+ $this->expectException('OutOfBoundsException');
$this->builder->remove(-1);
}
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php
index c58ebf510c8c..dbe63a258faf 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyPathTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\PropertyAccess\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\PropertyAccess\PropertyPath;
class PropertyPathTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testToString()
{
$path = new PropertyPath('reference.traversable[index].property');
@@ -23,19 +26,15 @@ public function testToString()
$this->assertEquals('reference.traversable[index].property', $path->__toString());
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException
- */
public function testDotIsRequiredBeforeProperty()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException');
new PropertyPath('[index]property');
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException
- */
public function testDotCannotBePresentAtTheBeginning()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException');
new PropertyPath('.property');
}
@@ -54,34 +53,28 @@ public function providePathsContainingUnexpectedCharacters()
/**
* @dataProvider providePathsContainingUnexpectedCharacters
- * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException
*/
public function testUnexpectedCharacters($path)
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException');
new PropertyPath($path);
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException
- */
public function testPathCannotBeEmpty()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidPropertyPathException');
new PropertyPath('');
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidArgumentException
- */
public function testPathCannotBeNull()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidArgumentException');
new PropertyPath(null);
}
- /**
- * @expectedException \Symfony\Component\PropertyAccess\Exception\InvalidArgumentException
- */
public function testPathCannotBeFalse()
{
+ $this->expectException('Symfony\Component\PropertyAccess\Exception\InvalidArgumentException');
new PropertyPath(false);
}
@@ -128,21 +121,17 @@ public function testGetElement()
$this->assertEquals('child', $propertyPath->getElement(2));
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testGetElementDoesNotAcceptInvalidIndices()
{
+ $this->expectException('OutOfBoundsException');
$propertyPath = new PropertyPath('grandpa.parent[child]');
$propertyPath->getElement(3);
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testGetElementDoesNotAcceptNegativeIndices()
{
+ $this->expectException('OutOfBoundsException');
$propertyPath = new PropertyPath('grandpa.parent[child]');
$propertyPath->getElement(-1);
@@ -156,21 +145,17 @@ public function testIsProperty()
$this->assertFalse($propertyPath->isProperty(2));
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testIsPropertyDoesNotAcceptInvalidIndices()
{
+ $this->expectException('OutOfBoundsException');
$propertyPath = new PropertyPath('grandpa.parent[child]');
$propertyPath->isProperty(3);
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testIsPropertyDoesNotAcceptNegativeIndices()
{
+ $this->expectException('OutOfBoundsException');
$propertyPath = new PropertyPath('grandpa.parent[child]');
$propertyPath->isProperty(-1);
@@ -184,21 +169,17 @@ public function testIsIndex()
$this->assertTrue($propertyPath->isIndex(2));
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testIsIndexDoesNotAcceptInvalidIndices()
{
+ $this->expectException('OutOfBoundsException');
$propertyPath = new PropertyPath('grandpa.parent[child]');
$propertyPath->isIndex(3);
}
- /**
- * @expectedException \OutOfBoundsException
- */
public function testIsIndexDoesNotAcceptNegativeIndices()
{
+ $this->expectException('OutOfBoundsException');
$propertyPath = new PropertyPath('grandpa.parent[child]');
$propertyPath->isIndex(-1);
diff --git a/src/Symfony/Component/PropertyInfo/Tests/TypeTest.php b/src/Symfony/Component/PropertyInfo/Tests/TypeTest.php
index cd1cab916737..ced72314504c 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/TypeTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/TypeTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\PropertyInfo\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\PropertyInfo\Type;
/**
@@ -19,6 +20,8 @@
*/
class TypeTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testConstruct()
{
$type = new Type('object', true, 'ArrayObject', true, new Type('int'), new Type('string'));
@@ -43,12 +46,10 @@ public function testIterable()
$this->assertSame('iterable', $type->getBuiltinType());
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage "foo" is not a valid PHP type.
- */
public function testInvalidType()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('"foo" is not a valid PHP type.');
new Type('foo');
}
}
diff --git a/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php b/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
index 2cbfd7390784..35b4ed6a66ed 100644
--- a/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
+++ b/src/Symfony/Component/Routing/Tests/Annotation/RouteTest.php
@@ -12,15 +12,16 @@
namespace Symfony\Component\Routing\Tests\Annotation;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Routing\Annotation\Route;
class RouteTest extends TestCase
{
- /**
- * @expectedException \BadMethodCallException
- */
+ use ForwardCompatTestTrait;
+
public function testInvalidRouteParameter()
{
+ $this->expectException('BadMethodCallException');
$route = new Route(['foo' => 'bar']);
}
diff --git a/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php b/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
index 13aba1325222..5adafe2f2c66 100644
--- a/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
+++ b/src/Symfony/Component/Routing/Tests/Generator/Dumper/PhpGeneratorDumperTest.php
@@ -118,11 +118,9 @@ public function testDumpWithTooManyRoutes()
$this->assertEquals('/app.php/testing2', $relativeUrlWithoutParameter);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testDumpWithoutRoutes()
{
+ $this->expectException('InvalidArgumentException');
file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(['class' => 'WithoutRoutesUrlGenerator']));
include $this->testTmpFilepath;
@@ -131,11 +129,9 @@ public function testDumpWithoutRoutes()
$projectUrlGenerator->generate('Test', []);
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\RouteNotFoundException
- */
public function testGenerateNonExistingRoute()
{
+ $this->expectException('Symfony\Component\Routing\Exception\RouteNotFoundException');
$this->routeCollection->add('Test', new Route('/test'));
file_put_contents($this->testTmpFilepath, $this->generatorDumper->dump(['class' => 'NonExistingRoutesUrlGenerator']));
diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
index 309b5333708a..802fbba39ec2 100644
--- a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
+++ b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
@@ -79,11 +79,9 @@ public function testRelativeUrlWithNullParameter()
$this->assertEquals('/app.php/testing', $url);
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\InvalidParameterException
- */
public function testRelativeUrlWithNullParameterButNotOptional()
{
+ $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
$routes = $this->getRoutes('test', new Route('/testing/{foo}/bar', ['foo' => null]));
// This must raise an exception because the default requirement for "foo" is "[^/]+" which is not met with these params.
// Generating path "/testing//bar" would be wrong as matching this route would fail.
@@ -165,38 +163,30 @@ public function testGlobalParameterHasHigherPriorityThanDefault()
$this->assertSame('/app.php/de', $url);
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\RouteNotFoundException
- */
public function testGenerateWithoutRoutes()
{
+ $this->expectException('Symfony\Component\Routing\Exception\RouteNotFoundException');
$routes = $this->getRoutes('foo', new Route('/testing/{foo}'));
$this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\MissingMandatoryParametersException
- */
public function testGenerateForRouteWithoutMandatoryParameter()
{
+ $this->expectException('Symfony\Component\Routing\Exception\MissingMandatoryParametersException');
$routes = $this->getRoutes('test', new Route('/testing/{foo}'));
$this->getGenerator($routes)->generate('test', [], UrlGeneratorInterface::ABSOLUTE_URL);
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\InvalidParameterException
- */
public function testGenerateForRouteWithInvalidOptionalParameter()
{
+ $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
$routes = $this->getRoutes('test', new Route('/testing/{foo}', ['foo' => '1'], ['foo' => 'd+']));
$this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL);
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\InvalidParameterException
- */
public function testGenerateForRouteWithInvalidParameter()
{
+ $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
$routes = $this->getRoutes('test', new Route('/testing/{foo}', [], ['foo' => '1|2']));
$this->getGenerator($routes)->generate('test', ['foo' => '0'], UrlGeneratorInterface::ABSOLUTE_URL);
}
@@ -228,29 +218,23 @@ public function testGenerateForRouteWithInvalidParameterButDisabledRequirementsC
$this->assertSame('/app.php/testing/bar', $generator->generate('test', ['foo' => 'bar']));
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\InvalidParameterException
- */
public function testGenerateForRouteWithInvalidMandatoryParameter()
{
+ $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
$routes = $this->getRoutes('test', new Route('/testing/{foo}', [], ['foo' => 'd+']));
$this->getGenerator($routes)->generate('test', ['foo' => 'bar'], UrlGeneratorInterface::ABSOLUTE_URL);
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\InvalidParameterException
- */
public function testGenerateForRouteWithInvalidUtf8Parameter()
{
+ $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
$routes = $this->getRoutes('test', new Route('/testing/{foo}', [], ['foo' => '\pL+'], ['utf8' => true]));
$this->getGenerator($routes)->generate('test', ['foo' => 'abc123'], UrlGeneratorInterface::ABSOLUTE_URL);
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\InvalidParameterException
- */
public function testRequiredParamAndEmptyPassed()
{
+ $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
$routes = $this->getRoutes('test', new Route('/{slug}', [], ['slug' => '.+']));
$this->getGenerator($routes)->generate('test', ['slug' => '']);
}
@@ -400,20 +384,16 @@ public function testDefaultRequirementOfVariable()
$this->assertSame('/app.php/index.mobile.html', $generator->generate('test', ['page' => 'index', '_format' => 'mobile.html']));
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\InvalidParameterException
- */
public function testDefaultRequirementOfVariableDisallowsSlash()
{
+ $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
$routes = $this->getRoutes('test', new Route('/{page}.{_format}'));
$this->getGenerator($routes)->generate('test', ['page' => 'index', '_format' => 'sl/ash']);
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\InvalidParameterException
- */
public function testDefaultRequirementOfVariableDisallowsNextSeparator()
{
+ $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
$routes = $this->getRoutes('test', new Route('/{page}.{_format}'));
$this->getGenerator($routes)->generate('test', ['page' => 'do.t', '_format' => 'html']);
}
@@ -439,29 +419,23 @@ public function testWithHostSameAsContextAndAbsolute()
$this->assertEquals('http://fr.example.com/app.php/Fabien', $this->getGenerator($routes, ['host' => 'fr.example.com'])->generate('test', ['name' => 'Fabien', 'locale' => 'fr'], UrlGeneratorInterface::ABSOLUTE_URL));
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\InvalidParameterException
- */
public function testUrlWithInvalidParameterInHost()
{
+ $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
$routes = $this->getRoutes('test', new Route('/', [], ['foo' => 'bar'], [], '{foo}.example.com'));
$this->getGenerator($routes)->generate('test', ['foo' => 'baz'], UrlGeneratorInterface::ABSOLUTE_PATH);
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\InvalidParameterException
- */
public function testUrlWithInvalidParameterInHostWhenParamHasADefaultValue()
{
+ $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
$routes = $this->getRoutes('test', new Route('/', ['foo' => 'bar'], ['foo' => 'bar'], [], '{foo}.example.com'));
$this->getGenerator($routes)->generate('test', ['foo' => 'baz'], UrlGeneratorInterface::ABSOLUTE_PATH);
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\InvalidParameterException
- */
public function testUrlWithInvalidParameterEqualsDefaultValueInHost()
{
+ $this->expectException('Symfony\Component\Routing\Exception\InvalidParameterException');
$routes = $this->getRoutes('test', new Route('/', ['foo' => 'baz'], ['foo' => 'bar'], [], '{foo}.example.com'));
$this->getGenerator($routes)->generate('test', ['foo' => 'baz'], UrlGeneratorInterface::ABSOLUTE_PATH);
}
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
index d84de3ac5a4f..424d38005417 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
@@ -29,19 +29,15 @@ private function doSetUp()
$this->loader = $this->getClassLoader($this->reader);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testLoadMissingClass()
{
+ $this->expectException('InvalidArgumentException');
$this->loader->load('MissingClass');
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testLoadAbstractClass()
{
+ $this->expectException('InvalidArgumentException');
$this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\AbstractClass');
}
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
index 109d47096e6d..ae43d9ba956f 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/AnnotationFileLoaderTest.php
@@ -48,12 +48,10 @@ public function testLoadTraitWithClassConstant()
$this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses/FooTrait.php');
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Did you forgot to add the "expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('Did you forgot to add the "loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/NoStartTagClass.php');
}
diff --git a/src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php
index 774e1a1fe575..9a00095661d7 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/ObjectRouteLoaderTest.php
@@ -12,12 +12,15 @@
namespace Symfony\Component\Routing\Tests\Loader;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Routing\Loader\ObjectRouteLoader;
use Symfony\Component\Routing\Route;
use Symfony\Component\Routing\RouteCollection;
class ObjectRouteLoaderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testLoadCallsServiceAndReturnsCollection()
{
$loader = new ObjectRouteLoaderForTest();
@@ -41,11 +44,11 @@ public function testLoadCallsServiceAndReturnsCollection()
}
/**
- * @expectedException \InvalidArgumentException
* @dataProvider getBadResourceStrings
*/
public function testExceptionWithoutSyntax($resourceString)
{
+ $this->expectException('InvalidArgumentException');
$loader = new ObjectRouteLoaderForTest();
$loader->load($resourceString);
}
@@ -59,31 +62,25 @@ public function getBadResourceStrings()
];
}
- /**
- * @expectedException \LogicException
- */
public function testExceptionOnNoObjectReturned()
{
+ $this->expectException('LogicException');
$loader = new ObjectRouteLoaderForTest();
$loader->loaderMap = ['my_service' => 'NOT_AN_OBJECT'];
$loader->load('my_service:method');
}
- /**
- * @expectedException \BadMethodCallException
- */
public function testExceptionOnBadMethod()
{
+ $this->expectException('BadMethodCallException');
$loader = new ObjectRouteLoaderForTest();
$loader->loaderMap = ['my_service' => new \stdClass()];
$loader->load('my_service:method');
}
- /**
- * @expectedException \LogicException
- */
public function testExceptionOnMethodNotReturningCollection()
{
+ $this->expectException('LogicException');
$service = $this->getMockBuilder('stdClass')
->setMethods(['loadRoutes'])
->getMock();
diff --git a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
index 9a061b295afb..b54d02053adc 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
@@ -12,12 +12,15 @@
namespace Symfony\Component\Routing\Tests\Loader;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\Routing\Loader\XmlFileLoader;
use Symfony\Component\Routing\Tests\Fixtures\CustomXmlFileLoader;
class XmlFileLoaderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testSupports()
{
$loader = new XmlFileLoader($this->getMockBuilder('Symfony\Component\Config\FileLocator')->getMock());
@@ -104,21 +107,21 @@ public function testUtf8Route()
}
/**
- * @expectedException \InvalidArgumentException
* @dataProvider getPathsToInvalidFiles
*/
public function testLoadThrowsExceptionWithInvalidFile($filePath)
{
+ $this->expectException('InvalidArgumentException');
$loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
$loader->load($filePath);
}
/**
- * @expectedException \InvalidArgumentException
* @dataProvider getPathsToInvalidFiles
*/
public function testLoadThrowsExceptionWithInvalidFileEvenWithoutSchemaValidation($filePath)
{
+ $this->expectException('InvalidArgumentException');
$loader = new CustomXmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
$loader->load($filePath);
}
@@ -128,12 +131,10 @@ public function getPathsToInvalidFiles()
return [['nonvalidnode.xml'], ['nonvalidroute.xml'], ['nonvalid.xml'], ['missing_id.xml'], ['missing_path.xml']];
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Document types are not allowed.
- */
public function testDocTypeIsNotAllowed()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('Document types are not allowed.');
$loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
$loader->load('withdoctype.xml');
}
@@ -338,12 +339,10 @@ public function testLoadRouteWithControllerSetInDefaults()
$this->assertSame('AppBundle:Blog:list', $route->getDefault('_controller'));
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessageRegExp /The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for "app_blog"/
- */
public function testOverrideControllerInDefaults()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for "app_blog"/');
$loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
$loader->load('override_defaults.xml');
}
@@ -372,12 +371,10 @@ public function provideFilesImportingRoutesWithControllers()
yield ['import__controller.xml'];
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessageRegExp /The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for the "import" tag/
- */
public function testImportWithOverriddenController()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for the "import" tag/');
$loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
$loader->load('import_override_defaults.xml');
}
diff --git a/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
index 4944e5b63651..7ca43a7582e9 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
@@ -12,12 +12,15 @@
namespace Symfony\Component\Routing\Tests\Loader;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Routing\Loader\YamlFileLoader;
class YamlFileLoaderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testSupports()
{
$loader = new YamlFileLoader($this->getMockBuilder('Symfony\Component\Config\FileLocator')->getMock());
@@ -41,11 +44,11 @@ public function testLoadDoesNothingIfEmpty()
}
/**
- * @expectedException \InvalidArgumentException
* @dataProvider getPathsToInvalidFiles
*/
public function testLoadThrowsExceptionWithInvalidFile($filePath)
{
+ $this->expectException('InvalidArgumentException');
$loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures']));
$loader->load($filePath);
}
@@ -139,12 +142,10 @@ public function testLoadRouteWithControllerSetInDefaults()
$this->assertSame('AppBundle:Blog:list', $route->getDefault('_controller'));
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessageRegExp /The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "app_blog"/
- */
public function testOverrideControllerInDefaults()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "app_blog"/');
$loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
$loader->load('override_defaults.yml');
}
@@ -173,12 +174,10 @@ public function provideFilesImportingRoutesWithControllers()
yield ['import__controller.yml'];
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessageRegExp /The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "_static"/
- */
public function testImportWithOverriddenController()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "_static"/');
$loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
$loader->load('import_override_defaults.yml');
}
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/DumpedUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/DumpedUrlMatcherTest.php
index 34946f3f2b26..10e9915480a8 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/DumpedUrlMatcherTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/DumpedUrlMatcherTest.php
@@ -11,27 +11,26 @@
namespace Symfony\Component\Routing\Tests\Matcher;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
use Symfony\Component\Routing\RequestContext;
use Symfony\Component\Routing\RouteCollection;
class DumpedUrlMatcherTest extends UrlMatcherTest
{
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface.
- */
+ use ForwardCompatTestTrait;
+
public function testSchemeRequirement()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface.');
parent::testSchemeRequirement();
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface.
- */
public function testSchemeAndMethodMismatch()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface.');
parent::testSchemeRequirement();
}
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
index c5b79c09ff6d..e7d4da255783 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
@@ -49,11 +49,9 @@ private function doTearDown()
@unlink($this->dumpPath);
}
- /**
- * @expectedException \LogicException
- */
public function testDumpWhenSchemeIsUsedWithoutAProperDumper()
{
+ $this->expectException('LogicException');
$collection = new RouteCollection();
$collection->add('secure', new Route(
'/secure',
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php
index b14fe98d4d4d..73662412c99b 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php
@@ -11,12 +11,15 @@
namespace Symfony\Component\Routing\Tests\Matcher;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Routing\RequestContext;
use Symfony\Component\Routing\Route;
use Symfony\Component\Routing\RouteCollection;
class RedirectableUrlMatcherTest extends UrlMatcherTest
{
+ use ForwardCompatTestTrait;
+
public function testMissingTrailingSlash()
{
$coll = new RouteCollection();
@@ -27,11 +30,9 @@ public function testMissingTrailingSlash()
$matcher->match('/foo');
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
- */
public function testRedirectWhenNoSlashForNonSafeMethod()
{
+ $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo/'));
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
index 9429b1171a9d..d38994703081 100644
--- a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
+++ b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
@@ -180,11 +180,9 @@ public function testMatchSpecialRouteName()
$this->assertEquals(['_route' => '$péß^a|'], $matcher->match('/bar'));
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
- */
public function testTrailingEncodedNewlineIsNotOverlooked()
{
+ $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$collection = new RouteCollection();
$collection->add('foo', new Route('/foo'));
@@ -319,11 +317,9 @@ public function testDefaultRequirementOfVariable()
$this->assertEquals(['page' => 'index', '_format' => 'mobile.html', '_route' => 'test'], $matcher->match('/index.mobile.html'));
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
- */
public function testDefaultRequirementOfVariableDisallowsSlash()
{
+ $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$coll = new RouteCollection();
$coll->add('test', new Route('/{page}.{_format}'));
$matcher = $this->getUrlMatcher($coll);
@@ -331,11 +327,9 @@ public function testDefaultRequirementOfVariableDisallowsSlash()
$matcher->match('/index.sl/ash');
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
- */
public function testDefaultRequirementOfVariableDisallowsNextSeparator()
{
+ $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$coll = new RouteCollection();
$coll->add('test', new Route('/{page}.{_format}', [], ['_format' => 'html|xml']));
$matcher = $this->getUrlMatcher($coll);
@@ -343,22 +337,18 @@ public function testDefaultRequirementOfVariableDisallowsNextSeparator()
$matcher->match('/do.t.html');
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
- */
public function testSchemeRequirement()
{
+ $this->getExpectedException() ?: $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo', [], [], [], '', ['https']));
$matcher = $this->getUrlMatcher($coll);
$matcher->match('/foo');
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
- */
public function testCondition()
{
+ $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$coll = new RouteCollection();
$route = new Route('/foo');
$route->setCondition('context.getMethod() == "POST"');
@@ -425,11 +415,9 @@ public function testWithHostOnRouteCollection()
$this->assertEquals(['foo' => 'bar', '_route' => 'bar', 'locale' => 'en'], $matcher->match('/bar/bar'));
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
- */
public function testWithOutHostHostDoesNotMatch()
{
+ $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo/{foo}', [], [], [], '{locale}.example.com'));
@@ -437,11 +425,9 @@ public function testWithOutHostHostDoesNotMatch()
$matcher->match('/foo/bar');
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
- */
public function testPathIsCaseSensitive()
{
+ $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$coll = new RouteCollection();
$coll->add('foo', new Route('/locale', [], ['locale' => 'EN|FR|DE']));
@@ -458,11 +444,9 @@ public function testHostIsCaseInsensitive()
$this->assertEquals(['_route' => 'foo', 'locale' => 'en'], $matcher->match('/'));
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\NoConfigurationException
- */
public function testNoConfiguration()
{
+ $this->expectException('Symfony\Component\Routing\Exception\NoConfigurationException');
$coll = new RouteCollection();
$matcher = $this->getUrlMatcher($coll);
@@ -493,11 +477,9 @@ public function testNestedCollections()
$this->assertEquals(['_route' => 'buz'], $matcher->match('/prefix/buz'));
}
- /**
- * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
- */
public function testSchemeAndMethodMismatch()
{
+ $this->expectException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$coll = new RouteCollection();
$coll->add('foo', new Route('/', [], [], [], null, ['https'], ['POST']));
diff --git a/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php b/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
index 11d9453e0909..3ce024751cb5 100644
--- a/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
+++ b/src/Symfony/Component/Routing/Tests/RouteCollectionBuilderTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Routing\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Routing\Loader\YamlFileLoader;
@@ -21,6 +22,8 @@
class RouteCollectionBuilderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testImport()
{
$resolvedLoader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
@@ -75,11 +78,9 @@ public function testImportAddResources()
$this->assertCount(1, $routeCollection->getResources());
}
- /**
- * @expectedException \BadMethodCallException
- */
public function testImportWithoutLoaderThrowsException()
{
+ $this->expectException('BadMethodCallException');
$collectionBuilder = new RouteCollectionBuilder();
$collectionBuilder->import('routing.yml');
}
diff --git a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
index d9783147b8de..789dd438123c 100644
--- a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
+++ b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Routing\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Routing\Route;
use Symfony\Component\Routing\RouteCompiler;
class RouteCompilerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
/**
* @dataProvider provideCompileData
*/
@@ -243,41 +246,33 @@ public function provideCompileImplicitUtf8Data()
];
}
- /**
- * @expectedException \LogicException
- */
public function testRouteWithSameVariableTwice()
{
+ $this->expectException('LogicException');
$route = new Route('/{name}/{name}');
$compiled = $route->compile();
}
- /**
- * @expectedException \LogicException
- */
public function testRouteCharsetMismatch()
{
+ $this->expectException('LogicException');
$route = new Route("/\xE9/{bar}", [], ['bar' => '.'], ['utf8' => true]);
$compiled = $route->compile();
}
- /**
- * @expectedException \LogicException
- */
public function testRequirementCharsetMismatch()
{
+ $this->expectException('LogicException');
$route = new Route('/foo/{bar}', [], ['bar' => "\xE9"], ['utf8' => true]);
$compiled = $route->compile();
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testRouteWithFragmentAsPathParameter()
{
+ $this->expectException('InvalidArgumentException');
$route = new Route('/{_fragment}');
$compiled = $route->compile();
@@ -285,10 +280,10 @@ public function testRouteWithFragmentAsPathParameter()
/**
* @dataProvider getVariableNamesStartingWithADigit
- * @expectedException \DomainException
*/
public function testRouteWithVariableNameStartingWithADigit($name)
{
+ $this->expectException('DomainException');
$route = new Route('/{'.$name.'}');
$route->compile();
}
@@ -373,11 +368,9 @@ public function provideCompileWithHostData()
];
}
- /**
- * @expectedException \DomainException
- */
public function testRouteWithTooLongVariableName()
{
+ $this->expectException('DomainException');
$route = new Route(sprintf('/{%s}', str_repeat('a', RouteCompiler::VARIABLE_MAXIMUM_LENGTH + 1)));
$route->compile();
}
diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php
index 179f4880d0d8..73fc832fc86f 100644
--- a/src/Symfony/Component/Routing/Tests/RouteTest.php
+++ b/src/Symfony/Component/Routing/Tests/RouteTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\Routing\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Routing\Route;
class RouteTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testConstructor()
{
$route = new Route('/{foo}', ['foo' => 'bar'], ['foo' => '\d+'], ['foo' => 'bar'], '{locale}.example.com');
@@ -124,10 +127,10 @@ public function testRequirement()
/**
* @dataProvider getInvalidRequirements
- * @expectedException \InvalidArgumentException
*/
public function testSetInvalidRequirement($req)
{
+ $this->expectException('InvalidArgumentException');
$route = new Route('/{foo}');
$route->setRequirement('foo', $req);
}
diff --git a/src/Symfony/Component/Routing/Tests/RouterTest.php b/src/Symfony/Component/Routing/Tests/RouterTest.php
index 7f42fd5ef5c4..118cbabff3df 100644
--- a/src/Symfony/Component/Routing/Tests/RouterTest.php
+++ b/src/Symfony/Component/Routing/Tests/RouterTest.php
@@ -44,12 +44,10 @@ public function testSetOptionsWithSupportedOptions()
$this->assertSame('ResourceType', $this->router->getOption('resource_type'));
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The Router does not support the following options: "option_foo", "option_bar"
- */
public function testSetOptionsWithUnsupportedOptions()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The Router does not support the following options: "option_foo", "option_bar"');
$this->router->setOptions([
'cache_dir' => './cache',
'option_foo' => true,
@@ -65,21 +63,17 @@ public function testSetOptionWithSupportedOption()
$this->assertSame('./cache', $this->router->getOption('cache_dir'));
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The Router does not support the "option_foo" option
- */
public function testSetOptionWithUnsupportedOption()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The Router does not support the "option_foo" option');
$this->router->setOption('option_foo', true);
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The Router does not support the "option_foo" option
- */
public function testGetOptionWithUnsupportedOption()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The Router does not support the "option_foo" option');
$this->router->getOption('option_foo', true);
}
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
index 379da4bb6132..f155f1c4f38a 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Core\Tests\Authentication;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
@@ -24,19 +25,17 @@
class AuthenticationProviderManagerTest extends TestCase
{
- /**
- * @expectedException \InvalidArgumentException
- */
+ use ForwardCompatTestTrait;
+
public function testAuthenticateWithoutProviders()
{
+ $this->expectException('InvalidArgumentException');
new AuthenticationProviderManager([]);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testAuthenticateWithProvidersWithIncorrectInterface()
{
+ $this->expectException('InvalidArgumentException');
(new AuthenticationProviderManager([
new \stdClass(),
]))->authenticate($this->getMockBuilder(TokenInterface::class)->getMock());
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php
index a888d2bf81b9..613d28382d95 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/AnonymousAuthenticationProviderTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Authentication\Provider\AnonymousAuthenticationProvider;
class AnonymousAuthenticationProviderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testSupports()
{
$provider = $this->getProvider('foo');
@@ -24,22 +27,18 @@ public function testSupports()
$this->assertFalse($provider->supports($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
- * @expectedExceptionMessage The token is not supported by this authentication provider.
- */
public function testAuthenticateWhenTokenIsNotSupported()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationException');
+ $this->expectExceptionMessage('The token is not supported by this authentication provider.');
$provider = $this->getProvider('foo');
$provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testAuthenticateWhenSecretIsNotValid()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$provider = $this->getProvider('foo');
$provider->authenticate($this->getSupportedToken('bar'));
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php
index 53ff17055422..576efb96eac3 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php
@@ -12,17 +12,18 @@
namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider;
use Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder;
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
class DaoAuthenticationProviderTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationServiceException
- */
+ use ForwardCompatTestTrait;
+
public function testRetrieveUserWhenProviderDoesNotReturnAnUserInterface()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationServiceException');
$provider = $this->getProvider('fabien');
$method = new \ReflectionMethod($provider, 'retrieveUser');
$method->setAccessible(true);
@@ -30,11 +31,9 @@ public function testRetrieveUserWhenProviderDoesNotReturnAnUserInterface()
$method->invoke($provider, 'fabien', $this->getSupportedToken());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException
- */
public function testRetrieveUserWhenUsernameIsNotFound()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\UsernameNotFoundException');
$userProvider = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface')->getMock();
$userProvider->expects($this->once())
->method('loadUserByUsername')
@@ -48,11 +47,9 @@ public function testRetrieveUserWhenUsernameIsNotFound()
$method->invoke($provider, 'fabien', $this->getSupportedToken());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationServiceException
- */
public function testRetrieveUserWhenAnExceptionOccurs()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationServiceException');
$userProvider = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserProviderInterface')->getMock();
$userProvider->expects($this->once())
->method('loadUserByUsername')
@@ -105,11 +102,9 @@ public function testRetrieveUser()
$this->assertSame($user, $method->invoke($provider, 'fabien', $this->getSupportedToken()));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testCheckAuthenticationWhenCredentialsAreEmpty()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$encoder = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface')->getMock();
$encoder
->expects($this->never())
@@ -161,11 +156,9 @@ public function testCheckAuthenticationWhenCredentialsAre0()
);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testCheckAuthenticationWhenCredentialsAreNotValid()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$encoder = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\Encoder\\PasswordEncoderInterface')->getMock();
$encoder->expects($this->once())
->method('isPasswordValid')
@@ -185,11 +178,9 @@ public function testCheckAuthenticationWhenCredentialsAreNotValid()
$method->invoke($provider, $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserInterface')->getMock(), $token);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testCheckAuthenticationDoesNotReauthenticateWhenPasswordHasChanged()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$user = $this->getMockBuilder('Symfony\\Component\\Security\\Core\\User\\UserInterface')->getMock();
$user->expects($this->once())
->method('getPassword')
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
index bad3072f4a9a..743b737d44ed 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/LdapBindAuthenticationProviderTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Ldap\Adapter\CollectionInterface;
use Symfony\Component\Ldap\Adapter\QueryInterface;
use Symfony\Component\Ldap\Entry;
@@ -28,12 +29,12 @@
*/
class LdapBindAuthenticationProviderTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- * @expectedExceptionMessage The presented password must not be empty.
- */
+ use ForwardCompatTestTrait;
+
public function testEmptyPasswordShouldThrowAnException()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
+ $this->expectExceptionMessage('The presented password must not be empty.');
$userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
$ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
$userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
@@ -45,12 +46,10 @@ public function testEmptyPasswordShouldThrowAnException()
$reflection->invoke($provider, new User('foo', null), new UsernamePasswordToken('foo', '', 'key'));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- * @expectedExceptionMessage The presented password must not be empty.
- */
public function testNullPasswordShouldThrowAnException()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
+ $this->expectExceptionMessage('The presented password must not be empty.');
$userProvider = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserProviderInterface')->getMock();
$ldap = $this->getMockBuilder('Symfony\Component\Ldap\LdapInterface')->getMock();
$userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
@@ -62,12 +61,10 @@ public function testNullPasswordShouldThrowAnException()
$reflection->invoke($provider, new User('foo', null), new UsernamePasswordToken('foo', null, 'key'));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- * @expectedExceptionMessage The presented password is invalid.
- */
public function testBindFailureShouldThrowAnException()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
+ $this->expectExceptionMessage('The presented password is invalid.');
$userProvider = $this->getMockBuilder(UserProviderInterface::class)->getMock();
$ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
$ldap
@@ -139,12 +136,10 @@ public function testQueryForDn()
$reflection->invoke($provider, new User('foo', null), new UsernamePasswordToken('foo', 'bar', 'key'));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- * @expectedExceptionMessage The presented username is invalid.
- */
public function testEmptyQueryResultShouldThrowAnException()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
+ $this->expectExceptionMessage('The presented username is invalid.');
$userProvider = $this->getMockBuilder(UserProviderInterface::class)->getMock();
$collection = $this->getMockBuilder(CollectionInterface::class)->getMock();
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
index 57bce20f5b20..7d37f93c7f31 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Authentication\Provider\PreAuthenticatedAuthenticationProvider;
use Symfony\Component\Security\Core\Exception\LockedException;
class PreAuthenticatedAuthenticationProviderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testSupports()
{
$provider = $this->getProvider();
@@ -36,22 +39,18 @@ public function testSupports()
$this->assertFalse($provider->supports($token));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
- * @expectedExceptionMessage The token is not supported by this authentication provider.
- */
public function testAuthenticateWhenTokenIsNotSupported()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationException');
+ $this->expectExceptionMessage('The token is not supported by this authentication provider.');
$provider = $this->getProvider();
$provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testAuthenticateWhenNoUserIsSet()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$provider = $this->getProvider();
$provider->authenticate($this->getSupportedToken(''));
}
@@ -75,11 +74,9 @@ public function testAuthenticate()
$this->assertSame($user, $token->getUser());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\LockedException
- */
public function testAuthenticateWhenUserCheckerThrowsException()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\LockedException');
$user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
index 6ac7438a064a..77fba2281116 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php
@@ -12,12 +12,15 @@
namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Authentication\Provider\RememberMeAuthenticationProvider;
use Symfony\Component\Security\Core\Exception\DisabledException;
use Symfony\Component\Security\Core\Role\Role;
class RememberMeAuthenticationProviderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testSupports()
{
$provider = $this->getProvider();
@@ -26,34 +29,28 @@ public function testSupports()
$this->assertFalse($provider->supports($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
- * @expectedExceptionMessage The token is not supported by this authentication provider.
- */
public function testAuthenticateWhenTokenIsNotSupported()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationException');
+ $this->expectExceptionMessage('The token is not supported by this authentication provider.');
$provider = $this->getProvider();
$token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
$provider->authenticate($token);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testAuthenticateWhenSecretsDoNotMatch()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$provider = $this->getProvider(null, 'secret1');
$token = $this->getSupportedToken(null, 'secret2');
$provider->authenticate($token);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\DisabledException
- */
public function testAuthenticateWhenPreChecksFails()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\DisabledException');
$userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
$userChecker->expects($this->once())
->method('checkPreAuth')
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/SimpleAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/SimpleAuthenticationProviderTest.php
index 07c1618f214d..d0d5d2697688 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/SimpleAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/SimpleAuthenticationProviderTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Authentication\Provider\SimpleAuthenticationProvider;
use Symfony\Component\Security\Core\Exception\DisabledException;
use Symfony\Component\Security\Core\Exception\LockedException;
@@ -19,11 +20,11 @@
class SimpleAuthenticationProviderTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\DisabledException
- */
+ use ForwardCompatTestTrait;
+
public function testAuthenticateWhenPreChecksFails()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\DisabledException');
$user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
@@ -46,11 +47,9 @@ public function testAuthenticateWhenPreChecksFails()
$provider->authenticate($token);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\LockedException
- */
public function testAuthenticateWhenPostChecksFails()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\LockedException');
$user = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserInterface')->getMock();
$token = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock();
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
index e959d18c5340..5a00096dece7 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Exception\AccountExpiredException;
use Symfony\Component\Security\Core\Exception\BadCredentialsException;
use Symfony\Component\Security\Core\Exception\CredentialsExpiredException;
@@ -21,6 +22,8 @@
class UserAuthenticationProviderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testSupports()
{
$provider = $this->getProvider();
@@ -29,22 +32,18 @@ public function testSupports()
$this->assertFalse($provider->supports($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock()));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
- * @expectedExceptionMessage The token is not supported by this authentication provider.
- */
public function testAuthenticateWhenTokenIsNotSupported()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationException');
+ $this->expectExceptionMessage('The token is not supported by this authentication provider.');
$provider = $this->getProvider();
$provider->authenticate($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException
- */
public function testAuthenticateWhenUsernameIsNotFound()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\UsernameNotFoundException');
$provider = $this->getProvider(false, false);
$provider->expects($this->once())
->method('retrieveUser')
@@ -54,11 +53,9 @@ public function testAuthenticateWhenUsernameIsNotFound()
$provider->authenticate($this->getSupportedToken());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testAuthenticateWhenUsernameIsNotFoundAndHideIsTrue()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$provider = $this->getProvider(false, true);
$provider->expects($this->once())
->method('retrieveUser')
@@ -68,11 +65,9 @@ public function testAuthenticateWhenUsernameIsNotFoundAndHideIsTrue()
$provider->authenticate($this->getSupportedToken());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationServiceException
- */
public function testAuthenticateWhenProviderDoesNotReturnAnUserInterface()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationServiceException');
$provider = $this->getProvider(false, true);
$provider->expects($this->once())
->method('retrieveUser')
@@ -82,11 +77,9 @@ public function testAuthenticateWhenProviderDoesNotReturnAnUserInterface()
$provider->authenticate($this->getSupportedToken());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\CredentialsExpiredException
- */
public function testAuthenticateWhenPreChecksFails()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\CredentialsExpiredException');
$userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
$userChecker->expects($this->once())
->method('checkPreAuth')
@@ -102,11 +95,9 @@ public function testAuthenticateWhenPreChecksFails()
$provider->authenticate($this->getSupportedToken());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AccountExpiredException
- */
public function testAuthenticateWhenPostChecksFails()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AccountExpiredException');
$userChecker = $this->getMockBuilder('Symfony\Component\Security\Core\User\UserCheckerInterface')->getMock();
$userChecker->expects($this->once())
->method('checkPostAuth')
@@ -122,12 +113,10 @@ public function testAuthenticateWhenPostChecksFails()
$provider->authenticate($this->getSupportedToken());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- * @expectedExceptionMessage Bad credentials
- */
public function testAuthenticateWhenPostCheckAuthenticationFails()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
+ $this->expectExceptionMessage('Bad credentials');
$provider = $this->getProvider();
$provider->expects($this->once())
->method('retrieveUser')
@@ -141,12 +130,10 @@ public function testAuthenticateWhenPostCheckAuthenticationFails()
$provider->authenticate($this->getSupportedToken());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- * @expectedExceptionMessage Foo
- */
public function testAuthenticateWhenPostCheckAuthenticationFailsWithHideFalse()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
+ $this->expectExceptionMessage('Foo');
$provider = $this->getProvider(false, false);
$provider->expects($this->once())
->method('retrieveUser')
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/RememberMe/InMemoryTokenProviderTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/RememberMe/InMemoryTokenProviderTest.php
index 1413b6d402a4..62ace0363312 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/RememberMe/InMemoryTokenProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/RememberMe/InMemoryTokenProviderTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Security\Core\Tests\Authentication\RememberMe;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Authentication\RememberMe\InMemoryTokenProvider;
use Symfony\Component\Security\Core\Authentication\RememberMe\PersistentToken;
class InMemoryTokenProviderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testCreateNewToken()
{
$provider = new InMemoryTokenProvider();
@@ -27,11 +30,9 @@ public function testCreateNewToken()
$this->assertSame($provider->loadTokenBySeries('foo'), $token);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\TokenNotFoundException
- */
public function testLoadTokenBySeriesThrowsNotFoundException()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\TokenNotFoundException');
$provider = new InMemoryTokenProvider();
$provider->loadTokenBySeries('foo');
}
@@ -49,11 +50,9 @@ public function testUpdateToken()
$this->assertSame($token->getLastUsed(), $lastUsed);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\TokenNotFoundException
- */
public function testDeleteToken()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\TokenNotFoundException');
$provider = new InMemoryTokenProvider();
$token = new PersistentToken('foo', 'foo', 'foo', 'foo', new \DateTime());
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php
index e1329e37430b..58035c519faa 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/RememberMeTokenTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Security\Core\Tests\Authentication\Token;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken;
use Symfony\Component\Security\Core\Role\Role;
class RememberMeTokenTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testConstructor()
{
$user = $this->getUser();
@@ -29,11 +32,9 @@ public function testConstructor()
$this->assertTrue($token->isAuthenticated());
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testConstructorSecretCannotBeNull()
{
+ $this->expectException('InvalidArgumentException');
new RememberMeToken(
$this->getUser(),
null,
@@ -41,11 +42,9 @@ public function testConstructorSecretCannotBeNull()
);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testConstructorSecretCannotBeEmptyString()
{
+ $this->expectException('InvalidArgumentException');
new RememberMeToken(
$this->getUser(),
'',
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php
index 87dceea3d842..0b0285800036 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/UsernamePasswordTokenTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Security\Core\Tests\Authentication\Token;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Symfony\Component\Security\Core\Role\Role;
class UsernamePasswordTokenTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testConstructor()
{
$token = new UsernamePasswordToken('foo', 'bar', 'key');
@@ -28,11 +31,9 @@ public function testConstructor()
$this->assertEquals('key', $token->getProviderKey());
}
- /**
- * @expectedException \LogicException
- */
public function testSetAuthenticatedToTrue()
{
+ $this->expectException('LogicException');
$token = new UsernamePasswordToken('foo', 'bar', 'key');
$token->setAuthenticated(true);
}
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
index 28aff4af31f0..f6566fa0e9b4 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authorization/AccessDecisionManagerTest.php
@@ -23,11 +23,9 @@ class AccessDecisionManagerTest extends TestCase
{
use ForwardCompatTestTrait;
- /**
- * @expectedException \InvalidArgumentException
- */
public function testSetUnsupportedStrategy()
{
+ $this->expectException('InvalidArgumentException');
new AccessDecisionManager([$this->getVoter(VoterInterface::ACCESS_GRANTED)], 'fooBar');
}
diff --git a/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php b/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php
index a26252df29bb..d666ce86848a 100644
--- a/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Authorization/AuthorizationCheckerTest.php
@@ -69,11 +69,9 @@ public function testVoteAuthenticatesTokenIfNecessary()
$this->assertSame($newToken, $this->tokenStorage->getToken());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException
- */
public function testVoteWithoutAuthenticationToken()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException');
$this->authorizationChecker->isGranted('ROLE_FOO');
}
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/Argon2iPasswordEncoderTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/Argon2iPasswordEncoderTest.php
index cf21eb61dbe1..f15af4f54724 100644
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/Argon2iPasswordEncoderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/Argon2iPasswordEncoderTest.php
@@ -39,11 +39,9 @@ public function testValidation()
$this->assertFalse($encoder->isPasswordValid($result, 'anotherPassword', null));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testEncodePasswordLength()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$encoder = new Argon2iPasswordEncoder();
$encoder->encodePassword(str_repeat('a', 4097), 'salt');
}
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php
index 7f9dbe7f33fd..cd8394f10182 100644
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/BCryptPasswordEncoderTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Core\Tests\Encoder;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Encoder\BCryptPasswordEncoder;
/**
@@ -19,22 +20,20 @@
*/
class BCryptPasswordEncoderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
const PASSWORD = 'password';
const VALID_COST = '04';
- /**
- * @expectedException \InvalidArgumentException
- */
public function testCostBelowRange()
{
+ $this->expectException('InvalidArgumentException');
new BCryptPasswordEncoder(3);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testCostAboveRange()
{
+ $this->expectException('InvalidArgumentException');
new BCryptPasswordEncoder(32);
}
@@ -69,11 +68,9 @@ public function testValidation()
$this->assertFalse($encoder->isPasswordValid($result, 'anotherPassword', null));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testEncodePasswordLength()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$encoder = new BCryptPasswordEncoder(self::VALID_COST);
$encoder->encodePassword(str_repeat('a', 73), 'salt');
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/BasePasswordEncoderTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/BasePasswordEncoderTest.php
index 2251cfdf906e..cf517f6cee5a 100644
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/BasePasswordEncoderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/BasePasswordEncoderTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Core\Tests\Encoder;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Encoder\BasePasswordEncoder;
class PasswordEncoder extends BasePasswordEncoder
@@ -27,6 +28,8 @@ public function isPasswordValid($encoded, $raw, $salt)
class BasePasswordEncoderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testComparePassword()
{
$this->assertTrue($this->invokeComparePasswords('password', 'password'));
@@ -46,11 +49,9 @@ public function testMergePasswordAndSalt()
$this->assertEquals('password', $this->invokeMergePasswordAndSalt('password', ''));
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testMergePasswordAndSaltWithException()
{
+ $this->expectException('InvalidArgumentException');
$this->invokeMergePasswordAndSalt('password', '{foo}');
}
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php
index ae8467af5753..5fc489e426e0 100644
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/EncoderFactoryTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Core\Tests\Encoder;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Encoder\EncoderAwareInterface;
use Symfony\Component\Security\Core\Encoder\EncoderFactory;
use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
@@ -20,6 +21,8 @@
class EncoderFactoryTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testGetEncoderWithMessageDigestEncoder()
{
$factory = new EncoderFactory(['Symfony\Component\Security\Core\User\UserInterface' => [
@@ -107,11 +110,9 @@ public function testGetNullNamedEncoderForEncoderAware()
$this->assertEquals($expectedEncoder->encodePassword('foo', ''), $encoder->encodePassword('foo', ''));
}
- /**
- * @expectedException \RuntimeException
- */
public function testGetInvalidNamedEncoderForEncoderAware()
{
+ $this->expectException('RuntimeException');
$factory = new EncoderFactory([
'Symfony\Component\Security\Core\Tests\Encoder\EncAwareUser' => new MessageDigestPasswordEncoder('sha1'),
'encoder_name' => new MessageDigestPasswordEncoder('sha256'),
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php
index c449194f8dda..50cd47bf0c8e 100644
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/MessageDigestPasswordEncoderTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\Security\Core\Tests\Encoder;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
class MessageDigestPasswordEncoderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testIsPasswordValid()
{
$encoder = new MessageDigestPasswordEncoder('sha256', false, 1);
@@ -35,20 +38,16 @@ public function testEncodePassword()
$this->assertSame(hash('sha256', hash('sha256', 'password', true).'password'), $encoder->encodePassword('password', ''));
}
- /**
- * @expectedException \LogicException
- */
public function testEncodePasswordAlgorithmDoesNotExist()
{
+ $this->expectException('LogicException');
$encoder = new MessageDigestPasswordEncoder('foobar');
$encoder->encodePassword('password', '');
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testEncodePasswordLength()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$encoder = new MessageDigestPasswordEncoder();
$encoder->encodePassword(str_repeat('a', 5000), 'salt');
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php
index e65eef5bba4e..0795c4b5d68d 100644
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/Pbkdf2PasswordEncoderTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\Security\Core\Tests\Encoder;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder;
class Pbkdf2PasswordEncoderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testIsPasswordValid()
{
$encoder = new Pbkdf2PasswordEncoder('sha256', false, 1, 40);
@@ -35,20 +38,16 @@ public function testEncodePassword()
$this->assertSame('8bc2f9167a81cdcfad1235cd9047f1136271c1f978fcfcb35e22dbeafa4634f6fd2214218ed63ebb', $encoder->encodePassword('password', ''));
}
- /**
- * @expectedException \LogicException
- */
public function testEncodePasswordAlgorithmDoesNotExist()
{
+ $this->expectException('LogicException');
$encoder = new Pbkdf2PasswordEncoder('foobar');
$encoder->encodePassword('password', '');
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testEncodePasswordLength()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$encoder = new Pbkdf2PasswordEncoder('foobar');
$encoder->encodePassword(str_repeat('a', 5000), 'salt');
diff --git a/src/Symfony/Component/Security/Core/Tests/Encoder/PlaintextPasswordEncoderTest.php b/src/Symfony/Component/Security/Core/Tests/Encoder/PlaintextPasswordEncoderTest.php
index 1196651a8631..1ef0e0c7788d 100644
--- a/src/Symfony/Component/Security/Core/Tests/Encoder/PlaintextPasswordEncoderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Encoder/PlaintextPasswordEncoderTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\Security\Core\Tests\Encoder;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder;
class PlaintextPasswordEncoderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testIsPasswordValid()
{
$encoder = new PlaintextPasswordEncoder();
@@ -38,11 +41,9 @@ public function testEncodePassword()
$this->assertSame('foo', $encoder->encodePassword('foo', ''));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testEncodePasswordLength()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$encoder = new PlaintextPasswordEncoder();
$encoder->encodePassword(str_repeat('a', 5000), 'salt');
diff --git a/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php b/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
index 05a7fbba19d8..6852273aef8f 100644
--- a/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php
@@ -12,12 +12,15 @@
namespace Symfony\Component\Security\Core\Tests\User;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
use Symfony\Component\Security\Core\User\ChainUserProvider;
class ChainUserProviderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testLoadUserByUsername()
{
$provider1 = $this->getProvider();
@@ -40,11 +43,9 @@ public function testLoadUserByUsername()
$this->assertSame($account, $provider->loadUserByUsername('foo'));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException
- */
public function testLoadUserByUsernameThrowsUsernameNotFoundException()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\UsernameNotFoundException');
$provider1 = $this->getProvider();
$provider1
->expects($this->once())
@@ -105,11 +106,9 @@ public function testRefreshUserAgain()
$this->assertSame($account, $provider->refreshUser($this->getAccount()));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\UnsupportedUserException
- */
public function testRefreshUserThrowsUnsupportedUserException()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\UnsupportedUserException');
$provider1 = $this->getProvider();
$provider1
->expects($this->once())
diff --git a/src/Symfony/Component/Security/Core/Tests/User/InMemoryUserProviderTest.php b/src/Symfony/Component/Security/Core/Tests/User/InMemoryUserProviderTest.php
index b1ff3b66e17e..6b78260b09be 100644
--- a/src/Symfony/Component/Security/Core/Tests/User/InMemoryUserProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/InMemoryUserProviderTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Security\Core\Tests\User;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\User\InMemoryUserProvider;
use Symfony\Component\Security\Core\User\User;
class InMemoryUserProviderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testConstructor()
{
$provider = $this->createProvider();
@@ -63,21 +66,17 @@ public function testCreateUser()
$this->assertEquals('foo', $user->getPassword());
}
- /**
- * @expectedException \LogicException
- */
public function testCreateUserAlreadyExist()
{
+ $this->expectException('LogicException');
$provider = new InMemoryUserProvider();
$provider->createUser(new User('fabien', 'foo'));
$provider->createUser(new User('fabien', 'foo'));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException
- */
public function testLoadUserByUsernameDoesNotExist()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\UsernameNotFoundException');
$provider = new InMemoryUserProvider();
$provider->loadUserByUsername('fabien');
}
diff --git a/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php b/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php
index 39a346433e46..de31af718b3a 100644
--- a/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/LdapUserProviderTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Core\Tests\User;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Ldap\Adapter\CollectionInterface;
use Symfony\Component\Ldap\Adapter\QueryInterface;
use Symfony\Component\Ldap\Entry;
@@ -24,11 +25,11 @@
*/
class LdapUserProviderTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException
- */
+ use ForwardCompatTestTrait;
+
public function testLoadUserByUsernameFailsIfCantConnectToLdap()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\UsernameNotFoundException');
$ldap = $this->getMockBuilder(LdapInterface::class)->getMock();
$ldap
->expects($this->once())
@@ -40,11 +41,9 @@ public function testLoadUserByUsernameFailsIfCantConnectToLdap()
$provider->loadUserByUsername('foo');
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException
- */
public function testLoadUserByUsernameFailsIfNoLdapEntries()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\UsernameNotFoundException');
$result = $this->getMockBuilder(CollectionInterface::class)->getMock();
$query = $this->getMockBuilder(QueryInterface::class)->getMock();
$query
@@ -73,11 +72,9 @@ public function testLoadUserByUsernameFailsIfNoLdapEntries()
$provider->loadUserByUsername('foo');
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\UsernameNotFoundException
- */
public function testLoadUserByUsernameFailsIfMoreThanOneLdapEntry()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\UsernameNotFoundException');
$result = $this->getMockBuilder(CollectionInterface::class)->getMock();
$query = $this->getMockBuilder(QueryInterface::class)->getMock();
$query
@@ -106,11 +103,9 @@ public function testLoadUserByUsernameFailsIfMoreThanOneLdapEntry()
$provider->loadUserByUsername('foo');
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\InvalidArgumentException
- */
public function testLoadUserByUsernameFailsIfMoreThanOneLdapPasswordsInEntry()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\InvalidArgumentException');
$result = $this->getMockBuilder(CollectionInterface::class)->getMock();
$query = $this->getMockBuilder(QueryInterface::class)->getMock();
$query
@@ -191,11 +186,9 @@ public function testLoadUserByUsernameShouldNotFailIfEntryHasNoUidKeyAttribute()
);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\InvalidArgumentException
- */
public function testLoadUserByUsernameFailsIfEntryHasNoPasswordAttribute()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\InvalidArgumentException');
$result = $this->getMockBuilder(CollectionInterface::class)->getMock();
$query = $this->getMockBuilder(QueryInterface::class)->getMock();
$query
diff --git a/src/Symfony/Component/Security/Core/Tests/User/UserCheckerTest.php b/src/Symfony/Component/Security/Core/Tests/User/UserCheckerTest.php
index 16eea31c4f0e..cdff6e1f3e5e 100644
--- a/src/Symfony/Component/Security/Core/Tests/User/UserCheckerTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/UserCheckerTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\Security\Core\Tests\User;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\User\UserChecker;
class UserCheckerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testCheckPostAuthNotAdvancedUserInterface()
{
$checker = new UserChecker();
@@ -33,11 +36,9 @@ public function testCheckPostAuthPass()
$this->assertNull($checker->checkPostAuth($account));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\CredentialsExpiredException
- */
public function testCheckPostAuthCredentialsExpired()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\CredentialsExpiredException');
$checker = new UserChecker();
$account = $this->getMockBuilder('Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
@@ -65,11 +66,9 @@ public function testCheckPreAuthPass()
$this->assertNull($checker->checkPreAuth($account));
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\LockedException
- */
public function testCheckPreAuthAccountLocked()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\LockedException');
$checker = new UserChecker();
$account = $this->getMockBuilder('Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
@@ -78,11 +77,9 @@ public function testCheckPreAuthAccountLocked()
$checker->checkPreAuth($account);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\DisabledException
- */
public function testCheckPreAuthDisabled()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\DisabledException');
$checker = new UserChecker();
$account = $this->getMockBuilder('Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
@@ -92,11 +89,9 @@ public function testCheckPreAuthDisabled()
$checker->checkPreAuth($account);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AccountExpiredException
- */
public function testCheckPreAuthAccountExpired()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AccountExpiredException');
$checker = new UserChecker();
$account = $this->getMockBuilder('Symfony\Component\Security\Core\User\AdvancedUserInterface')->getMock();
diff --git a/src/Symfony/Component/Security/Core/Tests/User/UserTest.php b/src/Symfony/Component/Security/Core/Tests/User/UserTest.php
index 9a8d65d537ca..c7065eb6f17b 100644
--- a/src/Symfony/Component/Security/Core/Tests/User/UserTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/User/UserTest.php
@@ -12,15 +12,16 @@
namespace Symfony\Component\Security\Core\Tests\User;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Core\User\User;
class UserTest extends TestCase
{
- /**
- * @expectedException \InvalidArgumentException
- */
+ use ForwardCompatTestTrait;
+
public function testConstructorException()
{
+ $this->expectException('InvalidArgumentException');
new User('', 'superpass');
}
diff --git a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
index 131b7f3b1fe4..c10011ac2441 100644
--- a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
+++ b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/UserPasswordValidatorTest.php
@@ -115,11 +115,9 @@ public function emptyPasswordData()
];
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testUserIsNotValid()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$user = $this->getMockBuilder('Foo\Bar\User')->getMock();
$this->tokenStorage = $this->createTokenStorage($user);
diff --git a/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php b/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
index ac4c19b89502..7574635dd45a 100644
--- a/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
+++ b/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/NativeSessionTokenStorageTest.php
@@ -89,11 +89,9 @@ public function testGetExistingToken()
$this->assertSame('TOKEN', $this->storage->getToken('token_id'));
}
- /**
- * @expectedException \Symfony\Component\Security\Csrf\Exception\TokenNotFoundException
- */
public function testGetNonExistingToken()
{
+ $this->expectException('Symfony\Component\Security\Csrf\Exception\TokenNotFoundException');
$this->storage->getToken('token_id');
}
diff --git a/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/SessionTokenStorageTest.php b/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/SessionTokenStorageTest.php
index d90278b16a79..4ad0e086405f 100644
--- a/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/SessionTokenStorageTest.php
+++ b/src/Symfony/Component/Security/Csrf/Tests/TokenStorage/SessionTokenStorageTest.php
@@ -89,19 +89,15 @@ public function testGetExistingTokenFromActiveSession()
$this->assertSame('RESULT', $this->storage->getToken('token_id'));
}
- /**
- * @expectedException \Symfony\Component\Security\Csrf\Exception\TokenNotFoundException
- */
public function testGetNonExistingTokenFromClosedSession()
{
+ $this->expectException('Symfony\Component\Security\Csrf\Exception\TokenNotFoundException');
$this->storage->getToken('token_id');
}
- /**
- * @expectedException \Symfony\Component\Security\Csrf\Exception\TokenNotFoundException
- */
public function testGetNonExistingTokenFromActiveSession()
{
+ $this->expectException('Symfony\Component\Security\Csrf\Exception\TokenNotFoundException');
$this->session->start();
$this->storage->getToken('token_id');
}
diff --git a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
index 7decb4072eb6..7344100ee02b 100644
--- a/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/Firewall/GuardAuthenticationListenerTest.php
@@ -362,11 +362,9 @@ public function testSupportsReturnFalseSkipAuth()
$listener->handle($this->event);
}
- /**
- * @expectedException \UnexpectedValueException
- */
public function testReturnNullFromGetCredentials()
{
+ $this->expectException('UnexpectedValueException');
$authenticator = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
$providerKey = 'my_firewall4';
diff --git a/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php b/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
index cb3cb3d221bf..fa77bf0a92a2 100644
--- a/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
@@ -152,11 +152,9 @@ public function testLegacyAuthenticate()
$this->assertSame($authedToken, $actualAuthedToken);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testCheckCredentialsReturningNonTrueFailsAuthentication()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$providerKey = 'my_uncool_firewall';
$authenticator = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
@@ -185,11 +183,9 @@ public function testCheckCredentialsReturningNonTrueFailsAuthentication()
$provider->authenticate($this->preAuthenticationToken);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationExpiredException
- */
public function testGuardWithNoLongerAuthenticatedTriggersLogout()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationExpiredException');
$providerKey = 'my_firewall_abc';
// create a token and mark it as NOT authenticated anymore
@@ -220,12 +216,10 @@ public function testSupportsChecksGuardAuthenticatorsTokenOrigin()
$this->assertFalse($supports);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
- * @expectedExceptionMessageRegExp /second_firewall_0/
- */
public function testAuthenticateFailsOnNonOriginatingToken()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationException');
+ $this->expectExceptionMessageRegExp('/second_firewall_0/');
$authenticatorA = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
$authenticators = [$authenticatorA];
diff --git a/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php b/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php
index 7a3ce94fcc20..4af479a5a5dd 100644
--- a/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Authentication/SimpleAuthenticationHandlerTest.php
@@ -81,12 +81,10 @@ public function testOnAuthenticationSuccessCallsSimpleAuthenticator()
$this->assertSame($this->response, $result);
}
- /**
- * @expectedException \UnexpectedValueException
- * @expectedExceptionMessage onAuthenticationSuccess method must return null to use the default success handler, or a Response object
- */
public function testOnAuthenticationSuccessThrowsAnExceptionIfNonResponseIsReturned()
{
+ $this->expectException('UnexpectedValueException');
+ $this->expectExceptionMessage('onAuthenticationSuccess method must return null to use the default success handler, or a Response object');
$this->successHandler->expects($this->never())
->method('onAuthenticationSuccess');
@@ -151,12 +149,10 @@ public function testOnAuthenticationFailureCallsSimpleAuthenticator()
$this->assertSame($this->response, $result);
}
- /**
- * @expectedException \UnexpectedValueException
- * @expectedExceptionMessage onAuthenticationFailure method must return null to use the default failure handler, or a Response object
- */
public function testOnAuthenticationFailureThrowsAnExceptionIfNonResponseIsReturned()
{
+ $this->expectException('UnexpectedValueException');
+ $this->expectExceptionMessage('onAuthenticationFailure method must return null to use the default failure handler, or a Response object');
$this->failureHandler->expects($this->never())
->method('onAuthenticationFailure');
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php
index 0bb27258befe..8ed9fe541897 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php
@@ -12,15 +12,16 @@
namespace Symfony\Component\Security\Http\Tests\Firewall;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Http\Firewall\AccessListener;
class AccessListenerTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AccessDeniedException
- */
+ use ForwardCompatTestTrait;
+
public function testHandleWhenTheAccessDecisionManagerDecidesToRefuseAccess()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AccessDeniedException');
$request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->disableOriginalConstructor()->disableOriginalClone()->getMock();
$accessMap = $this->getMockBuilder('Symfony\Component\Security\Http\AccessMapInterface')->getMock();
@@ -183,11 +184,9 @@ public function testHandleWhenThereIsNoAccessMapEntryMatchingTheRequest()
$listener->handle($event);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException
- */
public function testHandleWhenTheSecurityTokenStorageHasNoToken()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException');
$tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
$tokenStorage
->expects($this->any())
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php
index e331542369f5..e5008d663893 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/BasicAuthenticationListenerTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Http\Tests\Firewall;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager;
@@ -21,6 +22,8 @@
class BasicAuthenticationListenerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testHandleWithValidUsernameAndPasswordServerParameters()
{
$request = new Request([], [], [], [], [], [
@@ -182,12 +185,10 @@ public function testHandleWithASimilarAuthenticatedToken()
$listener->handle($event);
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage $providerKey must not be empty
- */
public function testItRequiresProviderKey()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('$providerKey must not be empty');
new BasicAuthenticationListener(
$this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock(),
$this->getMockBuilder('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface')->getMock(),
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
index 250b26cfef6e..9c11fc558d69 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Http\Tests\Firewall;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -34,12 +35,12 @@
class ContextListenerTest extends TestCase
{
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage $contextKey must not be empty
- */
+ use ForwardCompatTestTrait;
+
public function testItRequiresContextKey()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('$contextKey must not be empty');
new ContextListener(
$this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock(),
[],
@@ -47,12 +48,10 @@ public function testItRequiresContextKey()
);
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage User provider "stdClass" must implement "Symfony\Component\Security\Core\User\UserProviderInterface
- */
public function testUserProvidersNeedToImplementAnInterface()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('User provider "stdClass" must implement "Symfony\Component\Security\Core\User\UserProviderInterface');
$this->handleEventWithPreviousSession(new TokenStorage(), [new \stdClass()]);
}
@@ -308,11 +307,9 @@ public function testTokenIsSetToNullIfNoUserWasLoadedByTheRegisteredUserProvider
$this->assertNull($tokenStorage->getToken());
}
- /**
- * @expectedException \RuntimeException
- */
public function testRuntimeExceptionIsThrownIfNoSupportingUserProviderWasRegistered()
{
+ $this->expectException('RuntimeException');
$this->handleEventWithPreviousSession(new TokenStorage(), [new NotSupportingUserProvider(), new NotSupportingUserProvider()]);
}
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
index 3796f871562c..9dd4ebb25009 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
@@ -12,12 +12,15 @@
namespace Symfony\Component\Security\Http\Tests\Firewall;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Http\Firewall\LogoutListener;
class LogoutListenerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testHandleUnmatchedPath()
{
list($listener, $tokenStorage, $httpUtils, $options) = $this->getListener();
@@ -122,11 +125,9 @@ public function testHandleMatchedPathWithoutSuccessHandlerAndCsrfValidation()
$listener->handle($event);
}
- /**
- * @expectedException \RuntimeException
- */
public function testSuccessHandlerReturnsNonResponse()
{
+ $this->expectException('RuntimeException');
$successHandler = $this->getSuccessHandler();
list($listener, $tokenStorage, $httpUtils, $options) = $this->getListener($successHandler);
@@ -146,11 +147,9 @@ public function testSuccessHandlerReturnsNonResponse()
$listener->handle($event);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\LogoutException
- */
public function testCsrfValidationFails()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\LogoutException');
$tokenManager = $this->getTokenManager();
list($listener, $tokenStorage, $httpUtils, $options) = $this->getListener(null, $tokenManager);
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
index 57d297103ec8..8a1dbce9d8b3 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Http\Tests\Firewall;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Security\Core\Exception\AuthenticationException;
use Symfony\Component\Security\Http\Firewall\RememberMeListener;
@@ -19,6 +20,8 @@
class RememberMeListenerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testOnCoreSecurityDoesNotTryToPopulateNonEmptyTokenStorage()
{
list($listener, $tokenStorage) = $this->getListener();
@@ -103,12 +106,10 @@ public function testOnCoreSecurityIgnoresAuthenticationExceptionThrownByAuthenti
$listener->handle($event);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
- * @expectedExceptionMessage Authentication failed.
- */
public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExceptionThrownAuthenticationManagerImplementation()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationException');
+ $this->expectExceptionMessage('Authentication failed.');
list($listener, $tokenStorage, $service, $manager) = $this->getListener(false, false);
$tokenStorage
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
index ee5334c1e79b..6328ddf52346 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Security\Http\Tests\Firewall;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Security\Http\Firewall\RemoteUserAuthenticationListener;
class RemoteUserAuthenticationListenerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testGetPreAuthenticatedData()
{
$serverVars = [
@@ -42,11 +45,9 @@ public function testGetPreAuthenticatedData()
$this->assertSame($result, ['TheUser', null]);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testGetPreAuthenticatedDataNoUser()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$request = new Request([], [], [], [], [], []);
$tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
index 6db9950fdf4e..48f36de2e016 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php
@@ -50,12 +50,10 @@ private function doSetUp()
$this->event = new GetResponseEvent($this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock(), $this->request, HttpKernelInterface::MASTER_REQUEST);
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage $providerKey must not be empty
- */
public function testProviderKeyIsRequired()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('$providerKey must not be empty');
new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, '', $this->accessDecisionManager);
}
@@ -68,22 +66,18 @@ public function testEventIsIgnoredIfUsernameIsNotPassedWithTheRequest()
$this->assertNull($this->tokenStorage->getToken());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException
- */
public function testExitUserThrowsAuthenticationExceptionIfNoCurrentToken()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException');
$this->tokenStorage->setToken(null);
$this->request->query->set('_switch_user', '_exit');
$listener = new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager);
$listener->handle($this->event);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException
- */
public function testExitUserThrowsAuthenticationExceptionIfOriginalTokenCannotBeFound()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException');
$token = new UsernamePasswordToken('username', '', 'key', ['ROLE_FOO']);
$this->tokenStorage->setToken($token);
@@ -158,11 +152,9 @@ public function testExitUserDoesNotDispatchEventWithStringUser()
$listener->handle($this->event);
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AccessDeniedException
- */
public function testSwitchUserIsDisallowed()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AccessDeniedException');
$token = new UsernamePasswordToken('username', '', 'key', ['ROLE_FOO']);
$this->tokenStorage->setToken($token);
@@ -270,11 +262,9 @@ public function testSwitchUserWithReplacedToken()
$this->assertSame($replacedToken, $this->tokenStorage->getToken());
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException
- */
public function testSwitchtUserThrowsAuthenticationExceptionIfNoCurrentToken()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationCredentialsNotFoundException');
$this->tokenStorage->setToken(null);
$this->request->query->set('_switch_user', 'username');
$listener = new SwitchUserListener($this->tokenStorage, $this->userProvider, $this->userChecker, 'provider123', $this->accessDecisionManager);
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php
index 61455745289d..30feeb95b2e5 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordFormAuthenticationListenerTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Tests\Http\Firewall;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@@ -26,6 +27,8 @@
class UsernamePasswordFormAuthenticationListenerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
/**
* @dataProvider getUsernameForLength
*/
@@ -78,11 +81,11 @@ public function testHandleWhenUsernameLength($username, $ok)
/**
* @dataProvider postOnlyDataProvider
- * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
- * @expectedExceptionMessage The key "_username" must be a string, "array" given.
*/
public function testHandleNonStringUsernameWithArray($postOnly)
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
+ $this->expectExceptionMessage('The key "_username" must be a string, "array" given.');
$request = Request::create('/login_check', 'POST', ['_username' => []]);
$request->setSession($this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock());
$listener = new UsernamePasswordFormAuthenticationListener(
@@ -101,11 +104,11 @@ public function testHandleNonStringUsernameWithArray($postOnly)
/**
* @dataProvider postOnlyDataProvider
- * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
- * @expectedExceptionMessage The key "_username" must be a string, "integer" given.
*/
public function testHandleNonStringUsernameWithInt($postOnly)
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
+ $this->expectExceptionMessage('The key "_username" must be a string, "integer" given.');
$request = Request::create('/login_check', 'POST', ['_username' => 42]);
$request->setSession($this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock());
$listener = new UsernamePasswordFormAuthenticationListener(
@@ -124,11 +127,11 @@ public function testHandleNonStringUsernameWithInt($postOnly)
/**
* @dataProvider postOnlyDataProvider
- * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
- * @expectedExceptionMessage The key "_username" must be a string, "object" given.
*/
public function testHandleNonStringUsernameWithObject($postOnly)
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
+ $this->expectExceptionMessage('The key "_username" must be a string, "object" given.');
$request = Request::create('/login_check', 'POST', ['_username' => new \stdClass()]);
$request->setSession($this->getMockBuilder('Symfony\Component\HttpFoundation\Session\SessionInterface')->getMock());
$listener = new UsernamePasswordFormAuthenticationListener(
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php
index 7d2e55906b1d..ad8d3cd9f7c4 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/UsernamePasswordJsonAuthenticationListenerTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Tests\Http\Firewall;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@@ -31,6 +32,8 @@
*/
class UsernamePasswordJsonAuthenticationListenerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
/**
* @var UsernamePasswordJsonAuthenticationListener
*/
@@ -104,12 +107,10 @@ public function testUsePath()
$this->assertEquals('ok', $event->getResponse()->getContent());
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
- * @expectedExceptionMessage Invalid JSON
- */
public function testAttemptAuthenticationNoJson()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
+ $this->expectExceptionMessage('Invalid JSON');
$this->createListener();
$request = new Request();
$request->setRequestFormat('json');
@@ -118,12 +119,10 @@ public function testAttemptAuthenticationNoJson()
$this->listener->handle($event);
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
- * @expectedExceptionMessage The key "username" must be provided
- */
public function testAttemptAuthenticationNoUsername()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
+ $this->expectExceptionMessage('The key "username" must be provided');
$this->createListener();
$request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"usr": "dunglas", "password": "foo"}');
$event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
@@ -131,12 +130,10 @@ public function testAttemptAuthenticationNoUsername()
$this->listener->handle($event);
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
- * @expectedExceptionMessage The key "password" must be provided
- */
public function testAttemptAuthenticationNoPassword()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
+ $this->expectExceptionMessage('The key "password" must be provided');
$this->createListener();
$request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": "dunglas", "pass": "foo"}');
$event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
@@ -144,12 +141,10 @@ public function testAttemptAuthenticationNoPassword()
$this->listener->handle($event);
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
- * @expectedExceptionMessage The key "username" must be a string.
- */
public function testAttemptAuthenticationUsernameNotAString()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
+ $this->expectExceptionMessage('The key "username" must be a string.');
$this->createListener();
$request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": 1, "password": "foo"}');
$event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
@@ -157,12 +152,10 @@ public function testAttemptAuthenticationUsernameNotAString()
$this->listener->handle($event);
}
- /**
- * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
- * @expectedExceptionMessage The key "password" must be a string.
- */
public function testAttemptAuthenticationPasswordNotAString()
{
+ $this->expectException('Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
+ $this->expectExceptionMessage('The key "password" must be a string.');
$this->createListener();
$request = new Request([], [], [], [], [], ['HTTP_CONTENT_TYPE' => 'application/json'], '{"username": "dunglas", "password": 1}');
$event = new GetResponseEvent($this->getMockBuilder(KernelInterface::class)->getMock(), $request, KernelInterface::MASTER_REQUEST);
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
index 577ca7c38f1b..b82b616a637f 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/X509AuthenticationListenerTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Security\Http\Tests\Firewall;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Security\Http\Firewall\X509AuthenticationListener;
class X509AuthenticationListenerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
/**
* @dataProvider dataProviderGetPreAuthenticatedData
*/
@@ -83,11 +86,9 @@ public static function dataProviderGetPreAuthenticatedDataNoUser()
yield ['cert+something@example.com', 'emailAddress=cert+something@example.com'];
}
- /**
- * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException
- */
public function testGetPreAuthenticatedDataNoData()
{
+ $this->expectException('Symfony\Component\Security\Core\Exception\BadCredentialsException');
$request = new Request([], [], [], [], [], []);
$tokenStorage = $this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')->getMock();
diff --git a/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php b/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php
index a4a76747e5a5..016a22655a40 100644
--- a/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Security\Http\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Exception\MethodNotAllowedException;
use Symfony\Component\Routing\Exception\ResourceNotFoundException;
@@ -21,6 +22,8 @@
class HttpUtilsTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testCreateRedirectResponseWithPath()
{
$utils = new HttpUtils($this->getUrlGenerator());
@@ -251,11 +254,9 @@ public function testCheckRequestPathWithUrlMatcherAndResourceFoundByRequest()
$this->assertTrue($utils->checkRequestPath($request, 'foobar'));
}
- /**
- * @expectedException \RuntimeException
- */
public function testCheckRequestPathWithUrlMatcherLoadingException()
{
+ $this->expectException('RuntimeException');
$urlMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\UrlMatcherInterface')->getMock();
$urlMatcher
->expects($this->any())
@@ -280,12 +281,10 @@ public function testCheckPathWithoutRouteParam()
$this->assertFalse($utils->checkRequestPath($this->getRequest(), 'path/index.html'));
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Matcher must either implement UrlMatcherInterface or RequestMatcherInterface
- */
public function testUrlMatcher()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('Matcher must either implement UrlMatcherInterface or RequestMatcherInterface');
new HttpUtils($this->getUrlGenerator(), new \stdClass());
}
@@ -307,12 +306,10 @@ public function testGenerateUriPreservesFragment()
$this->assertEquals('/foo/bar#fragment', $utils->generateUri(new Request(), 'route_name'));
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage You must provide a UrlGeneratorInterface instance to be able to use routes.
- */
public function testUrlGeneratorIsRequiredToGenerateUrl()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('You must provide a UrlGeneratorInterface instance to be able to use routes.');
$utils = new HttpUtils();
$utils->generateUri(new Request(), 'route_name');
}
diff --git a/src/Symfony/Component/Security/Http/Tests/Logout/LogoutUrlGeneratorTest.php b/src/Symfony/Component/Security/Http/Tests/Logout/LogoutUrlGeneratorTest.php
index cdade5e870cf..7665117e074b 100644
--- a/src/Symfony/Component/Security/Http/Tests/Logout/LogoutUrlGeneratorTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Logout/LogoutUrlGeneratorTest.php
@@ -50,12 +50,10 @@ public function testGetLogoutPath()
$this->assertSame('/logout', $this->generator->getLogoutPath('secured_area'));
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage No LogoutListener found for firewall key "unregistered_key".
- */
public function testGetLogoutPathWithoutLogoutListenerRegisteredForKeyThrowsException()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('No LogoutListener found for firewall key "unregistered_key".');
$this->generator->registerListener('secured_area', '/logout', null, null, null);
$this->generator->getLogoutPath('unregistered_key');
@@ -69,12 +67,10 @@ public function testGuessFromToken()
$this->assertSame('/logout', $this->generator->getLogoutPath());
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Unable to generate a logout url for an anonymous token.
- */
public function testGuessFromAnonymousTokenThrowsException()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('Unable to generate a logout url for an anonymous token.');
$this->tokenStorage->setToken(new AnonymousToken('default', 'anon.'));
$this->generator->getLogoutPath();
@@ -105,12 +101,10 @@ public function testGuessFromTokenWithoutProviderKeyFallbacksToCurrentFirewall()
$this->assertSame('/logout', $this->generator->getLogoutPath());
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage Unable to find the current firewall LogoutListener, please provide the provider key manually
- */
public function testUnableToGuessThrowsException()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('Unable to find the current firewall LogoutListener, please provide the provider key manually');
$this->generator->registerListener('secured_area', '/logout', null, null);
$this->generator->getLogoutPath();
diff --git a/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php b/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
index 3709a92bba50..0cf4654bcc6d 100644
--- a/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/RememberMe/AbstractRememberMeServicesTest.php
@@ -42,11 +42,9 @@ public function testAutoLoginReturnsNullWhenNoCookie()
$this->assertNull($service->autoLogin(new Request()));
}
- /**
- * @expectedException \RuntimeException
- */
public function testAutoLoginThrowsExceptionWhenImplementationDoesNotReturnUserInterface()
{
+ $this->expectException('RuntimeException');
$service = $this->getService(null, ['name' => 'foo', 'path' => null, 'domain' => null]);
$request = new Request();
$request->cookies->set('foo', 'foo');
@@ -270,12 +268,10 @@ public function testEncodeCookieAndDecodeCookieAreInvertible()
$this->assertSame($cookieParts, $decoded);
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage cookie delimiter
- */
public function testThereShouldBeNoCookieDelimiterInCookieParts()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('cookie delimiter');
$cookieParts = ['aa', 'b'.AbstractRememberMeServices::COOKIE_DELIMITER.'b', 'cc'];
$service = $this->getService();
diff --git a/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php b/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php
index 6c0df8cb5f2c..4ef0b80b0697 100644
--- a/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Session/SessionAuthenticationStrategyTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\Security\Http\Tests\Session;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy;
class SessionAuthenticationStrategyTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testSessionIsNotChanged()
{
$request = $this->getRequest();
@@ -25,12 +28,10 @@ public function testSessionIsNotChanged()
$strategy->onAuthentication($request, $this->getToken());
}
- /**
- * @expectedException \RuntimeException
- * @expectedExceptionMessage Invalid session authentication strategy "foo"
- */
public function testUnsupportedStrategy()
{
+ $this->expectException('RuntimeException');
+ $this->expectExceptionMessage('Invalid session authentication strategy "foo"');
$request = $this->getRequest();
$request->expects($this->never())->method('getSession');
diff --git a/src/Symfony/Component/Serializer/Tests/Annotation/GroupsTest.php b/src/Symfony/Component/Serializer/Tests/Annotation/GroupsTest.php
index 9b54221d7630..203eb3c92b93 100644
--- a/src/Symfony/Component/Serializer/Tests/Annotation/GroupsTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Annotation/GroupsTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Serializer\Tests\Annotation;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Serializer\Annotation\Groups;
/**
@@ -19,27 +20,23 @@
*/
class GroupsTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
- */
+ use ForwardCompatTestTrait;
+
public function testEmptyGroupsParameter()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\InvalidArgumentException');
new Groups(['value' => []]);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
- */
public function testNotAnArrayGroupsParameter()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\InvalidArgumentException');
new Groups(['value' => 12]);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
- */
public function testInvalidGroupsParameter()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\InvalidArgumentException');
new Groups(['value' => ['a', 1, new \stdClass()]]);
}
diff --git a/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php b/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php
index 16f10e143459..8cca874ecd2a 100644
--- a/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Annotation/MaxDepthTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Serializer\Tests\Annotation;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Serializer\Annotation\MaxDepth;
/**
@@ -19,12 +20,12 @@
*/
class MaxDepthTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
- * @expectedExceptionMessage Parameter of annotation "Symfony\Component\Serializer\Annotation\MaxDepth" should be set.
- */
+ use ForwardCompatTestTrait;
+
public function testNotSetMaxDepthParameter()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Parameter of annotation "Symfony\Component\Serializer\Annotation\MaxDepth" should be set.');
new MaxDepth([]);
}
@@ -40,12 +41,11 @@ public function provideInvalidValues()
/**
* @dataProvider provideInvalidValues
- *
- * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
- * @expectedExceptionMessage Parameter of annotation "Symfony\Component\Serializer\Annotation\MaxDepth" must be a positive integer.
*/
public function testNotAnIntMaxDepthParameter($value)
{
+ $this->expectException('Symfony\Component\Serializer\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Parameter of annotation "Symfony\Component\Serializer\Annotation\MaxDepth" must be a positive integer.');
new MaxDepth(['value' => $value]);
}
diff --git a/src/Symfony/Component/Serializer/Tests/DependencyInjection/SerializerPassTest.php b/src/Symfony/Component/Serializer/Tests/DependencyInjection/SerializerPassTest.php
index 5c3fedfe895a..d5e044504f58 100644
--- a/src/Symfony/Component/Serializer/Tests/DependencyInjection/SerializerPassTest.php
+++ b/src/Symfony/Component/Serializer/Tests/DependencyInjection/SerializerPassTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Serializer\Tests\DependencyInjection;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\Serializer\DependencyInjection\SerializerPass;
@@ -23,12 +24,12 @@
*/
class SerializerPassTest extends TestCase
{
- /**
- * @expectedException \RuntimeException
- * @expectedExceptionMessage You must tag at least one service as "serializer.normalizer" to use the "serializer" service
- */
+ use ForwardCompatTestTrait;
+
public function testThrowExceptionWhenNoNormalizers()
{
+ $this->expectException('RuntimeException');
+ $this->expectExceptionMessage('You must tag at least one service as "serializer.normalizer" to use the "serializer" service');
$container = new ContainerBuilder();
$container->register('serializer');
@@ -36,12 +37,10 @@ public function testThrowExceptionWhenNoNormalizers()
$serializerPass->process($container);
}
- /**
- * @expectedException \RuntimeException
- * @expectedExceptionMessage You must tag at least one service as "serializer.encoder" to use the "serializer" service
- */
public function testThrowExceptionWhenNoEncoders()
{
+ $this->expectException('RuntimeException');
+ $this->expectExceptionMessage('You must tag at least one service as "serializer.encoder" to use the "serializer" service');
$container = new ContainerBuilder();
$container->register('serializer')
->addArgument([])
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/ChainDecoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/ChainDecoderTest.php
index ecb37f230084..659930c41e52 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/ChainDecoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/ChainDecoderTest.php
@@ -73,11 +73,9 @@ public function testDecode()
$this->chainDecoder->decode('string_to_decode', self::FORMAT_2);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\RuntimeException
- */
public function testDecodeUnsupportedFormat()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\RuntimeException');
$this->chainDecoder->decode('string_to_decode', self::FORMAT_3);
}
}
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php
index 2a0f85d04a98..bfec205a273d 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php
@@ -75,11 +75,9 @@ public function testEncode()
$this->chainEncoder->encode(['foo' => 123], self::FORMAT_2);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\RuntimeException
- */
public function testEncodeUnsupportedFormat()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\RuntimeException');
$this->chainEncoder->encode(['foo' => 123], self::FORMAT_3);
}
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php
index 2d9550d26fe3..f5d0dc5a3c96 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/JsonDecodeTest.php
@@ -61,10 +61,10 @@ public function decodeProvider()
/**
* @requires function json_last_error_msg
* @dataProvider decodeProviderException
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
*/
public function testDecodeWithException($value)
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$this->decode->decode($value, JsonEncoder::FORMAT);
}
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php
index e7c6a4f39bb7..6c16e99c15b9 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncodeTest.php
@@ -54,10 +54,10 @@ public function encodeProvider()
/**
* @requires function json_last_error_msg
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
*/
public function testEncodeWithError()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$this->encode->encode("\xB1\x31", JsonEncoder::FORMAT);
}
}
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
index 0080112baad8..27e1a55b02e3 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
@@ -68,11 +68,9 @@ public function testOptions()
$this->assertEquals($expected, $this->serializer->serialize($arr, 'json'), 'Context should not be persistent');
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testEncodeNotUtf8WithoutPartialOnError()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$arr = [
'utf8' => 'Hello World!',
'notUtf8' => "\xb0\xd0\xb5\xd0",
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
index bcfbeab2d2e8..26ac84478107 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
@@ -62,12 +62,10 @@ public function testSetRootNodeName()
$this->assertEquals($expected, $this->encoder->encode($obj, 'xml'));
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- * @expectedExceptionMessage Document types are not allowed.
- */
public function testDocTypeIsNotAllowed()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
+ $this->expectExceptionMessage('Document types are not allowed.');
$this->encoder->decode('', 'foo');
}
@@ -562,19 +560,15 @@ public function testDecodeWithoutItemHash()
$this->assertEquals($expected, $this->encoder->decode($xml, 'xml'));
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testDecodeInvalidXml()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$this->encoder->decode('', 'xml');
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testPreventsComplexExternalEntities()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$this->encoder->decode(']>&test;', 'xml');
}
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php
index 067f16acf9c3..8c5d61e2617e 100644
--- a/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Mapping/Factory/CacheMetadataFactoryTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Serializer\Tests\Mapping\Factory;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Cache\Adapter\ArrayAdapter;
use Symfony\Component\Serializer\Mapping\ClassMetadata;
use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
@@ -23,6 +24,8 @@
*/
class CacheMetadataFactoryTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testGetMetadataFor()
{
$metadata = new ClassMetadata(Dummy::class);
@@ -55,11 +58,9 @@ public function testHasMetadataFor()
$this->assertTrue($factory->hasMetadataFor(Dummy::class));
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
- */
public function testInvalidClassThrowsException()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\InvalidArgumentException');
$decorated = $this->getMockBuilder(ClassMetadataFactoryInterface::class)->getMock();
$factory = new CacheClassMetadataFactory($decorated, new ArrayAdapter());
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php
index 8d07809386fe..00674e2423ee 100644
--- a/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -55,11 +55,9 @@ public function testLoadClassMetadataReturnsFalseWhenEmpty()
$this->assertFalse($loader->loadClassMetadata($this->metadata));
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\MappingException
- */
public function testLoadClassMetadataReturnsThrowsInvalidMapping()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\MappingException');
$loader = new YamlFileLoader(__DIR__.'/../../Fixtures/invalid-mapping.yml');
$loader->loadClassMetadata($this->metadata);
}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
index 1e3eb9b5ede3..d76ac4c165b2 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -50,12 +50,10 @@ public function testInstantiateObjectDenormalizer()
$this->assertInstanceOf(__NAMESPACE__.'\Dummy', $normalizer->instantiateObject($data, $class, $context, new \ReflectionClass($class), []));
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\ExtraAttributesException
- * @expectedExceptionMessage Extra attributes are not allowed ("fooFoo", "fooBar" are unknown).
- */
public function testDenormalizeWithExtraAttributes()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\ExtraAttributesException');
+ $this->expectExceptionMessage('Extra attributes are not allowed ("fooFoo", "fooBar" are unknown).');
$factory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
$normalizer = new AbstractObjectNormalizerDummy($factory);
$normalizer->denormalize(
@@ -66,12 +64,10 @@ public function testDenormalizeWithExtraAttributes()
);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\ExtraAttributesException
- * @expectedExceptionMessage Extra attributes are not allowed ("fooFoo", "fooBar" are unknown).
- */
public function testDenormalizeWithExtraAttributesAndNoGroupsWithMetadataFactory()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\ExtraAttributesException');
+ $this->expectExceptionMessage('Extra attributes are not allowed ("fooFoo", "fooBar" are unknown).');
$normalizer = new AbstractObjectNormalizerWithMetadata();
$normalizer->denormalize(
['fooFoo' => 'foo', 'fooBar' => 'bar', 'bar' => 'bar'],
@@ -152,12 +148,11 @@ private function getDenormalizerForDummyCollection()
/**
* Test that additional attributes throw an exception if no metadata factory is specified.
- *
- * @expectedException \Symfony\Component\Serializer\Exception\LogicException
- * @expectedExceptionMessage A class metadata factory must be provided in the constructor when setting "allow_extra_attributes" to false.
*/
public function testExtraAttributesException()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\LogicException');
+ $this->expectExceptionMessage('A class metadata factory must be provided in the constructor when setting "allow_extra_attributes" to false.');
$normalizer = new ObjectNormalizer();
$normalizer->denormalize([], \stdClass::class, 'xml', [
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/DataUriNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/DataUriNormalizerTest.php
index ba252106a4ea..6f327657dabc 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/DataUriNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/DataUriNormalizerTest.php
@@ -114,21 +114,19 @@ public function testDenormalizeHttpFoundationFile()
$this->assertSame(file_get_contents(self::TEST_GIF_DATA), $this->getContent($file->openFile()));
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- * @expectedExceptionMessage The provided "data:" URI is not valid.
- */
public function testGiveNotAccessToLocalFiles()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
+ $this->expectExceptionMessage('The provided "data:" URI is not valid.');
$this->normalizer->denormalize('/etc/shadow', 'SplFileObject');
}
/**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
* @dataProvider invalidUriProvider
*/
public function testInvalidData($uri)
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$this->normalizer->denormalize($uri, 'SplFileObject');
}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php
index 0352bb87cf1a..2f4bee62c214 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/DateIntervalNormalizerTest.php
@@ -64,12 +64,10 @@ public function testNormalizeUsingFormatPassedInConstructor($format, $output, $i
$this->assertEquals($output, (new DateIntervalNormalizer($format))->normalize(new \DateInterval($input)));
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
- * @expectedExceptionMessage The object must be an instance of "\DateInterval".
- */
public function testNormalizeInvalidObjectThrowsException()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The object must be an instance of "\DateInterval".');
$this->normalizer->normalize(new \stdClass());
}
@@ -100,36 +98,28 @@ public function testDenormalizeUsingFormatPassedInConstructor($format, $input, $
$this->assertDateIntervalEquals(new \DateInterval($output), (new DateIntervalNormalizer($format))->denormalize($input, \DateInterval::class));
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
- */
public function testDenormalizeExpectsString()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\InvalidArgumentException');
$this->normalizer->denormalize(1234, \DateInterval::class);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- * @expectedExceptionMessage Expected a valid ISO 8601 interval string.
- */
public function testDenormalizeNonISO8601IntervalStringThrowsException()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
+ $this->expectExceptionMessage('Expected a valid ISO 8601 interval string.');
$this->normalizer->denormalize('10 years 2 months 3 days', \DateInterval::class, null);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testDenormalizeInvalidDataThrowsException()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$this->normalizer->denormalize('invalid interval', \DateInterval::class);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testDenormalizeFormatMismatchThrowsException()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$this->normalizer->denormalize('P00Y00M00DT00H00M00S', \DateInterval::class, null, [DateIntervalNormalizer::FORMAT_KEY => 'P%yY%mM%dD']);
}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php
index 33463f49346d..0234cf27cc04 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php
@@ -157,12 +157,10 @@ public function normalizeUsingTimeZonePassedInContextAndExpectedFormatWithMicros
];
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
- * @expectedExceptionMessage The object must implement the "\DateTimeInterface".
- */
public function testNormalizeInvalidObjectThrowsException()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The object must implement the "\DateTimeInterface".');
$this->normalizer->normalize(new \stdClass());
}
@@ -238,37 +236,29 @@ public function denormalizeUsingTimezonePassedInContextProvider()
];
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testDenormalizeInvalidDataThrowsException()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$this->normalizer->denormalize('invalid date', \DateTimeInterface::class);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- * @expectedExceptionMessage The data is either an empty string or null, you should pass a string that can be parsed with the passed format or a valid DateTime string.
- */
public function testDenormalizeNullThrowsException()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
+ $this->expectExceptionMessage('The data is either an empty string or null, you should pass a string that can be parsed with the passed format or a valid DateTime string.');
$this->normalizer->denormalize(null, \DateTimeInterface::class);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- * @expectedExceptionMessage The data is either an empty string or null, you should pass a string that can be parsed with the passed format or a valid DateTime string.
- */
public function testDenormalizeEmptyStringThrowsException()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
+ $this->expectExceptionMessage('The data is either an empty string or null, you should pass a string that can be parsed with the passed format or a valid DateTime string.');
$this->normalizer->denormalize('', \DateTimeInterface::class);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testDenormalizeFormatMismatchThrowsException()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$this->normalizer->denormalize('2016-01-01T00:00:00+00:00', \DateTimeInterface::class, null, [DateTimeNormalizer::FORMAT_KEY => 'Y-m-d|']);
}
}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
index 809284d52508..3ce06b659f80 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -322,11 +322,9 @@ public function testCallbacks($callbacks, $value, $result, $message)
);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testUncallableCallbacks()
{
+ $this->expectException('InvalidArgumentException');
$this->normalizer->setCallbacks(['bar' => null]);
$obj = new GetConstructorDummy('baz', 'quux', true);
@@ -409,12 +407,10 @@ public function provideCallbacks()
];
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\LogicException
- * @expectedExceptionMessage Cannot normalize attribute "object" because the injected serializer is not a normalizer
- */
public function testUnableToNormalizeObjectAttribute()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\LogicException');
+ $this->expectExceptionMessage('Cannot normalize attribute "object" because the injected serializer is not a normalizer');
$serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();
$this->normalizer->setSerializer($serializer);
@@ -425,11 +421,9 @@ public function testUnableToNormalizeObjectAttribute()
$this->normalizer->normalize($obj, 'any');
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\CircularReferenceException
- */
public function testUnableToNormalizeCircularReference()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\CircularReferenceException');
$serializer = new Serializer([$this->normalizer]);
$this->normalizer->setSerializer($serializer);
$this->normalizer->setCircularReferenceLimit(2);
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php
index 9af0d2171fdf..0532ef47c093 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php
@@ -63,11 +63,9 @@ public function testNormalize()
$this->assertEquals('string_object', $this->normalizer->normalize(new JsonSerializableDummy()));
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\CircularReferenceException
- */
public function testCircularNormalize()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\CircularReferenceException');
$this->normalizer->setCircularReferenceLimit(1);
$this->serializer
@@ -83,12 +81,10 @@ public function testCircularNormalize()
$this->assertEquals('string_object', $this->normalizer->normalize(new JsonSerializableDummy()));
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\InvalidArgumentException
- * @expectedExceptionMessage The object must implement "JsonSerializable".
- */
public function testInvalidDataThrowException()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The object must implement "JsonSerializable".');
$this->normalizer->normalize(new \stdClass());
}
}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
index 31679c3c6a95..2a27c1646ca0 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -185,12 +185,10 @@ public function testConstructorWithObjectTypeHintDenormalize()
$this->assertEquals('rab', $obj->getInner()->bar);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\RuntimeException
- * @expectedExceptionMessage Could not determine the class of the parameter "unknown".
- */
public function testConstructorWithUnknownObjectTypeHintDenormalize()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\RuntimeException');
+ $this->expectExceptionMessage('Could not determine the class of the parameter "unknown".');
$data = [
'id' => 10,
'unknown' => [
@@ -358,11 +356,9 @@ public function testCallbacks($callbacks, $value, $result, $message)
);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testUncallableCallbacks()
{
+ $this->expectException('InvalidArgumentException');
$this->normalizer->setCallbacks(['bar' => null]);
$obj = new ObjectConstructorDummy('baz', 'quux', true);
@@ -469,12 +465,10 @@ public function provideCallbacks()
];
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\LogicException
- * @expectedExceptionMessage Cannot normalize attribute "object" because the injected serializer is not a normalizer
- */
public function testUnableToNormalizeObjectAttribute()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\LogicException');
+ $this->expectExceptionMessage('Cannot normalize attribute "object" because the injected serializer is not a normalizer');
$serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();
$this->normalizer->setSerializer($serializer);
@@ -485,11 +479,9 @@ public function testUnableToNormalizeObjectAttribute()
$this->normalizer->normalize($obj, 'any');
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\CircularReferenceException
- */
public function testUnableToNormalizeCircularReference()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\CircularReferenceException');
$serializer = new Serializer([$this->normalizer]);
$this->normalizer->setSerializer($serializer);
$this->normalizer->setCircularReferenceLimit(2);
@@ -603,11 +595,9 @@ public function testMaxDepth()
$this->assertEquals($expected, $result);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testThrowUnexpectedValueException()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$this->normalizer->denormalize(['foo' => 'bar'], ObjectTypeHinted::class);
}
@@ -640,24 +630,20 @@ public function testAcceptJsonNumber()
$this->assertSame(10.0, $serializer->denormalize(['number' => 10], JsonNumber::class, 'jsonld')->number);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- * @expectedExceptionMessage The type of the "date" attribute for class "Symfony\Component\Serializer\Tests\Normalizer\ObjectOuter" must be one of "DateTimeInterface" ("string" given).
- */
public function testRejectInvalidType()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
+ $this->expectExceptionMessage('The type of the "date" attribute for class "Symfony\Component\Serializer\Tests\Normalizer\ObjectOuter" must be one of "DateTimeInterface" ("string" given).');
$normalizer = new ObjectNormalizer(null, null, null, new ReflectionExtractor());
$serializer = new Serializer([$normalizer]);
$serializer->denormalize(['date' => 'foo'], ObjectOuter::class);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- * @expectedExceptionMessage The type of the key "a" must be "int" ("string" given).
- */
public function testRejectInvalidKey()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
+ $this->expectExceptionMessage('The type of the key "a" must be "int" ("string" given).');
$extractor = new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]);
$normalizer = new ObjectNormalizer(null, null, null, $extractor);
$serializer = new Serializer([new ArrayDenormalizer(), new DateTimeNormalizer(), $normalizer]);
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
index 5223496d8982..3ed994caaf7f 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
@@ -135,11 +135,9 @@ public function testCallbacks($callbacks, $value, $result, $message)
);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testUncallableCallbacks()
{
+ $this->expectException('InvalidArgumentException');
$this->normalizer->setCallbacks(['bar' => null]);
$obj = new PropertyConstructorDummy('baz', 'quux');
@@ -323,11 +321,9 @@ public function provideCallbacks()
];
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\CircularReferenceException
- */
public function testUnableToNormalizeCircularReference()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\CircularReferenceException');
$serializer = new Serializer([$this->normalizer]);
$this->normalizer->setSerializer($serializer);
$this->normalizer->setCircularReferenceLimit(2);
@@ -382,12 +378,10 @@ public function testDenormalizeShouldIgnoreStaticProperty()
$this->assertEquals('out_of_scope', PropertyDummy::$outOfScope);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\LogicException
- * @expectedExceptionMessage Cannot normalize attribute "bar" because the injected serializer is not a normalizer
- */
public function testUnableToNormalizeObjectAttribute()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\LogicException');
+ $this->expectExceptionMessage('Cannot normalize attribute "bar" because the injected serializer is not a normalizer');
$serializer = $this->getMockBuilder('Symfony\Component\Serializer\SerializerInterface')->getMock();
$this->normalizer->setSerializer($serializer);
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
index 405317d5fb26..03708ab04870 100644
--- a/src/Symfony/Component/Serializer/Tests/SerializerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Serializer\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Serializer\Encoder\JsonEncoder;
use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
use Symfony\Component\Serializer\Normalizer\CustomNormalizer;
@@ -30,6 +31,8 @@
class SerializerTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testInterface()
{
$serializer = new Serializer();
@@ -41,11 +44,9 @@ public function testInterface()
$this->assertInstanceOf('Symfony\Component\Serializer\Encoder\DecoderInterface', $serializer);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testNormalizeNoMatch()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$serializer = new Serializer([$this->getMockBuilder('Symfony\Component\Serializer\Normalizer\CustomNormalizer')->getMock()]);
$serializer->normalize(new \stdClass(), 'xml');
}
@@ -64,29 +65,23 @@ public function testNormalizeGivesPriorityToInterfaceOverTraversable()
$this->assertEquals('{"foo":"normalizedFoo","bar":"normalizedBar"}', $result);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testNormalizeOnDenormalizer()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$serializer = new Serializer([new TestDenormalizer()], []);
$this->assertTrue($serializer->normalize(new \stdClass(), 'json'));
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testDenormalizeNoMatch()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$serializer = new Serializer([$this->getMockBuilder('Symfony\Component\Serializer\Normalizer\CustomNormalizer')->getMock()]);
$serializer->denormalize('foo', 'stdClass');
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testDenormalizeOnNormalizer()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$serializer = new Serializer([new TestNormalizer()], []);
$data = ['title' => 'foo', 'numbers' => [5, 3]];
$this->assertTrue($serializer->denormalize(json_encode($data), 'stdClass', 'json'));
@@ -168,21 +163,17 @@ public function testSerializeArrayOfScalars()
$this->assertEquals(json_encode($data), $result);
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testSerializeNoEncoder()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$serializer = new Serializer([], []);
$data = ['title' => 'foo', 'numbers' => [5, 3]];
$serializer->serialize($data, 'json');
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\LogicException
- */
public function testSerializeNoNormalizer()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\LogicException');
$serializer = new Serializer([], ['json' => new JsonEncoder()]);
$data = ['title' => 'foo', 'numbers' => [5, 3]];
$serializer->serialize(Model::fromArray($data), 'json');
@@ -206,31 +197,25 @@ public function testDeserializeUseCache()
$this->assertEquals($data, $result->toArray());
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\LogicException
- */
public function testDeserializeNoNormalizer()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\LogicException');
$serializer = new Serializer([], ['json' => new JsonEncoder()]);
$data = ['title' => 'foo', 'numbers' => [5, 3]];
$serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testDeserializeWrongNormalizer()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$serializer = new Serializer([new CustomNormalizer()], ['json' => new JsonEncoder()]);
$data = ['title' => 'foo', 'numbers' => [5, 3]];
$serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
}
- /**
- * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
- */
public function testDeserializeNoEncoder()
{
+ $this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$serializer = new Serializer([], []);
$data = ['title' => 'foo', 'numbers' => [5, 3]];
$serializer->deserialize(json_encode($data), '\Symfony\Component\Serializer\Tests\Model', 'json');
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
index 415ab3e9d56b..2fa7f563938b 100644
--- a/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
+++ b/src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Stopwatch\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Stopwatch\StopwatchEvent;
/**
@@ -23,6 +24,8 @@
*/
class StopwatchEventTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
const DELTA = 37;
public function testGetOrigin()
@@ -103,11 +106,9 @@ public function testDurationBeforeStop()
$this->assertEquals(100, $event->getDuration(), '', self::DELTA);
}
- /**
- * @expectedException \LogicException
- */
public function testStopWithoutStart()
{
+ $this->expectException('LogicException');
$event = new StopwatchEvent(microtime(true) * 1000);
$event->stop();
}
@@ -154,11 +155,9 @@ public function testStartTime()
$this->assertEquals(0, $event->getStartTime(), '', self::DELTA);
}
- /**
- * @expectedException \InvalidArgumentException
- */
public function testInvalidOriginThrowsAnException()
{
+ $this->expectException('InvalidArgumentException');
new StopwatchEvent('abc');
}
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php
index d70e803e43d8..6a7ef1582c3d 100644
--- a/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php
+++ b/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php
@@ -93,20 +93,16 @@ public function testStop()
$this->assertEquals(200, $event->getDuration(), '', self::DELTA);
}
- /**
- * @expectedException \LogicException
- */
public function testUnknownEvent()
{
+ $this->expectException('LogicException');
$stopwatch = new Stopwatch();
$stopwatch->getEvent('foo');
}
- /**
- * @expectedException \LogicException
- */
public function testStopWithoutStart()
{
+ $this->expectException('LogicException');
$stopwatch = new Stopwatch();
$stopwatch->stop('foo');
}
@@ -168,11 +164,9 @@ public function testReopenASection()
$this->assertCount(2, $events['__section__']->getPeriods());
}
- /**
- * @expectedException \LogicException
- */
public function testReopenANewSectionShouldThrowAnException()
{
+ $this->expectException('LogicException');
$stopwatch = new Stopwatch();
$stopwatch->openSection('section');
}
diff --git a/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php b/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php
index 3d61ec2716b5..07c3387d46bd 100644
--- a/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php
+++ b/src/Symfony/Component/Templating/Tests/DelegatingEngineTest.php
@@ -12,12 +12,15 @@
namespace Symfony\Component\Templating\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Templating\DelegatingEngine;
use Symfony\Component\Templating\EngineInterface;
use Symfony\Component\Templating\StreamingEngineInterface;
class DelegatingEngineTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testRenderDelegatesToSupportedEngine()
{
$firstEngine = $this->getEngineMock('template.php', false);
@@ -34,12 +37,10 @@ public function testRenderDelegatesToSupportedEngine()
$this->assertSame('', $result);
}
- /**
- * @expectedException \RuntimeException
- * @expectedExceptionMessage No engine is able to work with the template "template.php"
- */
public function testRenderWithNoSupportedEngine()
{
+ $this->expectException('RuntimeException');
+ $this->expectExceptionMessage('No engine is able to work with the template "template.php"');
$firstEngine = $this->getEngineMock('template.php', false);
$secondEngine = $this->getEngineMock('template.php', false);
@@ -61,12 +62,10 @@ public function testStreamDelegatesToSupportedEngine()
$this->assertNull($result);
}
- /**
- * @expectedException \LogicException
- * @expectedExceptionMessage Template "template.php" cannot be streamed as the engine supporting it does not implement StreamingEngineInterface
- */
public function testStreamRequiresStreamingEngine()
{
+ $this->expectException('LogicException');
+ $this->expectExceptionMessage('Template "template.php" cannot be streamed as the engine supporting it does not implement StreamingEngineInterface');
$delegatingEngine = new DelegatingEngine([new TestEngine()]);
$delegatingEngine->stream('template.php', ['foo' => 'bar']);
}
@@ -112,12 +111,10 @@ public function testGetExistingEngine()
$this->assertSame($secondEngine, $delegatingEngine->getEngine('template.php'));
}
- /**
- * @expectedException \RuntimeException
- * @expectedExceptionMessage No engine is able to work with the template "template.php"
- */
public function testGetInvalidEngine()
{
+ $this->expectException('RuntimeException');
+ $this->expectExceptionMessage('No engine is able to work with the template "template.php"');
$firstEngine = $this->getEngineMock('template.php', false);
$secondEngine = $this->getEngineMock('template.php', false);
diff --git a/src/Symfony/Component/Templating/Tests/PhpEngineTest.php b/src/Symfony/Component/Templating/Tests/PhpEngineTest.php
index 6a19c98dcdaf..247f81e17d4f 100644
--- a/src/Symfony/Component/Templating/Tests/PhpEngineTest.php
+++ b/src/Symfony/Component/Templating/Tests/PhpEngineTest.php
@@ -127,11 +127,11 @@ public function testRenderParameter()
}
/**
- * @expectedException \InvalidArgumentException
* @dataProvider forbiddenParameterNames
*/
public function testRenderForbiddenParameter($name)
{
+ $this->expectException('InvalidArgumentException');
$engine = new ProjectTemplateEngine(new TemplateNameParser(), $this->loader);
$this->loader->setTemplate('foo.php', 'bar');
$engine->render('foo.php', [$name => 'foo']);
diff --git a/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationExtractorPassTest.php b/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationExtractorPassTest.php
index a638498b6bde..b9996c8ed3e1 100644
--- a/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationExtractorPassTest.php
+++ b/src/Symfony/Component/Translation/Tests/DependencyInjection/TranslationExtractorPassTest.php
@@ -12,12 +12,15 @@
namespace Symfony\Component\Translation\Tests\DependencyInjection;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\Translation\DependencyInjection\TranslationExtractorPass;
class TranslationExtractorPassTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testProcess()
{
$container = new ContainerBuilder();
@@ -46,12 +49,10 @@ public function testProcessNoDefinitionFound()
$this->assertCount($aliasesBefore, $container->getAliases());
}
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
- * @expectedExceptionMessage The alias for the tag "translation.extractor" of service "foo.id" must be set.
- */
public function testProcessMissingAlias()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('The alias for the tag "translation.extractor" of service "foo.id" must be set.');
$definition = $this->getMockBuilder('Symfony\Component\DependencyInjection\Definition')->disableOriginalConstructor()->getMock();
$container = new ContainerBuilder();
$container->register('translation.extractor');
diff --git a/src/Symfony/Component/Translation/Tests/IntervalTest.php b/src/Symfony/Component/Translation/Tests/IntervalTest.php
index 8da3bb151722..cbeaea4250a5 100644
--- a/src/Symfony/Component/Translation/Tests/IntervalTest.php
+++ b/src/Symfony/Component/Translation/Tests/IntervalTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\Translation\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Translation\Interval;
class IntervalTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
/**
* @dataProvider getTests
*/
@@ -24,11 +27,9 @@ public function testTest($expected, $number, $interval)
$this->assertEquals($expected, Interval::test($number, $interval));
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidArgumentException
- */
public function testTestException()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidArgumentException');
Interval::test(1, 'foobar');
}
diff --git a/src/Symfony/Component/Translation/Tests/Loader/CsvFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/CsvFileLoaderTest.php
index 4fd5752db222..13b76bf35b04 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/CsvFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/CsvFileLoaderTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Translation\Tests\Loader;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Translation\Loader\CsvFileLoader;
class CsvFileLoaderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testLoad()
{
$loader = new CsvFileLoader();
@@ -39,21 +42,17 @@ public function testLoadDoesNothingIfEmpty()
$this->assertEquals([new FileResource($resource)], $catalogue->getResources());
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\NotFoundResourceException
- */
public function testLoadNonExistingResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\NotFoundResourceException');
$loader = new CsvFileLoader();
$resource = __DIR__.'/../fixtures/not-exists.csv';
$loader->load($resource, 'en', 'domain1');
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- */
public function testLoadNonLocalResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$loader = new CsvFileLoader();
$resource = 'http://example.com/resources.csv';
$loader->load($resource, 'en', 'domain1');
diff --git a/src/Symfony/Component/Translation/Tests/Loader/IcuDatFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/IcuDatFileLoaderTest.php
index 601680af8afd..db845a8d82d5 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/IcuDatFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/IcuDatFileLoaderTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Translation\Tests\Loader;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Translation\Loader\IcuDatFileLoader;
@@ -19,11 +20,11 @@
*/
class IcuDatFileLoaderTest extends LocalizedTestCase
{
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- */
+ use ForwardCompatTestTrait;
+
public function testLoadInvalidResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$loader = new IcuDatFileLoader();
$loader->load(__DIR__.'/../fixtures/resourcebundle/corrupted/resources', 'es', 'domain2');
}
@@ -53,11 +54,9 @@ public function testDatFrenchLoad()
$this->assertEquals([new FileResource($resource.'.dat')], $catalogue->getResources());
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\NotFoundResourceException
- */
public function testLoadNonExistingResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\NotFoundResourceException');
$loader = new IcuDatFileLoader();
$loader->load(__DIR__.'/../fixtures/non-existing.txt', 'en', 'domain1');
}
diff --git a/src/Symfony/Component/Translation/Tests/Loader/IcuResFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/IcuResFileLoaderTest.php
index 962c3af2efeb..25d5082747ff 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/IcuResFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/IcuResFileLoaderTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Translation\Tests\Loader;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Config\Resource\DirectoryResource;
use Symfony\Component\Translation\Loader\IcuResFileLoader;
@@ -19,6 +20,8 @@
*/
class IcuResFileLoaderTest extends LocalizedTestCase
{
+ use ForwardCompatTestTrait;
+
public function testLoad()
{
// resource is build using genrb command
@@ -31,20 +34,16 @@ public function testLoad()
$this->assertEquals([new DirectoryResource($resource)], $catalogue->getResources());
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\NotFoundResourceException
- */
public function testLoadNonExistingResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\NotFoundResourceException');
$loader = new IcuResFileLoader();
$loader->load(__DIR__.'/../fixtures/non-existing.txt', 'en', 'domain1');
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- */
public function testLoadInvalidResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$loader = new IcuResFileLoader();
$loader->load(__DIR__.'/../fixtures/resourcebundle/corrupted', 'en', 'domain1');
}
diff --git a/src/Symfony/Component/Translation/Tests/Loader/IniFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/IniFileLoaderTest.php
index e0d8b2f4c4a0..47ffc9b967c8 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/IniFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/IniFileLoaderTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Translation\Tests\Loader;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Translation\Loader\IniFileLoader;
class IniFileLoaderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testLoad()
{
$loader = new IniFileLoader();
@@ -39,11 +42,9 @@ public function testLoadDoesNothingIfEmpty()
$this->assertEquals([new FileResource($resource)], $catalogue->getResources());
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\NotFoundResourceException
- */
public function testLoadNonExistingResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\NotFoundResourceException');
$loader = new IniFileLoader();
$resource = __DIR__.'/../fixtures/non-existing.ini';
$loader->load($resource, 'en', 'domain1');
diff --git a/src/Symfony/Component/Translation/Tests/Loader/JsonFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/JsonFileLoaderTest.php
index 4c507da5abdf..0d452e16dfac 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/JsonFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/JsonFileLoaderTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Translation\Tests\Loader;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Translation\Loader\JsonFileLoader;
class JsonFileLoaderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testLoad()
{
$loader = new JsonFileLoader();
@@ -39,22 +42,18 @@ public function testLoadDoesNothingIfEmpty()
$this->assertEquals([new FileResource($resource)], $catalogue->getResources());
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\NotFoundResourceException
- */
public function testLoadNonExistingResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\NotFoundResourceException');
$loader = new JsonFileLoader();
$resource = __DIR__.'/../fixtures/non-existing.json';
$loader->load($resource, 'en', 'domain1');
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- * @expectedExceptionMessage Error parsing JSON - Syntax error, malformed JSON
- */
public function testParseException()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
+ $this->expectExceptionMessage('Error parsing JSON - Syntax error, malformed JSON');
$loader = new JsonFileLoader();
$resource = __DIR__.'/../fixtures/malformed.json';
$loader->load($resource, 'en', 'domain1');
diff --git a/src/Symfony/Component/Translation/Tests/Loader/MoFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/MoFileLoaderTest.php
index d6adecb1736f..f89584259fa4 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/MoFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/MoFileLoaderTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Translation\Tests\Loader;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Translation\Loader\MoFileLoader;
class MoFileLoaderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testLoad()
{
$loader = new MoFileLoader();
@@ -42,21 +45,17 @@ public function testLoadPlurals()
$this->assertEquals([new FileResource($resource)], $catalogue->getResources());
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\NotFoundResourceException
- */
public function testLoadNonExistingResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\NotFoundResourceException');
$loader = new MoFileLoader();
$resource = __DIR__.'/../fixtures/non-existing.mo';
$loader->load($resource, 'en', 'domain1');
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- */
public function testLoadInvalidResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$loader = new MoFileLoader();
$resource = __DIR__.'/../fixtures/empty.mo';
$loader->load($resource, 'en', 'domain1');
diff --git a/src/Symfony/Component/Translation/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/PhpFileLoaderTest.php
index 68cb2d0b72b5..d6e9712200c2 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/PhpFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/PhpFileLoaderTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Translation\Tests\Loader;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Translation\Loader\PhpFileLoader;
class PhpFileLoaderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testLoad()
{
$loader = new PhpFileLoader();
@@ -28,21 +31,17 @@ public function testLoad()
$this->assertEquals([new FileResource($resource)], $catalogue->getResources());
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\NotFoundResourceException
- */
public function testLoadNonExistingResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\NotFoundResourceException');
$loader = new PhpFileLoader();
$resource = __DIR__.'/../fixtures/non-existing.php';
$loader->load($resource, 'en', 'domain1');
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- */
public function testLoadThrowsAnExceptionIfFileNotLocal()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$loader = new PhpFileLoader();
$resource = 'http://example.com/resources.php';
$loader->load($resource, 'en', 'domain1');
diff --git a/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php
index cb94e90a9408..e55d6db89958 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/PoFileLoaderTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Translation\Tests\Loader;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Translation\Loader\PoFileLoader;
class PoFileLoaderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testLoad()
{
$loader = new PoFileLoader();
@@ -53,11 +56,9 @@ public function testLoadDoesNothingIfEmpty()
$this->assertEquals([new FileResource($resource)], $catalogue->getResources());
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\NotFoundResourceException
- */
public function testLoadNonExistingResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\NotFoundResourceException');
$loader = new PoFileLoader();
$resource = __DIR__.'/../fixtures/non-existing.po';
$loader->load($resource, 'en', 'domain1');
diff --git a/src/Symfony/Component/Translation/Tests/Loader/QtFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/QtFileLoaderTest.php
index 6083b68f7a0d..6e87b12d422f 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/QtFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/QtFileLoaderTest.php
@@ -31,31 +31,25 @@ public function testLoad()
$this->assertEquals([new FileResource($resource)], $catalogue->getResources());
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\NotFoundResourceException
- */
public function testLoadNonExistingResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\NotFoundResourceException');
$loader = new QtFileLoader();
$resource = __DIR__.'/../fixtures/non-existing.ts';
$loader->load($resource, 'en', 'domain1');
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- */
public function testLoadNonLocalResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$loader = new QtFileLoader();
$resource = 'http://domain1.com/resources.ts';
$loader->load($resource, 'en', 'domain1');
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- */
public function testLoadInvalidResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$loader = new QtFileLoader();
$resource = __DIR__.'/../fixtures/invalid-xml-resources.xlf';
$loader->load($resource, 'en', 'domain1');
diff --git a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
index af46c02d7693..118fc4ea2af9 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
@@ -99,50 +99,40 @@ public function testTargetAttributesAreStoredCorrectly()
$this->assertEquals('translated', $metadata['target-attributes']['state']);
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- */
public function testLoadInvalidResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$loader = new XliffFileLoader();
$loader->load(__DIR__.'/../fixtures/resources.php', 'en', 'domain1');
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- */
public function testLoadResourceDoesNotValidate()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$loader = new XliffFileLoader();
$loader->load(__DIR__.'/../fixtures/non-valid.xlf', 'en', 'domain1');
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\NotFoundResourceException
- */
public function testLoadNonExistingResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\NotFoundResourceException');
$loader = new XliffFileLoader();
$resource = __DIR__.'/../fixtures/non-existing.xlf';
$loader->load($resource, 'en', 'domain1');
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- */
public function testLoadThrowsAnExceptionIfFileNotLocal()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$loader = new XliffFileLoader();
$resource = 'http://example.com/resources.xlf';
$loader->load($resource, 'en', 'domain1');
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- * @expectedExceptionMessage Document types are not allowed.
- */
public function testDocTypeIsNotAllowed()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
+ $this->expectExceptionMessage('Document types are not allowed.');
$loader = new XliffFileLoader();
$loader->load(__DIR__.'/../fixtures/withdoctype.xlf', 'en', 'domain1');
}
diff --git a/src/Symfony/Component/Translation/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Translation/Tests/Loader/YamlFileLoaderTest.php
index a535db56fc0e..d05d65d03079 100644
--- a/src/Symfony/Component/Translation/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/Translation/Tests/Loader/YamlFileLoaderTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Translation\Tests\Loader;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Translation\Loader\YamlFileLoader;
class YamlFileLoaderTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testLoad()
{
$loader = new YamlFileLoader();
@@ -39,31 +42,25 @@ public function testLoadDoesNothingIfEmpty()
$this->assertEquals([new FileResource($resource)], $catalogue->getResources());
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\NotFoundResourceException
- */
public function testLoadNonExistingResource()
{
+ $this->expectException('Symfony\Component\Translation\Exception\NotFoundResourceException');
$loader = new YamlFileLoader();
$resource = __DIR__.'/../fixtures/non-existing.yml';
$loader->load($resource, 'en', 'domain1');
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- */
public function testLoadThrowsAnExceptionIfFileNotLocal()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$loader = new YamlFileLoader();
$resource = 'http://example.com/resources.yml';
$loader->load($resource, 'en', 'domain1');
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\InvalidResourceException
- */
public function testLoadThrowsAnExceptionIfNotAnArray()
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$loader = new YamlFileLoader();
$resource = __DIR__.'/../fixtures/non-valid.yml';
$loader->load($resource, 'en', 'domain1');
diff --git a/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php b/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
index 0f9c8d684e3b..4b10620733f5 100644
--- a/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
+++ b/src/Symfony/Component/Translation/Tests/MessageCatalogueTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\Translation\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Translation\MessageCatalogue;
class MessageCatalogueTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testGetLocale()
{
$catalogue = new MessageCatalogue('en');
@@ -132,11 +135,9 @@ public function testAddFallbackCatalogue()
$this->assertEquals([$r, $r1, $r2], $catalogue->getResources());
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\LogicException
- */
public function testAddFallbackCatalogueWithParentCircularReference()
{
+ $this->expectException('Symfony\Component\Translation\Exception\LogicException');
$main = new MessageCatalogue('en_US');
$fallback = new MessageCatalogue('fr_FR');
@@ -144,11 +145,9 @@ public function testAddFallbackCatalogueWithParentCircularReference()
$main->addFallbackCatalogue($fallback);
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\LogicException
- */
public function testAddFallbackCatalogueWithFallbackCircularReference()
{
+ $this->expectException('Symfony\Component\Translation\Exception\LogicException');
$fr = new MessageCatalogue('fr');
$en = new MessageCatalogue('en');
$es = new MessageCatalogue('es');
@@ -158,11 +157,9 @@ public function testAddFallbackCatalogueWithFallbackCircularReference()
$en->addFallbackCatalogue($fr);
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\LogicException
- */
public function testAddCatalogueWhenLocaleIsNotTheSameAsTheCurrentOne()
{
+ $this->expectException('Symfony\Component\Translation\Exception\LogicException');
$catalogue = new MessageCatalogue('en');
$catalogue->addCatalogue(new MessageCatalogue('fr', []));
}
diff --git a/src/Symfony/Component/Translation/Tests/MessageSelectorTest.php b/src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
index a887411eed45..71dcc6169a43 100644
--- a/src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
+++ b/src/Symfony/Component/Translation/Tests/MessageSelectorTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\Translation\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Translation\MessageSelector;
class MessageSelectorTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
/**
* @dataProvider getChooseTests
*/
@@ -35,10 +38,10 @@ public function testReturnMessageIfExactlyOneStandardRuleIsGiven()
/**
* @dataProvider getNonMatchingMessages
- * @expectedException \Symfony\Component\Translation\Exception\InvalidArgumentException
*/
public function testThrowExceptionIfMatchingMessageCannotBeFound($id, $number)
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidArgumentException');
$selector = new MessageSelector();
$selector->choose($id, $number, 'en');
diff --git a/src/Symfony/Component/Translation/Tests/TranslatorTest.php b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
index ab6dc5b8d4d4..6d6a946c1449 100644
--- a/src/Symfony/Component/Translation/Tests/TranslatorTest.php
+++ b/src/Symfony/Component/Translation/Tests/TranslatorTest.php
@@ -12,18 +12,21 @@
namespace Symfony\Component\Translation\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Translation\Loader\ArrayLoader;
use Symfony\Component\Translation\MessageCatalogue;
use Symfony\Component\Translation\Translator;
class TranslatorTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
/**
- * @dataProvider getInvalidLocalesTests
- * @expectedException \Symfony\Component\Translation\Exception\InvalidArgumentException
+ * @dataProvider getInvalidLocalesTests
*/
public function testConstructorInvalidLocale($locale)
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidArgumentException');
new Translator($locale);
}
@@ -55,11 +58,11 @@ public function testSetGetLocale()
}
/**
- * @dataProvider getInvalidLocalesTests
- * @expectedException \Symfony\Component\Translation\Exception\InvalidArgumentException
+ * @dataProvider getInvalidLocalesTests
*/
public function testSetInvalidLocale($locale)
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidArgumentException');
$translator = new Translator('fr');
$translator->setLocale($locale);
}
@@ -138,11 +141,11 @@ public function testSetFallbackLocalesMultiple()
}
/**
- * @dataProvider getInvalidLocalesTests
- * @expectedException \Symfony\Component\Translation\Exception\InvalidArgumentException
+ * @dataProvider getInvalidLocalesTests
*/
public function testSetFallbackInvalidLocales($locale)
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidArgumentException');
$translator = new Translator('fr');
$translator->setFallbackLocales(['fr', $locale]);
}
@@ -170,11 +173,11 @@ public function testTransWithFallbackLocale()
}
/**
- * @dataProvider getInvalidLocalesTests
- * @expectedException \Symfony\Component\Translation\Exception\InvalidArgumentException
+ * @dataProvider getInvalidLocalesTests
*/
public function testAddResourceInvalidLocales($locale)
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidArgumentException');
$translator = new Translator('fr');
$translator->addResource('array', ['foo' => 'foofoo'], $locale);
}
@@ -205,11 +208,11 @@ public function testAddResourceAfterTrans()
}
/**
- * @dataProvider getTransFileTests
- * @expectedException \Symfony\Component\Translation\Exception\NotFoundResourceException
+ * @dataProvider getTransFileTests
*/
public function testTransWithoutFallbackLocaleFile($format, $loader)
{
+ $this->expectException('Symfony\Component\Translation\Exception\NotFoundResourceException');
$loaderClass = 'Symfony\\Component\\Translation\\Loader\\'.$loader;
$translator = new Translator('en');
$translator->addLoader($format, new $loaderClass());
@@ -264,11 +267,9 @@ public function testTransNonExistentWithFallback()
$this->assertEquals('non-existent', $translator->trans('non-existent'));
}
- /**
- * @expectedException \Symfony\Component\Translation\Exception\RuntimeException
- */
public function testWhenAResourceHasNoRegisteredLoader()
{
+ $this->expectException('Symfony\Component\Translation\Exception\RuntimeException');
$translator = new Translator('en');
$translator->addResource('array', ['foo' => 'foofoo'], 'en');
@@ -318,11 +319,11 @@ public function testTrans($expected, $id, $translation, $parameters, $locale, $d
}
/**
- * @dataProvider getInvalidLocalesTests
- * @expectedException \Symfony\Component\Translation\Exception\InvalidArgumentException
+ * @dataProvider getInvalidLocalesTests
*/
public function testTransInvalidLocale($locale)
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidArgumentException');
$translator = new Translator('en');
$translator->addLoader('array', new ArrayLoader());
$translator->addResource('array', ['foo' => 'foofoo'], 'en');
@@ -331,7 +332,7 @@ public function testTransInvalidLocale($locale)
}
/**
- * @dataProvider getValidLocalesTests
+ * @dataProvider getValidLocalesTests
*/
public function testTransValidLocale($locale)
{
@@ -368,11 +369,11 @@ public function testTransChoice($expected, $id, $translation, $number, $paramete
}
/**
- * @dataProvider getInvalidLocalesTests
- * @expectedException \Symfony\Component\Translation\Exception\InvalidArgumentException
+ * @dataProvider getInvalidLocalesTests
*/
public function testTransChoiceInvalidLocale($locale)
{
+ $this->expectException('Symfony\Component\Translation\Exception\InvalidArgumentException');
$translator = new Translator('en');
$translator->addLoader('array', new ArrayLoader());
$translator->addResource('array', ['foo' => 'foofoo'], 'en');
@@ -381,7 +382,7 @@ public function testTransChoiceInvalidLocale($locale)
}
/**
- * @dataProvider getValidLocalesTests
+ * @dataProvider getValidLocalesTests
*/
public function testTransChoiceValidLocale($locale)
{
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintTest.php b/src/Symfony/Component/Validator/Tests/ConstraintTest.php
index cc36eaac8c64..9ebcd4e84c98 100644
--- a/src/Symfony/Component/Validator/Tests/ConstraintTest.php
+++ b/src/Symfony/Component/Validator/Tests/ConstraintTest.php
@@ -207,11 +207,9 @@ public function testSerializeKeepsCustomGroups()
$this->assertSame(['MyGroup'], $constraint->groups);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\InvalidArgumentException
- */
public function testGetErrorNameForUnknownCode()
{
+ $this->expectException('Symfony\Component\Validator\Exception\InvalidArgumentException');
Constraint::getErrorName(1);
}
@@ -226,12 +224,10 @@ public function testOptionsAsDefaultOption()
$this->assertEquals($options, $constraint->property2);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\InvalidOptionsException
- * @expectedExceptionMessage The options "0", "5" do not exist in constraint "Symfony\Component\Validator\Tests\Fixtures\ConstraintA".
- */
public function testInvalidOptions()
{
+ $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');
+ $this->expectExceptionMessage('The options "0", "5" do not exist in constraint "Symfony\Component\Validator\Tests\Fixtures\ConstraintA".');
new ConstraintA(['property2' => 'foo', 'bar', 5 => 'baz']);
}
@@ -246,12 +242,10 @@ public function testOptionsWithInvalidInternalPointer()
$this->assertEquals('foo', $constraint->property1);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- * @expectedExceptionMessage No default option is configured for constraint "Symfony\Component\Validator\Tests\Fixtures\ConstraintB".
- */
public function testAnnotationSetUndefinedDefaultOption()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+ $this->expectExceptionMessage('No default option is configured for constraint "Symfony\Component\Validator\Tests\Fixtures\ConstraintB".');
new ConstraintB(['value' => 1]);
}
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php b/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
index b2f30e7ad1c5..aefb874fe415 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/AbstractComparisonValidatorTestCase.php
@@ -84,20 +84,18 @@ public function provideInvalidConstraintOptions()
/**
* @dataProvider provideInvalidConstraintOptions
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- * @expectedExceptionMessage requires either the "value" or "propertyPath" option to be set.
*/
public function testThrowsConstraintExceptionIfNoValueOrPropertyPath($options)
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+ $this->expectExceptionMessage('requires either the "value" or "propertyPath" option to be set.');
$this->createConstraint($options);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- * @expectedExceptionMessage requires only one of the "value" or "propertyPath" options to be set, not both.
- */
public function testThrowsConstraintExceptionIfBothValueAndPropertyPath()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
+ $this->expectExceptionMessage('requires only one of the "value" or "propertyPath" options to be set, not both.');
$this->createConstraint(([
'value' => 'value',
'propertyPath' => 'propertyPath',
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/AllTest.php b/src/Symfony/Component/Validator/Tests/Constraints/AllTest.php
index cdd72a22ebc5..450248a6b336 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/AllTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/AllTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\All;
use Symfony\Component\Validator\Constraints\Valid;
@@ -20,21 +21,19 @@
*/
class AllTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
+ use ForwardCompatTestTrait;
+
public function testRejectNonConstraints()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new All([
'foo',
]);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testRejectValidConstraint()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new All([
new Valid(),
]);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php
index 1752f47e700a..09d756d46586 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/AllValidatorTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\All;
use Symfony\Component\Validator\Constraints\AllValidator;
use Symfony\Component\Validator\Constraints\NotNull;
@@ -19,6 +20,8 @@
class AllValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new AllValidator();
@@ -31,11 +34,9 @@ public function testNullIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testThrowsExceptionIfNotTraversable()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate('foo.barbar', new All(new Range(['min' => 4])));
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
index 1c771c2c13aa..61b72e03aab5 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CallbackValidatorTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Constraints\Callback;
use Symfony\Component\Validator\Constraints\CallbackValidator;
@@ -46,6 +47,8 @@ public static function validateStatic($object, ExecutionContextInterface $contex
class CallbackValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new CallbackValidator();
@@ -180,21 +183,17 @@ public function testArrayCallableExplicitName()
->assertRaised();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testExpectValidMethods()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$object = new CallbackValidatorTest_Object();
$this->validator->validate($object, new Callback(['callback' => ['foobar']]));
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testExpectValidCallbacks()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$object = new CallbackValidatorTest_Object();
$this->validator->validate($object, new Callback(['callback' => ['foo', 'bar']]));
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
index e83cb8997745..9aeff71cf8e5 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/ChoiceValidatorTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Choice;
use Symfony\Component\Validator\Constraints\ChoiceValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
@@ -22,6 +23,8 @@ function choice_callback()
class ChoiceValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new ChoiceValidator();
@@ -37,11 +40,9 @@ public function objectMethodCallback()
return ['foo', 'bar'];
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectArrayIfMultipleIsTrue()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$constraint = new Choice([
'choices' => ['foo', 'bar'],
'multiple' => true,
@@ -64,19 +65,15 @@ public function testNullIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testChoicesOrCallbackExpected()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$this->validator->validate('foobar', new Choice(['strict' => true]));
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testValidCallbackExpected()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$this->validator->validate('foobar', new Choice(['callback' => 'abcd', 'strict' => true]));
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php
index fec935082afe..477e8b38440f 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Collection;
use Symfony\Component\Validator\Constraints\Email;
use Symfony\Component\Validator\Constraints\Optional;
@@ -23,51 +24,43 @@
*/
class CollectionTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
+ use ForwardCompatTestTrait;
+
public function testRejectInvalidFieldsOption()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new Collection([
'fields' => 'foo',
]);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testRejectNonConstraints()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new Collection([
'foo' => 'bar',
]);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testRejectValidConstraint()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new Collection([
'foo' => new Valid(),
]);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testRejectValidConstraintWithinOptional()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new Collection([
'foo' => new Optional(new Valid()),
]);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testRejectValidConstraintWithinRequired()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new Collection([
'foo' => new Required(new Valid()),
]);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
index fa2ee0985ef1..417949533dfc 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CollectionValidatorTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Collection;
use Symfony\Component\Validator\Constraints\CollectionValidator;
use Symfony\Component\Validator\Constraints\NotNull;
@@ -21,6 +22,8 @@
abstract class CollectionValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new CollectionValidator();
@@ -52,11 +55,9 @@ public function testFieldsAsDefaultOption()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testThrowsExceptionIfNotTraversable()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate('foobar', new Collection(['fields' => [
'foo' => new Range(['min' => 4]),
]]));
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php
index 3070e6a22f33..4e6c8917006c 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Composite;
use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Constraints\NotNull;
@@ -37,6 +38,8 @@ public function getDefaultOption()
*/
class CompositeTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testMergeNestedGroupsIfNoExplicitParentGroup()
{
$constraint = new ConcreteComposite([
@@ -79,11 +82,9 @@ public function testExplicitNestedGroupsMustBeSubsetOfExplicitParentGroups()
$this->assertEquals(['Strict'], $constraint->constraints[1]->groups);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testFailIfExplicitNestedGroupsNotSubsetOfExplicitParentGroups()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new ConcreteComposite([
'constraints' => [
new NotNull(['groups' => ['Default', 'Foobar']]),
@@ -114,33 +115,27 @@ public function testSingleConstraintsAccepted()
$this->assertEquals([$nestedConstraint], $constraint->constraints);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testFailIfNoConstraint()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new ConcreteComposite([
new NotNull(['groups' => 'Default']),
'NotBlank',
]);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testFailIfNoConstraintObject()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new ConcreteComposite([
new NotNull(['groups' => 'Default']),
new \ArrayObject(),
]);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testValidCantBeNested()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new ConcreteComposite([
new Valid(),
]);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php
index 01e23cc3b92c..ac845aa5478d 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CountValidatorTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Count;
use Symfony\Component\Validator\Constraints\CountValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
@@ -20,6 +21,8 @@
*/
abstract class CountValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new CountValidator();
@@ -34,11 +37,9 @@ public function testNullIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsCountableType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new Count(5));
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php
index 23c528363000..6b12d6362914 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Intl\Util\IntlTestHelper;
use Symfony\Component\Validator\Constraints\Country;
use Symfony\Component\Validator\Constraints\CountryValidator;
@@ -18,6 +19,8 @@
class CountryValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new CountryValidator();
@@ -37,11 +40,9 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new Country());
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
index c699f851f26f..fec42407af12 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Intl\Util\IntlTestHelper;
use Symfony\Component\Validator\Constraints\Currency;
use Symfony\Component\Validator\Constraints\CurrencyValidator;
@@ -18,6 +19,8 @@
class CurrencyValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new CurrencyValidator();
@@ -37,11 +40,9 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new Currency());
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
index 6a8fa15b4203..e1fa819f42cb 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/DateTimeValidatorTest.php
@@ -11,12 +11,15 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\DateTime;
use Symfony\Component\Validator\Constraints\DateTimeValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
class DateTimeValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new DateTimeValidator();
@@ -50,11 +53,9 @@ public function testDateTimeImmutableClassIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new DateTime());
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
index 0e0114f0ae65..7956d3836387 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/DateValidatorTest.php
@@ -11,12 +11,15 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Date;
use Symfony\Component\Validator\Constraints\DateValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
class DateValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new DateValidator();
@@ -50,11 +53,9 @@ public function testDateTimeImmutableClassIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new Date());
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
index 60cf10e4cac8..ef873d801e36 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
use Symfony\Bridge\PhpUnit\DnsMock;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Email;
use Symfony\Component\Validator\Constraints\EmailValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
@@ -21,6 +22,8 @@
*/
class EmailValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new EmailValidator(false);
@@ -40,11 +43,9 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new Email());
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileTest.php
index e0b6ec8f41f5..39e375b5e5e1 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileTest.php
@@ -12,11 +12,14 @@
namespace Symfony\Component\Validator\Tests\Constraints;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\File;
use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
class FileTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
/**
* @dataProvider provideValidSizes
*/
@@ -52,10 +55,10 @@ public function testMaxSizeCanBeSetAfterInitialization($maxSize, $bytes, $binary
/**
* @dataProvider provideInvalidSizes
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
*/
public function testInvalidValueForMaxSizeThrowsExceptionAfterInitialization($maxSize)
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$file = new File(['maxSize' => 1000]);
$file->maxSize = $maxSize;
}
@@ -77,10 +80,10 @@ public function testMaxSizeCannotBeSetToInvalidValueAfterInitialization($maxSize
/**
* @dataProvider provideInValidSizes
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
*/
public function testInvalidMaxSize($maxSize)
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new File(['maxSize' => $maxSize]);
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
index 4d447eb25dca..0d250be1d2f3 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/FileValidatorTest.php
@@ -69,11 +69,9 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleTypeOrFile()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new File());
}
@@ -225,11 +223,9 @@ public function testMaxSizeNotExceeded($bytesWritten, $limit)
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testInvalidMaxSize()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$constraint = new File([
'maxSize' => '1abc',
]);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
index 22bb93bd0931..461ef5e628f6 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
@@ -203,11 +203,9 @@ public function testPixelsTooMany()
->assertRaised();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testInvalidMinWidth()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$constraint = new Image([
'minWidth' => '1abc',
]);
@@ -215,11 +213,9 @@ public function testInvalidMinWidth()
$this->validator->validate($this->image, $constraint);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testInvalidMaxWidth()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$constraint = new Image([
'maxWidth' => '1abc',
]);
@@ -227,11 +223,9 @@ public function testInvalidMaxWidth()
$this->validator->validate($this->image, $constraint);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testInvalidMinHeight()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$constraint = new Image([
'minHeight' => '1abc',
]);
@@ -239,11 +233,9 @@ public function testInvalidMinHeight()
$this->validator->validate($this->image, $constraint);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testInvalidMaxHeight()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$constraint = new Image([
'maxHeight' => '1abc',
]);
@@ -251,11 +243,9 @@ public function testInvalidMaxHeight()
$this->validator->validate($this->image, $constraint);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testInvalidMinPixels()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$constraint = new Image([
'minPixels' => '1abc',
]);
@@ -263,11 +253,9 @@ public function testInvalidMinPixels()
$this->validator->validate($this->image, $constraint);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testInvalidMaxPixels()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$constraint = new Image([
'maxPixels' => '1abc',
]);
@@ -318,11 +306,9 @@ public function testMaxRatioUsesTwoDecimalsOnly()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testInvalidMinRatio()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$constraint = new Image([
'minRatio' => '1abc',
]);
@@ -330,11 +316,9 @@ public function testInvalidMinRatio()
$this->validator->validate($this->image, $constraint);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testInvalidMaxRatio()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$constraint = new Image([
'maxRatio' => '1abc',
]);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
index 1ee44e7c518d..14d88afd55c6 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
@@ -11,12 +11,15 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Ip;
use Symfony\Component\Validator\Constraints\IpValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
class IpValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new IpValidator();
@@ -36,19 +39,15 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new Ip());
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testInvalidValidatorVersion()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new Ip([
'version' => 666,
]);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
index 3c17fd403ad0..ec8715ed7dd1 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Isbn;
use Symfony\Component\Validator\Constraints\IsbnValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
@@ -20,6 +21,8 @@
*/
class IsbnValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new IsbnValidator();
@@ -136,11 +139,9 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$constraint = new Isbn(true);
$this->validator->validate(new \stdClass(), $constraint);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
index c9ca7ade8877..ecdc0a2e4fbc 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Issn;
use Symfony\Component\Validator\Constraints\IssnValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
@@ -20,6 +21,8 @@
*/
class IssnValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new IssnValidator();
@@ -106,11 +109,9 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$constraint = new Issn();
$this->validator->validate(new \stdClass(), $constraint);
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php
index 247301df2e16..02970ff5fc71 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LanguageValidatorTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Intl\Util\IntlTestHelper;
use Symfony\Component\Validator\Constraints\Language;
use Symfony\Component\Validator\Constraints\LanguageValidator;
@@ -18,6 +19,8 @@
class LanguageValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new LanguageValidator();
@@ -37,11 +40,9 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new Language());
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
index f1daee534aa3..31f63c02e571 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LengthValidatorTest.php
@@ -11,12 +11,15 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Length;
use Symfony\Component\Validator\Constraints\LengthValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
class LengthValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new LengthValidator();
@@ -36,11 +39,9 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new Length(5));
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php
index 3d5123116534..98569092230b 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php
@@ -11,12 +11,15 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Locale;
use Symfony\Component\Validator\Constraints\LocaleValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
class LocaleValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new LocaleValidator();
@@ -36,11 +39,9 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new Locale());
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php
index 02aae3adbc31..0afb0358734a 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php
@@ -11,12 +11,15 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Luhn;
use Symfony\Component\Validator\Constraints\LuhnValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
class LuhnValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new LuhnValidator();
@@ -99,11 +102,11 @@ public function getInvalidNumbers()
}
/**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
* @dataProvider getInvalidTypes
*/
public function testInvalidTypes($number)
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$constraint = new Luhn();
$this->validator->validate($number, $constraint);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
index 55e739b03688..31f0432537f6 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/RegexValidatorTest.php
@@ -11,12 +11,15 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Regex;
use Symfony\Component\Validator\Constraints\RegexValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
class RegexValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new RegexValidator();
@@ -36,11 +39,9 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new Regex(['pattern' => '/^[0-9]+$/']));
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
index fe22e9673b7c..6f3ed9db5c3f 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/TimeValidatorTest.php
@@ -11,12 +11,15 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Time;
use Symfony\Component\Validator\Constraints\TimeValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
class TimeValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new TimeValidator();
@@ -43,11 +46,9 @@ public function testDateTimeClassIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new Time());
}
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
index bd1c9a3e09f9..d35623091c18 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
use Symfony\Bridge\PhpUnit\DnsMock;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Url;
use Symfony\Component\Validator\Constraints\UrlValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
@@ -21,6 +22,8 @@
*/
class UrlValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new UrlValidator();
@@ -47,11 +50,9 @@ public function testEmptyStringFromObjectIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new Url());
}
@@ -281,11 +282,11 @@ public function testCheckDnsWithBoolean()
}
/**
- * @expectedException \Symfony\Component\Validator\Exception\InvalidOptionsException
* @requires function Symfony\Bridge\PhpUnit\DnsMock::withMockedHosts
*/
public function testCheckDnsWithInvalidType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\InvalidOptionsException');
DnsMock::withMockedHosts(['example.com' => [['type' => 'A']]]);
$constraint = new Url([
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
index 6c379b9430fb..d3ca7c214223 100644
--- a/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Constraints/UuidValidatorTest.php
@@ -11,6 +11,7 @@
namespace Symfony\Component\Validator\Tests\Constraints;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Uuid;
use Symfony\Component\Validator\Constraints\UuidValidator;
use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
@@ -20,6 +21,8 @@
*/
class UuidValidatorTest extends ConstraintValidatorTestCase
{
+ use ForwardCompatTestTrait;
+
protected function createValidator()
{
return new UuidValidator();
@@ -39,21 +42,17 @@ public function testEmptyStringIsValid()
$this->assertNoViolation();
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsUuidConstraintCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$constraint = $this->getMockForAbstractClass('Symfony\\Component\\Validator\\Constraint');
$this->validator->validate('216fff40-98d9-11e3-a5e2-0800200c9a66', $constraint);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\UnexpectedTypeException
- */
public function testExpectsStringCompatibleType()
{
+ $this->expectException('Symfony\Component\Validator\Exception\UnexpectedTypeException');
$this->validator->validate(new \stdClass(), new Uuid());
}
diff --git a/src/Symfony/Component/Validator/Tests/ContainerConstraintValidatorFactoryTest.php b/src/Symfony/Component/Validator/Tests/ContainerConstraintValidatorFactoryTest.php
index 5178bc3b3060..41b0fa8eaad9 100644
--- a/src/Symfony/Component/Validator/Tests/ContainerConstraintValidatorFactoryTest.php
+++ b/src/Symfony/Component/Validator/Tests/ContainerConstraintValidatorFactoryTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Validator\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Constraints\Blank as BlankConstraint;
@@ -20,6 +21,8 @@
class ContainerConstraintValidatorFactoryTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testGetInstanceCreatesValidator()
{
$factory = new ContainerConstraintValidatorFactory(new Container());
@@ -45,11 +48,9 @@ public function testGetInstanceReturnsService()
$this->assertSame($validator, $factory->getInstance(new DummyConstraint()));
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ValidatorException
- */
public function testGetInstanceInvalidValidatorClass()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
$constraint = $this->getMockBuilder(Constraint::class)->getMock();
$constraint
->expects($this->once())
diff --git a/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php b/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
index c3224840bb2d..48943a3fb265 100644
--- a/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
+++ b/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Validator\Tests\DependencyInjection;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
@@ -21,6 +22,8 @@
class AddConstraintValidatorsPassTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testThatConstraintValidatorServicesAreProcessed()
{
$container = new ContainerBuilder();
@@ -43,12 +46,10 @@ public function testThatConstraintValidatorServicesAreProcessed()
$this->assertEquals($expected, $container->getDefinition((string) $validatorFactory->getArgument(0)));
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The service "my_abstract_constraint_validator" tagged "validator.constraint_validator" must not be abstract.
- */
public function testAbstractConstraintValidator()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The service "my_abstract_constraint_validator" tagged "validator.constraint_validator" must not be abstract.');
$container = new ContainerBuilder();
$container->register('validator.validator_factory')
->addArgument([]);
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
index bb1c2fed0cef..e8929d9f81c5 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
@@ -253,47 +253,37 @@ public function testGroupSequencesWorkIfContainingDefaultGroup()
$this->assertInstanceOf('Symfony\Component\Validator\Constraints\GroupSequence', $this->metadata->getGroupSequence());
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\GroupDefinitionException
- */
public function testGroupSequencesFailIfNotContainingDefaultGroup()
{
+ $this->expectException('Symfony\Component\Validator\Exception\GroupDefinitionException');
$this->metadata->setGroupSequence(['Foo', 'Bar']);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\GroupDefinitionException
- */
public function testGroupSequencesFailIfContainingDefault()
{
+ $this->expectException('Symfony\Component\Validator\Exception\GroupDefinitionException');
$this->metadata->setGroupSequence(['Foo', $this->metadata->getDefaultGroup(), Constraint::DEFAULT_GROUP]);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\GroupDefinitionException
- */
public function testGroupSequenceFailsIfGroupSequenceProviderIsSet()
{
+ $this->expectException('Symfony\Component\Validator\Exception\GroupDefinitionException');
$metadata = new ClassMetadata(self::PROVIDERCLASS);
$metadata->setGroupSequenceProvider(true);
$metadata->setGroupSequence(['GroupSequenceProviderEntity', 'Foo']);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\GroupDefinitionException
- */
public function testGroupSequenceProviderFailsIfGroupSequenceIsSet()
{
+ $this->expectException('Symfony\Component\Validator\Exception\GroupDefinitionException');
$metadata = new ClassMetadata(self::PROVIDERCLASS);
$metadata->setGroupSequence(['GroupSequenceProviderEntity', 'Foo']);
$metadata->setGroupSequenceProvider(true);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\GroupDefinitionException
- */
public function testGroupSequenceProviderFailsIfDomainClassIsInvalid()
{
+ $this->expectException('Symfony\Component\Validator\Exception\GroupDefinitionException');
$metadata = new ClassMetadata('stdClass');
$metadata->setGroupSequenceProvider(true);
}
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Factory/BlackHoleMetadataFactoryTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Factory/BlackHoleMetadataFactoryTest.php
index a323567d2316..9b844a28990e 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Factory/BlackHoleMetadataFactoryTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Factory/BlackHoleMetadataFactoryTest.php
@@ -12,15 +12,16 @@
namespace Symfony\Component\Validator\Tests\Mapping\Factory;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Mapping\Factory\BlackHoleMetadataFactory;
class BlackHoleMetadataFactoryTest extends TestCase
{
- /**
- * @expectedException \LogicException
- */
+ use ForwardCompatTestTrait;
+
public function testGetMetadataForThrowsALogicException()
{
+ $this->expectException('LogicException');
$metadataFactory = new BlackHoleMetadataFactory();
$metadataFactory->getMetadataFor('foo');
}
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
index 9ad85e3f904f..a1f66ce4ce66 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Validator\Tests\Mapping\Factory;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Validator\Constraints\Callback;
use Symfony\Component\Validator\Mapping\ClassMetadata;
use Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory;
@@ -20,6 +21,8 @@
class LazyLoadingMetadataFactoryTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
const CLASS_NAME = 'Symfony\Component\Validator\Tests\Fixtures\Entity';
const PARENT_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityParent';
const INTERFACE_A_CLASS = 'Symfony\Component\Validator\Tests\Fixtures\EntityInterfaceA';
@@ -149,11 +152,9 @@ public function testReadMetadataFromCache()
$this->assertEquals($metadata, $factory->getMetadataFor(self::PARENT_CLASS));
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\NoSuchMetadataException
- */
public function testNonClassNameStringValues()
{
+ $this->expectException('Symfony\Component\Validator\Exception\NoSuchMetadataException');
$testedValue = 'error@example.com';
$loader = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
$cache = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Cache\CacheInterface')->getMock();
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/GetterMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/GetterMetadataTest.php
index fd62ea80f283..7c78a0bb7243 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/GetterMetadataTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/GetterMetadataTest.php
@@ -64,12 +64,10 @@ public function testGetPropertyValueFromHasser()
$this->assertEquals('permissions', $metadata->getPropertyValue($entity));
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ValidatorException
- * @expectedExceptionMessage The hasLastName() method does not exist in class Symfony\Component\Validator\Tests\Fixtures\Entity.
- */
public function testUndefinedMethodNameThrowsException()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ValidatorException');
+ $this->expectExceptionMessage('The hasLastName() method does not exist in class Symfony\Component\Validator\Tests\Fixtures\Entity.');
new GetterMetadata(self::CLASSNAME, 'lastName', 'hasLastName');
}
}
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
index 158bebdbc779..d30a83d8b846 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -43,10 +43,10 @@ public function testLoadClassMetadataReturnsFalseIfEmpty()
/**
* @dataProvider provideInvalidYamlFiles
- * @expectedException \InvalidArgumentException
*/
public function testInvalidYamlFiles($path)
{
+ $this->expectException('InvalidArgumentException');
$loader = new YamlFileLoader(__DIR__.'/'.$path);
$metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
diff --git a/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php b/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php
index a2525311c56a..85b81ebe52c8 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/AbstractTest.php
@@ -414,11 +414,9 @@ public function testTraversalDisabledOnClass()
$this->assertCount(0, $violations);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
- */
public function testExpectTraversableIfTraversalEnabledOnClass()
{
+ $this->expectException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$entity = new Entity();
$this->metadata->addConstraint(new Traverse(true));
@@ -572,11 +570,9 @@ public function testNoDuplicateValidationIfPropertyConstraintInMultipleGroups()
$this->assertCount(1, $violations);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\RuntimeException
- */
public function testValidateFailsIfNoConstraintsAndNoObjectOrArray()
{
+ $this->expectException('Symfony\Component\Validator\Exception\RuntimeException');
$this->validate('Foobar');
}
diff --git a/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php
index e07a158fa253..9d345b763ae7 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/AbstractValidatorTest.php
@@ -502,11 +502,9 @@ public function testsIgnoreNullReference()
$this->assertCount(0, $violations);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\NoSuchMetadataException
- */
public function testFailOnScalarReferences()
{
+ $this->expectException('Symfony\Component\Validator\Exception\NoSuchMetadataException');
$entity = new Entity();
$entity->reference = 'string';
@@ -741,11 +739,9 @@ public function testDisableTraversableTraversal()
$this->assertCount(0, $violations);
}
- /**
- * @expectedException \Symfony\Component\Validator\Exception\NoSuchMetadataException
- */
public function testMetadataMustExistIfTraversalIsDisabled()
{
+ $this->expectException('Symfony\Component\Validator\Exception\NoSuchMetadataException');
$entity = new Entity();
$entity->reference = new \ArrayIterator();
diff --git a/src/Symfony/Component/Workflow/Tests/DefinitionBuilderTest.php b/src/Symfony/Component/Workflow/Tests/DefinitionBuilderTest.php
index f330777a64a7..817b8fce401e 100644
--- a/src/Symfony/Component/Workflow/Tests/DefinitionBuilderTest.php
+++ b/src/Symfony/Component/Workflow/Tests/DefinitionBuilderTest.php
@@ -3,16 +3,17 @@
namespace Symfony\Component\Workflow\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Workflow\DefinitionBuilder;
use Symfony\Component\Workflow\Transition;
class DefinitionBuilderTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\InvalidArgumentException
- */
+ use ForwardCompatTestTrait;
+
public function testAddPlaceInvalidName()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\InvalidArgumentException');
$builder = new DefinitionBuilder(['a"', 'b']);
}
diff --git a/src/Symfony/Component/Workflow/Tests/DefinitionTest.php b/src/Symfony/Component/Workflow/Tests/DefinitionTest.php
index 506cfee6a8da..e334adde8350 100644
--- a/src/Symfony/Component/Workflow/Tests/DefinitionTest.php
+++ b/src/Symfony/Component/Workflow/Tests/DefinitionTest.php
@@ -3,11 +3,14 @@
namespace Symfony\Component\Workflow\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Workflow\Definition;
use Symfony\Component\Workflow\Transition;
class DefinitionTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testAddPlaces()
{
$places = range('a', 'e');
@@ -18,11 +21,9 @@ public function testAddPlaces()
$this->assertEquals('a', $definition->getInitialPlace());
}
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\InvalidArgumentException
- */
public function testAddPlacesInvalidArgument()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\InvalidArgumentException');
$places = ['a"', 'e"'];
$definition = new Definition($places, []);
}
@@ -35,12 +36,10 @@ public function testSetInitialPlace()
$this->assertEquals($places[3], $definition->getInitialPlace());
}
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\LogicException
- * @expectedExceptionMessage Place "d" cannot be the initial place as it does not exist.
- */
public function testSetInitialPlaceAndPlaceIsNotDefined()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\LogicException');
+ $this->expectExceptionMessage('Place "d" cannot be the initial place as it does not exist.');
$definition = new Definition([], [], 'd');
}
@@ -55,23 +54,19 @@ public function testAddTransition()
$this->assertSame($transition, $definition->getTransitions()[0]);
}
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\LogicException
- * @expectedExceptionMessage Place "c" referenced in transition "name" does not exist.
- */
public function testAddTransitionAndFromPlaceIsNotDefined()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\LogicException');
+ $this->expectExceptionMessage('Place "c" referenced in transition "name" does not exist.');
$places = range('a', 'b');
new Definition($places, [new Transition('name', 'c', $places[1])]);
}
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\LogicException
- * @expectedExceptionMessage Place "c" referenced in transition "name" does not exist.
- */
public function testAddTransitionAndToPlaceIsNotDefined()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\LogicException');
+ $this->expectExceptionMessage('Place "c" referenced in transition "name" does not exist.');
$places = range('a', 'b');
new Definition($places, [new Transition('name', $places[0], 'c')]);
diff --git a/src/Symfony/Component/Workflow/Tests/RegistryTest.php b/src/Symfony/Component/Workflow/Tests/RegistryTest.php
index 038af0d89fde..3032dccd1592 100644
--- a/src/Symfony/Component/Workflow/Tests/RegistryTest.php
+++ b/src/Symfony/Component/Workflow/Tests/RegistryTest.php
@@ -46,23 +46,19 @@ public function testGetWithSuccess()
$this->assertSame('workflow2', $workflow->getName());
}
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\InvalidArgumentException
- * @expectedExceptionMessage At least two workflows match this subject. Set a different name on each and use the second (name) argument of this method.
- */
public function testGetWithMultipleMatch()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('At least two workflows match this subject. Set a different name on each and use the second (name) argument of this method.');
$w1 = $this->registry->get(new Subject2());
$this->assertInstanceOf(Workflow::class, $w1);
$this->assertSame('workflow1', $w1->getName());
}
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\InvalidArgumentException
- * @expectedExceptionMessage Unable to find a workflow for class "stdClass".
- */
public function testGetWithNoMatch()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('Unable to find a workflow for class "stdClass".');
$w1 = $this->registry->get(new \stdClass());
$this->assertInstanceOf(Workflow::class, $w1);
$this->assertSame('workflow1', $w1->getName());
diff --git a/src/Symfony/Component/Workflow/Tests/TransitionTest.php b/src/Symfony/Component/Workflow/Tests/TransitionTest.php
index 2f500ff5e5c7..f349cca8b9b6 100644
--- a/src/Symfony/Component/Workflow/Tests/TransitionTest.php
+++ b/src/Symfony/Component/Workflow/Tests/TransitionTest.php
@@ -3,16 +3,17 @@
namespace Symfony\Component\Workflow\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Workflow\Transition;
class TransitionTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\InvalidArgumentException
- * @expectedExceptionMessage The transition "foo.bar" contains invalid characters.
- */
+ use ForwardCompatTestTrait;
+
public function testValidateName()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\InvalidArgumentException');
+ $this->expectExceptionMessage('The transition "foo.bar" contains invalid characters.');
$transition = new Transition('foo.bar', 'a', 'b');
}
diff --git a/src/Symfony/Component/Workflow/Tests/Validator/StateMachineValidatorTest.php b/src/Symfony/Component/Workflow/Tests/Validator/StateMachineValidatorTest.php
index 4e344560557d..23c70f39da20 100644
--- a/src/Symfony/Component/Workflow/Tests/Validator/StateMachineValidatorTest.php
+++ b/src/Symfony/Component/Workflow/Tests/Validator/StateMachineValidatorTest.php
@@ -3,18 +3,19 @@
namespace Symfony\Component\Workflow\Tests\Validator;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Workflow\Definition;
use Symfony\Component\Workflow\Transition;
use Symfony\Component\Workflow\Validator\StateMachineValidator;
class StateMachineValidatorTest extends TestCase
{
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\InvalidDefinitionException
- * @expectedExceptionMessage A transition from a place/state must have an unique name.
- */
+ use ForwardCompatTestTrait;
+
public function testWithMultipleTransitionWithSameNameShareInput()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\InvalidDefinitionException');
+ $this->expectExceptionMessage('A transition from a place/state must have an unique name.');
$places = ['a', 'b', 'c'];
$transitions[] = new Transition('t1', 'a', 'b');
$transitions[] = new Transition('t1', 'a', 'c');
@@ -35,12 +36,10 @@ public function testWithMultipleTransitionWithSameNameShareInput()
// +----+ +----+
}
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\InvalidDefinitionException
- * @expectedExceptionMessage A transition in StateMachine can only have one output.
- */
public function testWithMultipleTos()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\InvalidDefinitionException');
+ $this->expectExceptionMessage('A transition in StateMachine can only have one output.');
$places = ['a', 'b', 'c'];
$transitions[] = new Transition('t1', 'a', ['b', 'c']);
$definition = new Definition($places, $transitions);
@@ -60,12 +59,10 @@ public function testWithMultipleTos()
// +----+
}
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\InvalidDefinitionException
- * @expectedExceptionMessage A transition in StateMachine can only have one input.
- */
public function testWithMultipleFroms()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\InvalidDefinitionException');
+ $this->expectExceptionMessage('A transition in StateMachine can only have one input.');
$places = ['a', 'b', 'c'];
$transitions[] = new Transition('t1', ['a', 'b'], 'c');
$definition = new Definition($places, $transitions);
diff --git a/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php b/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php
index 4a5c5a57dd85..e6fc8f442e1d 100644
--- a/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php
+++ b/src/Symfony/Component/Workflow/Tests/Validator/WorkflowValidatorTest.php
@@ -3,6 +3,7 @@
namespace Symfony\Component\Workflow\Tests\Validator;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Workflow\Definition;
use Symfony\Component\Workflow\Tests\WorkflowBuilderTrait;
use Symfony\Component\Workflow\Transition;
@@ -10,14 +11,13 @@
class WorkflowValidatorTest extends TestCase
{
+ use ForwardCompatTestTrait;
use WorkflowBuilderTrait;
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\InvalidDefinitionException
- * @expectedExceptionMessage The marking store of workflow "foo" can not store many places.
- */
public function testSinglePlaceWorkflowValidatorAndComplexWorkflow()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\InvalidDefinitionException');
+ $this->expectExceptionMessage('The marking store of workflow "foo" can not store many places.');
$definition = $this->createComplexWorkflowDefinition();
(new WorkflowValidator(true))->validate($definition, 'foo');
@@ -33,12 +33,10 @@ public function testSinglePlaceWorkflowValidatorAndSimpleWorkflow()
$this->addToAssertionCount(1);
}
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\InvalidDefinitionException
- * @expectedExceptionMessage All transitions for a place must have an unique name. Multiple transitions named "t1" where found for place "a" in workflow "foo".
- */
public function testWorkflowWithInvalidNames()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\InvalidDefinitionException');
+ $this->expectExceptionMessage('All transitions for a place must have an unique name. Multiple transitions named "t1" where found for place "a" in workflow "foo".');
$places = range('a', 'c');
$transitions = [];
diff --git a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
index d6f6bae45cbf..21d5ed2026ce 100644
--- a/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
+++ b/src/Symfony/Component/Workflow/Tests/WorkflowTest.php
@@ -3,6 +3,7 @@
namespace Symfony\Component\Workflow\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\Workflow\Definition;
use Symfony\Component\Workflow\Event\Event;
@@ -15,14 +16,13 @@
class WorkflowTest extends TestCase
{
+ use ForwardCompatTestTrait;
use WorkflowBuilderTrait;
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\LogicException
- * @expectedExceptionMessage The value returned by the MarkingStore is not an instance of "Symfony\Component\Workflow\Marking" for workflow "unnamed".
- */
public function testGetMarkingWithInvalidStoreReturn()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\LogicException');
+ $this->expectExceptionMessage('The value returned by the MarkingStore is not an instance of "Symfony\Component\Workflow\Marking" for workflow "unnamed".');
$subject = new \stdClass();
$subject->marking = null;
$workflow = new Workflow(new Definition([], []), $this->getMockBuilder(MarkingStoreInterface::class)->getMock());
@@ -30,12 +30,10 @@ public function testGetMarkingWithInvalidStoreReturn()
$workflow->getMarking($subject);
}
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\LogicException
- * @expectedExceptionMessage The Marking is empty and there is no initial place for workflow "unnamed".
- */
public function testGetMarkingWithEmptyDefinition()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\LogicException');
+ $this->expectExceptionMessage('The Marking is empty and there is no initial place for workflow "unnamed".');
$subject = new \stdClass();
$subject->marking = null;
$workflow = new Workflow(new Definition([], []), new MultipleStateMarkingStore());
@@ -43,12 +41,10 @@ public function testGetMarkingWithEmptyDefinition()
$workflow->getMarking($subject);
}
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\LogicException
- * @expectedExceptionMessage Place "nope" is not valid for workflow "unnamed".
- */
public function testGetMarkingWithImpossiblePlace()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\LogicException');
+ $this->expectExceptionMessage('Place "nope" is not valid for workflow "unnamed".');
$subject = new \stdClass();
$subject->marking = ['nope' => 1];
$workflow = new Workflow(new Definition([], []), new MultipleStateMarkingStore());
@@ -162,12 +158,10 @@ public function testCanDoesNotTriggerGuardEventsForNotEnabledTransitions()
$this->assertSame(['workflow_name.guard.t3'], $dispatchedEvents);
}
- /**
- * @expectedException \Symfony\Component\Workflow\Exception\LogicException
- * @expectedExceptionMessage Unable to apply transition "t2" for workflow "unnamed".
- */
public function testApplyWithImpossibleTransition()
{
+ $this->expectException('Symfony\Component\Workflow\Exception\LogicException');
+ $this->expectExceptionMessage('Unable to apply transition "t2" for workflow "unnamed".');
$definition = $this->createComplexWorkflowDefinition();
$subject = new \stdClass();
$subject->marking = null;
diff --git a/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php b/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php
index cb86e951d273..c9ec8109bd50 100644
--- a/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php
+++ b/src/Symfony/Component/Yaml/Tests/Command/LintCommandTest.php
@@ -81,11 +81,9 @@ public function testCustomTagsError()
$this->assertSame(1, $ret, 'lint:yaml exits with code 1 in case of error');
}
- /**
- * @expectedException \RuntimeException
- */
public function testLintFileNotReadable()
{
+ $this->expectException('RuntimeException');
$tester = $this->createCommandTester();
$filename = $this->createFile('');
unlink($filename);
diff --git a/src/Symfony/Component/Yaml/Tests/DumperTest.php b/src/Symfony/Component/Yaml/Tests/DumperTest.php
index 0a85acd9a28f..e3ecfa1a7b95 100644
--- a/src/Symfony/Component/Yaml/Tests/DumperTest.php
+++ b/src/Symfony/Component/Yaml/Tests/DumperTest.php
@@ -234,20 +234,18 @@ public function testObjectSupportDisabledButNoExceptions()
$this->assertEquals('{ foo: null, bar: 1 }', $dump, '->dump() does not dump objects when disabled');
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\DumpException
- */
public function testObjectSupportDisabledWithExceptions()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\DumpException');
$this->dumper->dump(['foo' => new A(), 'bar' => 1], 0, 0, Yaml::DUMP_EXCEPTION_ON_INVALID_TYPE);
}
/**
* @group legacy
- * @expectedException \Symfony\Component\Yaml\Exception\DumpException
*/
public function testObjectSupportDisabledWithExceptionsPassingTrue()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\DumpException');
$this->dumper->dump(['foo' => new A(), 'bar' => 1], 0, 0, true);
}
@@ -562,21 +560,17 @@ public function testCarriageReturnIsMaintainedWhenDumpingAsMultiLineLiteralBlock
$this->assertSame("- \"a\\r\\nb\\nc\"\n", $this->dumper->dump(["a\r\nb\nc"], 2, 0, Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK));
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The indentation must be greater than zero
- */
public function testZeroIndentationThrowsException()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The indentation must be greater than zero');
new Dumper(0);
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The indentation must be greater than zero
- */
public function testNegativeIndentationThrowsException()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The indentation must be greater than zero');
new Dumper(-4);
}
}
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
index 58f1719d9e7d..851398c44c60 100644
--- a/src/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -65,21 +65,17 @@ public function getTestsForParsePhpConstants()
];
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessage The constant "WRONG_CONSTANT" is not defined
- */
public function testParsePhpConstantThrowsExceptionWhenUndefined()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('The constant "WRONG_CONSTANT" is not defined');
Inline::parse('!php/const WRONG_CONSTANT', Yaml::PARSE_CONSTANT);
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessageRegExp #The string "!php/const PHP_INT_MAX" could not be parsed as a constant.*#
- */
public function testParsePhpConstantThrowsExceptionOnInvalidType()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessageRegExp('#The string "!php/const PHP_INT_MAX" could not be parsed as a constant.*#');
Inline::parse('!php/const PHP_INT_MAX', Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
}
@@ -152,46 +148,36 @@ public function testHashStringsResemblingExponentialNumericsShouldNotBeChangedTo
$this->assertSame($value, Inline::parse(Inline::dump($value)));
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessage Found unknown escape character "\V".
- */
public function testParseScalarWithNonEscapedBlackslashShouldThrowException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('Found unknown escape character "\V".');
Inline::parse('"Foo\Var"');
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- */
public function testParseScalarWithNonEscapedBlackslashAtTheEndShouldThrowException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
Inline::parse('"Foo\\"');
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- */
public function testParseScalarWithIncorrectlyQuotedStringShouldThrowException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
$value = "'don't do somthin' like that'";
Inline::parse($value);
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- */
public function testParseScalarWithIncorrectlyDoubleQuotedStringShouldThrowException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
$value = '"don"t do somthin" like that"';
Inline::parse($value);
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- */
public function testParseInvalidMappingKeyShouldThrowException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
$value = '{ "foo " bar": "bar" }';
Inline::parse($value);
}
@@ -206,19 +192,15 @@ public function testParseMappingKeyWithColonNotFollowedBySpace()
Inline::parse('{1:""}');
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- */
public function testParseInvalidMappingShouldThrowException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
Inline::parse('[foo] bar');
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- */
public function testParseInvalidSequenceShouldThrowException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
Inline::parse('{ foo: bar } bar');
}
@@ -284,21 +266,17 @@ public function testParseMapReferenceInSequenceAsFifthArgument()
$this->assertSame([$foo], Inline::parse('[*foo]', false, false, false, ['foo' => $foo]));
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessage A reference must contain at least one character at line 1.
- */
public function testParseUnquotedAsterisk()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('A reference must contain at least one character at line 1.');
Inline::parse('{ foo: * }');
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessage A reference must contain at least one character at line 1.
- */
public function testParseUnquotedAsteriskFollowedByAComment()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('A reference must contain at least one character at line 1.');
Inline::parse('{ foo: * #foo }');
}
@@ -688,10 +666,10 @@ public function getBinaryData()
/**
* @dataProvider getInvalidBinaryData
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
*/
public function testParseInvalidBinaryData($data, $expectedMessage)
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
$this->expectExceptionMessageRegExp($expectedMessage);
Inline::parse($data);
@@ -707,12 +685,10 @@ public function getInvalidBinaryData()
];
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessage Malformed inline YAML string: {this, is not, supported} at line 1.
- */
public function testNotSupportedMissingValue()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('Malformed inline YAML string: {this, is not, supported} at line 1.');
Inline::parse('{this, is not, supported}');
}
@@ -796,12 +772,10 @@ public function testDeprecatedStrTag()
$this->assertSame(['foo' => 'bar'], Inline::parse('{ foo: !str bar }'));
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessage Unexpected end of line, expected one of ",}" at line 1 (near "{abc: 'def'").
- */
public function testUnfinishedInlineMap()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('Unexpected end of line, expected one of ",}" at line 1 (near "{abc: \'def\'").');
Inline::parse("{abc: 'def'");
}
}
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index f2412fc56784..a40c49790f2e 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -613,10 +613,10 @@ public function getObjectForMapTests()
/**
* @dataProvider invalidDumpedObjectProvider
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
*/
public function testObjectsSupportDisabledWithExceptions($yaml)
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
$this->parser->parse($yaml, Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
}
@@ -634,10 +634,10 @@ public function testCanParseContentWithTrailingSpaces()
/**
* @group legacy
* @dataProvider invalidDumpedObjectProvider
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
*/
public function testObjectsSupportDisabledWithExceptionsUsingBooleanToggles($yaml)
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
$this->parser->parse($yaml, true);
}
@@ -680,11 +680,9 @@ public function testNonUtf8Exception()
}
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- */
public function testUnindentedCollectionException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
$yaml = <<<'EOF'
collection:
@@ -697,11 +695,9 @@ public function testUnindentedCollectionException()
$this->parser->parse($yaml);
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- */
public function testShortcutKeyUnindentedCollectionException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
$yaml = <<<'EOF'
collection:
@@ -713,12 +709,10 @@ public function testShortcutKeyUnindentedCollectionException()
$this->parser->parse($yaml);
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessageRegExp /^Multiple documents are not supported.+/
- */
public function testMultipleDocumentsNotSupportedException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessageRegExp('/^Multiple documents are not supported.+/');
Yaml::parse(<<<'EOL'
# Ranking of 1998 home runs
---
@@ -734,11 +728,9 @@ public function testMultipleDocumentsNotSupportedException()
);
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- */
public function testSequenceInAMapping()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
Yaml::parse(<<<'EOF'
yaml:
hash: me
@@ -843,10 +835,10 @@ public function getParseExceptionNotAffectedMultiLineStringLastResortParsing()
/**
* @dataProvider getParseExceptionNotAffectedMultiLineStringLastResortParsing
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
*/
public function testParseExceptionNotAffectedByMultiLineStringLastResortParsing($yaml)
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
$this->parser->parse($yaml);
}
@@ -876,11 +868,9 @@ public function testMultiLineStringLastResortParsing()
$this->assertSame($expected, $this->parser->parse($yaml));
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- */
public function testMappingInASequence()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
Yaml::parse(<<<'EOF'
yaml:
- array stuff
@@ -889,12 +879,10 @@ public function testMappingInASequence()
);
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessage missing colon
- */
public function testScalarInSequence()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('missing colon');
Yaml::parse(<<<'EOF'
foo:
- bar
@@ -1245,12 +1233,10 @@ public function testExplicitStringCasting()
$this->assertEquals($expected, $this->parser->parse($yaml));
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessage A colon cannot be used in an unquoted mapping value
- */
public function testColonInMappingValueException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('A colon cannot be used in an unquoted mapping value');
$yaml = <<<'EOF'
foo: bar: baz
EOF;
@@ -1484,10 +1470,10 @@ public function getBinaryData()
/**
* @dataProvider getInvalidBinaryData
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
*/
public function testParseInvalidBinaryData($data, $expectedMessage)
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
$this->expectExceptionMessageRegExp($expectedMessage);
$this->parser->parse($data);
@@ -1798,12 +1784,10 @@ public function taggedValuesProvider()
];
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessage Tags support is not enabled. Enable the `Yaml::PARSE_CUSTOM_TAGS` flag to use "!iterator" at line 1 (near "!iterator [foo]").
- */
public function testCustomTagsDisabled()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('Tags support is not enabled. Enable the `Yaml::PARSE_CUSTOM_TAGS` flag to use "!iterator" at line 1 (near "!iterator [foo]").');
$this->parser->parse('!iterator [foo]');
}
@@ -1816,12 +1800,10 @@ public function testUnsupportedTagWithScalar()
$this->assertEquals('!iterator foo', $this->parser->parse('!iterator foo'));
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessage The built-in tag "!!foo" is not implemented at line 1 (near "!!foo").
- */
public function testExceptionWhenUsingUnsuportedBuiltInTags()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('The built-in tag "!!foo" is not implemented at line 1 (near "!!foo").');
$this->parser->parse('!!foo');
}
@@ -1871,12 +1853,10 @@ public function testComplexMappingNestedInSequenceThrowsParseException()
$this->parser->parse($yaml);
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessage Unable to parse at line 1 (near "[parameters]").
- */
public function testParsingIniThrowsException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('Unable to parse at line 1 (near "[parameters]").');
$ini = <<assertEquals($trickyVal, $arrayFromYaml);
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessage Reference "foo" does not exist at line 2
- */
public function testParserCleansUpReferencesBetweenRuns()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('Reference "foo" does not exist at line 2');
$yaml = <<assertIsArray($this->parser->parseFile(__DIR__.'/Fixtures/index.yml'));
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessageRegExp #^File ".+/Fixtures/nonexistent.yml" does not exist\.$#
- */
public function testParsingNonExistentFilesThrowsException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessageRegExp('#^File ".+/Fixtures/nonexistent.yml" does not exist\.$#');
$this->parser->parseFile(__DIR__.'/Fixtures/nonexistent.yml');
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessageRegExp #^File ".+/Fixtures/not_readable.yml" cannot be read\.$#
- */
public function testParsingNotReadableFilesThrowsException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessageRegExp('#^File ".+/Fixtures/not_readable.yml" cannot be read\.$#');
if ('\\' === \DIRECTORY_SEPARATOR) {
$this->markTestSkipped('chmod is not supported on Windows');
}
@@ -2160,12 +2134,10 @@ public function testParseReferencesOnMergeKeysWithMappingsParsedAsObjects()
$this->assertEquals($expected, $this->parser->parse($yaml, Yaml::PARSE_OBJECT_FOR_MAP));
}
- /**
- * @expectedException \Symfony\Component\Yaml\Exception\ParseException
- * @expectedExceptionMessage Reference "foo" does not exist
- */
public function testEvalRefException()
{
+ $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('Reference "foo" does not exist');
$yaml = <<expectException('Symfony\Component\Yaml\Exception\ParseException');
+ $this->expectExceptionMessage('Circular reference [foo, bar, foo] detected');
$this->parser->parse($yaml, Yaml::PARSE_CUSTOM_TAGS);
}
diff --git a/src/Symfony/Component/Yaml/Tests/YamlTest.php b/src/Symfony/Component/Yaml/Tests/YamlTest.php
index 5a792c51160a..158d581d6691 100644
--- a/src/Symfony/Component/Yaml/Tests/YamlTest.php
+++ b/src/Symfony/Component/Yaml/Tests/YamlTest.php
@@ -12,10 +12,13 @@
namespace Symfony\Component\Yaml\Tests;
use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
use Symfony\Component\Yaml\Yaml;
class YamlTest extends TestCase
{
+ use ForwardCompatTestTrait;
+
public function testParseAndDump()
{
$data = ['lorem' => 'ipsum', 'dolor' => 'sit'];
@@ -24,21 +27,17 @@ public function testParseAndDump()
$this->assertEquals($data, $parsed);
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The indentation must be greater than zero
- */
public function testZeroIndentationThrowsException()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The indentation must be greater than zero');
Yaml::dump(['lorem' => 'ipsum', 'dolor' => 'sit'], 2, 0);
}
- /**
- * @expectedException \InvalidArgumentException
- * @expectedExceptionMessage The indentation must be greater than zero
- */
public function testNegativeIndentationThrowsException()
{
+ $this->expectException('InvalidArgumentException');
+ $this->expectExceptionMessage('The indentation must be greater than zero');
Yaml::dump(['lorem' => 'ipsum', 'dolor' => 'sit'], 2, -4);
}
}