Merge branch '4.4' into 5.1

* 4.4:
  Remove :void in test function signatures

Author: fabpot

src/Symfony/Component/BrowserKit/Tests/Test/Constraint/BrowserCookieValueSameTest.php

@@ -21,7 +21,7 @@
 
 class BrowserCookieValueSameTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $browser = $this->getBrowser();
         $constraint = new BrowserCookieValueSame('foo', 'bar', false, '/path');

src/Symfony/Component/BrowserKit/Tests/Test/Constraint/BrowserHasCookieTest.php

@@ -21,7 +21,7 @@
 
 class BrowserHasCookieTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $browser = $this->getBrowser();
         $constraint = new BrowserHasCookie('foo', '/path');
@@ -42,7 +42,7 @@ public function testConstraint(): void
         $this->fail();
     }
 
-    public function testConstraintWithWrongPath(): void
+    public function testConstraintWithWrongPath()
     {
         $browser = $this->getBrowser();
         $constraint = new BrowserHasCookie('foo', '/other');
@@ -57,7 +57,7 @@ public function testConstraintWithWrongPath(): void
         $this->fail();
     }
 
-    public function testConstraintWithWrongDomain(): void
+    public function testConstraintWithWrongDomain()
     {
         $browser = $this->getBrowser();
         $constraint = new BrowserHasCookie('foo', '/path', 'example.org');

src/Symfony/Component/Console/Tests/Helper/TableTest.php

@@ -1263,7 +1263,7 @@ protected function getOutputContent(StreamOutput $output)
         return str_replace(\PHP_EOL, "\n", stream_get_contents($output->getStream()));
     }
 
-    public function testWithColspanAndMaxWith(): void
+    public function testWithColspanAndMaxWith()
     {
         $table = new Table($output = $this->getOutputStream());
 

src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php

@@ -202,7 +202,7 @@ public function testEnvIsNotUnset()
         $this->assertSame($expected, $container->resolveEnvPlaceholders($ext->getConfig()));
     }
 
-    public function testEmptyEnvWhichCannotBeEmptyForScalarNode(): void
+    public function testEmptyEnvWhichCannotBeEmptyForScalarNode()
     {
         $container = new ContainerBuilder();
         $container->registerExtension($ext = new EnvExtension());
@@ -215,7 +215,7 @@ public function testEmptyEnvWhichCannotBeEmptyForScalarNode(): void
         $this->assertSame($expected, $container->resolveEnvPlaceholders($ext->getConfig()));
     }
 
-    public function testEmptyEnvWhichCannotBeEmptyForScalarNodeWithValidation(): void
+    public function testEmptyEnvWhichCannotBeEmptyForScalarNodeWithValidation()
     {
         $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
         $this->expectExceptionMessage('The path "env_extension.scalar_node_not_empty_validated" cannot contain an environment variable when empty values are not allowed by definition and are validated.');
@@ -229,7 +229,7 @@ public function testEmptyEnvWhichCannotBeEmptyForScalarNodeWithValidation(): voi
         $this->doProcess($container);
     }
 
-    public function testPartialEnvWhichCannotBeEmptyForScalarNode(): void
+    public function testPartialEnvWhichCannotBeEmptyForScalarNode()
     {
         $container = new ContainerBuilder();
         $container->registerExtension($ext = new EnvExtension());
@@ -242,7 +242,7 @@ public function testPartialEnvWhichCannotBeEmptyForScalarNode(): void
         $this->assertSame($expected, $container->resolveEnvPlaceholders($ext->getConfig()));
     }
 
-    public function testEnvWithVariableNode(): void
+    public function testEnvWithVariableNode()
     {
         $container = new ContainerBuilder();
         $container->registerExtension($ext = new EnvExtension());
@@ -266,7 +266,7 @@ public function testEmptyConfigFromMoreThanOneSource()
         $this->addToAssertionCount(1);
     }
 
-    public function testDiscardedEnvInConfig(): void
+    public function testDiscardedEnvInConfig()
     {
         $container = new ContainerBuilder();
         $container->setParameter('env(BOOLISH)', '1');

src/Symfony/Component/DomCrawler/Tests/Test/Constraint/CrawlerSelectorAttributeValueSameTest.php

@@ -19,7 +19,7 @@
 
 class CrawlerSelectorAttributeValueSameTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $constraint = new CrawlerSelectorAttributeValueSame('input[name="username"]', 'value', 'Fabien');
         $this->assertTrue($constraint->evaluate(new Crawler('<html><body><form><input type="text" name="username" value="Fabien">'), '', true));

src/Symfony/Component/DomCrawler/Tests/Test/Constraint/CrawlerSelectorExistsTest.php

@@ -19,7 +19,7 @@
 
 class CrawlerSelectorExistsTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $constraint = new CrawlerSelectorExists('title');
         $this->assertTrue($constraint->evaluate(new Crawler('<html><head><title>'), '', true));

src/Symfony/Component/DomCrawler/Tests/Test/Constraint/CrawlerSelectorTextContainsTest.php

@@ -19,7 +19,7 @@
 
 class CrawlerSelectorTextContainsTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $constraint = new CrawlerSelectorTextContains('title', 'Foo');
         $this->assertTrue($constraint->evaluate(new Crawler('<html><head><title>Foobar'), '', true));

src/Symfony/Component/DomCrawler/Tests/Test/Constraint/CrawlerSelectorTextSameTest.php

@@ -19,7 +19,7 @@
 
 class CrawlerSelectorTextSameTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $constraint = new CrawlerSelectorTextSame('title', 'Foo');
         $this->assertTrue($constraint->evaluate(new Crawler('<html><head><title>Foo'), '', true));

src/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php

@@ -61,7 +61,7 @@ public function testValidEventSubscriber()
         $this->assertEquals($expectedCalls, $eventDispatcherDefinition->getMethodCalls());
     }
 
