diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.2'

Browse Source 
* 3.2:
  Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
  Refactored other PHPUnit method calls to work with namespaced PHPUnit 6
  Further refactorings to PHPUnit namespaces
  resolve parameters in definition classes
This commit is contained in:
Nicolas Grekas 2017-02-21 11:07:34 +01:00
commit e28f6b44e5
74 changed files with 364 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php
View File

@ -105,7 +105,7 @@ class EntityUserProviderTest extends TestCase
$user1 = new User(null, null, 'user1');
$provider = new EntityUserProvider($this->getManager($em), 'Symfony\Bridge\Doctrine\Tests\Fixtures\User', 'name');
$this->setExpectedException(
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(
'InvalidArgumentException',
'You cannot refresh a user from the EntityUserProvider that does not contain an identifier. The user object has to be serialized with its own identifier mapped by Doctrine'
);
@ -125,7 +125,7 @@ class EntityUserProviderTest extends TestCase
$provider = new EntityUserProvider($this->getManager($em), 'Symfony\Bridge\Doctrine\Tests\Fixtures\User', 'name');
$user2 = new User(1, 2, 'user2');
$this->setExpectedException(
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(
'Symfony\Component\Security\Core\Exception\UsernameNotFoundException',
'User with id {"id1":1,"id2":2} not found'
);

8
src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php
View File

@ -47,7 +47,13 @@ class HttpKernelExtensionTest extends TestCase
;
$renderer = new FragmentHandler($context);
$this->setExpectedException('InvalidArgumentException', 'The "inline" renderer does not exist.');
if (method_exists($this, 'expectException')) {
$this->expectException('InvalidArgumentException');
$this->expectExceptionMessage('The "inline" renderer does not exist.');
} else {
$this->setExpectedException('InvalidArgumentException', 'The "inline" renderer does not exist.');
}
$renderer->render('/foo');
}

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/DataCollectorTranslatorPass.php
View File

@ -25,7 +25,7 @@ class DataCollectorTranslatorPass implements CompilerPassInterface
return;
}
$translatorClass = $container->findDefinition('translator')->getClass();
$translatorClass = $container->getParameterBag()->resolveValue($container->findDefinition('translator')->getClass());
if (!is_subclass_of($translatorClass, 'Symfony\Component\Translation\TranslatorBagInterface')) {
$container->removeDefinition('translator.data_collector');

7
src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php
View File

@ -143,7 +143,12 @@ class ControllerResolverTest extends BaseControllerResolverTest
{
// All this logic needs to be duplicated, since calling parent::testGetControllerOnNonUndefinedFunction will override the expected excetion and not use the regex
$resolver = $this->createControllerResolver();
$this->setExpectedExceptionRegExp($exceptionName, $exceptionMessage);
if (method_exists($this, 'expectException')) {
$this->expectException($exceptionName);
$this->expectExceptionMessageRegExp($exceptionMessage);
} else {
$this->setExpectedExceptionRegExp($exceptionName, $exceptionMessage);
}
$request = Request::create('/');
$request->attributes->set('_controller', $controller);

47
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/DataCollectorTranslatorPassTest.php
View File

@ -27,6 +27,9 @@ class DataCollectorTranslatorPassTest extends TestCase
$this->container = new ContainerBuilder();
$this->dataCollectorTranslatorPass = new DataCollectorTranslatorPass();
$this->container->setParameter('translator_implementing_bag', 'Symfony\Component\Translation\Translator');
$this->container->setParameter('translator_not_implementing_bag', 'Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag');
$this->container->register('translator.data_collector', 'Symfony\Component\Translation\DataCollectorTranslator')
->setPublic(false)
->setDecoratedService('translator')
@ -38,41 +41,69 @@ class DataCollectorTranslatorPassTest extends TestCase
;
}
public function testProcessKeepsDataCollectorTranslatorIfItImplementsTranslatorBagInterface()
/**
* @dataProvider getImplementingTranslatorBagInterfaceTranslatorClassNames
*/
public function testProcessKeepsDataCollectorTranslatorIfItImplementsTranslatorBagInterface($class)
{
$this->container->register('translator', 'Symfony\Component\Translation\Translator');
$this->container->register('translator', $class);
$this->dataCollectorTranslatorPass->process($this->container);
$this->assertTrue($this->container->hasDefinition('translator.data_collector'));
}
public function testProcessKeepsDataCollectorIfTranslatorImplementsTranslatorBagInterface()
/**
* @dataProvider getImplementingTranslatorBagInterfaceTranslatorClassNames
*/
public function testProcessKeepsDataCollectorIfTranslatorImplementsTranslatorBagInterface($class)
{
$this->container->register('translator', 'Symfony\Component\Translation\Translator');
$this->container->register('translator', $class);
$this->dataCollectorTranslatorPass->process($this->container);
$this->assertTrue($this->container->hasDefinition('data_collector.translation'));
}
public function testProcessRemovesDataCollectorTranslatorIfItDoesNotImplementTranslatorBagInterface()
public function getImplementingTranslatorBagInterfaceTranslatorClassNames()
{
$this->container->register('translator', 'Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag');
return array(
array('Symfony\Component\Translation\Translator'),
array('%translator_implementing_bag%'),
);
}
/**
* @dataProvider getNotImplementingTranslatorBagInterfaceTranslatorClassNames
*/
public function testProcessRemovesDataCollectorTranslatorIfItDoesNotImplementTranslatorBagInterface($class)
{
$this->container->register('translator', $class);
$this->dataCollectorTranslatorPass->process($this->container);
$this->assertFalse($this->container->hasDefinition('translator.data_collector'));
}
public function testProcessRemovesDataCollectorIfTranslatorDoesNotImplementTranslatorBagInterface()
/**
* @dataProvider getNotImplementingTranslatorBagInterfaceTranslatorClassNames
*/
public function testProcessRemovesDataCollectorIfTranslatorDoesNotImplementTranslatorBagInterface($class)
{
$this->container->register('translator', 'Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag');
$this->container->register('translator', $class);
$this->dataCollectorTranslatorPass->process($this->container);
$this->assertFalse($this->container->hasDefinition('data_collector.translation'));
}
public function getNotImplementingTranslatorBagInterfaceTranslatorClassNames()
{
return array(
array('Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\TranslatorWithTranslatorBag'),
array('%translator_not_implementing_bag%'),
);
}
}
class TranslatorWithTranslatorBag implements TranslatorInterface

7
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php
View File

@ -197,7 +197,12 @@ class FormPassTest extends TestCase
$container->setDefinition('form.extension', $extDefinition);
$container->register($id, 'stdClass')->setPublic(false)->addTag($tagName);
$this->setExpectedException('\InvalidArgumentException', $expectedExceptionMessage);
if (method_exists($this, 'expectException')) {
$this->expectException('InvalidArgumentException');
$this->expectExceptionMessage($expectedExceptionMessage);
} else {
$this->setExpectedException('InvalidArgumentException', $expectedExceptionMessage);
}
$container->compile();
}

