composer: allow Symfony6 + phpunit upgrade

COil · COil · commit 745ec8280f5a · 2022-03-01T22:11:27.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+vendor/*
+.phpunit.result.cache
+composer.lock
diff --git a/composer.json b/composer.json
@@ -13,17 +13,17 @@
     ],
     "require": {
         "php": ">=7.2.0",
-        "symfony/console": "~2.3|~3.0|~4.0|~5.0",
-        "symfony/dependency-injection": "~2.3|~3.0|~4.0|~5.0",
-        "symfony/expression-language": "~2.4|~3.0|~4.0|~5.0",
-        "symfony/filesystem": "~2.3|~3.0|~4.0|~5.0",
-        "symfony/http-foundation": "~2.3|~3.0|~4.0|~5.0",
-        "symfony/http-kernel": "~2.3|~3.0|~4.0|~5.0",
+        "symfony/console": "~2.3|~3.0|~4.0|~5.0|~6.0",
+        "symfony/dependency-injection": "~2.3|~3.0|~4.0|~5.0|~6.0",
+        "symfony/expression-language": "~2.4|~3.0|~4.0|~5.0|~6.0",
+        "symfony/filesystem": "~2.3|~3.0|~4.0|~5.0|~6.0",
+        "symfony/http-foundation": "~2.3|~3.0|~4.0|~5.0|~6.0",
+        "symfony/http-kernel": "~2.3|~3.0|~4.0|~5.0|~6.0",
         "symfony/polyfill-mbstring": "^1.3",
-        "symfony/process": "~2.3|~3.0|~4.0|~5.0"
+        "symfony/process": "~2.3|~3.0|~4.0|~5.0|~6.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.1"
+        "phpunit/phpunit": "^9.5"
     },
     "config": {
         "sort-packages": true
diff --git a/tests/Configuration/ConfigurationAdapterTest.php b/tests/Configuration/ConfigurationAdapterTest.php
@@ -21,7 +21,7 @@ class ConfigurationAdapterTest extends TestCase
     /** @var DefaultConfiguration */
     private $config;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->config = (new DefaultConfiguration(__DIR__))
             ->sharedFilesAndDirs([])
@@ -32,7 +32,7 @@ protected function setUp()
         ;
     }
 
