Skip to content

Commit a976868

Browse files
author
ruff
committed
Renamed methods to more intuitive names
1 parent 65dc9da commit a976868

File tree

2 files changed

+54
-54
lines changed

2 files changed

+54
-54
lines changed

‎src/MimeDb.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ function ($mimetypeDefinition) {
9898
* @param string $lookuoFileExtension
9999
* @return string|null
100100
*/
101-
public function findType(string $lookuoFileExtension): ?string
101+
public function findFirstMimeTypeByExtension(string $lookuoFileExtension): ?string
102102
{
103-
$mimeTypes = $this->findTypeAll($lookuoFileExtension);
103+
$mimeTypes = $this->findAllMimeTypesByExtension($lookuoFileExtension);
104104

105105
if (is_null($mimeTypes)) {
106106
return null;
@@ -115,7 +115,7 @@ public function findType(string $lookuoFileExtension): ?string
115115
* @param string $lookuoFileExtension
116116
* @return array|null
117117
*/
118-
public function findTypeAll(string $lookuoFileExtension): ?array
118+
public function findAllMimeTypesByExtension(string $lookuoFileExtension): ?array
119119
{
120120
$this->initializeDatabase();
121121

@@ -135,14 +135,14 @@ function ($mimetypeDefinition) use ($lookuoFileExtension) {
135135

136136
/**
137137
* Find by file extension
138-
* This is an alias function for findTyoe
138+
* This is an alias function for findFirstMimeTypeByExtension
139139
*
140140
* @param string $lookuoFileExtension
141141
* @return string|null
142142
*/
143143
public function findByExtension(string $lookuoFileExtension): ?string
144144
{
145-
return $this->findType($lookuoFileExtension);
145+
return $this->findFirstMimeTypeByExtension($lookuoFileExtension);
146146
}
147147

148148
/**
@@ -151,9 +151,9 @@ public function findByExtension(string $lookuoFileExtension): ?string
151151
* @param string $lookupMimeType
152152
* @return string|null
153153
*/
154-
public function findMimeType(string $lookupMimeType): ?string
154+
public function findFirstFileExtensionByMimeType(string $lookupMimeType): ?string
155155
{
156-
$fileExtensions = $this->findMimeTypeAll($lookupMimeType);
156+
$fileExtensions = $this->findAllFileExtensionsByMimeType($lookupMimeType);
157157

158158
if (is_null($fileExtensions)) {
159159
return null;
@@ -168,7 +168,7 @@ public function findMimeType(string $lookupMimeType): ?string
168168
* @param string $lookupMimeType
169169
* @return array|null
170170
*/
171-
public function findMimeTypeAll(string $lookupMimeType): ?array
171+
public function findAllFileExtensionsByMimeType(string $lookupMimeType): ?array
172172
{
173173
$this->initializeDatabase();
174174

‎tests/testcases/MimeDbTest.php

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testSingleton(): void
4646
$this->assertInstanceOf(MimeDb::class, $instance);
4747
$this->assertEmpty($this->getPrivatePropertyFromObject($instance, 'mimeDatabase')->getValue($instance));
4848

49-
$instance->findType('.mp4');
49+
$instance->findFirstMimeTypeByExtension('.mp4');
5050

5151
$this->assertNotEmpty($this->getPrivatePropertyFromObject($instance, 'mimeDatabase')->getValue($instance));
5252

@@ -58,47 +58,47 @@ public function testSingleton(): void
5858
/**
5959
* Test "findType" method
6060
*
61-
* @covers \horstoeko\mimeDb\MimeDb::findType
62-
* @covers \horstoeko\mimeDb\MimeDb::findTypeAll
61+
* @covers \horstoeko\mimeDb\MimeDb::findFirstMimeTypeByExtension
62+
* @covers \horstoeko\mimeDb\MimeDb::findAllMimeTypesByExtension
6363
* @covers \horstoeko\mimeDb\MimeDb::initializeDatabase
6464
* @covers \horstoeko\mimeDb\MimeDb::loadedDatabase
6565
* @covers \horstoeko\mimeDb\MimeDb::loadDatabase
6666
* @return void
6767
*/
6868
public function testFindType(): void
6969
{
70-
$this->assertEquals('application/vnd.openxmlformats-officedocument.wordprocessingml.document', $this->mimeDb->findType('.docx'));
71-
$this->assertEquals('video/mp4', $this->mimeDb->findType('.mp4'));
72-
$this->assertEquals('audio/midi', $this->mimeDb->findType('.mid'));
73-
$this->assertEquals('application/vnd.openxmlformats-officedocument.wordprocessingml.document', $this->mimeDb->findType('docx'));
74-
$this->assertEquals('video/mp4', $this->mimeDb->findType('mp4'));
75-
$this->assertEquals('audio/midi', $this->mimeDb->findType('mid'));
76-
$this->assertNull($this->mimeDb->findType('.unknown'));
70+
$this->assertEquals('application/vnd.openxmlformats-officedocument.wordprocessingml.document', $this->mimeDb->findFirstMimeTypeByExtension('.docx'));
71+
$this->assertEquals('video/mp4', $this->mimeDb->findFirstMimeTypeByExtension('.mp4'));
72+
$this->assertEquals('audio/midi', $this->mimeDb->findFirstMimeTypeByExtension('.mid'));
73+
$this->assertEquals('application/vnd.openxmlformats-officedocument.wordprocessingml.document', $this->mimeDb->findFirstMimeTypeByExtension('docx'));
74+
$this->assertEquals('video/mp4', $this->mimeDb->findFirstMimeTypeByExtension('mp4'));
75+
$this->assertEquals('audio/midi', $this->mimeDb->findFirstMimeTypeByExtension('mid'));
76+
$this->assertNull($this->mimeDb->findFirstMimeTypeByExtension('.unknown'));
7777
}
7878

7979
/**
80-
* Test "findTypeAll" method
80+
* Test "findAllMimeTypesByExtension" method
8181
*
82-
* @covers \horstoeko\mimeDb\MimeDb::findTypeAll
82+
* @covers \horstoeko\mimeDb\MimeDb::findAllMimeTypesByExtension
8383
* @covers \horstoeko\mimeDb\MimeDb::initializeDatabase
8484
* @covers \horstoeko\mimeDb\MimeDb::loadedDatabase
8585
* @covers \horstoeko\mimeDb\MimeDb::loadDatabase
8686
* @return void
8787
*/
88-
public function testFindTypeAll(): void
88+
public function testFindAllMimeTypesByExtension(): void
8989
{
90-
$this->assertIsArray($this->mimeDb->findTypeAll('.docx'));
91-
$this->assertArrayHasKey(0, $this->mimeDb->findTypeAll('.docx'));
92-
$this->assertArrayNotHasKey(1, $this->mimeDb->findTypeAll('.docx'));
90+
$this->assertIsArray($this->mimeDb->findAllMimeTypesByExtension('.docx'));
91+
$this->assertArrayHasKey(0, $this->mimeDb->findAllMimeTypesByExtension('.docx'));
92+
$this->assertArrayNotHasKey(1, $this->mimeDb->findAllMimeTypesByExtension('.docx'));
9393

94-
$this->assertNull($this->mimeDb->findTypeAll('.unknown'));
94+
$this->assertNull($this->mimeDb->findAllMimeTypesByExtension('.unknown'));
9595
}
9696

9797
/**
9898
* Test "findByExtension" method
9999
*
100-
* @covers \horstoeko\mimeDb\MimeDb::findType
101-
* @covers \horstoeko\mimeDb\MimeDb::findTypeAll
100+
* @covers \horstoeko\mimeDb\MimeDb::findFirstMimeTypeByExtension
101+
* @covers \horstoeko\mimeDb\MimeDb::findAllMimeTypesByExtension
102102
* @covers \horstoeko\mimeDb\MimeDb::findByExtension
103103
* @covers \horstoeko\mimeDb\MimeDb::initializeDatabase
104104
* @covers \horstoeko\mimeDb\MimeDb::loadedDatabase
@@ -117,49 +117,49 @@ public function testFindByExtension(): void
117117
}
118118

119119
/**
120-
* Test "findMimeType" method
120+
* Test "findFirstFileExtensionByMimeType" method
121121
*
122-
* @covers \horstoeko\mimeDb\MimeDb::findMimeType
123-
* @covers \horstoeko\mimeDb\MimeDb::findMimeTypeAll
122+
* @covers \horstoeko\mimeDb\MimeDb::findFirstFileExtensionByMimeType
123+
* @covers \horstoeko\mimeDb\MimeDb::findAllFileExtensionsByMimeType
124124
* @covers \horstoeko\mimeDb\MimeDb::initializeDatabase
125125
* @covers \horstoeko\mimeDb\MimeDb::loadedDatabase
126126
* @covers \horstoeko\mimeDb\MimeDb::loadDatabase
127127
* @return void
128128
*/
129-
public function testFindMimeType(): void
129+
public function testFindFirstFileExtensionByMimeType(): void
130130
{
131-
$this->assertEquals("docx", $this->mimeDb->findMimeType('application/vnd.openxmlformats-officedocument.wordprocessingml.document'));
132-
$this->assertEquals("mp4", $this->mimeDb->findMimeType('video/mp4'));
133-
$this->assertEquals("mid", $this->mimeDb->findMimeType('audio/midi'));
134-
$this->assertNull($this->mimeDb->findMimeType('unknown/unknown'));
131+
$this->assertEquals("docx", $this->mimeDb->findFirstFileExtensionByMimeType('application/vnd.openxmlformats-officedocument.wordprocessingml.document'));
132+
$this->assertEquals("mp4", $this->mimeDb->findFirstFileExtensionByMimeType('video/mp4'));
133+
$this->assertEquals("mid", $this->mimeDb->findFirstFileExtensionByMimeType('audio/midi'));
134+
$this->assertNull($this->mimeDb->findFirstFileExtensionByMimeType('unknown/unknown'));
135135
}
136136

137137
/**
138-
* Test "findMimeTypeAll" method
138+
* Test "findAllFileExtensionsByMimeType" method
139139
*
140-
* @covers \horstoeko\mimeDb\MimeDb::findMimeTypeAll
140+
* @covers \horstoeko\mimeDb\MimeDb::findAllFileExtensionsByMimeType
141141
* @covers \horstoeko\mimeDb\MimeDb::initializeDatabase
142142
* @covers \horstoeko\mimeDb\MimeDb::loadedDatabase
143143
* @covers \horstoeko\mimeDb\MimeDb::loadDatabase
144144
* @return void
145145
*/
146-
public function testFindMimeTypeAll(): void
146+
public function textFindAllFileExtensionsByMimeType(): void
147147
{
148-
$this->assertIsArray($this->mimeDb->findMimeTypeAll('application/vnd.openxmlformats-officedocument.wordprocessingml.document'));
149-
$this->assertArrayHasKey(0, $this->mimeDb->findMimeTypeAll('application/vnd.openxmlformats-officedocument.wordprocessingml.document'));
150-
$this->assertArrayNotHasKey(1, $this->mimeDb->findMimeTypeAll('application/vnd.openxmlformats-officedocument.wordprocessingml.document'));
151-
$this->assertEquals("docx", $this->mimeDb->findMimeTypeAll('application/vnd.openxmlformats-officedocument.wordprocessingml.document')[0]);
152-
153-
$this->assertIsArray($this->mimeDb->findMimeTypeAll('video/x-matroska'));
154-
$this->assertArrayHasKey(0, $this->mimeDb->findMimeTypeAll('video/x-matroska'));
155-
$this->assertArrayHasKey(1, $this->mimeDb->findMimeTypeAll('video/x-matroska'));
156-
$this->assertArrayHasKey(2, $this->mimeDb->findMimeTypeAll('video/x-matroska'));
157-
$this->assertArrayNotHasKey(3, $this->mimeDb->findMimeTypeAll('video/x-matroska'));
158-
$this->assertEquals("mkv", $this->mimeDb->findMimeTypeAll('video/x-matroska')[0]);
159-
$this->assertEquals("mk3d", $this->mimeDb->findMimeTypeAll('video/x-matroska')[1]);
160-
$this->assertEquals("mks", $this->mimeDb->findMimeTypeAll('video/x-matroska')[2]);
161-
162-
$this->assertNull($this->mimeDb->findMimeTypeAll('application/pdx'));
163-
$this->assertNull($this->mimeDb->findMimeTypeAll('unknown/unknown'));
148+
$this->assertIsArray($this->mimeDb->findAllFileExtensionsByMimeType('application/vnd.openxmlformats-officedocument.wordprocessingml.document'));
149+
$this->assertArrayHasKey(0, $this->mimeDb->findAllFileExtensionsByMimeType('application/vnd.openxmlformats-officedocument.wordprocessingml.document'));
150+
$this->assertArrayNotHasKey(1, $this->mimeDb->findAllFileExtensionsByMimeType('application/vnd.openxmlformats-officedocument.wordprocessingml.document'));
151+
$this->assertEquals("docx", $this->mimeDb->findAllFileExtensionsByMimeType('application/vnd.openxmlformats-officedocument.wordprocessingml.document')[0]);
152+
153+
$this->assertIsArray($this->mimeDb->findAllFileExtensionsByMimeType('video/x-matroska'));
154+
$this->assertArrayHasKey(0, $this->mimeDb->findAllFileExtensionsByMimeType('video/x-matroska'));
155+
$this->assertArrayHasKey(1, $this->mimeDb->findAllFileExtensionsByMimeType('video/x-matroska'));
156+
$this->assertArrayHasKey(2, $this->mimeDb->findAllFileExtensionsByMimeType('video/x-matroska'));
157+
$this->assertArrayNotHasKey(3, $this->mimeDb->findAllFileExtensionsByMimeType('video/x-matroska'));
158+
$this->assertEquals("mkv", $this->mimeDb->findAllFileExtensionsByMimeType('video/x-matroska')[0]);
159+
$this->assertEquals("mk3d", $this->mimeDb->findAllFileExtensionsByMimeType('video/x-matroska')[1]);
160+
$this->assertEquals("mks", $this->mimeDb->findAllFileExtensionsByMimeType('video/x-matroska')[2]);
161+
162+
$this->assertNull($this->mimeDb->findAllFileExtensionsByMimeType('application/pdx'));
163+
$this->assertNull($this->mimeDb->findAllFileExtensionsByMimeType('unknown/unknown'));
164164
}
165165
}

0 commit comments

Comments
 (0)