diff --git a/composer.lock b/composer.lock index 8adc67d..76769a6 100644 --- a/composer.lock +++ b/composer.lock @@ -4202,16 +4202,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v3.1.5", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "1f4e2059cf4ecae1053b9c3027b3fc548fd077b9" + "reference": "d5ab07f582cb6cea85100f8d2df022f901415cd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/1f4e2059cf4ecae1053b9c3027b3fc548fd077b9", - "reference": "1f4e2059cf4ecae1053b9c3027b3fc548fd077b9", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/d5ab07f582cb6cea85100f8d2df022f901415cd0", + "reference": "d5ab07f582cb6cea85100f8d2df022f901415cd0", "shasum": "" }, "require": { @@ -4220,10 +4220,13 @@ "suggest": { "symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader" }, + "bin": [ + "bin/simple-phpunit" + ], "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -4253,12 +4256,14 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2016-08-19 06:48:39" + "time": "2016-09-24 08:11:35" } ], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": { + "symfony/phpunit-bridge": 20 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { diff --git a/core/composer.json b/core/composer.json index 5d2432e..1258445 100644 --- a/core/composer.json +++ b/core/composer.json @@ -42,7 +42,7 @@ "mikey179/vfsStream": "~1.2", "phpunit/phpunit": "~4.8", "symfony/css-selector": "~2.8", - "symfony/phpunit-bridge": "~3.1" + "symfony/phpunit-bridge": "3.2.x-dev" }, "replace": { "drupal/action": "self.version", diff --git a/core/phpunit.xml.dist b/core/phpunit.xml.dist index 9658f2c..848b05c 100644 --- a/core/phpunit.xml.dist +++ b/core/phpunit.xml.dist @@ -45,6 +45,8 @@ + + diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php index 3c89804..5c22f07 100644 --- a/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php +++ b/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php @@ -674,6 +674,8 @@ public function testInitializedForAliases() { * @expectedException \BadMethodCallException * * @dataProvider scopeExceptionTestProvider + * + * @group legacy */ public function testScopeFunctionsWithException($method, $argument) { $callable = array( diff --git a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php index 49b6556..04139d3 100644 --- a/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php +++ b/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php @@ -208,6 +208,8 @@ public function getParametersDataProvider() { * @covers ::getParameterCall * * @dataProvider getDefinitionsDataProvider + * + * @group legacy */ public function testGetServiceDefinitions($services, $definition_services) { $this->containerDefinition['services'] = $definition_services; @@ -483,6 +485,8 @@ protected function getServiceCall($id, $invalid_behavior = ContainerInterface::E * @covers ::getServiceDefinition * * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException + * + * @group legacy */ public function testGetServiceDefinitionWithInvalidScope() { $bar_definition = new Definition('\stdClass'); @@ -499,6 +503,8 @@ public function testGetServiceDefinitionWithInvalidScope() { * @covers ::getReferenceCall * * @dataProvider publicPrivateDataProvider + * + * @group legacy */ public function testGetServiceDefinitionWithReferenceToAlias($public) { $bar_definition = new Definition('\stdClass'); @@ -556,6 +562,8 @@ public function publicPrivateDataProvider() { * @covers ::getServiceDefinition * * @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException + * + * @group legacy */ public function testGetServiceDefinitionForDecoratedService() { $bar_definition = new Definition('\stdClass'); diff --git a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php index 09ec989..bbee477 100644 --- a/core/tests/Drupal/Tests/Core/Template/AttributeTest.php +++ b/core/tests/Drupal/Tests/Core/Template/AttributeTest.php @@ -261,6 +261,8 @@ public function testChainAddRemoveClasses() { * * @covers ::removeClass * @covers ::addClass + * + * @group legacy */ public function testTwigAddRemoveClasses($template, $expected, $seed_attributes = array()) { $loader = new \Twig_Loader_String(); diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php index ea93703..6a59868 100644 --- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php +++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php @@ -30,6 +30,8 @@ class TwigExtensionTest extends UnitTestCase { * Tests the escaping * * @dataProvider providerTestEscaping + * + * @group legacy */ public function testEscaping($template, $expected) { $renderer = $this->getMock('\Drupal\Core\Render\RendererInterface'); @@ -81,6 +83,8 @@ public function providerTestEscaping() { /** * Tests the active_theme function. + * + * @group legacy */ public function testActiveTheme() { $renderer = $this->getMock('\Drupal\Core\Render\RendererInterface'); @@ -158,6 +162,8 @@ public function testActiveThemePath() { * Tests the escaping of objects implementing MarkupInterface. * * @covers ::escapeFilter + * + * @group legacy */ public function testSafeStringEscaping() { $renderer = $this->getMock('\Drupal\Core\Render\RendererInterface'); @@ -245,6 +251,8 @@ public function providerTestRenderVar() { /** * @covers ::escapeFilter * @covers ::bubbleArgMetadata + * + * @group legacy */ public function testEscapeWithGeneratedLink() { $renderer = $this->prophesize(RendererInterface::class); diff --git a/core/tests/Drupal/Tests/Core/Test/LegacyTest.php b/core/tests/Drupal/Tests/Core/Test/LegacyTest.php new file mode 100644 index 0000000..d4b60d7 --- /dev/null +++ b/core/tests/Drupal/Tests/Core/Test/LegacyTest.php @@ -0,0 +1,22 @@ +