2
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/ProfilerPassTest.php
View File

@ -41,7 +41,7 @@ class ProfilerPassTest extends TestCase
$builder = $this->createContainerMock($services);
$this->setExpectedException('InvalidArgumentException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
$profilerPass = new ProfilerPass();
$profilerPass->process($builder);

4
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/SerializerPassTest.php
View File

@ -38,7 +38,7 @@ class SerializerPassTest extends TestCase
->with('serializer.normalizer')
->will($this->returnValue(array()));
$this->setExpectedException('RuntimeException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('RuntimeException');
$serializerPass = new SerializerPass();
$serializerPass->process($container);
@ -65,7 +65,7 @@ class SerializerPassTest extends TestCase
->method('getDefinition')
->will($this->returnValue($definition));
$this->setExpectedException('RuntimeException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('RuntimeException');
$serializerPass = new SerializerPass();
$serializerPass->process($container);

10
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolsTest.php
View File

@ -39,6 +39,11 @@ class CachePoolsTest extends WebTestCase
{
try {
$this->doTestCachePools(array('root_config' => 'redis_config.yml', 'environment' => 'redis_cache'), RedisAdapter::class);
} catch (\PHPUnit\Framework\Error\Warning $e) {
if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
throw $e;
}
$this->markTestSkipped($e->getMessage());
} catch (\PHPUnit_Framework_Error_Warning $e) {
if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
throw $e;
@ -59,6 +64,11 @@ class CachePoolsTest extends WebTestCase
{
try {
$this->doTestCachePools(array('root_config' => 'redis_custom_config.yml', 'environment' => 'custom_redis_cache'), RedisAdapter::class);
} catch (\PHPUnit\Framework\Error\Warning $e) {
if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
throw $e;
}
$this->markTestSkipped($e->getMessage());
} catch (\PHPUnit_Framework_Error_Warning $e) {
if (0 !== strpos($e->getMessage(), 'unable to connect to')) {
throw $e;

7
src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
View File

@ -133,7 +133,12 @@ class UserPasswordEncoderCommandTest extends WebTestCase
public function testEncodePasswordNoConfigForGivenUserClass()
{
$this->setExpectedException('\RuntimeException', 'No encoder has been configured for account "Foo\Bar\User".');
if (method_exists($this, 'expectException')) {
$this->expectException('\RuntimeException');
$this->expectExceptionMessage('No encoder has been configured for account "Foo\Bar\User".');
} else {
$this->setExpectedException('\RuntimeException', 'No encoder has been configured for account "Foo\Bar\User".');
}
$this->passwordEncoderCommandTester->execute(array(
'command' => 'security:encode-password',

4
src/Symfony/Component/BrowserKit/Tests/CookieTest.php
View File

@ -85,7 +85,7 @@ class CookieTest extends TestCase
public function testFromStringThrowsAnExceptionIfCookieIsNotValid()
{
$this->setExpectedException('InvalidArgumentException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
Cookie::fromString('foo');
}
@ -98,7 +98,7 @@ class CookieTest extends TestCase
public function testFromStringThrowsAnExceptionIfUrlIsNotValid()
{
$this->setExpectedException('InvalidArgumentException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
Cookie::fromString('foo=bar', 'foobar');
}

2
src/Symfony/Component/Cache/Tests/Adapter/PdoAdapterTest.php
View File

@ -23,7 +23,7 @@ class PdoAdapterTest extends AdapterTestCase
public static function setupBeforeClass()
{
if (!extension_loaded('pdo_sqlite')) {
throw new \PHPUnit_Framework_SkippedTestError('Extension pdo_sqlite required.');
self::markTestSkipped('Extension pdo_sqlite required.');
}
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');

2
src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php
View File

@ -24,7 +24,7 @@ class PdoDbalAdapterTest extends AdapterTestCase
public static function setupBeforeClass()
{
if (!extension_loaded('pdo_sqlite')) {
throw new \PHPUnit_Framework_SkippedTestError('Extension pdo_sqlite required.');
self::markTestSkipped('Extension pdo_sqlite required.');
}
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');

7
src/Symfony/Component/Config/Tests/Definition/ArrayNodeTest.php
View File

@ -55,7 +55,12 @@ class ArrayNodeTest extends TestCase
public function testIgnoreAndRemoveBehaviors($ignore, $remove, $expected, $message = '')
{
if ($expected instanceof \Exception) {
$this->setExpectedException(get_class($expected), $expected->getMessage());
if (method_exists($this, 'expectException')) {
$this->expectException(get_class($expected));
$this->expectExceptionMessage($expected->getMessage());
} else {
$this->setExpectedException(get_class($expected), $expected->getMessage());
}
}
$node = new ArrayNode('root');
$node->setIgnoreExtraKeys($ignore, $remove);

14
src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php
View File

@ -63,7 +63,12 @@ class ScalarNodeTest extends TestCase
{
$node = new ScalarNode('test');
$this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', 'Invalid type for path "test". Expected scalar, but got array.');
if (method_exists($this, 'expectException')) {
$this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');
$this->expectExceptionMessage('Invalid type for path "test". Expected scalar, but got array.');
} else {
$this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', 'Invalid type for path "test". Expected scalar, but got array.');
}
$node->normalize(array());
}
@ -73,7 +78,12 @@ class ScalarNodeTest extends TestCase
$node = new ScalarNode('test');
$node->setInfo('"the test value"');
$this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', "Invalid type for path \"test\". Expected scalar, but got array.\nHint: \"the test value\"");
if (method_exists($this, 'expectException')) {
$this->expectException('Symfony\Component\Config\Definition\Exception\InvalidTypeException');
$this->expectExceptionMessage("Invalid type for path \"test\". Expected scalar, but got array.\nHint: \"the test value\"");
} else {
$this->setExpectedException('Symfony\Component\Config\Definition\Exception\InvalidTypeException', "Invalid type for path \"test\". Expected scalar, but got array.\nHint: \"the test value\"");
}
$node->normalize(array());
}

9
src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
View File

@ -151,7 +151,14 @@ class XmlUtilsTest extends TestCase
public function testLoadEmptyXmlFile()
{
$file = __DIR__.'/../Fixtures/foo.xml';
$this->setExpectedException('InvalidArgumentException', sprintf('File %s does not contain valid XML, it is empty.', $file));
if (method_exists($this, 'expectException')) {
$this->expectException('InvalidArgumentException');
$this->expectExceptionMessage(sprintf('File %s does not contain valid XML, it is empty.', $file));
} else {
$this->setExpectedException('InvalidArgumentException', sprintf('File %s does not contain valid XML, it is empty.', $file));
}
XmlUtils::loadFile($file);
}

14
src/Symfony/Component/Console/Tests/ApplicationTest.php
View File

@ -266,7 +266,12 @@ class ApplicationTest extends TestCase
*/
public function testFindWithAmbiguousAbbreviations($abbreviation, $expectedExceptionMessage)
{
$this->setExpectedException('Symfony\Component\Console\Exception\CommandNotFoundException', $expectedExceptionMessage);
if (method_exists($this, 'expectException')) {
$this->expectException('Symfony\Component\Console\Exception\CommandNotFoundException');
$this->expectExceptionMessage($expectedExceptionMessage);
} else {
$this->setExpectedException('Symfony\Component\Console\Exception\CommandNotFoundException', $expectedExceptionMessage);
}
$application = new Application();
$application->add(new \FooCommand());
@ -959,7 +964,12 @@ class ApplicationTest extends TestCase
public function testRunWithError()
{
$this->setExpectedException('Exception', 'dymerr');
if (method_exists($this, 'expectException')) {
$this->expectException('Exception');
$this->expectExceptionMessage('dymerr');
} else {
$this->setExpectedException('Exception', 'dymerr');
}
$application = new Application();
$application->setAutoExit(false);

9
src/Symfony/Component/Console/Tests/Command/CommandTest.php
View File

@ -117,7 +117,12 @@ class CommandTest extends TestCase
*/
public function testInvalidCommandNames($name)
{
$this->setExpectedException('InvalidArgumentException', sprintf('Command name "%s" is invalid.', $name));
if (method_exists($this, 'expectException')) {
$this->expectException('InvalidArgumentException');
$this->expectExceptionMessage(sprintf('Command name "%s" is invalid.', $name));
} else {
$this->setExpectedException('InvalidArgumentException', sprintf('Command name "%s" is invalid.', $name));
}
$command = new \TestCommand();
$command->setName($name);
@ -175,7 +180,7 @@ class CommandTest extends TestCase
public function testSetAliasesNull()
{
$command = new \TestCommand();
$this->setExpectedException('InvalidArgumentException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
$command->setAliases(null);
}

4
src/Symfony/Component/Console/Tests/Formatter/OutputFormatterStyleTest.php
View File

@ -41,7 +41,7 @@ class OutputFormatterStyleTest extends TestCase
$style->setForeground('default');
$this->assertEquals("\033[39mfoo\033[39m", $style->apply('foo'));
$this->setExpectedException('InvalidArgumentException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
$style->setForeground('undefined-color');
}
@ -58,7 +58,7 @@ class OutputFormatterStyleTest extends TestCase
$style->setBackground('default');
$this->assertEquals("\033[49mfoo\033[49m", $style->apply('foo'));
$this->setExpectedException('InvalidArgumentException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
$style->setBackground('undefined-color');
}

7
src/Symfony/Component/Console/Tests/Input/ArgvInputTest.php
View File

@ -164,7 +164,12 @@ class ArgvInputTest extends TestCase
*/
public function testInvalidInput($argv, $definition, $expectedExceptionMessage)
{
$this->setExpectedException('RuntimeException', $expectedExceptionMessage);
if (method_exists($this, 'expectException')) {
$this->expectException('RuntimeException');
$this->expectExceptionMessage($expectedExceptionMessage);
} else {
$this->setExpectedException('RuntimeException', $expectedExceptionMessage);
}
$input = new ArgvInput($argv);
$input->bind($definition);

7
src/Symfony/Component/Console/Tests/Input/ArrayInputTest.php
View File

@ -121,7 +121,12 @@ class ArrayInputTest extends TestCase
*/
public function testParseInvalidInput($parameters, $definition, $expectedExceptionMessage)
{
$this->setExpectedException('InvalidArgumentException', $expectedExceptionMessage);
if (method_exists($this, 'expectException')) {
$this->expectException('InvalidArgumentException');
$this->expectExceptionMessage($expectedExceptionMessage);
} else {
$this->setExpectedException('InvalidArgumentException', $expectedExceptionMessage);
}
new ArrayInput($parameters, $definition);
}

7
src/Symfony/Component/Console/Tests/Input/InputArgumentTest.php
View File

@ -42,7 +42,12 @@ class InputArgumentTest extends TestCase
*/
public function testInvalidModes($mode)
{
$this->setExpectedException('InvalidArgumentException', sprintf('Argument mode "%s" is not valid.', $mode));
if (method_exists($this, 'expectException')) {
$this->expectException('InvalidArgumentException');
$this->expectExceptionMessage(sprintf('Argument mode "%s" is not valid.', $mode));
} else {
$this->setExpectedException('InvalidArgumentException', sprintf('Argument mode "%s" is not valid.', $mode));
}
new InputArgument('foo', $mode);
}

7
src/Symfony/Component/Console/Tests/Input/InputOptionTest.php
View File

@ -78,7 +78,12 @@ class InputOptionTest extends TestCase
*/
public function testInvalidModes($mode)
{
$this->setExpectedException('InvalidArgumentException', sprintf('Option mode "%s" is not valid.', $mode));
if (method_exists($this, 'expectException')) {
$this->expectException('InvalidArgumentException');
$this->expectExceptionMessage(sprintf('Option mode "%s" is not valid.', $mode));
} else {
$this->setExpectedException('InvalidArgumentException', sprintf('Option mode "%s" is not valid.', $mode));
}
new InputOption('foo', 'f', $mode);
}

2
src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php
View File

@ -89,7 +89,7 @@ class ParserTest extends TestCase
/** @var FunctionNode $function */
$function = $selectors[0]->getTree();
$this->setExpectedException('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
Parser::parseSeries($function->getArguments());
}

4
src/Symfony/Component/CssSelector/Tests/Parser/TokenStreamTest.php
View File

@ -53,7 +53,7 @@ class TokenStreamTest extends TestCase
public function testFailToGetNextIdentifier()
{
$this->setExpectedException('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
$stream = new TokenStream();
$stream->push(new Token(Token::TYPE_DELIMITER, '.', 2));
@ -73,7 +73,7 @@ class TokenStreamTest extends TestCase
public function testFailToGetNextIdentifierOrStar()
{
$this->setExpectedException('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\CssSelector\Exception\SyntaxErrorException');
$stream = new TokenStream();
$stream->push(new Token(Token::TYPE_DELIMITER, '.', 2));

2
src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
View File

@ -789,7 +789,7 @@ class ContainerBuilderTest extends TestCase
$container->registerExtension($extension = new \ProjectExtension());
$this->assertTrue($container->getExtension('project') === $extension, '->registerExtension() registers an extension');
$this->setExpectedException('LogicException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('LogicException');
$container->getExtension('no_registered');
}

9
src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
View File

@ -66,7 +66,14 @@ class DefinitionTest extends TestCase
$this->assertNull($def->getDecoratedService());
$def = new Definition('stdClass');
$this->setExpectedException('InvalidArgumentException', 'The decorated service inner name for "foo" must be different than the service name itself.');
if (method_exists($this, 'expectException')) {
$this->expectException('InvalidArgumentException');
$this->expectExceptionMessage('The decorated service inner name for "foo" must be different than the service name itself.');
} else {
$this->setExpectedException('InvalidArgumentException', 'The decorated service inner name for "foo" must be different than the service name itself.');
}
$def->setDecoratedService('foo', 'foo');
}

7
src/Symfony/Component/DependencyInjection/Tests/ParameterBag/ParameterBagTest.php
View File

@ -84,7 +84,12 @@ class ParameterBagTest extends TestCase
'fiz' => array('bar' => array('boo' => 12)),
));
$this->setExpectedException('Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException', $exceptionMessage);
if (method_exists($this, 'expectException')) {
$this->expectException(ParameterNotFoundException::class);
$this->expectExceptionMessage($exceptionMessage);
} else {
$this->setExpectedException(ParameterNotFoundException::class, $exceptionMessage);
}
$bag->get($parameterKey);
}

2
src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
View File

@ -996,6 +996,8 @@ HTML;
$crawler = new Crawler('<p></p>');
$crawler->filter('p')->children();
$this->assertTrue(true, '->children() does not trigger a notice if the node has no children');
} catch (\PHPUnit\Framework\Error\Notice $e) {
$this->fail('->children() does not trigger a notice if the node has no children');
} catch (\PHPUnit_Framework_Error_Notice $e) {
$this->fail('->children() does not trigger a notice if the node has no children');
}

2
src/Symfony/Component/EventDispatcher/Tests/GenericEventTest.php
View File

@ -96,7 +96,7 @@ class GenericEventTest extends TestCase
$this->assertEquals('Event', $this->event['name']);
// test getting invalid arg
$this->setExpectedException('InvalidArgumentException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
$this->assertFalse($this->event['nameNotExist']);
}

14
src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php
View File

@ -75,7 +75,7 @@ class ParserCacheAdapterTest extends TestCase
{
$poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
$this->setExpectedException(\BadMethodCallException::class);
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
$parserCacheAdapter->getItems();
}
@ -85,7 +85,7 @@ class ParserCacheAdapterTest extends TestCase
$poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$key = 'key';
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
$this->setExpectedException(\BadMethodCallException::class);
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
$parserCacheAdapter->hasItem($key);
}
@ -94,7 +94,7 @@ class ParserCacheAdapterTest extends TestCase
{
$poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
$this->setExpectedException(\BadMethodCallException::class);
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
$parserCacheAdapter->clear();
}
@ -104,7 +104,7 @@ class ParserCacheAdapterTest extends TestCase
$poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$key = 'key';
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
$this->setExpectedException(\BadMethodCallException::class);
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
$parserCacheAdapter->deleteItem($key);
}
@ -114,7 +114,7 @@ class ParserCacheAdapterTest extends TestCase
$poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$keys = array('key');
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
$this->setExpectedException(\BadMethodCallException::class);
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
$parserCacheAdapter->deleteItems($keys);
}
@ -124,7 +124,7 @@ class ParserCacheAdapterTest extends TestCase
$poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
$cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
$this->setExpectedException(\BadMethodCallException::class);
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
$parserCacheAdapter->saveDeferred($cacheItemMock);
}
@ -133,7 +133,7 @@ class ParserCacheAdapterTest extends TestCase
{
$poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
$parserCacheAdapter = new ParserCacheAdapter($poolMock);
$this->setExpectedException(\BadMethodCallException::class);
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
$parserCacheAdapter->commit();
}

4
src/Symfony/Component/Finder/Tests/FinderTest.php
View File

@ -634,6 +634,10 @@ class FinderTest extends Iterator\RealIteratorTestCase
$this->fail(sprintf("Expected exception:\n%s\nGot:\n%s\nWith comparison failure:\n%s", $expectedExceptionClass, 'PHPUnit_Framework_ExpectationFailedException', $e->getComparisonFailure()->getExpectedAsString()));
}
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()));
}
$this->assertInstanceOf($expectedExceptionClass, $e);
}
}

2
src/Symfony/Component/Form/Tests/ButtonBuilderTest.php
View File

@ -53,7 +53,7 @@ class ButtonBuilderTest extends TestCase
*/
public function testInvalidNames($name)
{
$this->setExpectedException(
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(
'\Symfony\Component\Form\Exception\InvalidArgumentException',
'Buttons cannot have empty names.'
);

10
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToArrayTransformerTest.php
View File

@ -12,6 +12,8 @@
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateIntervalToArrayTransformer;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**
* @author Steffen Roßkamp <steffen.rosskamp@gimmickmedia.de>
@ -159,7 +161,7 @@ class DateIntervalToArrayTransformerTest extends DateIntervalTestCase
{
$transformer = new DateIntervalToArrayTransformer();
$this->assertNull($transformer->reverseTransform(null));
$this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(UnexpectedTypeException::class);
$transformer->reverseTransform('12345');
}
@ -167,7 +169,7 @@ class DateIntervalToArrayTransformerTest extends DateIntervalTestCase
{
$transformer = new DateIntervalToArrayTransformer();
$input = array('years' => '1');
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class);
$transformer->reverseTransform($input);
}
@ -179,7 +181,7 @@ class DateIntervalToArrayTransformerTest extends DateIntervalTestCase
'minutes' => '',
'seconds' => '6',
);
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException', 'This amount of "minutes" is invalid');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class, 'This amount of "minutes" is invalid');
$transformer->reverseTransform($input);
}
@ -189,7 +191,7 @@ class DateIntervalToArrayTransformerTest extends DateIntervalTestCase
$input = array(
'invert' => '1',
);
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException', 'The value of "invert" must be boolean');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class, 'The value of "invert" must be boolean');
$transformer->reverseTransform($input);
}

10
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateIntervalToStringTransformerTest.php
View File

@ -12,6 +12,8 @@
namespace Symfony\Component\Form\Tests\Extension\Core\DataTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateIntervalToStringTransformer;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**
* @author Steffen Roßkamp <steffen.rosskamp@gimmickmedia.de>
@ -73,7 +75,7 @@ class DateIntervalToStringTransformerTest extends DateIntervalTestCase
public function testTransformExpectsDateTime()
{
$transformer = new DateIntervalToStringTransformer();
$this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(UnexpectedTypeException::class);
$transformer->transform('1234');
}
@ -94,7 +96,7 @@ class DateIntervalToStringTransformerTest extends DateIntervalTestCase
{
$reverseTransformer = new DateIntervalToStringTransformer($format, true);
$interval = new \DateInterval($output);
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class);
$this->assertDateIntervalEquals($interval, $reverseTransformer->reverseTransform($input));
}
@ -107,14 +109,14 @@ class DateIntervalToStringTransformerTest extends DateIntervalTestCase
public function testReverseTransformExpectsString()
{
$reverseTransformer = new DateIntervalToStringTransformer();
$this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(UnexpectedTypeException::class);
$reverseTransformer->reverseTransform(1234);
}
public function testReverseTransformExpectsValidIntervalString()
{
$reverseTransformer = new DateIntervalToStringTransformer();
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(TransformationFailedException::class);
$reverseTransformer->reverseTransform('10Y');
}
}

2
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
View File

@ -187,7 +187,7 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
// HOW TO REPRODUCE?
//$this->setExpectedException('Symfony\Component\Form\Extension\Core\DataTransformer\TransformationFailedException');
//$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Extension\Core\DataTransformer\TransformationFailedException');
//$transformer->transform(1.5);
}

8
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToStringTransformerTest.php
View File

@ -110,7 +110,7 @@ class DateTimeToStringTransformerTest extends DateTimeTestCase
{
$transformer = new DateTimeToStringTransformer();
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer->transform('1234');
}
@ -161,7 +161,7 @@ class DateTimeToStringTransformerTest extends DateTimeTestCase
{
$reverseTransformer = new DateTimeToStringTransformer();
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
$reverseTransformer->reverseTransform(1234);
}
@ -170,7 +170,7 @@ class DateTimeToStringTransformerTest extends DateTimeTestCase
{
$reverseTransformer = new DateTimeToStringTransformer();
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
$reverseTransformer->reverseTransform('2010-2010-2010');
}
@ -179,7 +179,7 @@ class DateTimeToStringTransformerTest extends DateTimeTestCase
{
$reverseTransformer = new DateTimeToStringTransformer();
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
$reverseTransformer->reverseTransform('2010-04-31');
}

4
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToTimestampTransformerTest.php
View File

@ -71,7 +71,7 @@ class DateTimeToTimestampTransformerTest extends DateTimeTestCase
{
$transformer = new DateTimeToTimestampTransformer();
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer->transform('1234');
}
@ -108,7 +108,7 @@ class DateTimeToTimestampTransformerTest extends DateTimeTestCase
{
$reverseTransformer = new DateTimeToTimestampTransformer();
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
$reverseTransformer->reverseTransform('2010-2010-2010');
}

4
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformerTest.php
View File

@ -33,7 +33,7 @@ class MoneyToLocalizedStringTransformerTest extends TestCase
{
$transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer->transform('abcd');
}
@ -61,7 +61,7 @@ class MoneyToLocalizedStringTransformerTest extends TestCase
{
$transformer = new MoneyToLocalizedStringTransformer(null, null, null, 100);
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer->reverseTransform(12345);
}

4
src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
View File

@ -106,7 +106,7 @@ class PercentToLocalizedStringTransformerTest extends TestCase
{
$transformer = new PercentToLocalizedStringTransformer();
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer->transform('foo');
}
@ -115,7 +115,7 @@ class PercentToLocalizedStringTransformerTest extends TestCase
{
$transformer = new PercentToLocalizedStringTransformer();
$this->setExpectedException('Symfony\Component\Form\Exception\TransformationFailedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\TransformationFailedException');
$transformer->reverseTransform(1);
}

2
src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
View File

@ -58,7 +58,7 @@ class CollectionTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
$form = $this->factory->create('Symfony\Component\Form\Extension\Core\Type\CollectionType', null, array(
'entry_type' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
));
$this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');
$form->setData(new \stdClass());
}

