Skip to content

Commit 2880b67

Browse files
author
Erwin Derksen
committed
dirname(__FILE__) => __DIR__ (valid as of php 5.3)
1 parent 39b3e18 commit 2880b67

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎tests/TarTestCase.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public function testCreateDynamic()
7979
{
8080
$tar = new Tar();
8181

82-
$dir = dirname(__FILE__) . '/tar';
82+
$dir = __DIR__ . '/tar';
8383
$tdir = ltrim($dir, '/');
8484

8585
$tar->create();
@@ -117,7 +117,7 @@ public function testCreateFile()
117117
{
118118
$tar = new Tar();
119119

120-
$dir = dirname(__FILE__) . '/tar';
120+
$dir = __DIR__ . '/tar';
121121
$tdir = ltrim($dir, '/');
122122
$tmp = vfsStream::url('home_root_path/test.tar');
123123

@@ -153,7 +153,7 @@ public function testCreateFile()
153153
*/
154154
public function testTarcontent()
155155
{
156-
$dir = dirname(__FILE__) . '/tar';
156+
$dir = __DIR__ . '/tar';
157157

158158
foreach ($this->extensions as $ext) {
159159
$tar = new Tar();
@@ -178,7 +178,7 @@ public function testTarcontent()
178178
public function testDogfood()
179179
{
180180
foreach ($this->extensions as $ext) {
181-
$input = glob(dirname(__FILE__) . '/../src/*');
181+
$input = glob(__DIR__ . '/../src/*');
182182
$archive = sys_get_temp_dir() . '/dwtartest' . md5(time()) . '.' . $ext;
183183
$extract = sys_get_temp_dir() . '/dwtartest' . md5(time() + 1);
184184

@@ -250,7 +250,7 @@ protected function nativeCheck($archive, $ext)
250250
*/
251251
public function testTarExtract()
252252
{
253-
$dir = dirname(__FILE__) . '/tar';
253+
$dir = __DIR__ . '/tar';
254254
$out = sys_get_temp_dir() . '/dwtartest' . md5(time());
255255

256256
foreach ($this->extensions as $ext) {
@@ -277,7 +277,7 @@ public function testTarExtract()
277277
*/
278278
public function testCompStripExtract()
279279
{
280-
$dir = dirname(__FILE__) . '/tar';
280+
$dir = __DIR__ . '/tar';
281281
$out = sys_get_temp_dir() . '/dwtartest' . md5(time());
282282

283283
foreach ($this->extensions as $ext) {
@@ -304,7 +304,7 @@ public function testCompStripExtract()
304304
*/
305305
public function testPrefixStripExtract()
306306
{
307-
$dir = dirname(__FILE__) . '/tar';
307+
$dir = __DIR__ . '/tar';
308308
$out = sys_get_temp_dir() . '/dwtartest' . md5(time());
309309

310310
foreach ($this->extensions as $ext) {
@@ -331,7 +331,7 @@ public function testPrefixStripExtract()
331331
*/
332332
public function testIncludeExtract()
333333
{
334-
$dir = dirname(__FILE__) . '/tar';
334+
$dir = __DIR__ . '/tar';
335335
$out = sys_get_temp_dir() . '/dwtartest' . md5(time());
336336

337337
foreach ($this->extensions as $ext) {
@@ -357,7 +357,7 @@ public function testIncludeExtract()
357357
*/
358358
public function testExcludeExtract()
359359
{
360-
$dir = dirname(__FILE__) . '/tar';
360+
$dir = __DIR__ . '/tar';
361361
$out = sys_get_temp_dir() . '/dwtartest' . md5(time());
362362

363363
foreach ($this->extensions as $ext) {
@@ -394,7 +394,7 @@ public function testFileType()
394394
$this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tar.BZ2'));
395395
$this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype('foo.tar.bz2'));
396396

397-
$dir = dirname(__FILE__) . '/tar';
397+
$dir = __DIR__ . '/tar';
398398
$this->assertEquals(Tar::COMPRESS_NONE, $tar->filetype("$dir/test.tar"));
399399
$this->assertEquals(Tar::COMPRESS_GZIP, $tar->filetype("$dir/test.tgz"));
400400
$this->assertEquals(Tar::COMPRESS_BZIP, $tar->filetype("$dir/test.tbz"));
@@ -408,7 +408,7 @@ public function testFileType()
408408
*/
409409
public function testLongPathExtract()
410410
{
411-
$dir = dirname(__FILE__) . '/tar';
411+
$dir = __DIR__ . '/tar';
412412
$out = vfsStream::url('home_root_path/dwtartest' . md5(time()));
413413

414414
foreach (array('ustar', 'gnu') as $format) {
@@ -504,7 +504,7 @@ public function testCreateLongPathGnu()
504504
*/
505505
public function testTarBomb()
506506
{
507-
$dir = dirname(__FILE__) . '/tar';
507+
$dir = __DIR__ . '/tar';
508508
$out = vfsStream::url('home_root_path/dwtartest' . md5(time()));
509509

510510
$tar = new Tar();
@@ -524,7 +524,7 @@ public function testTarBomb()
524524
*/
525525
public function testZeroFile()
526526
{
527-
$dir = dirname(__FILE__) . '/tar';
527+
$dir = __DIR__ . '/tar';
528528
$tar = new Tar();
529529
$tar->setCompression(0);
530530
$tar->create();
@@ -582,7 +582,7 @@ public function testZeroByteFile() {
582582
*/
583583
public function testBlockFile()
584584
{
585-
$dir = dirname(__FILE__) . '/tar';
585+
$dir = __DIR__ . '/tar';
586586
$tar = new Tar();
587587
$tar->setCompression(0);
588588
$tar->create();
@@ -609,7 +609,7 @@ public function testBlockData()
609609
public function testGzipIsValid()
610610
{
611611
foreach (['tgz', 'tar.gz'] as $ext) {
612-
$input = glob(dirname(__FILE__) . '/../src/*');
612+
$input = glob(__DIR__ . '/../src/*');
613613
$archive = sys_get_temp_dir() . '/dwtartest' . md5(time()) . '.' . $ext;
614614
$extract = sys_get_temp_dir() . '/dwtartest' . md5(time() + 1);
615615

@@ -649,7 +649,7 @@ public function testContentsWithInvalidArchiveStream()
649649
public function testExtractWithInvalidOutDir()
650650
{
651651
$this->expectException(ArchiveIOException::class);
652-
$dir = dirname(__FILE__) . '/tar';
652+
$dir = __DIR__ . '/tar';
653653
$out = '/root/invalid_out_dir';
654654

655655
$tar = new Tar();
@@ -661,7 +661,7 @@ public function testExtractWithInvalidOutDir()
661661
public function testExtractWithArchiveStreamIsClosed()
662662
{
663663
$this->expectException(ArchiveIOException::class);
664-
$dir = dirname(__FILE__) . '/tar';
664+
$dir = __DIR__ . '/tar';
665665
$out = '/root/invalid_out_dir';
666666

667667
$tar = new Tar();
@@ -674,7 +674,7 @@ public function testExtractWithArchiveStreamIsClosed()
674674
public function testCreateWithInvalidFile()
675675
{
676676
$this->expectException(ArchiveIOException::class);
677-
$dir = dirname(__FILE__) . '/tar';
677+
$dir = __DIR__ . '/tar';
678678
$tar = new Tar();
679679

680680
$tar->open("$dir/tarbomb.tgz");
@@ -730,7 +730,7 @@ public function testCloseHasBeenClosed()
730730
*/
731731
public function testGetArchiveWithBzipCompress()
732732
{
733-
$dir = dirname(__FILE__) . '/tar';
733+
$dir = __DIR__ . '/tar';
734734
$tar = new Tar();
735735
$tar->setCompression(9, Tar::COMPRESS_BZIP);
736736
$tar->create();
@@ -742,7 +742,7 @@ public function testGetArchiveWithBzipCompress()
742742

743743
public function testSaveWithCompressionAuto()
744744
{
745-
$dir = dirname(__FILE__) . '/tar';
745+
$dir = __DIR__ . '/tar';
746746
$tar = new Tar();
747747
$tar->setCompression(-1);
748748
$tar->create();
@@ -755,7 +755,7 @@ public function testSaveWithCompressionAuto()
755755
public function testSaveWithInvalidDestinationFile()
756756
{
757757
$this->expectException(ArchiveIOException::class);
758-
$dir = dirname(__FILE__) . '/tar';
758+
$dir = __DIR__ . '/tar';
759759
$tar = new Tar();
760760
$tar->setCompression();
761761
$tar->create();

‎tests/ZipTestCase.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function testCreateDynamic()
5151
{
5252
$zip = new Zip();
5353

54-
$dir = dirname(__FILE__) . '/zip';
54+
$dir = __DIR__ . '/zip';
5555
$tdir = ltrim($dir, '/');
5656

5757
$zip->create();
@@ -91,7 +91,7 @@ public function testCreateFile()
9191
{
9292
$zip = new Zip();
9393

94-
$dir = dirname(__FILE__) . '/zip';
94+
$dir = __DIR__ . '/zip';
9595
$tdir = ltrim($dir, '/');
9696
$tmp = vfsStream::url('home_root_path/test.zip');
9797

@@ -135,7 +135,7 @@ public function testAddFileWithArchiveStreamIsClosed()
135135
{
136136
$this->expectException(ArchiveIOException::class);
137137
$zip = new Zip();
138-
$dir = dirname(__FILE__) . '/zip';
138+
$dir = __DIR__ . '/zip';
139139
$zip->setCompression(0);
140140
$zip->close();
141141
$zip->addFile("$dir/testdata1.txt", "$dir/testdata1.txt");
@@ -158,7 +158,7 @@ public function testAddFileWithInvalidFile()
158158
*/
159159
public function testZipContent()
160160
{
161-
$dir = dirname(__FILE__) . '/zip';
161+
$dir = __DIR__ . '/zip';
162162

163163
$zip = new Zip();
164164
$file = "$dir/test.zip";
@@ -177,7 +177,7 @@ public function testZipContent()
177177
public function testZipContentWithArchiveStreamIsClosed()
178178
{
179179
$this->expectException(ArchiveIOException::class);
180-
$dir = dirname(__FILE__) . '/zip';
180+
$dir = __DIR__ . '/zip';
181181
$zip = new Zip();
182182
$file = "$dir/test.zip";
183183
$zip->open($file);
@@ -191,7 +191,7 @@ public function testZipContentWithArchiveStreamIsClosed()
191191
*/
192192
public function testDogFood()
193193
{
194-
$input = glob(dirname(__FILE__) . '/../src/*');
194+
$input = glob(__DIR__ . '/../src/*');
195195
$archive = sys_get_temp_dir() . '/dwziptest' . md5(time()) . '.zip';
196196
$extract = sys_get_temp_dir() . '/dwziptest' . md5(time() + 1);
197197

@@ -312,7 +312,7 @@ public function testCloseWithArchiveStreamIsClosed()
312312

313313
public function testSaveArchiveFile()
314314
{
315-
$dir = dirname(__FILE__) . '/tar';
315+
$dir = __DIR__ . '/tar';
316316
$zip = new zip();
317317
$zip->setCompression(-1);
318318
$zip->create();
@@ -382,7 +382,7 @@ protected function native7ZipCheck($archive)
382382
*/
383383
public function testZipExtract()
384384
{
385-
$dir = dirname(__FILE__) . '/zip';
385+
$dir = __DIR__ . '/zip';
386386
$out = sys_get_temp_dir() . '/dwziptest' . md5(time());
387387

388388
$zip = new Zip();
@@ -409,7 +409,7 @@ public function testZipExtract()
409409
public function testZipExtractWithArchiveStreamIsClosed()
410410
{
411411
$this->expectException(ArchiveIOException::class);
412-
$dir = dirname(__FILE__) . '/zip';
412+
$dir = __DIR__ . '/zip';
413413
$out = sys_get_temp_dir() . '/dwziptest' . md5(time());
414414

415415
$zip = new Zip();
@@ -426,7 +426,7 @@ public function testZipExtractWithArchiveStreamIsClosed()
426426
*/
427427
public function testCompStripExtract()
428428
{
429-
$dir = dirname(__FILE__) . '/zip';
429+
$dir = __DIR__ . '/zip';
430430
$out = sys_get_temp_dir() . '/dwziptest' . md5(time());
431431

432432
$zip = new Zip();
@@ -452,7 +452,7 @@ public function testCompStripExtract()
452452
*/
453453
public function testPrefixStripExtract()
454454
{
455-
$dir = dirname(__FILE__) . '/zip';
455+
$dir = __DIR__ . '/zip';
456456
$out = sys_get_temp_dir() . '/dwziptest' . md5(time());
457457

458458
$zip = new Zip();
@@ -478,7 +478,7 @@ public function testPrefixStripExtract()
478478
*/
479479
public function testIncludeExtract()
480480
{
481-
$dir = dirname(__FILE__) . '/zip';
481+
$dir = __DIR__ . '/zip';
482482
$out = sys_get_temp_dir() . '/dwziptest' . md5(time());
483483

484484
$zip = new Zip();
@@ -503,7 +503,7 @@ public function testIncludeExtract()
503503
*/
504504
public function testExcludeExtract()
505505
{
506-
$dir = dirname(__FILE__) . '/zip';
506+
$dir = __DIR__ . '/zip';
507507
$out = sys_get_temp_dir() . '/dwziptest' . md5(time());
508508

509509
$zip = new Zip();

0 commit comments

Comments
 (0)