Skip to content

Commit 756a384

Browse files
raphaelstoltraphaelstolt
committed
Migrate tests to PHPUnit 10
1 parent 6d31719 commit 756a384

20 files changed

+516
-768
lines changed

‎phpunit.xml.dist

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit backupGlobals="false"
3-
backupStaticAttributes="false"
4-
bootstrap="vendor/autoload.php"
5-
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="true"
11-
syntaxCheck="false">
1+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
backupGlobals="false" bootstrap="vendor/autoload.php"
3+
colors="true" processIsolation="false" stopOnFailure="true"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
5+
cacheDirectory=".phpunit.cache" backupStaticProperties="false">
6+
<coverage/>
127
<testsuites>
138
<testsuite name="GitUserBend Suite">
149
<directory>tests/</directory>
1510
</testsuite>
1611
</testsuites>
17-
<filter>
18-
<whitelist>
12+
<source>
13+
<include>
1914
<directory suffix=".php">src/</directory>
20-
</whitelist>
21-
</filter>
15+
</include>
16+
</source>
2217
</phpunit>

‎src/Commands/PersonasCommand.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,8 @@ protected function configure()
5252

5353
/**
5454
* Execute command.
55-
*
56-
* @param \Symfony\Component\Console\Input\InputInterface $input
57-
* @param \Symfony\Component\Console\Output\OutputInterface $output
58-
*
59-
* @return void
6055
*/
61-
protected function execute(InputInterface $input, OutputInterface $output)
56+
protected function execute(InputInterface $input, OutputInterface $output): int
6257
{
6358
if ($input->getOption('edit')) {
6459
$editor = escapeshellcmd(getenv('EDITOR'));
@@ -102,6 +97,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
10297
}
10398

10499
$this->renderTable($output, $personas);
100+
return self::SUCCESS;
105101
}
106102

107103
/**

‎src/Commands/WhoamiCommand.php

+4-7
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,8 @@ protected function configure()
5959

6060
/**
6161
* Execute command.
62-
*
63-
* @param \Symfony\Component\Console\Input\InputInterface $input
64-
* @param \Symfony\Component\Console\Output\OutputInterface $output
65-
*
66-
* @return void
6762
*/
68-
protected function execute(InputInterface $input, OutputInterface $output)
63+
protected function execute(InputInterface $input, OutputInterface $output): int
6964
{
7065
$directory = $input->getArgument('directory');
7166

@@ -79,7 +74,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
7974
. "</comment>.</info>";
8075
$output->writeln($outputContent);
8176

82-
return 0;
77+
return self::SUCCESS;
8378
}
8479

8580
$persona = Persona::fromRepository($this->repository);
@@ -98,6 +93,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
9893
}
9994