12
src/Symfony/Component/Form/Tests/FormBuilderTest.php
View File

@ -49,13 +49,13 @@ class FormBuilderTest extends TestCase
public function testAddNameNoStringAndNoInteger()
{
$this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');
$this->builder->add(true);
}
public function testAddTypeNoString()
{
$this->setExpectedException('Symfony\Component\Form\Exception\UnexpectedTypeException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Form\Exception\UnexpectedTypeException');
$this->builder->add('foo', 1234);
}
@ -165,7 +165,13 @@ class FormBuilderTest extends TestCase
public function testGetUnknown()
{
$this->setExpectedException('Symfony\Component\Form\Exception\InvalidArgumentException', 'The child with the name "foo" does not exist.');
if (method_exists($this, 'expectException')) {
$this->expectException('Symfony\Component\Form\Exception\InvalidArgumentException');
$this->expectExceptionMessage('The child with the name "foo" does not exist.');
} else {
$this->setExpectedException('Symfony\Component\Form\Exception\InvalidArgumentException', 'The child with the name "foo" does not exist.');
}
$this->builder->get('foo');
}

6
src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php
View File

@ -20,7 +20,11 @@ class TranslationFilesTest extends TestCase
*/
public function testTranslationFileIsValid($filePath)
{
\PHPUnit_Util_XML::loadfile($filePath, false, false, true);
if (class_exists('PHPUnit_Util_XML')) {
\PHPUnit_Util_XML::loadfile($filePath, false, false, true);
} else {
\PHPUnit\Util\XML::loadfile($filePath, false, false, true);
}
}
public function provideTranslationFiles()