-    public function test_get_options()
+    public function test_get_options(): void
     {
         $config = new ConfigurationAdapter($this->config);
 
diff --git a/tests/Configuration/DefaultConfigurationTest.php b/tests/Configuration/DefaultConfigurationTest.php
@@ -12,34 +12,36 @@
 namespace EasyCorp\Bundle\EasyDeployBundle\Tests;
 
 use EasyCorp\Bundle\EasyDeployBundle\Configuration\DefaultConfiguration;
+use EasyCorp\Bundle\EasyDeployBundle\Exception\InvalidConfigurationException;
 use PHPUnit\Framework\TestCase;
 
 class DefaultConfigurationTest extends TestCase
 {
     /**
      * @dataProvider provideHttpRepositoryUrls
-     * @expectedException \EasyCorp\Bundle\EasyDeployBundle\Exception\InvalidConfigurationException
-     * @expectedExceptionMessageRegExp /The repository URL must use the SSH syntax instead of the HTTPs syntax to make it work on any remote server. Replace "https?:\/\/.*\/symfony\/symfony-demo.git" by "git@.*:symfony\/symfony-demo.git"/
      */
-    public function test_repository_url_protocol(string $url)
+    public function test_repository_url_protocol(string $url): void
     {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessageMatches('/The repository URL must use the SSH syntax instead of the HTTPs syntax to make it work on any remote server. Replace "https?:\/\/.*\/symfony\/symfony-demo.git" by "git@.*:symfony\/symfony-demo.git"/');
+
         (new DefaultConfiguration(__DIR__))
             ->repositoryUrl($url)
         ;
     }
 
-    /**
-     * @expectedException \EasyCorp\Bundle\EasyDeployBundle\Exception\InvalidConfigurationException
-     * @expectedExceptionMessage The value of resetOpCacheFor option must be the valid URL of your homepage (it must start with http:// or https://).
-     */
-    public function test_reset_opcache_for()
+    public function test_reset_opcache_for(): void
     {
+        $this->expectException(InvalidConfigurationException::class);
+        $this->expectExceptionMessage('The value of resetOpCacheFor option must be the valid URL of your homepage (it must start with http:// or https://).');
+
+
         (new DefaultConfiguration(__DIR__))
             ->resetOpCacheFor('symfony.com')
         ;
     }
 
-    public function provideHttpRepositoryUrls()
+    public function provideHttpRepositoryUrls(): ?\Generator
     {
         yield ['http://github.com/symfony/symfony-demo.git'];
         yield ['https://github.com/symfony/symfony-demo.git'];
diff --git a/tests/Helper/StrTest.php b/tests/Helper/StrTest.php
@@ -17,36 +17,36 @@
 class StrTest extends TestCase
 {
     /** @dataProvider startsWithProvider */
-    public function test_starts_with(string $haystack, string $needle, bool $expectedResult)
+    public function test_starts_with(string $haystack, string $needle, bool $expectedResult): void
     {
         $this->assertSame($expectedResult, Str::startsWith($haystack, $needle));
     }
 
     /** @dataProvider endsWithProvider */
-    public function test_ends_with(string $haystack, string $needle, bool $expectedResult)
+    public function test_ends_with(string $haystack, string $needle, bool $expectedResult): void
     {
         $this->assertSame($expectedResult, Str::endsWith($haystack, $needle));
     }
 
     /** @dataProvider containsProvider */
-    public function test_contains(string $haystack, string $needle, bool $expectedResult)
+    public function test_contains(string $haystack, string $needle, bool $expectedResult): void
     {
         $this->assertSame($expectedResult, Str::contains($haystack, $needle));
     }
 
     /** @dataProvider prefixProvider */
-    public function test_prefix($text, string $prefix, string $expectedResult)
+    public function test_prefix($text, string $prefix, string $expectedResult): void
     {
         $this->assertSame($expectedResult, Str::prefix($text, $prefix));
     }
 
     /** @dataProvider stringifyProvider */
-    public function test_stringify($value, string $expectedResult)
+    public function test_stringify($value, string $expectedResult): void
     {
         $this->assertSame($expectedResult, Str::stringify($value));
     }
 
-    public function test_format_as_table()
+    public function test_format_as_table(): void
     {
         $values = ['key1' => -3.14, 'key3 with long name' => ['a', 'b' => 2], 'key2' => 'aaa'];
         $result = <<<TABLE
@@ -58,7 +58,7 @@ public function test_format_as_table()
         $this->assertSame($result, Str::formatAsTable($values));
     }
 
-    public function startsWithProvider()
+    public function startsWithProvider(): ?\Generator
     {
         yield ['', '', false];
         yield ['abc', '', false];
@@ -71,7 +71,7 @@ public function startsWithProvider()
         yield ['<h1>a</> bc', 'a', false];
     }
 
-    public function endsWithProvider()
+    public function endsWithProvider(): ?\Generator
     {
         yield ['', '', true];
         yield ['abc', '', false];
@@ -84,7 +84,7 @@ public function endsWithProvider()
         yield ['ab <h1>c</>', 'c', false];
     }
 
-    public function containsProvider()
+    public function containsProvider(): ?\Generator
     {
         yield ['', '', false];
         yield ['abc', '', false];
@@ -102,15 +102,15 @@ public function containsProvider()
         yield ['ab <h1>c</>', 'ab c', false];
     }
 
-    public function prefixProvider()
+    public function prefixProvider(): ?\Generator
     {
         yield ['', '', ''];
         yield ['aaa', 'xxx', 'xxxaaa'];
         yield ["aaa\nbbb\nccc", 'xxx', "xxxaaa\nxxxbbb\nxxxccc"];
         yield [['aaa', 'bbb', 'ccc'], 'xxx', "xxxaaa\nxxxbbb\nxxxccc"];
     }
 
-    public function stringifyProvider()
+    public function stringifyProvider(): ?\Generator
     {
         yield ['', ''];
         yield [fopen('php://memory', 'r+'), 'PHP Resource'];
diff --git a/tests/Server/ServerRepositoryTest.php b/tests/Server/ServerRepositoryTest.php
@@ -20,7 +20,7 @@ class ServerRepositoryTest extends TestCase
     /** @var ServerRepository */
     private $servers;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $repository = new ServerRepository();
         $repository->add(new Server('host0'));
diff --git a/tests/Server/ServerTest.php b/tests/Server/ServerTest.php
@@ -18,7 +18,7 @@
 class ServerTest extends TestCase
 {
     /** @dataProvider dsnProvider */
-    public function test_dsn_parsing(string $dsn, string $expectedHost, ?string $expectedUser, ?int $expectedPort)
+    public function test_dsn_parsing(string $dsn, string $expectedHost, ?string $expectedUser, ?int $expectedPort): void
     {
         $server = new Server($dsn);
 
@@ -27,70 +27,69 @@ public function test_dsn_parsing(string $dsn, string $expectedHost, ?string $exp
         $this->assertSame($expectedPort, $server->getPort());
     }
 
-    /**
-     * @expectedException \EasyCorp\Bundle\EasyDeployBundle\Exception\ServerConfigurationException
-     * @expectedExceptionMessage The host is missing (define it as an IP address or a host name)
-     */
-    public function test_dsn_parsing_error()
+    public function test_dsn_parsing_error(): void
     {
+        $this->expectException(\EasyCorp\Bundle\EasyDeployBundle\Exception\ServerConfigurationException::class);
+        $this->expectExceptionMessage('The host is missing (define it as an IP address or a host name)');
+
         new Server('deployer@');
     }
 
     /** @dataProvider localDsnProvider */
-    public function test_local_dsn_parsing(string $dsn)
+    public function test_local_dsn_parsing(string $dsn): void
     {
         $server = new Server($dsn);
 
         $this->assertTrue($server->isLocalHost());
     }
 
     /** @dataProvider sshConnectionStringProvider */
-    public function test_ssh_connection_string($dsn, $expectedSshConnectionString)
+    public function test_ssh_connection_string($dsn, $expectedSshConnectionString): void
     {
         $server = new Server($dsn);
 
         $this->assertSame($expectedSshConnectionString, $server->getSshConnectionString());
     }
 
-    public function test_ssh_agent_forwarding()
+    public function test_ssh_agent_forwarding(): void
     {
         $server = new Server('host');
         $server->set(Property::use_ssh_agent_forwarding, true);
 
         $this->assertSame('ssh -A host', $server->getSshConnectionString());
     }
 
-    public function test_default_server_roles()
+    public function test_default_server_roles(): void
     {
         $server = new Server('host');
 
         $this->assertSame([Server::ROLE_APP], $server->getRoles());
     }
 
     /** @dataProvider serverRolesProvider */
-    public function test_server_roles(array $definedRoles, array $expectedRoles)
+    public function test_server_roles(array $definedRoles, array $expectedRoles): void
     {
         $server = new Server('host', $definedRoles);
 
         $this->assertSame($expectedRoles, $server->getRoles());
     }
 
-    public function test_default_server_properties()
+    public function test_default_server_properties(): void
     {
         $server = new Server('host');
 
         $this->assertSame([], $server->getProperties());
     }
 
-    public function test_server_properties()
+    public function test_server_properties(): void
     {
         $properties = ['prop1' => -3.14, 'prop2' => false, 'prop3' => 'Lorem Ipsum', 'prop4' => ['foo' => 'bar']];
         $server = new Server('host', [], $properties);
 
         $this->assertSame($properties, $server->getProperties());
     }
 
-    public function test_get_set_has_server_properties()
+    public function test_get_set_has_server_properties(): void
     {
         $properties = ['prop1' => -3.14, 'prop2' => false, 'prop3' => 'Lorem Ipsum', 'prop4' => ['foo' => 'bar']];
         $server = new Server('host');
@@ -106,7 +105,7 @@ public function test_get_set_has_server_properties()
     }
 
     /** @dataProvider expressionProvider */
-    public function test_resolve_properties(array $properties, string $expression, string $expectedExpression)
+    public function test_resolve_properties(array $properties, string $expression, string $expectedExpression): void
     {
         $server = new Server('host', [], $properties);
 
@@ -115,16 +114,16 @@ public function test_resolve_properties(array $properties, string $expression, s
 
     /**
      * @dataProvider wrongExpressionProvider
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessageRegExp /The ".*" property in ".*" expression is not a valid server property./
      */
-    public function test_resolve_unknown_properties(array $properties, string $expression)
+    public function test_resolve_unknown_properties(array $properties, string $expression): void
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessageMatches('/The ".*" property in ".*" expression is not a valid server property./');
         $server = new Server('host', [], $properties);
         $server->resolveProperties($expression);
     }
 
-    public function dsnProvider()
+    public function dsnProvider(): ?\Generator
     {
         yield ['123.123.123.123', '123.123.123.123', null, null];
         yield ['deployer@123.123.123.123', '123.123.123.123', 'deployer', null];
@@ -143,7 +142,7 @@ public function dsnProvider()
         yield ['ssh://deployer@host:22001', 'host', 'deployer', 22001];
     }
 
-    public function localDsnProvider()
+    public function localDsnProvider(): ?\Generator
     {
         yield ['local'];
         yield ['deployer@local'];
@@ -158,23 +157,23 @@ public function localDsnProvider()
         yield ['deployer@127.0.0.1:22001'];
     }
 
-    public function serverRolesProvider()
+    public function serverRolesProvider(): ?\Generator
     {
         yield [[], []];
         yield [[Server::ROLE_APP], [Server::ROLE_APP]];
         yield [['custom_role'], ['custom_role']];
         yield [['custom_role_1', 'custom_role_2'], ['custom_role_1', 'custom_role_2']];
     }
 
-    public function sshConnectionStringProvider()
+    public function sshConnectionStringProvider(): ?\Generator
     {
         yield ['localhost', ''];
         yield ['123.123.123.123', 'ssh 123.123.123.123'];
         yield ['deployer@123.123.123.123', 'ssh deployer@123.123.123.123'];
         yield ['deployer@123.123.123.123:22001', 'ssh deployer@123.123.123.123 -p 22001'];
     }
 
-    public function expressionProvider()
+    public function expressionProvider(): ?\Generator
     {
         yield [['prop1' => 'aaa'], '{{ prop1 }}', 'aaa'];
         yield [['prop.1' => 'aaa'], '{{ prop.1 }}', 'aaa'];
@@ -188,7 +187,7 @@ public function expressionProvider()
         yield [['prop1' => 'aaa', 'prop2' => 'bbb'], 'cd {{ prop1 }}{{ prop2 }}', 'cd aaabbb'];
     }
 
-    public function wrongExpressionProvider()
+    public function wrongExpressionProvider(): ?\Generator
     {
         yield [[], '{{ prop1 }}'];
         yield [['prop1' => 'aaa'], '{{ prop 1 }}'];
diff --git a/tests/Task/TaskCompletedTest.php b/tests/Task/TaskCompletedTest.php
@@ -17,23 +17,23 @@
 
 class TaskCompletedTest extends TestCase
 {
-    public function test_server()
+    public function test_server(): void
     {
         $result = new TaskCompleted(new Server('deployer@host1'), 'aaa', 0);
 
         $this->assertSame('deployer', $result->getServer()->getUser());
         $this->assertSame('host1', $result->getServer()->getHost());
     }
 
-    public function test_output()
+    public function test_output(): void
     {
         $result = new TaskCompleted(new Server('localhost'), 'aaa   ', 0);
 
         $this->assertSame('aaa   ', $result->getOutput());
         $this->assertSame('aaa', $result->getTrimmedOutput());
     }
 
-    public function test_exit_code()
+    public function test_exit_code(): void
     {
         $result = new TaskCompleted(new Server('localhost'), 'aaa', -1);
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+vendor/*`
	`2`	`+.phpunit.result.cache`
	`3`	`+composer.lock`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class ConfigurationAdapterTest extends TestCase`
`21`	`21`	`/** @var DefaultConfiguration */`
`22`	`22`	`private $config;`
`23`	`23`
`24`		`- protected function setUp()`
	`24`	`+ protected function setUp(): void`
`25`	`25`	`{`
`26`	`26`	`$this->config = (new DefaultConfiguration(__DIR__))`
`27`	`27`	`->sharedFilesAndDirs([])`
`@@ -32,7 +32,7 @@ protected function setUp()`
`32`	`32`	`;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function test_get_options()`
	`35`	`+ public function test_get_options(): void`
`36`	`36`	`{`
`37`	`37`	`$config = new ConfigurationAdapter($this->config);`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -12,34 +12,36 @@`
`12`	`12`	`namespace EasyCorp\Bundle\EasyDeployBundle\Tests;`
`13`	`13`
`14`	`14`	`use EasyCorp\Bundle\EasyDeployBundle\Configuration\DefaultConfiguration;`
	`15`	`+use EasyCorp\Bundle\EasyDeployBundle\Exception\InvalidConfigurationException;`
`15`	`16`	`use PHPUnit\Framework\TestCase;`
`16`	`17`
`17`	`18`	`class DefaultConfigurationTest extends TestCase`
`18`	`19`	`{`
`19`	`20`	`/**`
`20`	`21`	`* @dataProvider provideHttpRepositoryUrls`
`21`		`- * @expectedException \EasyCorp\Bundle\EasyDeployBundle\Exception\InvalidConfigurationException`
`22`		`- * @expectedExceptionMessageRegExp /The repository URL must use the SSH syntax instead of the HTTPs syntax to make it work on any remote server. Replace "https?:\/\/.\/symfony\/symfony-demo.git" by "git@.:symfony\/symfony-demo.git"/`
`23`	`22`	`*/`
`24`		`- public function test_repository_url_protocol(string $url)`
	`23`	`+ public function test_repository_url_protocol(string $url): void`
`25`	`24`	`{`
	`25`	`+ $this->expectException(InvalidConfigurationException::class);`
	`26`	`+ $this->expectExceptionMessageMatches('/The repository URL must use the SSH syntax instead of the HTTPs syntax to make it work on any remote server. Replace "https?:\/\/.\/symfony\/symfony-demo.git" by "git@.:symfony\/symfony-demo.git"/');`
	`27`	`+`
`26`	`28`	`(new DefaultConfiguration(__DIR__))`
`27`	`29`	`->repositoryUrl($url)`
`28`	`30`	`;`
`29`	`31`	`}`
`30`	`32`
`31`		`- /**`
`32`		`- * @expectedException \EasyCorp\Bundle\EasyDeployBundle\Exception\InvalidConfigurationException`
`33`		`- * @expectedExceptionMessage The value of resetOpCacheFor option must be the valid URL of your homepage (it must start with http:// or https://).`
`34`		`- */`
`35`		`- public function test_reset_opcache_for()`
	`33`	`+ public function test_reset_opcache_for(): void`
`36`	`34`	`{`
	`35`	`+ $this->expectException(InvalidConfigurationException::class);`
	`36`	`+ $this->expectExceptionMessage('The value of resetOpCacheFor option must be the valid URL of your homepage (it must start with http:// or https://).');`
	`37`	`+`
	`38`	`+`
`37`	`39`	`(new DefaultConfiguration(__DIR__))`
`38`	`40`	`->resetOpCacheFor('symfony.com')`
`39`	`41`	`;`
`40`	`42`	`}`
`41`	`43`
`42`		`- public function provideHttpRepositoryUrls()`
	`44`	`+ public function provideHttpRepositoryUrls(): ?\Generator`
`43`	`45`	`{`
`44`	`46`	`yield ['http://github.com/symfony/symfony-demo.git'];`
`45`	`47`	`yield ['https://github.com/symfony/symfony-demo.git'];`
Original file line number	Diff line number	Diff line change
`@@ -17,36 +17,36 @@`
`17`	`17`	`class StrTest extends TestCase`
`18`	`18`	`{`
`19`	`19`	`/** @dataProvider startsWithProvider */`
`20`		`- public function test_starts_with(string $haystack, string $needle, bool $expectedResult)`
	`20`	`+ public function test_starts_with(string $haystack, string $needle, bool $expectedResult): void`
`21`	`21`	`{`
`22`	`22`	`$this->assertSame($expectedResult, Str::startsWith($haystack, $needle));`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/** @dataProvider endsWithProvider */`
`26`		`- public function test_ends_with(string $haystack, string $needle, bool $expectedResult)`
	`26`	`+ public function test_ends_with(string $haystack, string $needle, bool $expectedResult): void`
`27`	`27`	`{`
`28`	`28`	`$this->assertSame($expectedResult, Str::endsWith($haystack, $needle));`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`/** @dataProvider containsProvider */`
`32`		`- public function test_contains(string $haystack, string $needle, bool $expectedResult)`
	`32`	`+ public function test_contains(string $haystack, string $needle, bool $expectedResult): void`
`33`	`33`	`{`
`34`	`34`	`$this->assertSame($expectedResult, Str::contains($haystack, $needle));`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/** @dataProvider prefixProvider */`
`38`		`- public function test_prefix($text, string $prefix, string $expectedResult)`
	`38`	`+ public function test_prefix($text, string $prefix, string $expectedResult): void`
`39`	`39`	`{`
`40`	`40`	`$this->assertSame($expectedResult, Str::prefix($text, $prefix));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/** @dataProvider stringifyProvider */`
`44`		`- public function test_stringify($value, string $expectedResult)`
	`44`	`+ public function test_stringify($value, string $expectedResult): void`
`45`	`45`	`{`
`46`	`46`	`$this->assertSame($expectedResult, Str::stringify($value));`
`47`	`47`	`}`
`48`	`48`
`49`		`- public function test_format_as_table()`
	`49`	`+ public function test_format_as_table(): void`
`50`	`50`	`{`
`51`	`51`	`$values = ['key1' => -3.14, 'key3 with long name' => ['a', 'b' => 2], 'key2' => 'aaa'];`
`52`	`52`	`$result = <<<TABLE`
`@@ -58,7 +58,7 @@ public function test_format_as_table()`
`58`	`58`	`$this->assertSame($result, Str::formatAsTable($values));`
`59`	`59`	`}`
`60`	`60`
`61`		`- public function startsWithProvider()`
	`61`	`+ public function startsWithProvider(): ?\Generator`
`62`	`62`	`{`
`63`	`63`	`yield ['', '', false];`
`64`	`64`	`yield ['abc', '', false];`
`@@ -71,7 +71,7 @@ public function startsWithProvider()`
`71`	`71`	`yield ['<h1>a</> bc', 'a', false];`
`72`	`72`	`}`
`73`	`73`
`74`		`- public function endsWithProvider()`
	`74`	`+ public function endsWithProvider(): ?\Generator`
`75`	`75`	`{`
`76`	`76`	`yield ['', '', true];`
`77`	`77`	`yield ['abc', '', false];`
`@@ -84,7 +84,7 @@ public function endsWithProvider()`
`84`	`84`	`yield ['ab <h1>c</>', 'c', false];`
`85`	`85`	`}`
`86`	`86`
`87`		`- public function containsProvider()`
	`87`	`+ public function containsProvider(): ?\Generator`
`88`	`88`	`{`
`89`	`89`	`yield ['', '', false];`
`90`	`90`	`yield ['abc', '', false];`
`@@ -102,15 +102,15 @@ public function containsProvider()`
`102`	`102`	`yield ['ab <h1>c</>', 'ab c', false];`
`103`	`103`	`}`
`104`	`104`
`105`		`- public function prefixProvider()`
	`105`	`+ public function prefixProvider(): ?\Generator`
`106`	`106`	`{`
`107`	`107`	`yield ['', '', ''];`
`108`	`108`	`yield ['aaa', 'xxx', 'xxxaaa'];`
`109`	`109`	`yield ["aaa\nbbb\nccc", 'xxx', "xxxaaa\nxxxbbb\nxxxccc"];`
`110`	`110`	`yield [['aaa', 'bbb', 'ccc'], 'xxx', "xxxaaa\nxxxbbb\nxxxccc"];`
`111`	`111`	`}`
`112`	`112`
`113`		`- public function stringifyProvider()`
	`113`	`+ public function stringifyProvider(): ?\Generator`
`114`	`114`	`{`
`115`	`115`	`yield ['', ''];`
`116`	`116`	`yield [fopen('php://memory', 'r+'), 'PHP Resource'];`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class ServerRepositoryTest extends TestCase`
`20`	`20`	`/** @var ServerRepository */`
`21`	`21`	`private $servers;`
`22`	`22`
`23`		`- protected function setUp()`
	`23`	`+ protected function setUp(): void`
`24`	`24`	`{`
`25`	`25`	`$repository = new ServerRepository();`
`26`	`26`	`$repository->add(new Server('host0'));`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`class ServerTest extends TestCase`
`19`	`19`	`{`
`20`	`20`	`/** @dataProvider dsnProvider */`
`21`		`- public function test_dsn_parsing(string $dsn, string $expectedHost, ?string $expectedUser, ?int $expectedPort)`
	`21`	`+ public function test_dsn_parsing(string $dsn, string $expectedHost, ?string $expectedUser, ?int $expectedPort): void`
`22`	`22`	`{`
`23`	`23`	`$server = new Server($dsn);`
`24`	`24`
`@@ -27,70 +27,69 @@ public function test_dsn_parsing(string $dsn, string $expectedHost, ?string $exp`
`27`	`27`	`$this->assertSame($expectedPort, $server->getPort());`
`28`	`28`	`}`
`29`	`29`
`30`		`- /**`
`31`		`- * @expectedException \EasyCorp\Bundle\EasyDeployBundle\Exception\ServerConfigurationException`
`32`		`- * @expectedExceptionMessage The host is missing (define it as an IP address or a host name)`
`33`		`- */`
`34`		`- public function test_dsn_parsing_error()`
	`30`	`+ public function test_dsn_parsing_error(): void`
`35`	`31`	`{`
	`32`	`+ $this->expectException(\EasyCorp\Bundle\EasyDeployBundle\Exception\ServerConfigurationException::class);`
	`33`	`+ $this->expectExceptionMessage('The host is missing (define it as an IP address or a host name)');`
	`34`	`+`
`36`	`35`	`new Server('deployer@');`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`/** @dataProvider localDsnProvider */`
`40`		`- public function test_local_dsn_parsing(string $dsn)`
	`39`	`+ public function test_local_dsn_parsing(string $dsn): void`
`41`	`40`	`{`
`42`	`41`	`$server = new Server($dsn);`
`43`	`42`
`44`	`43`	`$this->assertTrue($server->isLocalHost());`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`/** @dataProvider sshConnectionStringProvider */`
`48`		`- public function test_ssh_connection_string($dsn, $expectedSshConnectionString)`
	`47`	`+ public function test_ssh_connection_string($dsn, $expectedSshConnectionString): void`
`49`	`48`	`{`
`50`	`49`	`$server = new Server($dsn);`
`51`	`50`
`52`	`51`	`$this->assertSame($expectedSshConnectionString, $server->getSshConnectionString());`
`53`	`52`	`}`
`54`	`53`
`55`		`- public function test_ssh_agent_forwarding()`
	`54`	`+ public function test_ssh_agent_forwarding(): void`
`56`	`55`	`{`
`57`	`56`	`$server = new Server('host');`
`58`	`57`	`$server->set(Property::use_ssh_agent_forwarding, true);`
`59`	`58`
`60`	`59`	`$this->assertSame('ssh -A host', $server->getSshConnectionString());`
`61`	`60`	`}`
`62`	`61`
`63`		`- public function test_default_server_roles()`
	`62`	`+ public function test_default_server_roles(): void`
`64`	`63`	`{`
`65`	`64`	`$server = new Server('host');`
`66`	`65`
`67`	`66`	`$this->assertSame([Server::ROLE_APP], $server->getRoles());`
`68`	`67`	`}`
`69`	`68`
`70`	`69`	`/** @dataProvider serverRolesProvider */`
`71`		`- public function test_server_roles(array $definedRoles, array $expectedRoles)`
	`70`	`+ public function test_server_roles(array $definedRoles, array $expectedRoles): void`
`72`	`71`	`{`
`73`	`72`	`$server = new Server('host', $definedRoles);`
`74`	`73`
`75`	`74`	`$this->assertSame($expectedRoles, $server->getRoles());`
`76`	`75`	`}`
`77`	`76`
`78`		`- public function test_default_server_properties()`
	`77`	`+ public function test_default_server_properties(): void`
`79`	`78`	`{`
`80`	`79`	`$server = new Server('host');`
`81`	`80`
`82`	`81`	`$this->assertSame([], $server->getProperties());`
`83`	`82`	`}`
`84`	`83`
`85`		`- public function test_server_properties()`
	`84`	`+ public function test_server_properties(): void`
`86`	`85`	`{`
`87`	`86`	`$properties = ['prop1' => -3.14, 'prop2' => false, 'prop3' => 'Lorem Ipsum', 'prop4' => ['foo' => 'bar']];`
`88`	`87`	`$server = new Server('host', [], $properties);`
`89`	`88`
`90`	`89`	`$this->assertSame($properties, $server->getProperties());`
`91`	`90`	`}`
`92`	`91`
`93`		`- public function test_get_set_has_server_properties()`
	`92`	`+ public function test_get_set_has_server_properties(): void`
`94`	`93`	`{`
`95`	`94`	`$properties = ['prop1' => -3.14, 'prop2' => false, 'prop3' => 'Lorem Ipsum', 'prop4' => ['foo' => 'bar']];`
`96`	`95`	`$server = new Server('host');`
`@@ -106,7 +105,7 @@ public function test_get_set_has_server_properties()`
`106`	`105`	`}`
`107`	`106`
`108`	`107`	`/** @dataProvider expressionProvider */`
`109`		`- public function test_resolve_properties(array $properties, string $expression, string $expectedExpression)`
	`108`	`+ public function test_resolve_properties(array $properties, string $expression, string $expectedExpression): void`
`110`	`109`	`{`
`111`	`110`	`$server = new Server('host', [], $properties);`
`112`	`111`
`@@ -115,16 +114,16 @@ public function test_resolve_properties(array $properties, string $expression, s`
`115`	`114`
`116`	`115`	`/**`
`117`	`116`	`* @dataProvider wrongExpressionProvider`
`118`		`- * @expectedException \InvalidArgumentException`
`119`		`- * @expectedExceptionMessageRegExp /The "." property in "." expression is not a valid server property./`
`120`	`117`	`*/`
`121`		`- public function test_resolve_unknown_properties(array $properties, string $expression)`
	`118`	`+ public function test_resolve_unknown_properties(array $properties, string $expression): void`
`122`	`119`	`{`
	`120`	`+ $this->expectException(\InvalidArgumentException::class);`
	`121`	`+ $this->expectExceptionMessageMatches('/The "." property in "." expression is not a valid server property./');`
`123`	`122`	`$server = new Server('host', [], $properties);`
`124`	`123`	`$server->resolveProperties($expression);`
`125`	`124`	`}`
`126`	`125`
`127`		`- public function dsnProvider()`
	`126`	`+ public function dsnProvider(): ?\Generator`
`128`	`127`	`{`
`129`	`128`	`yield ['123.123.123.123', '123.123.123.123', null, null];`
`130`	`129`	`yield ['[email protected]', '123.123.123.123', 'deployer', null];`
`@@ -143,7 +142,7 @@ public function dsnProvider()`
`143`	`142`	`yield ['ssh://deployer@host:22001', 'host', 'deployer', 22001];`
`144`	`143`	`}`
`145`	`144`
`146`		`- public function localDsnProvider()`
	`145`	`+ public function localDsnProvider(): ?\Generator`
`147`	`146`	`{`
`148`	`147`	`yield ['local'];`
`149`	`148`	`yield ['deployer@local'];`
`@@ -158,23 +157,23 @@ public function localDsnProvider()`
`158`	`157`	`yield ['[email protected]:22001'];`
`159`	`158`	`}`
`160`	`159`
`161`		`- public function serverRolesProvider()`
	`160`	`+ public function serverRolesProvider(): ?\Generator`
`162`	`161`	`{`
`163`	`162`	`yield [[], []];`
`164`	`163`	`yield [[Server::ROLE_APP], [Server::ROLE_APP]];`
`165`	`164`	`yield [['custom_role'], ['custom_role']];`
`166`	`165`	`yield [['custom_role_1', 'custom_role_2'], ['custom_role_1', 'custom_role_2']];`
`167`	`166`	`}`
`168`	`167`
`169`		`- public function sshConnectionStringProvider()`
	`168`	`+ public function sshConnectionStringProvider(): ?\Generator`
`170`	`169`	`{`
`171`	`170`	`yield ['localhost', ''];`
`172`	`171`	`yield ['123.123.123.123', 'ssh 123.123.123.123'];`
`173`	`172`	`yield ['[email protected]', 'ssh [email protected]'];`
`174`	`173`	`yield ['[email protected]:22001', 'ssh [email protected] -p 22001'];`
`175`	`174`	`}`
`176`	`175`
`177`		`- public function expressionProvider()`
	`176`	`+ public function expressionProvider(): ?\Generator`
`178`	`177`	`{`
`179`	`178`	`yield [['prop1' => 'aaa'], '{{ prop1 }}', 'aaa'];`
`180`	`179`	`yield [['prop.1' => 'aaa'], '{{ prop.1 }}', 'aaa'];`
`@@ -188,7 +187,7 @@ public function expressionProvider()`
`188`	`187`	`yield [['prop1' => 'aaa', 'prop2' => 'bbb'], 'cd {{ prop1 }}{{ prop2 }}', 'cd aaabbb'];`
`189`	`188`	`}`
`190`	`189`
`191`		`- public function wrongExpressionProvider()`
	`190`	`+ public function wrongExpressionProvider(): ?\Generator`
`192`	`191`	`{`
`193`	`192`	`yield [[], '{{ prop1 }}'];`
`194`	`193`	`yield [['prop1' => 'aaa'], '{{ prop 1 }}'];`
Original file line number	Diff line number	Diff line change
`@@ -17,23 +17,23 @@`
`17`	`17`
`18`	`18`	`class TaskCompletedTest extends TestCase`
`19`	`19`	`{`
`20`		`- public function test_server()`
	`20`	`+ public function test_server(): void`
`21`	`21`	`{`
`22`	`22`	`$result = new TaskCompleted(new Server('deployer@host1'), 'aaa', 0);`
`23`	`23`
`24`	`24`	`$this->assertSame('deployer', $result->getServer()->getUser());`
`25`	`25`	`$this->assertSame('host1', $result->getServer()->getHost());`
`26`	`26`	`}`
`27`	`27`
`28`		`- public function test_output()`
	`28`	`+ public function test_output(): void`
`29`	`29`	`{`
`30`	`30`	`$result = new TaskCompleted(new Server('localhost'), 'aaa ', 0);`
`31`	`31`
`32`	`32`	`$this->assertSame('aaa ', $result->getOutput());`
`33`	`33`	`$this->assertSame('aaa', $result->getTrimmedOutput());`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function test_exit_code()`
	`36`	`+ public function test_exit_code(): void`
`37`	`37`	`{`
`38`	`38`	`$result = new TaskCompleted(new Server('localhost'), 'aaa', -1);`
`39`	`39`