-    public function testAliasedEventSubscriber(): void
+    public function testAliasedEventSubscriber()
     {
         $builder = new ContainerBuilder();
         $builder->setParameter('event_dispatcher.event_aliases', [AliasedEvent::class => 'aliased_event']);
@@ -231,7 +231,7 @@ public function testInvokableEventListener()
         $this->assertEquals($expectedCalls, $definition->getMethodCalls());
     }
 
-    public function testAliasedEventListener(): void
+    public function testAliasedEventListener()
     {
         $container = new ContainerBuilder();
         $eventAliases = [AliasedEvent::class => 'aliased_event'];
@@ -272,7 +272,7 @@ public function testAliasedEventListener(): void
         $this->assertEquals($expectedCalls, $definition->getMethodCalls());
     }
 
-    public function testOmitEventNameOnTypedListener(): void
+    public function testOmitEventNameOnTypedListener()
     {
         $container = new ContainerBuilder();
         $container->setParameter('event_dispatcher.event_aliases', [AliasedEvent::class => 'aliased_event']);
@@ -305,7 +305,7 @@ public function testOmitEventNameOnTypedListener(): void
         $this->assertEquals($expectedCalls, $definition->getMethodCalls());
     }
 
-    public function testOmitEventNameOnUntypedListener(): void
+    public function testOmitEventNameOnUntypedListener()
     {
         $container = new ContainerBuilder();
         $container->register('foo', InvokableListenerService::class)->addTag('kernel.event_listener', ['method' => 'onEvent']);
@@ -318,7 +318,7 @@ public function testOmitEventNameOnUntypedListener(): void
         $registerListenersPass->process($container);
     }
 
-    public function testOmitEventNameAndMethodOnUntypedListener(): void
+    public function testOmitEventNameAndMethodOnUntypedListener()
     {
         $container = new ContainerBuilder();
         $container->register('foo', InvokableListenerService::class)->addTag('kernel.event_listener');
@@ -334,7 +334,7 @@ public function testOmitEventNameAndMethodOnUntypedListener(): void
     /**
      * @requires PHP 7.2
      */
-    public function testOmitEventNameAndMethodOnGenericListener(): void
+    public function testOmitEventNameAndMethodOnGenericListener()
     {
         $container = new ContainerBuilder();
         $container->register('foo', GenericListener::class)->addTag('kernel.event_listener');
@@ -347,7 +347,7 @@ public function testOmitEventNameAndMethodOnGenericListener(): void
         $registerListenersPass->process($container);
     }
 
-    public function testOmitEventNameOnSubscriber(): void
+    public function testOmitEventNameOnSubscriber()
     {
         $container = new ContainerBuilder();
         $container->register('subscriber', IncompleteSubscriber::class)

src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php

@@ -717,7 +717,7 @@ public function provideEmptyData()
         ];
     }
 
-    public function testSubmitStringWithCustomInputFormat(): void
+    public function testSubmitStringWithCustomInputFormat()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',

src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php

@@ -1048,7 +1048,7 @@ public function provideEmptyData()
         ];
     }
 
-    public function testSubmitStringWithCustomInputFormat(): void
+    public function testSubmitStringWithCustomInputFormat()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, [
             'model_timezone' => 'UTC',

src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php

@@ -99,7 +99,7 @@ public function testStringInputWithIntData(): void
         ]);
     }
 
-    public function testDefaultFormattingWithRounding(): void
+    public function testDefaultFormattingWithRounding()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, ['scale' => 0, 'rounding_mode' => \NumberFormatter::ROUND_UP]);
         $form->setData('12345.54321');
@@ -139,7 +139,7 @@ public function testSubmitNullWithEmptyDataSetToNull()
         $this->assertNull($form->getData());
     }
 
-    public function testSubmitNumericInput(): void
+    public function testSubmitNumericInput()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, ['input' => 'number']);
         $form->submit('1,234');
@@ -149,7 +149,7 @@ public function testSubmitNumericInput(): void
         $this->assertSame('1,234', $form->getViewData());
     }
 
