Skip to content

Commit c7fd4df

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #18907 from MauricioFauth/phpunit-static-methods
Call PHPUnit static methods using static calls
2 parents ac325d2 + ba72f54 commit c7fd4df

File tree

385 files changed

+6680
-6692
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+6680
-6692
lines changed

‎phpstan-baseline.neon‎

Lines changed: 122 additions & 122 deletions
Large diffs are not rendered by default.

‎phpstan.neon.dist‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,3 @@ parameters:
2626
checkDynamicProperties: true
2727
checkTooWideReturnTypesInProtectedAndPublicMethods: true
2828
checkImplicitMixed: true
29-
ignoreErrors:
30-
-
31-
message: '#Dynamic call to static method PHPUnit\\Framework\\Assert::[a-zA-Z]+\(\)\.#'
32-
paths:
33-
- tests/classes/*
34-
- tests/selenium/*
35-
-
36-
message: '#Dynamic call to static method PHPUnit\\Framework\\TestCase::[a-zA-Z]+\(\)\.#'
37-
path: tests/classes/*

‎tests/classes/Advisory/AdvisorTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ protected function setUp(): void
3535
public function testAdvisorBytime(float $time, string $expected): void
3636
{
3737
$result = Advisor::byTime($time, 2);
38-
$this->assertEquals($expected, $result);
38+
self::assertEquals($expected, $result);
3939
}
4040

4141
/** @return mixed[][] */
@@ -69,14 +69,14 @@ public function testAddRule(array $rule, array $expected, string|null $error): v
6969
$advisor->addRule('fired', $rule);
7070
$runResult = $advisor->getRunResult();
7171
if ($error !== null) {
72-
$this->assertEquals([$error], $runResult['errors']);
72+
self::assertEquals([$error], $runResult['errors']);
7373
}
7474

7575
if ($runResult['fired'] === [] && $expected === []) {
7676
return;
7777
}
7878

79-
$this->assertEquals([$expected], $runResult['fired']);
79+
self::assertEquals([$expected], $runResult['fired']);
8080
}
8181

