Skip to content

Commit 91a4ddb

Browse files
helhumhelhum
committed
[TASK] Clean up test files
1 parent 0a72567 commit 91a4ddb

6 files changed

Lines changed: 44 additions & 73 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
12+
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
1313

1414
steps:
1515
- uses: actions/checkout@v2

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
},
2222
"require": {
2323
"php": ">=7.1",
24-
"composer-plugin-api": "^1.0 || ^2.0"
24+
"composer-plugin-api": "^2.0"
2525
},
2626
"require-dev": {
27-
"composer/composer": "^1.1@dev || ^2.0@dev",
27+
"composer/composer": "^2.0@dev",
2828
"mikey179/vfsstream": "~1.4.0@dev",
29-
"phpunit/phpunit": ">4.8 <9"
29+
"phpunit/phpunit": "^8 || ^9"
3030
},
3131
"replace": {
3232
"helhum/class-alias-loader": "*"

‎tests/Unit/BaseTestCase.php‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎tests/Unit/ClassAliasLoaderTest.php‎

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,39 @@
1212

1313
use Composer\Autoload\ClassLoader as ComposerClassLoader;
1414
use PHPUnit\Framework\MockObject\MockObject;
15+
use PHPUnit\Framework\TestCase;
1516
use TYPO3\ClassAliasLoader\ClassAliasLoader;
1617

1718
/**
1819
* Test case for ClassAliasLoader
1920
*/
20-
class ClassAliasLoaderTest extends BaseTestCase
21+
class ClassAliasLoaderTest extends TestCase
2122
{
2223
/**
2324
* @var ClassAliasLoader
2425
*/
2526
protected $subject;
2627

2728
/**
28-
* @var ComposerClassLoader|MockObject|PHPUnit_Framework_MockObject_MockObject
29+
* @var ComposerClassLoader|MockObject
2930
*/
3031
protected $composerClassLoaderMock;
3132

32-
/**
33-
* @before
34-
*/
35-
public function setMeUp()
33+
public function setUp(): void
3634
{
3735
$this->composerClassLoaderMock = $this->getMockBuilder('Composer\\Autoload\\ClassLoader')->getMock();
3836
$this->subject = new ClassAliasLoader($this->composerClassLoaderMock);
3937
}
4038

41-
/**
42-
* @after
43-
*/
44-
public function tearMeDown()
39+
public function tearDown(): void
4540
{
4641
$this->subject->unregister();
4742
}
4843

4944
/**
5045
* @test
5146
*/
52-
public function composerLoadClassIsCalledOnlyOnceWhenCaseSensitiveClassLoadingIsOn()
47+
public function composerLoadClassIsCalledOnlyOnceWhenCaseSensitiveClassLoadingIsOn(): void
5348
{
5449
$this->composerClassLoaderMock->expects($this->once())->method('loadClass');
5550
$this->subject->loadClassWithAlias('TestClass');
@@ -58,7 +53,7 @@ public function composerLoadClassIsCalledOnlyOnceWhenCaseSensitiveClassLoadingIs
5853
/**
5954
* @test
6055
*/
61-
public function composerLoadClassIsCalledOnlyOnceWhenCaseSensitiveClassLoadingIsOffButClassIsFound()
56+
public function composerLoadClassIsCalledOnlyOnceWhenCaseSensitiveClassLoadingIsOffButClassIsFound(): void
6257
{
6358
$this->composerClassLoaderMock->expects($this->once())->method('loadClass')->willReturn(true);
6459
$this->subject->setCaseSensitiveClassLoading(false);
@@ -68,7 +63,7 @@ public function composerLoadClassIsCalledOnlyOnceWhenCaseSensitiveClassLoadingIs
6863
/**
6964
* @test
7065
*/
71-
public function composerLoadClassIsCalledTwiceWhenCaseSensitiveClassLoadingIsOffAndClassIsNotFound()
66+
public function composerLoadClassIsCalledTwiceWhenCaseSensitiveClassLoadingIsOffAndClassIsNotFound(): void
7267
{
7368
$this->composerClassLoaderMock->expects($this->exactly(2))->method('loadClass');
7469
$this->subject->setCaseSensitiveClassLoading(false);
@@ -78,7 +73,7 @@ public function composerLoadClassIsCalledTwiceWhenCaseSensitiveClassLoadingIsOff
7873
/**
7974
* @test
8075
*/
81-
public function loadsClassIfNoAliasIsFound()
76+
public function loadsClassIfNoAliasIsFound(): void
8277
{
8378
$testClassName = 'TestClass' . md5(uniqid('bla', true));
8479
$this->composerClassLoaderMock->expects($this->once())->method('loadClass')->willReturnCallback(function ($className) {
@@ -92,7 +87,7 @@ public function loadsClassIfNoAliasIsFound()
9287
/**
9388
* @test
9489
*/
95-
public function callingLoadClassMultipleTimesInEdgeCasesWillStillWork()
90+
public function callingLoadClassMultipleTimesInEdgeCasesWillStillWork(): void
9691
{
9792
$this->composerClassLoaderMock
9893
->expects($this->exactly(2))
@@ -105,7 +100,7 @@ public function callingLoadClassMultipleTimesInEdgeCasesWillStillWork()
105100
/**
106101
* @test
107102
*/
108-
public function loadClassWithOriginalClassNameSetsAliases()
103+
public function loadClassWithOriginalClassNameSetsAliases(): void
109104
{
110105
$testClassName = 'TestClass' . md5(uniqid('bla', true));
111106
$testAlias1 = 'TestAlias' . md5(uniqid('bla', true));
@@ -134,7 +129,7 @@ public function loadClassWithOriginalClassNameSetsAliases()
134129
/**
135130
* @test
136131
*/
137-
public function getClassNameForAliasReturnsClassNameForEachAlias()
132+
public function getClassNameForAliasReturnsClassNameForEachAlias(): void
138133
{
139134
$testClassName = 'TestClass' . md5(uniqid('bla', true));
140135
$testAlias1 = 'TestAlias' . md5(uniqid('bla', true));
@@ -157,7 +152,7 @@ public function getClassNameForAliasReturnsClassNameForEachAlias()
157152
/**
158153
* @test
159154
*/
160-
public function addAliasMapAddsAliasesCorrectlyToTheMap()
155+
public function addAliasMapAddsAliasesCorrectlyToTheMap(): void
161156
{
162157
$testClassName = 'TestClass' . md5(uniqid('bla', true));
163158
$testAlias1 = 'TestAlias' . md5(uniqid('bla', true));
@@ -185,7 +180,7 @@ public function addAliasMapAddsAliasesCorrectlyToTheMap()
185180
/**
186181
* @test
187182
*/
188-
public function getClassNameForAliasReturnsClassNameForClassName()
183+
public function getClassNameForAliasReturnsClassNameForClassName(): void
189184
{
190185
$testClassName = 'TestClass' . md5(uniqid('bla', true));
191186
$testAlias1 = 'TestAlias' . md5(uniqid('bla', true));
@@ -207,7 +202,7 @@ public function getClassNameForAliasReturnsClassNameForClassName()
207202
/**
208203
* @test
209204
*/
210-
public function getClassNameForAliasReturnsClassNameForClassNameWithNoAliasMapSet()
205+
public function getClassNameForAliasReturnsClassNameForClassNameWithNoAliasMapSet(): void
211206
{
212207
$testClassName = 'TestClass' . md5(uniqid('bla', true));
213208
$this->assertEquals($testClassName, $this->subject->getClassNameForAlias($testClassName));
@@ -216,7 +211,7 @@ public function getClassNameForAliasReturnsClassNameForClassNameWithNoAliasMapSe
216211
/**
217212
* @test
218213
*/
219-
public function loadClassWithAliasClassNameSetsAliasesAndLoadsOriginalClass()
214+
public function loadClassWithAliasClassNameSetsAliasesAndLoadsOriginalClass(): void
220215
{
221216
$testClassName = 'TestClass' . md5(uniqid('bla', true));
222217
$testAlias1 = 'TestAlias' . md5(uniqid('bla', true));
@@ -246,7 +241,7 @@ public function loadClassWithAliasClassNameSetsAliasesAndLoadsOriginalClass()
246241
/**
247242
* @test
248243
*/
249-
public function aliasesInstancesHaveOriginalClassName()
244+
public function aliasesInstancesHaveOriginalClassName(): void
250245
{
251246
$testClassName = 'TestClass' . md5(uniqid('bla', true));
252247
$testAlias1 = 'TestAlias' . md5(uniqid('bla', true));
@@ -279,7 +274,7 @@ public function aliasesInstancesHaveOriginalClassName()
279274
/**
280275
* @test
281276
*/
282-
public function classAliasesAreGracefullySetIfClassAlreadyExists()
277+
public function classAliasesAreGracefullySetIfClassAlreadyExists(): void
283278
{
284279
$testClassName = 'TestClass' . md5(uniqid('bla', true));
285280
$testAlias1 = 'TestAlias' . md5(uniqid('bla', true));
@@ -310,7 +305,7 @@ public function classAliasesAreGracefullySetIfClassAlreadyExists()
310305
/**
311306
* @test
312307
*/
313-
public function interfaceAliasesAreGracefullySetIfInterfaceAlreadyExists()
308+
public function interfaceAliasesAreGracefullySetIfInterfaceAlreadyExists(): void
314309
{
315310
$testClassName = 'TestClass' . md5(uniqid('bla', true));
316311
$testAlias1 = 'TestAlias' . md5(uniqid('bla', true));
@@ -338,7 +333,7 @@ public function interfaceAliasesAreGracefullySetIfInterfaceAlreadyExists()
338333
/**
339334
* @test
340335
*/
341-
public function classAliasesAreNotReEstablishedIfTheyAlreadyExist()
336+
public function classAliasesAreNotReEstablishedIfTheyAlreadyExist(): void
342337
{
343338
$testClassName = 'TestClass' . md5(uniqid('bla', true));
344339
$testAlias1 = 'TestAlias' . md5(uniqid('bla', true));
@@ -366,7 +361,7 @@ class_alias($testClassName, $testAlias1);
366361
/**
367362
* @test
368363
*/
369-
public function loadClassWithAliasReturnsNullIfComposerClassLoaderCannotFindClass()
364+
public function loadClassWithAliasReturnsNullIfComposerClassLoaderCannotFindClass(): void
370365
{
371366
$this->composerClassLoaderMock->expects($this->once())->method('loadClass');
372367
$this->assertNull($this->subject->loadClassWithAlias('TestClass'));
@@ -375,7 +370,7 @@ public function loadClassWithAliasReturnsNullIfComposerClassLoaderCannotFindClas
375370
/**
376371
* @test
377372
*/
378-
public function loadClassWithAliasReturnsNullIfComposerClassLoaderCannotFindClassEvenIfItExistsInMap()
373+
public function loadClassWithAliasReturnsNullIfComposerClassLoaderCannotFindClassEvenIfItExistsInMap(): void
379374
{
380375
$testClassName = 'TestClass' . md5(uniqid('bla', true));
381376
$testAlias1 = 'TestAlias' . md5(uniqid('bla', true));

‎tests/Unit/ConfigTest.php‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,41 @@
1212

1313
use Composer\IO\IOInterface;
1414
use Composer\Package\PackageInterface;
15+
use PHPUnit\Framework\MockObject\MockObject;
16+
use PHPUnit\Framework\TestCase;
1517
use TYPO3\ClassAliasLoader\Config;
1618

1719
/**
1820
* Test case for Config
1921
*/
20-
class ConfigTest extends BaseTestCase
22+
class ConfigTest extends TestCase
2123
{
2224
/**
2325
* @var Config
2426
*/
2527
protected $subject;
2628

2729
/**
28-
* @var IOInterface|\PHPUnit_Framework_MockObject_MockObject
30+
* @var IOInterface|MockObject
2931
*/
3032
protected $ioMock;
3133

3234
/**
33-
* @var PackageInterface|\PHPUnit_Framework_MockObject_MockObject
35+
* @var PackageInterface|MockObject
3436
*/
3537
protected $packageMock;
3638

37-
/**
38-
* @before
39-
*/
40-
public function setMeUp()
39+
public function setUp(): void
4140
{
4241
$this->ioMock = $this->getMockBuilder('Composer\\IO\\IOInterface')->getMock();
4342
$this->packageMock = $this->getMockBuilder('Composer\\Package\\PackageInterface')->getMock();
44-
4543
$this->subject = new Config($this->packageMock, $this->ioMock);
4644
}
4745

4846
/**
4947
* @test
5048
*/
51-
public function throwsExceptionForEmptyKey()
49+
public function throwsExceptionForEmptyKey(): void
5250
{
5351
// Use this instead when old PHP versions are dropped and minimum phpunit version can be raised:
5452
/**
@@ -70,7 +68,7 @@ public function throwsExceptionForEmptyKey()
7068
/**
7169
* @test
7270
*/
73-
public function defaultConfigIsAppliedWhenNothingIsConfiguredInPackage()
71+
public function defaultConfigIsAppliedWhenNothingIsConfiguredInPackage(): void
7472
{
7573
$this->assertFalse($this->subject->get('always-add-alias-loader'));
7674
$this->assertTrue($this->subject->get('autoload-case-sensitivity'));
@@ -80,7 +78,7 @@ public function defaultConfigIsAppliedWhenNothingIsConfiguredInPackage()
8078
/**
8179
* @test
8280
*/
83-
public function aliasMapConfigIsExtracted()
81+
public function aliasMapConfigIsExtracted(): void
8482
{
8583
$this->packageMock->expects($this->any())->method('getExtra')->willReturn(
8684
array(
@@ -100,7 +98,7 @@ public function aliasMapConfigIsExtracted()
10098
/**
10199
* @test
102100
*/
103-
public function aliasMapConfigIsExtractedFromDeprecatedKey()
101+
public function aliasMapConfigIsExtractedFromDeprecatedKey(): void
104102
{
105103
$this->packageMock->expects($this->any())->method('getExtra')->willReturn(
106104
array(
@@ -121,7 +119,7 @@ public function aliasMapConfigIsExtractedFromDeprecatedKey()
121119
/**
122120
* @test
123121
*/
124-
public function otherConfigIsExtracted()
122+
public function otherConfigIsExtracted(): void
125123
{
126124
$this->packageMock->expects($this->any())->method('getExtra')->willReturn(
127125
array(
@@ -141,7 +139,7 @@ public function otherConfigIsExtracted()
141139
/**
142140
* @test
143141
*/
144-
public function otherConfigIsExtractedFromDeprecatedKey()
142+
public function otherConfigIsExtractedFromDeprecatedKey(): void
145143
{
146144
$this->packageMock->expects($this->any())->method('getExtra')->willReturn(
147145
array(
@@ -161,7 +159,7 @@ public function otherConfigIsExtractedFromDeprecatedKey()
161159
/**
162160
* @test
163161
*/
164-
public function caseSensitivityConfigIsExtractedFromVeryDeprecatedKey()
162+
public function caseSensitivityConfigIsExtractedFromVeryDeprecatedKey(): void
165163
{
166164
$this->packageMock->expects($this->any())->method('getExtra')->willReturn(
167165
array(

‎tests/Unit/IncludeFileTest.php‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
use Composer\IO\IOInterface;
1515
use Composer\Package\PackageInterface;
1616
use PHPUnit\Framework\MockObject\MockObject;
17+
use PHPUnit\Framework\TestCase;
1718
use TYPO3\ClassAliasLoader\Config;
1819
use TYPO3\ClassAliasLoader\IncludeFile;
1920

2021
/**
2122
* Test case for IncludeFile
2223
*/
23-
final class IncludeFileTest extends BaseTestCase
24+
final class IncludeFileTest extends TestCase
2425
{
2526
/**
2627
* @var IncludeFile
@@ -44,10 +45,7 @@ final class IncludeFileTest extends BaseTestCase
4445

4546
private $testDir = __DIR__;
4647

47-
/**
48-
* @before
49-
*/
50-
public function setMeUp()
48+
public function setUp(): void
5149
{
5250
$this->ioMock = $this->getMockBuilder('Composer\\IO\\IOInterface')->getMock();
5351
$this->packageMock = $this->getMockBuilder('Composer\\Package\\RootPackageInterface')->getMock();
@@ -84,17 +82,14 @@ public function setMeUp()
8482
);
8583
}
8684

87-
/**
88-
* @after
89-
*/
90-
public function tearMeDown()
85+
public function tearDown(): void
9186
{
9287
unlink($this->testDir . IncludeFile::INCLUDE_FILE);
9388
rmdir(dirname($this->testDir . IncludeFile::INCLUDE_FILE));
9489
}
9590

9691

97-
public function testIncludeFileCanPeWritten()
92+
public function testIncludeFileCanPeWritten(): void
9893
{
9994
$this->subject->register();
10095
self::assertTrue(file_exists($this->testDir . IncludeFile::INCLUDE_FILE));

0 commit comments

Comments
 (0)