-    public function testSubmitNumericInputWithScale(): void
+    public function testSubmitNumericInputWithScale()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, ['input' => 'number', 'scale' => 2]);
         $form->submit('1,234');
@@ -159,7 +159,7 @@ public function testSubmitNumericInputWithScale(): void
         $this->assertSame('1,23', $form->getViewData());
     }
 
-    public function testSubmitStringInput(): void
+    public function testSubmitStringInput()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, ['input' => 'string']);
         $form->submit('1,234');
@@ -169,7 +169,7 @@ public function testSubmitStringInput(): void
         $this->assertSame('1,234', $form->getViewData());
     }
 
-    public function testSubmitStringInputWithScale(): void
+    public function testSubmitStringInputWithScale()
     {
         $form = $this->factory->create(static::TESTED_TYPE, null, ['input' => 'string', 'scale' => 2]);
         $form->submit('1,234');

src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/RequestAttributeValueSameTest.php

@@ -19,7 +19,7 @@
 
 class RequestAttributeValueSameTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $request = new Request();
         $request->attributes->set('foo', 'bar');

src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/ResponseCookieValueSameTest.php

@@ -20,7 +20,7 @@
 
 class ResponseCookieValueSameTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $response = new Response();
         $response->headers->setCookie(Cookie::create('foo', 'bar', 0, '/path'));

src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/ResponseHasCookieTest.php

@@ -20,7 +20,7 @@
 
 class ResponseHasCookieTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $response = new Response();
         $response->headers->setCookie(Cookie::create('foo', 'bar'));

src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/ResponseHasHeaderTest.php

@@ -19,7 +19,7 @@
 
 class ResponseHasHeaderTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $constraint = new ResponseHasHeader('Date');
         $this->assertTrue($constraint->evaluate(new Response(), '', true));

src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/ResponseHeaderSameTest.php

@@ -19,7 +19,7 @@
 
 class ResponseHeaderSameTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $constraint = new ResponseHeaderSame('Cache-Control', 'no-cache, private');
         $this->assertTrue($constraint->evaluate(new Response(), '', true));

src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/ResponseIsRedirectedTest.php

@@ -19,7 +19,7 @@
 
 class ResponseIsRedirectedTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $constraint = new ResponseIsRedirected();
 

src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/ResponseIsSuccessfulTest.php

@@ -19,7 +19,7 @@
 
 class ResponseIsSuccessfulTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $constraint = new ResponseIsSuccessful();
 

src/Symfony/Component/HttpFoundation/Tests/Test/Constraint/ResponseStatusCodeSameTest.php

@@ -19,7 +19,7 @@
 
 class ResponseStatusCodeSameTest extends TestCase
 {
-    public function testConstraint(): void
+    public function testConstraint()
     {
         $constraint = new ResponseStatusCodeSame(200);
         $this->assertTrue($constraint->evaluate(new Response(), '', true));

src/Symfony/Component/Mailer/Tests/Transport/Smtp/SmtpTransportTest.php

@@ -31,7 +31,7 @@ public function testToString()
         $this->assertEquals('smtp://127.0.0.1:2525', (string) $t);
     }
 
-    public function testSendDoesNotPingBelowThreshold(): void
+    public function testSendDoesNotPingBelowThreshold()
     {
         $stream = new DummyStream();
         $envelope = new Envelope(new Address('[email protected]'), [new Address('[email protected]')]);
@@ -44,7 +44,7 @@ public function testSendDoesNotPingBelowThreshold(): void
         $this->assertNotContains("NOOP\r\n", $stream->getCommands());
     }
 
-    public function testSendPingAfterTransportException(): void
+    public function testSendPingAfterTransportException()
     {
         $stream = new DummyStream();
         $envelope = new Envelope(new Address('[email protected]'), [new Address('[email protected]')]);
@@ -67,7 +67,7 @@ public function testSendPingAfterTransportException(): void
         $this->assertFalse($stream->isClosed());
     }
 
-    public function testSendDoesPingAboveThreshold(): void
+    public function testSendDoesPingAboveThreshold()
     {
         $stream = new DummyStream();
         $envelope = new Envelope(new Address('[email protected]'), [new Address('[email protected]')]);

src/Symfony/Component/Serializer/Tests/Extractor/ObjectPropertyListExtractorTest.php

@@ -17,7 +17,7 @@
 
 class ObjectPropertyListExtractorTest extends TestCase
 {
-    public function testGetPropertiesWithoutObjectClassResolver(): void
+    public function testGetPropertiesWithoutObjectClassResolver()
     {
         $object = new \stdClass();
         $context = ['bar' => true];
@@ -35,7 +35,7 @@ public function testGetPropertiesWithoutObjectClassResolver(): void
         );
     }
 
-    public function testGetPropertiesWithObjectClassResolver(): void
+    public function testGetPropertiesWithObjectClassResolver()
     {
         $object = new \stdClass();
         $classResolver = function ($objectArg) use ($object): string {