8282
/**

‎tests/classes/Advisory/RulesTest.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ class RulesTest extends TestCase
1818
public function testRules(callable $rulesFactory): void
1919
{
2020
$rules = $rulesFactory();
21-
$this->assertNotEmpty($rules);
21+
self::assertNotEmpty($rules);
2222
foreach ($rules as $rule) {
23-
$this->assertArrayHasKey('id', $rule);
24-
$this->assertArrayHasKey('name', $rule);
25-
$this->assertArrayHasKey('formula', $rule);
26-
$this->assertArrayHasKey('test', $rule);
27-
$this->assertArrayHasKey('issue', $rule);
28-
$this->assertArrayHasKey('recommendation', $rule);
29-
$this->assertArrayHasKey('justification', $rule);
30-
$this->assertContainsOnly('string', $rule);
23+
self::assertArrayHasKey('id', $rule);
24+
self::assertArrayHasKey('name', $rule);
25+
self::assertArrayHasKey('formula', $rule);
26+
self::assertArrayHasKey('test', $rule);
27+
self::assertArrayHasKey('issue', $rule);
28+
self::assertArrayHasKey('recommendation', $rule);
29+
self::assertArrayHasKey('justification', $rule);
30+
self::assertContainsOnly('string', $rule);
3131
}
3232
}
3333

‎tests/classes/ApplicationTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public function testInit(): void
2727
#[BackupStaticProperties(true)]
2828
public function testRunWithConfigError(): void
2929
{
30-
$errorHandler = $this->createStub(ErrorHandler::class);
30+
$errorHandler = self::createStub(ErrorHandler::class);
3131

32-
$config = $this->createMock(Config::class);
33-
$config->expects($this->once())->method('loadAndCheck')
32+
$config = self::createMock(Config::class);
33+
$config->expects(self::once())->method('loadAndCheck')
3434
->willThrowException(new ConfigException('Failed to load phpMyAdmin configuration.'));
3535
$config->config = new Config\Settings([]);
3636

@@ -45,6 +45,6 @@ public function testRunWithConfigError(): void
4545
$application->run();
4646

4747
$output = $this->getActualOutputForAssertion();
48-
$this->assertSame($expected, $output);
48+
self::assertSame($expected, $output);
4949
}
5050
}

‎tests/classes/BookmarkTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testGetList(): void
6363
Config::getInstance()->selectedServer['user'],
6464
'sakila',
6565
);
66-
$this->assertContainsOnlyInstancesOf(Bookmark::class, $actual);
66+
self::assertContainsOnlyInstancesOf(Bookmark::class, $actual);
6767
$this->dummyDbi->assertAllSelectsConsumed();
6868
}
6969

@@ -78,7 +78,7 @@ public function testGet(): void
7878
['id', 'dbase', 'user', 'label', 'query'],
7979
);
8080
$dbi = DatabaseInterface::getInstance();
81-
$this->assertNull(
81+
self::assertNull(
8282
(new BookmarkRepository($dbi, new Relation($dbi)))->get(
8383
Config::getInstance()->selectedServer['user'],
8484
1,
@@ -103,7 +103,7 @@ public function testSave(): void
103103
'root',
104104
'phpmyadmin',
105105
);
106-
$this->assertNotFalse($bookmark);
107-
$this->assertTrue($bookmark->save());
106+
self::assertNotFalse($bookmark);
107+
self::assertTrue($bookmark->save());
108108
}
109109
}

‎tests/classes/BrowseForeignersTest.php‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ protected function setUp(): void
3030
*/
3131
public function testGetForeignLimit(): void
3232
{
33-
$this->assertNull(
33+
self::assertNull(
3434
$this->browseForeigners->getForeignLimit('Show all'),
3535
);
3636

37-
$this->assertEquals(
37+
self::assertEquals(
3838
'LIMIT 0, 25 ',
3939
$this->browseForeigners->getForeignLimit(null),
4040
);
4141

4242
$_POST['pos'] = 10;
4343

44-
$this->assertEquals(
44+
self::assertEquals(
4545
'LIMIT 10, 25 ',
4646
$this->browseForeigners->getForeignLimit(null),
4747
);
@@ -50,12 +50,12 @@ public function testGetForeignLimit(): void
5050
$config->set('MaxRows', 50);
5151
$browseForeigners = new BrowseForeigners(new Template(), $config, new ThemeManager());
5252

53-
$this->assertEquals(
53+
self::assertEquals(
5454
'LIMIT 10, 50 ',
5555
$browseForeigners->getForeignLimit(null),
5656
);
5757

58-
$this->assertEquals(
58+
self::assertEquals(
5959
'LIMIT 10, 50 ',
6060
$browseForeigners->getForeignLimit('xyz'),
6161
);
@@ -66,7 +66,7 @@ public function testGetForeignLimit(): void
6666
*/
6767
public function testGetHtmlForGotoPage(): void
6868
{
69-
$this->assertEquals(
69+
self::assertEquals(
7070
'',
7171
$this->callFunction(
7272
$this->browseForeigners,
@@ -81,7 +81,7 @@ public function testGetHtmlForGotoPage(): void
8181
$foreignData['disp_row'] = [];
8282
$foreignData['the_total'] = 5;
8383

84-
$this->assertEquals(
84+
self::assertEquals(
8585
'',
8686
$this->callFunction(
8787
$this->browseForeigners,
@@ -99,15 +99,15 @@ public function testGetHtmlForGotoPage(): void
9999
[$foreignData],
100100
);
101101

102-
$this->assertStringStartsWith('Page number:', $result);
102+
self::assertStringStartsWith('Page number:', $result);
103103

104-
$this->assertStringEndsWith('</select>', $result);
104+
self::assertStringEndsWith('</select>', $result);
105105

106-
$this->assertStringContainsString('<select class="pageselector ajax" name="pos"', $result);
106+
self::assertStringContainsString('<select class="pageselector ajax" name="pos"', $result);
107107

108-
$this->assertStringContainsString('<option selected="selected" style="font-weight: bold" value="0">', $result);
108+
self::assertStringContainsString('<option selected="selected" style="font-weight: bold" value="0">', $result);
109109

110-
$this->assertStringContainsString('<option value="25"', $result);
110+
self::assertStringContainsString('<option value="25"', $result);
111111
}
112112

113113
/**
@@ -117,7 +117,7 @@ public function testGetDescriptionAndTitle(): void
117117
{
118118
$desc = 'foobar<baz';
119119

120-
$this->assertEquals(
120+
self::assertEquals(
121121
['foobar<baz', ''],
122122
$this->callFunction(
123123
$this->browseForeigners,
@@ -131,7 +131,7 @@ public function testGetDescriptionAndTitle(): void
131131
$config->set('LimitChars', 5);
132132
$browseForeigners = new BrowseForeigners(new Template(), $config, new ThemeManager());
133133

134-
$this->assertEquals(
134+
self::assertEquals(
135135
['fooba...', 'foobar<baz'],
136136
$this->callFunction(
137137
$browseForeigners,
@@ -165,36 +165,36 @@ public function testGetHtmlForRelationalFieldSelection(): void
165165
$currentValue,
166166
);
167167

168-
$this->assertStringContainsString(
168+
self::assertStringContainsString(
169169
'<form class="ajax" '
170170
. 'id="browse_foreign_form" name="browse_foreign_from" '
171171
. 'action="index.php?route=/browse-foreigners',
172172
$result,
173173
);
174-
$this->assertStringContainsString('" method="post">', $result);
174+
self::assertStringContainsString('" method="post">', $result);
175175

176-
$this->assertStringContainsString('<fieldset class="row g-3 align-items-center mb-3">', $result);
176+
self::assertStringContainsString('<fieldset class="row g-3 align-items-center mb-3">', $result);
177177

178-
$this->assertStringContainsString('<input type="hidden" name="field" value="foo">', $result);
178+
self::assertStringContainsString('<input type="hidden" name="field" value="foo">', $result);
179179

180-
$this->assertStringContainsString('<input type="hidden" name="fieldkey" value="bar">', $result);
180+
self::assertStringContainsString('<input type="hidden" name="fieldkey" value="bar">', $result);
181181

182-
$this->assertStringContainsString('<input type="hidden" name="rownumber" value="1">', $result);
182+
self::assertStringContainsString('<input type="hidden" name="rownumber" value="1">', $result);
183183

184-
$this->assertStringContainsString('<div class="col-auto">', $result);
185-
$this->assertStringContainsString('<label class="form-label" for="input_foreign_filter">', $result);
186-
$this->assertStringContainsString(
184+
self::assertStringContainsString('<div class="col-auto">', $result);
185+
self::assertStringContainsString('<label class="form-label" for="input_foreign_filter">', $result);
186+
self::assertStringContainsString(
187187
'<input class="form-control" type="text" name="foreign_filter" '
188188
. 'id="input_foreign_filter" value="5" data-old="5">',
189189
$result,
190190
);
191191

192-
$this->assertStringContainsString(
192+
self::assertStringContainsString(
193193
'<input class="btn btn-primary" type="submit" name="submit_foreign_filter" value="Go">',
194194
$result,
195195
);
196196

197-
$this->assertStringContainsString(
197+
self::assertStringContainsString(
198198
'<table class="table table-striped table-hover" id="browse_foreign_table">',
199199
$result,
200200
);
@@ -210,11 +210,11 @@ public function testGetHtmlForRelationalFieldSelection(): void
210210
$currentValue,
211211
);
212212

213-
$this->assertStringContainsString(
213+
self::assertStringContainsString(
214214
'<table class="table table-striped table-hover" id="browse_foreign_table">',
215215
$result,
216216
);
217217

218-
$this->assertStringContainsString('<th>', $result);
218+
self::assertStringContainsString('<th>', $result);
219219
}
220220
}

‎tests/classes/CacheTest.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,62 +30,62 @@ public static function dataProviderCacheKeyValues(): array
3030
#[DataProvider('dataProviderCacheKeyValues')]
3131
public function testCacheHas(string $cacheKey, mixed $valueToCache): void
3232
{
33-
$this->assertFalse(Cache::has($cacheKey));
33+
self::assertFalse(Cache::has($cacheKey));
3434
Cache::set($cacheKey, $valueToCache);
35-
$this->assertTrue(Cache::has($cacheKey));
35+
self::assertTrue(Cache::has($cacheKey));
3636
Cache::remove($cacheKey);
37-
$this->assertFalse(Cache::has($cacheKey));
37+
self::assertFalse(Cache::has($cacheKey));
3838
}
3939

4040
#[DataProvider('dataProviderCacheKeyValues')]
4141
public function testCachePurge(string $cacheKey, mixed $valueToCache): void
4242
{
43-
$this->assertFalse(Cache::has($cacheKey));
43+
self::assertFalse(Cache::has($cacheKey));
4444
Cache::set($cacheKey, $valueToCache);
45-
$this->assertTrue(Cache::has($cacheKey));
45+
self::assertTrue(Cache::has($cacheKey));
4646
Cache::purge();
47-
$this->assertFalse(Cache::has($cacheKey));
47+
self::assertFalse(Cache::has($cacheKey));
4848
}
4949

5050
#[DataProvider('dataProviderCacheKeyValues')]
5151
public function testCacheSet(string $cacheKey, mixed $valueToCache): void
5252
{
53-
$this->assertFalse(Cache::has($cacheKey));
53+
self::assertFalse(Cache::has($cacheKey));
5454
Cache::set($cacheKey, $valueToCache);
55-
$this->assertTrue(Cache::has($cacheKey));
55+
self::assertTrue(Cache::has($cacheKey));
5656
}
5757

5858
#[DataProvider('dataProviderCacheKeyValues')]
5959
public function testCacheGet(string $cacheKey, mixed $valueToCache): void
6060
{
61-
$this->assertFalse(Cache::has($cacheKey));
61+
self::assertFalse(Cache::has($cacheKey));
6262
Cache::set($cacheKey, $valueToCache);
63-
$this->assertTrue(Cache::has($cacheKey));
64-
$this->assertSame(Cache::get($cacheKey), $valueToCache);
63+
self::assertTrue(Cache::has($cacheKey));
64+
self::assertSame(Cache::get($cacheKey), $valueToCache);
6565
}
6666

6767
#[DataProvider('dataProviderCacheKeyValues')]
6868
public function testCacheGetDefaultValue(string $cacheKey, mixed $valueToCache): void
6969
{
70-
$this->assertFalse(Cache::has($cacheKey));
70+
self::assertFalse(Cache::has($cacheKey));
7171
Cache::set($cacheKey, $valueToCache);
72-
$this->assertTrue(Cache::has($cacheKey));
73-
$this->assertSame(Cache::get($cacheKey, null), $valueToCache);
72+
self::assertTrue(Cache::has($cacheKey));
73+
self::assertSame(Cache::get($cacheKey, null), $valueToCache);
7474
Cache::remove($cacheKey);
75-
$this->assertFalse(Cache::has($cacheKey));
76-
$this->assertNull(Cache::get($cacheKey, null));
75+
self::assertFalse(Cache::has($cacheKey));
76+
self::assertNull(Cache::get($cacheKey, null));
7777
$defaultValue = new stdClass();
78-
$this->assertSame($defaultValue, Cache::get($cacheKey, $defaultValue));
79-
$this->assertFalse(Cache::get($cacheKey, false));
78+
self::assertSame($defaultValue, Cache::get($cacheKey, $defaultValue));
79+
self::assertFalse(Cache::get($cacheKey, false));
8080
}
8181

8282
#[DataProvider('dataProviderCacheKeyValues')]
8383
public function testCacheRemove(string $cacheKey, mixed $valueToCache): void
8484
{
85-
$this->assertFalse(Cache::has($cacheKey));
85+
self::assertFalse(Cache::has($cacheKey));
8686
Cache::set($cacheKey, $valueToCache);
87-
$this->assertTrue(Cache::has($cacheKey));
87+
self::assertTrue(Cache::has($cacheKey));
8888
Cache::remove($cacheKey);
89-
$this->assertFalse(Cache::has($cacheKey));
89+
self::assertFalse(Cache::has($cacheKey));
9090
}
9191
}

‎tests/classes/Charsets/CharsetTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ public function testFromServer(): void
2222

2323
$charset = Charset::fromServer($serverCharset);
2424

25-
$this->assertInstanceOf(Charset::class, $charset);
26-
$this->assertSame('utf8', $charset->getName());
27-
$this->assertSame('utf8_general_ci', $charset->getDefaultCollation());
28-
$this->assertSame('UTF-8 Unicode', $charset->getDescription());
29-
$this->assertSame(3, $charset->getMaxLength());
25+
self::assertInstanceOf(Charset::class, $charset);
26+
self::assertSame('utf8', $charset->getName());
27+
self::assertSame('utf8_general_ci', $charset->getDefaultCollation());
28+
self::assertSame('UTF-8 Unicode', $charset->getDescription());
29+
self::assertSame(3, $charset->getMaxLength());
3030
}
3131
}

0 commit comments

Comments
 (0)