2
src/Symfony/Component/HttpFoundation/Tests/File/FileTest.php
View File

@ -64,7 +64,7 @@ class FileTest extends TestCase
public function testConstructWhenFileNotExists()
{
$this->setExpectedException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
new File(__DIR__.'/Fixtures/not_here');
}

6
src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
View File

@ -29,7 +29,7 @@ class MimeTypeTest extends TestCase
public function testGuessImageWithDirectory()
{
$this->setExpectedException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/directory');
}
@ -53,7 +53,7 @@ class MimeTypeTest extends TestCase
public function testGuessWithIncorrectPath()
{
$this->setExpectedException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/not_here');
}
@ -72,7 +72,7 @@ class MimeTypeTest extends TestCase
@chmod($path, 0333);
if (substr(sprintf('%o', fileperms($path)), -4) == '0333') {
$this->setExpectedException('Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException');
MimeTypeGuesser::getInstance()->guess($path);
} else {
$this->markTestSkipped('Can not verify chmod operations, change of file permissions failed');

2
src/Symfony/Component/HttpFoundation/Tests/File/UploadedFileTest.php
View File

@ -25,7 +25,7 @@ class UploadedFileTest extends TestCase
public function testConstructWhenFileNotExists()
{
$this->setExpectedException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');
new UploadedFile(
__DIR__.'/Fixtures/not_here',

8
src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
View File

@ -1937,7 +1937,13 @@ class RequestTest extends TestCase
$this->assertSame($expectedPort, $request->getPort());
}
} else {
$this->setExpectedException(SuspiciousOperationException::class, 'Invalid Host');
if (method_exists($this, 'expectException')) {
$this->expectException(SuspiciousOperationException::class);
$this->expectExceptionMessage('Invalid Host');
} else {
$this->setExpectedException(SuspiciousOperationException::class, 'Invalid Host');
}
$request->getHost();
}
}