10095
$output->writeln($outputContent);
96+
97+
return self::SUCCESS;
10198
} catch (Exception $e) {
10299
$error = "<error>Error:</error> " . $e->getInforizedMessage();
103100
$output->writeln($error);

‎tests/CommandTester.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class CommandTester extends ConsoleCommandTester
1313
*
1414
* @return string The display
1515
*/
16-
public function getDisplay($normalize = true)
16+
public function getDisplay(bool $normalize = true): string
1717
{
1818
return parent::getDisplay($normalize);
1919
}
@@ -32,7 +32,7 @@ public function getDisplay($normalize = true)
3232
*
3333
* @return int The command exit code
3434
*/
35-
public function execute(array $input, array $options = ['decorated' => false])
35+
public function execute(array $input, array $options = ['decorated' => false]): int
3636
{
3737
return parent::execute($input, $options);
3838
}

‎tests/Commands/AddCommandTest.php

+25-35
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
namespace Stolt\GitUserBend\Tests\Commands;
44

55
use Mockery;
6+
use PHPUnit\Framework\Attributes\Group;
7+
use PHPUnit\Framework\Attributes\Test;
68
use Stolt\GitUserBend\Commands\AddCommand;
79
use Stolt\GitUserBend\Persona;
810
use Stolt\GitUserBend\Persona\Storage;
@@ -20,7 +22,7 @@ class AddCommandTest extends TestCase
2022
/**
2123
* @return \Symfony\Component\Console\Application
2224
*/
23-
protected function getApplication()
25+
protected function getApplication(): Application
2426
{
2527
$application = new Application();
2628
$application->add(new AddCommand(new Storage(STORAGE_FILE)));
@@ -31,7 +33,7 @@ protected function getApplication()
3133
/**
3234
* Set up test environment.
3335
*/
34-
protected function setUp()
36+
protected function setUp(): void
3537
{
3638
$this->setUpTemporaryDirectory();
3739

@@ -58,18 +60,16 @@ protected function setUp()
5860
*
5961
* @return void
6062
*/
61-
protected function tearDown()
63+
protected function tearDown(): void
6264
{
6365
if (is_dir($this->temporaryDirectory)) {
6466
$this->removeDirectory($this->temporaryDirectory);
6567
}
6668
}
6769

68-
/**
69-
* @test
70-
* @group integration
71-
*/
72-
public function addsAPersonaAsExpected()
70+
#[Test]
71+
#[Group('integration')]
72+
public function addsAPersonaAsExpected(): void
7373
{
7474
$existingStorageContent = <<<CONTENT
7575
[{"alias":"jo","name":"John Doe","email":"[email protected]","usage_frequency":11},
@@ -92,14 +92,12 @@ public function addsAPersonaAsExpected()
9292
CONTENT;
9393

9494
$this->assertSame($expectedDisplay, $commandTester->getDisplay());
95-
$this->assertTrue($commandTester->getStatusCode() == 0);
95+
$commandTester->assertCommandIsSuccessful();
9696
}
9797

98-
/**
99-
* @test
100-
* @group integration
101-
*/
102-
public function returnsExpectedWarningWhenProvidedAliasIsTooLong()
98+
#[Test]
99+
#[Group('integration')]
100+
public function returnsExpectedWarningWhenProvidedAliasIsTooLong(): void
103101
{
104102
$maxAliasLength = Persona::MAX_ALIAS_LENGTH;
105103
$alias = str_repeat('x', $maxAliasLength + 1);
@@ -119,14 +117,12 @@ public function returnsExpectedWarningWhenProvidedAliasIsTooLong()
119117
CONTENT;
120118

121119
$this->assertSame($expectedDisplay, $commandTester->getDisplay());
122-
$this->assertTrue($commandTester->getStatusCode() == 1);
120+
$this->assertTrue($commandTester->getStatusCode() > 0);
123121
}
124122

125-
/**
126-
* @test
127-
* @group integration
128-
*/
129-
public function returnsExpectedWarningWhenProvidedEmailIsInvalid()
123+
#[Test]
124+
#[Group('integration')]
125+
public function returnsExpectedWarningWhenProvidedEmailIsInvalid(): void
130126
{
131127
$email = 1234;
132128

@@ -148,11 +144,9 @@ public function returnsExpectedWarningWhenProvidedEmailIsInvalid()
148144
$this->assertTrue($commandTester->getStatusCode() == 1);
149145
}
150146

151-
/**
152-
* @test
153-
* @group integration
154-
*/
155-
public function returnsExpectedWarningWhenPersonaAlreadyAliased()
147+
#[Test]
148+
#[Group('integration')]
149+
public function returnsExpectedWarningWhenPersonaAlreadyAliased(): void
156150
{
157151
$existingStorageContent = <<<CONTENT
158152
[{"alias":"jo","name":"John Doe","email":"[email protected]","usage_frequency":11},
@@ -178,11 +172,9 @@ public function returnsExpectedWarningWhenPersonaAlreadyAliased()
178172
$this->assertTrue($commandTester->getStatusCode() == 1);
179173
}
180174

181-
/**
182-
* @test
183-
* @group integration
184-
*/
185-
public function returnsExpectedWarningWhenPersonaAliasAlreadyPresent()
175+
#[Test]
176+
#[Group('integration')]
177+
public function returnsExpectedWarningWhenPersonaAliasAlreadyPresent(): void
186178
{
187179
$existingStorageContent = <<<CONTENT
188180
[{"alias":"jo","name":"John Doe","email":"[email protected]","usage_frequency":11},
@@ -208,11 +200,9 @@ public function returnsExpectedWarningWhenPersonaAliasAlreadyPresent()
208200
$this->assertTrue($commandTester->getStatusCode() == 1);
209201
}
210202

211-
/**
212-
* @test
213-
* @group integration
214-
*/
215-
public function returnsExpectedWarningWhenPersonaAdditionFails()
203+
#[Test]
204+
#[Group('integration')]
205+
public function returnsExpectedWarningWhenPersonaAdditionFails(): void
216206
{
217207
$storage = Mockery::mock('Stolt\GitUserBend\Persona\Storage');
218208
$application = new Application();

0 commit comments

Comments
 (0)