@@ -46,52 +46,54 @@ protected function setUp(): void
46
46
*/
47
47
public static function provideExcel ()
48
48
{
49
+ $ PHPID = PHP_VERSION_ID ;
50
+
49
51
yield from [
50
52
'Excel 2024 ' => [
51
53
'checkFiles ' => 'excel2024.xlsx ' ,
52
- 'expectedFiles ' => 'excel2024_result.xlsx ' ,
54
+ 'expectedFiles ' => 'excel2024_result ' . $ PHPID . ' .xlsx ' ,
53
55
],
54
56
'Excel 2024 - Strict ' => [
55
57
'checkFiles ' => 'excel2024strict.xlsx ' ,
56
- 'expectedFiles ' => 'excel2024strict_result.xlsx ' ,
58
+ 'expectedFiles ' => 'excel2024strict_result ' . $ PHPID . ' .xlsx ' ,
57
59
],
58
60
'Excel Macro ' => [
59
61
'checkFiles ' => 'excelmacro.xlsm ' ,
60
- 'expectedFiles ' => 'excelmacro_result.xlsm ' ,
62
+ 'expectedFiles ' => 'excelmacro_result ' . $ PHPID . ' .xlsm ' ,
61
63
],
62
64
'Excel Binary ' => [
63
65
'checkFiles ' => 'excelbinary.xlsb ' ,
64
- 'expectedFiles ' => 'excelbinary_result.xlsb ' ,
66
+ 'expectedFiles ' => 'excelbinary_result ' . $ PHPID . ' .xlsb ' ,
65
67
],
66
68
'Excel 97-2003 ' => [
67
69
'checkFiles ' => 'excel97.xls ' ,
68
- 'expectedFiles ' => 'excel97_result.xls ' ,
70
+ 'expectedFiles ' => 'excel97_result ' . $ PHPID . ' .xls ' ,
69
71
],
70
72
'Excel 95 ' => [
71
73
'checkFiles ' => 'excel95.xls ' ,
72
- 'expectedFiles ' => 'excel95_result.xls ' ,
74
+ 'expectedFiles ' => 'excel95_result ' . $ PHPID . ' .xls ' ,
73
75
],
74
76
'CSV UTF-8 ' => [
75
77
'checkFiles ' => 'csvutf8.csv ' ,
76
- 'expectedFiles ' => 'csvutf8_result.csv ' ,
78
+ 'expectedFiles ' => 'csvutf8_result ' . $ PHPID . ' .csv ' ,
77
79
],
78
80
'CSV Unknown ' => [
79
81
'checkFiles ' => 'csvunknown.csv ' ,
80
- 'expectedFiles ' => 'csvunknown_result.csv ' ,
82
+ 'expectedFiles ' => 'csvunknown_result ' . $ PHPID . ' .csv ' ,
81
83
],
82
84
];
83
85
}
84
86
85
87
#[DataProvider('provideExcel ' )]
86
88
public static function testEncryptor (string $ checkFiles = '' , string $ expectedFiles = '' ): void
87
89
{
88
- if (is_file (self ::$ folderSupportResult . $ expectedFiles )) {
89
- unlink (self ::$ folderSupportResult . $ expectedFiles );
90
- }
91
-
92
90
(new Secure ())->setFile (self ::$ folderSupport . $ checkFiles )->setPassword ('111 ' )->output (self ::$ folderSupportResult . $ expectedFiles );
93
91
94
92
self ::assertFileExists (self ::$ folderSupportResult . $ expectedFiles );
93
+
94
+ if (is_file (self ::$ folderSupportResult . $ expectedFiles )) {
95
+ unlink (self ::$ folderSupportResult . $ expectedFiles );
96
+ }
95
97
}
96
98
97
99
public static function testEncryptorWithBinaryData (): void
0 commit comments