2
src/Symfony/Component/HttpKernel/Tests/Config/FileLocatorTest.php
View File

@ -30,7 +30,7 @@ class FileLocatorTest extends TestCase
$kernel
->expects($this->never())
->method('locateResource');
$this->setExpectedException('LogicException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('LogicException');
$locator->locate('/some/path');
}

7
src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php
View File

@ -118,7 +118,12 @@ class ControllerResolverTest extends TestCase
public function testGetControllerOnNonUndefinedFunction($controller, $exceptionName = null, $exceptionMessage = null)
{
$resolver = $this->createControllerResolver();
$this->setExpectedException($exceptionName, $exceptionMessage);
if (method_exists($this, 'expectException')) {
$this->expectException($exceptionName);
$this->expectExceptionMessage($exceptionMessage);
} else {
$this->setExpectedException($exceptionName, $exceptionMessage);
}
$request = Request::create('/');
$request->attributes->set('_controller', $controller);

31
src/Symfony/Component/Intl/Tests/NumberFormatter/AbstractNumberFormatterTest.php
View File

@ -306,10 +306,17 @@ abstract class AbstractNumberFormatterTest extends TestCase
/**
* @dataProvider formatTypeCurrencyProvider
* @expectedException \PHPUnit_Framework_Error_Warning
*/
public function testFormatTypeCurrency($formatter, $value)
{
$exceptionCode = 'PHPUnit\Framework\Error\Warning';
if (class_exists('PHPUnit_Framework_Error_Warning')) {
$exceptionCode = 'PHPUnit_Framework_Error_Warning';
}
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}($exceptionCode);
$formatter->format($value, NumberFormatter::TYPE_CURRENCY);
}
@ -641,11 +648,16 @@ abstract class AbstractNumberFormatterTest extends TestCase
);
}
/**
* @expectedException \PHPUnit_Framework_Error_Warning
*/
public function testParseTypeDefault()
{
$exceptionCode = 'PHPUnit\Framework\Error\Warning';
if (class_exists('PHPUnit_Framework_Error_Warning')) {
$exceptionCode = 'PHPUnit_Framework_Error_Warning';
}
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}($exceptionCode);
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
$formatter->parse('1', NumberFormatter::TYPE_DEFAULT);
}
@ -762,11 +774,16 @@ abstract class AbstractNumberFormatterTest extends TestCase
);
}
/**
* @expectedException \PHPUnit_Framework_Error_Warning
*/
public function testParseTypeCurrency()
{
$exceptionCode = 'PHPUnit\Framework\Error\Warning';
if (class_exists('PHPUnit_Framework_Error_Warning')) {
$exceptionCode = 'PHPUnit_Framework_Error_Warning';
}
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}($exceptionCode);
$formatter = $this->getNumberFormatter('en', NumberFormatter::DECIMAL);
$formatter->parse('1', NumberFormatter::TYPE_CURRENCY);
}

