@@ -17,7 +17,7 @@ class XmlScannerTest extends TestCase
17
17
* @param mixed $filename
18
18
* @param mixed $expectedResult
19
19
*/
20
- public function testValidXML ($ filename , $ expectedResult, bool $ libxmlDisableEntityLoader ): void
20
+ public function testValidXML ($ filename , $ expectedResult ): void
21
21
{
22
22
$ reader = XmlScanner::getInstance (new \PhpOffice \PhpSpreadsheet \Reader \Xml ());
23
23
$ result = $ reader ->scanFile ($ filename );
@@ -32,8 +32,7 @@ public static function providerValidXML(): array
32
32
foreach ($ glob as $ file ) {
33
33
$ filename = realpath ($ file );
34
34
$ expectedResult = file_get_contents ($ file );
35
- $ tests [basename ($ file ) . '_libxml_entity_loader_disabled ' ] = [$ filename , $ expectedResult , true ];
36
- $ tests [basename ($ file ) . '_libxml_entity_loader_enabled ' ] = [$ filename , $ expectedResult , false ];
35
+ $ tests [basename ($ file )] = [$ filename , $ expectedResult ];
37
36
}
38
37
39
38
return $ tests ;
@@ -44,7 +43,7 @@ public static function providerValidXML(): array
44
43
*
45
44
* @param mixed $filename
46
45
*/
47
- public function testInvalidXML ($ filename, bool $ libxmlDisableEntityLoader ): void
46
+ public function testInvalidXML ($ filename ): void
48
47
{
49
48
$ this ->expectException (\PhpOffice \PhpSpreadsheet \Reader \Exception::class);
50
49
@@ -61,8 +60,7 @@ public static function providerInvalidXML(): array
61
60
self ::assertNotFalse ($ glob );
62
61
foreach ($ glob as $ file ) {
63
62
$ filename = realpath ($ file );
64
- $ tests [basename ($ file ) . '_libxml_entity_loader_disabled ' ] = [$ filename , true ];
65
- $ tests [basename ($ file ) . '_libxml_entity_loader_enabled ' ] = [$ filename , false ];
63
+ $ tests [basename ($ file )] = [$ filename ];
66
64
}
67
65
68
66
return $ tests ;
0 commit comments