8000 Merge branch '3.1' · symfony/symfony@22f00a2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 22f00a2

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.1'
* 3.1: [2.8][PhpUnitBridge] Drop ErrorAssert in favor of @expectedDeprecation [3.1][PhpUnitBridge] Drop ErrorAssert in favor of @expectedDeprecation
2 parents 60e6af5 + 57f8d1e commit 22f00a2

File tree

6 files changed

+33
-54
lines changed

6 files changed

+33
-54
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
1313

14-
use Symfony\Bridge\PhpUnit\ErrorAssert;
1514
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
1615
use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
1716
use Symfony\Component\Cache\Adapter\ApcuAdapter;
@@ -566,19 +565,17 @@ public function testSerializerCacheDisabled()
566565

567566
/**
568567
* @group legacy
569-
* @requires function Symfony\Bridge\PhpUnit\ErrorAssert::assertDeprecationsAreTriggered
568+
* @expectedDeprecation The "framework.serializer.cache" option is deprecated %s.
570569
*/
571570
public function testDeprecatedSerializerCacheOption()
572571
{
573-
ErrorAssert::assertDeprecationsAreTriggered('The "framework.serializer.cache" option is deprecated', function () {
574-
$container = $this->createContainerFromFile('serializer_legacy_cache', array('kernel.debug' => true, 'kernel.container_class' => __CLASS__));
572+
$container = $this->createContainerFromFile('serializer_legacy_cache', array('kernel.debug' => true, 'kernel.container_class' => __CLASS__));
575573

576-
$this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
577-
$this->assertTrue($container->hasDefinition('serializer.mapping.class_metadata_factory'));
574+
$this->assertFalse($container->hasDefinition('serializer.mapping.cache_class_metadata_factory'));
575+
$this->assertTrue($container->hasDefinition('serializer.mapping.class_metadata_factory'));
578576

579-
$cache = $container->getDefinition('serializer.mapping.class_metadata_factory')->getArgument(1);
580-
$this->assertEquals(new Reference('foo'), $cache);
581-
});
577+
$cache = $container->getDefinition('serializer.mapping.class_metadata_factory')->getArgument(1);
578+
$this->assertEquals(new Reference('foo'), $cache);
582579
}
583580

584581
public function testAssetHelperWhenAssetsAreEnabled()

‎src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TemplateNameParserTest.php

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Templating;
1313

14-
use Symfony\Bridge\PhpUnit\ErrorAssert;
1514
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
1615
use Symfony\Bundle\FrameworkBundle\Templating\TemplateNameParser;
1716
use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
@@ -86,17 +85,15 @@ public function testParseValidNameWithNotFoundBundle()
8685
/**
8786
* @group legacy
8887
* @dataProvider provideAbsolutePaths
89-
* @requires function Symfony\Bridge\PhpUnit\ErrorAssert::assertDeprecationsAreTriggered
88+
* @expectedDeprecation Absolute template path support is deprecated since Symfony 3.1 and will be removed in 4.0.
9089
*/
9190
public function testAbsolutePathsAreDeprecated($name, $logicalName, $path, $ref)
9291
{
93-
ErrorAssert::assertDeprecationsAreTriggered('Absolute template path support is deprecated since Symfony 3.1 and will be removed in 4.0.', function () use ($name, $logicalName, $path, $ref) {
94-
$template = $this->parser->parse($name);
92+
$template = $this->parser->parse($name);
9593

96-
$this->assertSame($ref->getLogicalName(), $template->getLogicalName());
97-
$this->assertSame($logicalName, $template->getLogicalName());
98-
$this->assertSame($path, $template->getPath());
99-
});
94+
$this->assertSame($ref->getLogicalName(), $template->getLogicalName());
95+
$this->assertSame($logicalName, $template->getLogicalName());
96+
$this->assertSame($path, $template->getPath());
10097
}
10198

10299
public function provideAbsolutePaths()

‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
require_once __DIR__.'/Fixtures/includes/classes.php';
1515
require_once __DIR__.'/Fixtures/includes/ProjectExtension.php';
1616

17-
use Symfony\Bridge\PhpUnit\ErrorAssert;
1817
use Symfony\Component\Config\Resource\ResourceInterface;
1918
use Symfony\Component\DependencyInjection\Alias;
2019
use Symfony\Component\DependencyInjection\Compiler\PassConfig;
@@ -60,19 +59,18 @@ public function testDefinitions()
6059
}
6160

6261
/**
63-
* @requires function Symfony\Bridge\PhpUnit\ErrorAssert::assertDeprecationsAreTriggered
62+
* @group legacy
63+
* @expectedDeprecation The "deprecated_foo" service is deprecated. You should stop using it, as it will soon be removed.
6464
*/
6565
public function testCreateDeprecatedService()
6666
{
67-
ErrorAssert::assertDeprecationsAreTriggered('The "deprecated_foo" service is deprecated. You should stop using it, as it will soon be removed.', function () {
68-
$definition = new Definition('stdClass');
69-
$definition->setDeprecated(true);
67+
$definition = new Definition('stdClass');
68+
$definition->setDeprecated(true);
7069

71-
$builder = new ContainerBuilder();
72-
$builder->setDefinition('deprecated_foo', $definition);
73-
$builder->compile();
74-
$builder->get('deprecated_foo');
75-
});
70+
$builder = new ContainerBuilder();
71+
$builder->setDefinition('deprecated_foo', $definition);
72+
$builder->compile();
73+
$builder->get('deprecated_foo');
7674
}
7775