2
src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php
View File

@ -74,7 +74,7 @@ class AdapterTest extends LdapTestCase
public function testLdapQueryWithoutBind()
{
$ldap = new Adapter($this->getLdapConfig());
$this->setExpectedException(NotBoundException::class);
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(NotBoundException::class);
$query = $ldap->createQuery('dc=symfony,dc=com', '(&(objectclass=person)(ou=Maintainers))', array());
$query->execute();
}

8
src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
View File

@ -59,7 +59,7 @@ class LdapManagerTest extends LdapTestCase
*/
public function testLdapAddInvalidEntry()
{
$this->setExpectedException(LdapException::class);
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(LdapException::class);
$this->executeSearchQuery(1);
// The entry is missing a subject name
@ -105,7 +105,7 @@ class LdapManagerTest extends LdapTestCase
public function testLdapUnboundAdd()
{
$this->adapter = new Adapter($this->getLdapConfig());
$this->setExpectedException(NotBoundException::class);
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(NotBoundException::class);
$em = $this->adapter->getEntryManager();
$em->add(new Entry(''));
}
@ -116,7 +116,7 @@ class LdapManagerTest extends LdapTestCase
public function testLdapUnboundRemove()
{
$this->adapter = new Adapter($this->getLdapConfig());
$this->setExpectedException(NotBoundException::class);
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(NotBoundException::class);
$em = $this->adapter->getEntryManager();
$em->remove(new Entry(''));
}
@ -127,7 +127,7 @@ class LdapManagerTest extends LdapTestCase
public function testLdapUnboundUpdate()
{
$this->adapter = new Adapter($this->getLdapConfig());
$this->setExpectedException(NotBoundException::class);
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(NotBoundException::class);
$em = $this->adapter->getEntryManager();
$em->update(new Entry(''));
}

2
src/Symfony/Component/Ldap/Tests/LdapTest.php
View File

@ -78,7 +78,7 @@ class LdapTest extends TestCase
public function testCreateWithInvalidAdapterName()
{
$this->setExpectedException(DriverNotFoundException::class);
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(DriverNotFoundException::class);
Ldap::create('foo');
}
}

9
src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
View File

@ -507,7 +507,14 @@ class OptionsResolverTest extends TestCase
{
$this->resolver->setDefined('option');
$this->resolver->setAllowedTypes('option', $allowedType);
$this->setExpectedException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException', $exceptionMessage);
if (method_exists($this, 'expectException')) {
$this->expectException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException');
$this->expectExceptionMessage($exceptionMessage);
} else {
$this->setExpectedException('Symfony\Component\OptionsResolver\Exception\InvalidOptionsException', $exceptionMessage);
}
$this->resolver->resolve(array('option' => $actualType));
}

2
src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php
View File

@ -29,7 +29,7 @@ class ProcessFailedExceptionTest extends TestCase
->method('isSuccessful')
->will($this->returnValue(true));
$this->setExpectedException(
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(
'\InvalidArgumentException',
'Expected a failed process, but the given process was successful.'
);

16
src/Symfony/Component/Process/Tests/ProcessTest.php
View File

@ -938,7 +938,14 @@ class ProcessTest extends TestCase
public function testMethodsThatNeedARunningProcess($method)
{
$process = $this->getProcess('foo');
$this->setExpectedException('Symfony\Component\Process\Exception\LogicException', sprintf('Process must be started before calling %s.', $method));
if (method_exists($this, 'expectException')) {
$this->expectException('Symfony\Component\Process\Exception\LogicException');
$this->expectExceptionMessage(sprintf('Process must be started before calling %s.', $method));
} else {
$this->setExpectedException('Symfony\Component\Process\Exception\LogicException', sprintf('Process must be started before calling %s.', $method));
}
$process->{$method}();
}
@ -1497,7 +1504,12 @@ class ProcessTest extends TestCase
if (!$expectException) {
$this->markTestSkipped('PHP is compiled with --enable-sigchild.');
} elseif (self::$notEnhancedSigchild) {
$this->setExpectedException('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild.');
if (method_exists($this, 'expectException')) {
$this->expectException('Symfony\Component\Process\Exception\RuntimeException');
$this->expectExceptionMessage('This PHP has been compiled with --enable-sigchild.');
} else {
$this->setExpectedException('Symfony\Component\Process\Exception\RuntimeException', 'This PHP has been compiled with --enable-sigchild.');
}
}
}
}

2
src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
View File

@ -368,7 +368,7 @@ class UrlGeneratorTest extends TestCase
// The default requirement for 'x' should not allow the separator '.' in this case because it would otherwise match everything
// and following optional variables like _format could never match.
$this->setExpectedException('Symfony\Component\Routing\Exception\InvalidParameterException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Routing\Exception\InvalidParameterException');
$generator->generate('test', array('x' => 'do.t', 'y' => '123', 'z' => 'bar', '_format' => 'xml'));
}

6
src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
View File

@ -195,7 +195,7 @@ class UrlMatcherTest extends TestCase
$matcher = new UrlMatcher($collection, new RequestContext());
$this->assertEquals(array('_route' => 'foo'), $matcher->match('/foo1'));
$this->setExpectedException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$this->assertEquals(array(), $matcher->match('/foo'));
}
@ -252,7 +252,7 @@ class UrlMatcherTest extends TestCase
// z and _format are optional.
$this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'default-z', '_format' => 'html', '_route' => 'test'), $matcher->match('/wwwwwxy'));
$this->setExpectedException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$matcher->match('/wxy.html');
}
@ -267,7 +267,7 @@ class UrlMatcherTest extends TestCase
// Usually the character in front of an optional parameter can be left out, e.g. with pattern '/get/{what}' just '/get' would match.
// But here the 't' in 'get' is not a separating character, so it makes no sense to match without it.
$this->setExpectedException('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$matcher->match('/ge');
}

6
src/Symfony/Component/Security/Core/Tests/Resources/TranslationFilesTest.php
View File

@ -20,7 +20,11 @@ class TranslationFilesTest extends TestCase
*/
public function testTranslationFileIsValid($filePath)
{
\PHPUnit_Util_XML::loadfile($filePath, false, false, true);
if (class_exists('PHPUnit_Util_XML')) {
\PHPUnit_Util_XML::loadfile($filePath, false, false, true);
} else {
\PHPUnit\Util\XML::loadfile($filePath, false, false, true);
}
}
public function provideTranslationFiles()

2
src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
View File

@ -29,7 +29,7 @@ class PersistentTokenBasedRememberMeServicesTest extends TestCase
try {
random_bytes(1);
} catch (\Exception $e) {
throw new \PHPUnit_Framework_SkippedTestError($e->getMessage());
self::markTestSkipped($e->getMessage());
}
}

7
src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
View File

@ -472,7 +472,12 @@ XML;
public function testDecodeEmptyXml()
{
$this->setExpectedException('Symfony\Component\Serializer\Exception\UnexpectedValueException', 'Invalid XML data, it can not be empty.');
if (method_exists($this, 'expectException')) {
$this->expectException('Symfony\Component\Serializer\Exception\UnexpectedValueException');
$this->expectExceptionMessage('Invalid XML data, it can not be empty.');
} else {
$this->setExpectedException('Symfony\Component\Serializer\Exception\UnexpectedValueException', 'Invalid XML data, it can not be empty.');
}
$this->encoder->decode(' ', 'xml');
}

2
src/Symfony/Component/Templating/Tests/PhpEngineTest.php
View File

@ -86,7 +86,7 @@ class PhpEngineTest extends TestCase
$foo = new \Symfony\Component\Templating\Tests\Fixtures\SimpleHelper('foo');
$engine->set($foo);
$this->setExpectedException('\LogicException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\LogicException');
unset($engine['foo']);
}

2
src/Symfony/Component/Translation/Tests/Catalogue/AbstractOperationTest.php
View File