7876
public function testRegister()

‎src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\DependencyInjection\Tests\Loader;
1313

14-
use Symfony\Bridge\PhpUnit\ErrorAssert;
1514
use Symfony\Component\DependencyInjection\ContainerInterface;
1615
use Symfony\Component\DependencyInjection\ContainerBuilder;
1716
use Symfony\Component\DependencyInjection\Reference;
@@ -558,23 +557,17 @@ public function testAutowire()
558557

559558
/**
560559
* @group legacy
561-
* @requires function Symfony\Bridge\PhpUnit\ErrorAssert::assertDeprecationsAreTriggered
560+
* @expectedDeprecation Using the attribute "class" is deprecated for the service "bar" which is defined as an alias %s.
561+
* @expectedDeprecation Using the element "tag" is deprecated for the service "bar" which is defined as an alias %s.
562+
* @expectedDeprecation Using the element "factory" is deprecated for the service "bar" which is defined as an alias %s.
562563
*/
563564
public function testAliasDefinitionContainsUnsupportedElements()
564565
{
565-
$deprecations = array(
566-
'Using the attribute "class" is deprecated for the service "bar" which is defined as an alias',
567-
'Using the element "tag" is deprecated for the service "bar" which is defined as an alias',
568-
'Using the element "factory" is deprecated for the service "bar" which is defined as an alias',
569-
);
570-
571-
ErrorAssert::assertDeprecationsAreTriggered($deprecations, function () {
572-
$container = new ContainerBuilder();
573-
$loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
566+
$container = new ContainerBuilder();
567+
$loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
574568

575-
$loader->load('legacy_invalid_alias_definition.xml');
569+
$loader->load('legacy_invalid_alias_definition.xml');
576570

577-
$this->assertTrue($container->has('bar'));
578-
});
571+
$this->assertTrue($container->has('bar'));
579572
}
580573
}

‎src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\HttpKernel\Tests\Fragment;
1313

14-
use Symfony\Bridge\PhpUnit\ErrorAssert;
1514
use Symfony\Component\HttpKernel\Controller\ControllerReference;
1615
use Symfony\Component\HttpKernel\Fragment\EsiFragmentRenderer;
1716
use Symfony\Component\HttpKernel\HttpCache\Esi;
@@ -28,16 +27,14 @@ public function testRenderFallbackToInlineStrategyIfEsiNotSupported()
2827

2928
/**
3029
* @group legacy
31-
* @requires function Symfony\Bridge\PhpUnit\ErrorAssert::assertDeprecationsAreTriggered
30+
* @expectedDeprecation Passing non-scalar values as part of URI attributes to the ESI and SSI rendering strategies is deprecated %s.
3231
*/
3332
public function testRenderFallbackWithObjectAttributesIsDeprecated()
3433
{
35-
ErrorAssert::assertDeprecationsAreTriggered('Passing non-scalar values as part of URI attributes to the ESI and SSI rendering strategies is deprecated', function () {
36-
$strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true), new UriSigner('foo'));
37-
$request = Request::create('/');
38-
$reference = new ControllerReference('main_controller', array('foo' => array('a' => array(), 'b' => new \stdClass())), array());
39-
$strategy->render($reference, $request);
40-
});
34+
$strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true), new UriSigner('foo'));
35+
$request = Request::create('/');
36+
$reference = new ControllerReference('main_controller', array('foo' => array('a' => array(), 'b' => new \stdClass())), array());
37+
$strategy->render($reference, $request);
4138
}
4239

4340
public function testRender()

‎src/Symfony/Component/Yaml/Tests/InlineTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Yaml\Tests;
1313

14-
use Symfony\Bridge\PhpUnit\ErrorAssert;
1514
use Symfony\Component\Yaml\Inline;
1615
use Symfony\Component\Yaml\Yaml;
1716

@@ -303,14 +302,12 @@ public function getScalarIndicators()
303302

304303
/**
305304
* @group legacy
306-
* @requires function Symfony\Bridge\PhpUnit\ErrorAssert::assertDeprecationsAreTriggered
305+
* @expectedDeprecation Not quoting the scalar "%bar " starting with the "%" indicator character is deprecated since Symfony 3.1 and will throw a ParseException in 4.0.
307306
* throws \Symfony\Component\Yaml\Exception\ParseException in 4.0
308307
*/
309308
public function testParseUnquotedScalarStartingWithPercentCharacter()
310309
{
311-
ErrorAssert::assertDeprecationsAreTriggered('Not quoting the scalar "%foo " starting with the &qu 57AE ot;%" indicator character is deprecated since Symfony 3.1 and will throw a ParseException in 4.0.', function () {
312-
Inline::parse('{ foo: %foo }');
313-
});
310+
Inline::parse('{ foo: %bar }');
314311
}
315312

316313
/**

0 commit comments

Comments
 (0)
0