@ -41,7 +41,7 @@ abstract class AbstractOperationTest extends TestCase
public function testGetMessagesFromUnknownDomain()
{
$this->setExpectedException('InvalidArgumentException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('InvalidArgumentException');
$this->createOperation(
new MessageCatalogue('en'),
new MessageCatalogue('en')

9
src/Symfony/Component/Translation/Tests/Loader/QtFileLoaderTest.php
View File

@ -62,7 +62,14 @@ class QtFileLoaderTest extends TestCase
{
$loader = new QtFileLoader();
$resource = __DIR__.'/../fixtures/empty.xlf';
$this->setExpectedException('Symfony\Component\Translation\Exception\InvalidResourceException', sprintf('Unable to load "%s".', $resource));
if (method_exists($this, 'expectException')) {
$this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$this->expectExceptionMessage(sprintf('Unable to load "%s".', $resource));
} else {
$this->setExpectedException('Symfony\Component\Translation\Exception\InvalidResourceException', sprintf('Unable to load "%s".', $resource));
}
$loader->load($resource, 'en', 'domain1');
}
}

9
src/Symfony/Component/Translation/Tests/Loader/XliffFileLoaderTest.php
View File

@ -148,7 +148,14 @@ class XliffFileLoaderTest extends TestCase
{
$loader = new XliffFileLoader();
$resource = __DIR__.'/../fixtures/empty.xlf';
$this->setExpectedException('Symfony\Component\Translation\Exception\InvalidResourceException', sprintf('Unable to load "%s":', $resource));
if (method_exists($this, 'expectException')) {
$this->expectException('Symfony\Component\Translation\Exception\InvalidResourceException');
$this->expectExceptionMessage(sprintf('Unable to load "%s":', $resource));
} else {
$this->setExpectedException('Symfony\Component\Translation\Exception\InvalidResourceException', sprintf('Unable to load "%s":', $resource));
}
$loader->load($resource, 'en', 'domain1');
}

10
src/Symfony/Component/Validator/Tests/ConstraintTest.php
View File

@ -35,7 +35,7 @@ class ConstraintTest extends TestCase
public function testSetNotExistingPropertyThrowsException()
{
$this->setExpectedException('Symfony\Component\Validator\Exception\InvalidOptionsException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
new ConstraintA(array(
'foo' => 'bar',
@ -46,14 +46,14 @@ class ConstraintTest extends TestCase
{
$constraint = new ConstraintA();
$this->setExpectedException('Symfony\Component\Validator\Exception\InvalidOptionsException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
$constraint->foo = 'bar';
}
public function testInvalidAndRequiredOptionsPassed()
{
$this->setExpectedException('Symfony\Component\Validator\Exception\InvalidOptionsException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\InvalidOptionsException');
new ConstraintC(array(
'option1' => 'default',
@ -101,14 +101,14 @@ class ConstraintTest extends TestCase
public function testSetUndefinedDefaultProperty()
{
$this->setExpectedException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
new ConstraintB('foo');
}
public function testRequiredOptionsMustBeDefined()
{
$this->setExpectedException('Symfony\Component\Validator\Exception\MissingOptionsException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\MissingOptionsException');
new ConstraintC();
}

8
src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
View File

@ -39,14 +39,14 @@ class ClassMetadataTest extends TestCase
public function testAddConstraintDoesNotAcceptValid()
{
$this->setExpectedException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$this->metadata->addConstraint(new Valid());
}
public function testAddConstraintRequiresClassConstraints()
{
$this->setExpectedException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$this->metadata->addConstraint(new PropertyConstraint());
}
@ -249,14 +249,14 @@ class ClassMetadataTest extends TestCase
public function testGroupSequencesFailIfNotContainingDefaultGroup()
{
$this->setExpectedException('Symfony\Component\Validator\Exception\GroupDefinitionException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\GroupDefinitionException');
$this->metadata->setGroupSequence(array('Foo', 'Bar'));
}
public function testGroupSequencesFailIfContainingDefault()
{
$this->setExpectedException('Symfony\Component\Validator\Exception\GroupDefinitionException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\GroupDefinitionException');
$this->metadata->setGroupSequence(array('Foo', $this->metadata->getDefaultGroup(), Constraint::DEFAULT_GROUP));
}

2
src/Symfony/Component/Validator/Tests/Mapping/GetterMetadataTest.php
View File

@ -21,7 +21,7 @@ class GetterMetadataTest extends TestCase
public function testInvalidPropertyName()
{
$this->setExpectedException('Symfony\Component\Validator\Exception\ValidatorException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');
new GetterMetadata(self::CLASSNAME, 'foobar');
}

4
src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php
View File

@ -114,7 +114,7 @@ class XmlFileLoaderTest extends TestCase
$loader = new XmlFileLoader(__DIR__.'/withdoctype.xml');
$metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
$this->setExpectedException('\Symfony\Component\Validator\Exception\MappingException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\Symfony\Component\Validator\Exception\MappingException');
$loader->loadClassMetadata($metadata);
}
@ -129,7 +129,7 @@ class XmlFileLoaderTest extends TestCase
try {
$loader->loadClassMetadata($metadata);
} catch (MappingException $e) {
$this->setExpectedException('\Symfony\Component\Validator\Exception\MappingException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\Symfony\Component\Validator\Exception\MappingException');
$loader->loadClassMetadata($metadata);
}
}

2
src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
View File

@ -69,7 +69,7 @@ class YamlFileLoaderTest extends TestCase
$loader->loadClassMetadata($metadata);
} catch (\InvalidArgumentException $e) {
// Call again. Again an exception should be thrown
$this->setExpectedException('\InvalidArgumentException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('\InvalidArgumentException');
$loader->loadClassMetadata($metadata);
}
}

2
src/Symfony/Component/Validator/Tests/Mapping/MemberMetadataTest.php
View File

@ -38,7 +38,7 @@ class MemberMetadataTest extends TestCase
public function testAddConstraintRequiresClassConstraints()
{
$this->setExpectedException('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ConstraintDefinitionException');
$this->metadata->addConstraint(new ClassConstraint());
}

4
src/Symfony/Component/Validator/Tests/Mapping/PropertyMetadataTest.php
View File

@ -22,7 +22,7 @@ class PropertyMetadataTest extends TestCase
public function testInvalidPropertyName()
{
$this->setExpectedException('Symfony\Component\Validator\Exception\ValidatorException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');
new PropertyMetadata(self::CLASSNAME, 'foobar');
}
@ -50,7 +50,7 @@ class PropertyMetadataTest extends TestCase
$metadata = new PropertyMetadata(self::CLASSNAME, 'internal');
$metadata->name = 'test';
$this->setExpectedException('Symfony\Component\Validator\Exception\ValidatorException');
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\ValidatorException');
$metadata->getPropertyValue($entity);
}
}

6
src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php
View File

@ -20,7 +20,11 @@ class TranslationFilesTest extends TestCase
*/
public function testTranslationFileIsValid($filePath)
{
\PHPUnit_Util_XML::loadfile($filePath, false, false, true);
if (class_exists('PHPUnit_Util_XML')) {
\PHPUnit_Util_XML::loadfile($filePath, false, false, true);
} else {
\PHPUnit\Util\XML::loadfile($filePath, false, false, true);
}
}
public function provideTranslationFiles()

16
src/Symfony/Component/Yaml/Tests/ParserTest.php
View File

@ -42,7 +42,11 @@ class ParserTest extends TestCase
if (E_USER_DEPRECATED !== $type) {
restore_error_handler();
return call_user_func_array('PHPUnit_Util_ErrorHandler::handleError', func_get_args());
if (class_exists('PHPUnit_Util_ErrorHandler')) {
return call_user_func_array('PHPUnit_Util_ErrorHandler::handleError', func_get_args());
}
return call_user_func_array('PHPUnit\Util\ErrorHandler::handleError', func_get_args());
}
$deprecations[] = $msg;
@ -1381,10 +1385,12 @@ EOT;
*/
public function testParserThrowsExceptionWithCorrectLineNumber($lineNumber, $yaml)
{
$this->setExpectedException(
'\Symfony\Component\Yaml\Exception\ParseException',
sprintf('Unexpected characters near "," at line %d (near "bar: "123",").', $lineNumber)
);
if (method_exists($this, 'expectException')) {
$this->expectException('\Symfony\Component\Yaml\Exception\ParseException');
$this->expectExceptionMessage(sprintf('Unexpected characters near "," at line %d (near "bar: "123",").', $lineNumber));
} else {
$this->setExpectedException('\Symfony\Component\Yaml\Exception\ParseException', sprintf('Unexpected characters near "," at line %d (near "bar: "123",").', $lineNumber));
}
$this->parser->parse($yaml);
}