Merge branch 'PHP-7.4'

* PHP-7.4:
  Replace dirname(__FILE__) by __DIR__ in tests

45 files changed, 43 insertions, 43 deletions

diff --git a/ext/exif/tests/bug34704-mb.phpt b/ext/exif/tests/bug34704-mb.phpt
index 8185eb319c..4ca5d6af6b 100644
--- a/ext/exif/tests/bug34704-mb.phpt
+++ b/ext/exif/tests/bug34704-mb.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-$infile = dirname(__FILE__).'/bug34704私はガラスを食べられます.jpg';
+$infile = __DIR__.'/bug34704私はガラスを食べられます.jpg';
 var_dump(exif_read_data($infile));
 ?>
 ===DONE===
diff --git a/ext/exif/tests/bug34704.phpt b/ext/exif/tests/bug34704.phpt
index ebe05fb878..9925840d5a 100644
--- a/ext/exif/tests/bug34704.phpt
+++ b/ext/exif/tests/bug34704.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-$infile = dirname(__FILE__).'/bug34704.jpg';
+$infile = __DIR__.'/bug34704.jpg';
 var_dump(exif_read_data($infile));
 ?>
 ===DONE===
diff --git a/ext/exif/tests/bug48378.phpt b/ext/exif/tests/bug48378.phpt
index cd2e48a0d4..a830f226b1 100644
--- a/ext/exif/tests/bug48378.phpt
+++ b/ext/exif/tests/bug48378.phpt
@@ -5,7 +5,7 @@ Bug #48378 (Infinite recursion due to corrupt JPEG)
 --FILE--
 <?php
 exif_read_data(
-dirname(__FILE__) . "/bug48378.jpeg",
+__DIR__ . "/bug48378.jpeg",
 "FILE,COMPUTED,ANY_TAG"
 );
 ?>
diff --git a/ext/exif/tests/bug50660/bug50660.phpt b/ext/exif/tests/bug50660/bug50660.phpt
index e523921ebd..4b502a0a29 100644
--- a/ext/exif/tests/bug50660/bug50660.phpt
+++ b/ext/exif/tests/bug50660/bug50660.phpt
@@ -7,9 +7,9 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-$infile = dirname(__FILE__).'/bug50660-1.jpg';
+$infile = __DIR__.'/bug50660-1.jpg';
 var_dump(exif_read_data($infile) !== false);
-$infile = dirname(__FILE__).'/bug50660-2.jpg';
+$infile = __DIR__.'/bug50660-2.jpg';
 var_dump(exif_read_data($infile) !== false);
 ?>
 ===DONE===
diff --git a/ext/exif/tests/bug50845.phpt b/ext/exif/tests/bug50845.phpt
index 2c142236a4..277415cd73 100644
--- a/ext/exif/tests/bug50845.phpt
+++ b/ext/exif/tests/bug50845.phpt
@@ -4,7 +4,7 @@ Bug #50845 (exif_read_data() returns corrupted exif headers)
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
 <?php
-$infile = dirname(__FILE__).'/bug50845.jpg';
+$infile = __DIR__.'/bug50845.jpg';
 var_dump(exif_read_data($infile));
 --EXPECTF--
 array(44) {
diff --git a/ext/exif/tests/bug60150.phpt b/ext/exif/tests/bug60150.phpt
index 2f39c11511..17aafb0ca0 100644
--- a/ext/exif/tests/bug60150.phpt
+++ b/ext/exif/tests/bug60150.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-$infile = dirname(__FILE__).'/bug60150.jpg';
+$infile = __DIR__.'/bug60150.jpg';
 var_dump(exif_read_data($infile));
 ?>
 ===DONE===
diff --git a/ext/exif/tests/bug72603.phpt b/ext/exif/tests/bug72603.phpt
index 71d3943446..eacb6ee45a 100644
--- a/ext/exif/tests/bug72603.phpt
+++ b/ext/exif/tests/bug72603.phpt
@@ -4,7 +4,7 @@ Bug #72603 (Out of bound read in exif_process_IFD_in_MAKERNOTE)
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
 <?php
-var_dump(count(exif_read_data(dirname(__FILE__) . "/bug72603.jpeg")));
+var_dump(count(exif_read_data(__DIR__ . "/bug72603.jpeg")));
 ?>
 --EXPECTF--
 Warning: exif_read_data(bug72603.jpeg): %s in %s%ebug72603.php on line %d
diff --git a/ext/exif/tests/bug72618.phpt b/ext/exif/tests/bug72618.phpt
index c4fe8e3f90..c76edb4c50 100644
--- a/ext/exif/tests/bug72618.phpt
+++ b/ext/exif/tests/bug72618.phpt
@@ -4,7 +4,7 @@ Bug 72618 (NULL Pointer Dereference in exif_process_user_comment)
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
 <?php
-var_dump(count(exif_read_data(dirname(__FILE__) . "/bug72618.jpg")));
+var_dump(count(exif_read_data(__DIR__ . "/bug72618.jpg")));
 ?>
 --EXPECTF--
 Warning: exif_read_data(bug72618.jpg): %s in %s%ebug72618.php on line %d
diff --git a/ext/exif/tests/bug72819/bug72819.phpt b/ext/exif/tests/bug72819/bug72819.phpt
index d99a15c197..0813c8a5eb 100644
--- a/ext/exif/tests/bug72819/bug72819.phpt
+++ b/ext/exif/tests/bug72819/bug72819.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-$infile = dirname(__FILE__).'/bug72819.jpg';
+$infile = __DIR__.'/bug72819.jpg';
 var_dump(strlen(exif_thumbnail($infile)));
 ?>
 ===DONE===
diff --git a/ext/exif/tests/bug73115/bug73115.phpt b/ext/exif/tests/bug73115/bug73115.phpt
index 9ce3818e59..86c99a63d0 100644
--- a/ext/exif/tests/bug73115/bug73115.phpt
+++ b/ext/exif/tests/bug73115/bug73115.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-$infile = dirname(__FILE__).'/bug73115.jpg';
+$infile = __DIR__.'/bug73115.jpg';
 var_dump(count(exif_read_data($infile)));
 ?>
 ===DONE===
diff --git a/ext/exif/tests/bug74428/bug74428.phpt b/ext/exif/tests/bug74428/bug74428.phpt
index 24911084e4..881e6987c4 100644
--- a/ext/exif/tests/bug74428/bug74428.phpt
+++ b/ext/exif/tests/bug74428/bug74428.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-$infile = dirname(__FILE__).'/bug74428.jpg';
+$infile = __DIR__.'/bug74428.jpg';
 var_dump(exif_read_data($infile));
 ?>
 ===DONE===
diff --git a/ext/exif/tests/bug76557.phpt b/ext/exif/tests/bug76557.phpt
index 0b48b792ea..b036971f8b 100644
--- a/ext/exif/tests/bug76557.phpt
+++ b/ext/exif/tests/bug76557.phpt
@@ -4,7 +4,7 @@ Bug 76557 (heap-buffer-overflow (READ of size 48) while reading exif data)
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__) . "/bug76557.jpg"));
+var_dump(exif_read_data(__DIR__ . "/bug76557.jpg"));
 ?>
 DONE
 --EXPECTF--
diff --git a/ext/exif/tests/bug77184/bug77184.phpt b/ext/exif/tests/bug77184/bug77184.phpt
index e118d2f677..da2bbc048f 100644
--- a/ext/exif/tests/bug77184/bug77184.phpt
+++ b/ext/exif/tests/bug77184/bug77184.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-$infile = dirname(__FILE__).'/DJI_0245_tiny.JPG';
+$infile = __DIR__.'/DJI_0245_tiny.JPG';
 $tags = exif_read_data($infile);
 echo $tags['GPSLatitude'][2], PHP_EOL;
 echo $tags['GPSLongitude'][2], PHP_EOL;
diff --git a/ext/exif/tests/bug77564/bug77564.phpt b/ext/exif/tests/bug77564/bug77564.phpt
index 2f72b3c9ac..ec686958af 100644
--- a/ext/exif/tests/bug77564/bug77564.phpt
+++ b/ext/exif/tests/bug77564/bug77564.phpt
@@ -4,7 +4,7 @@ Bug 77564 (Memory leak in exif_process_IFD_TAG)
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__) . '/bug77564.jpg'));
+var_dump(exif_read_data(__DIR__ . '/bug77564.jpg'));
 ?>
 DONE
 --EXPECTF--
diff --git a/ext/exif/tests/exif000.phpt b/ext/exif/tests/exif000.phpt
index eea16438cf..2e6b94f7ad 100644
--- a/ext/exif/tests/exif000.phpt
+++ b/ext/exif/tests/exif000.phpt
@@ -12,7 +12,7 @@ zlib.output_compression=0
   test2.jpg is the same image but contains Exif/Comment information and a
             copy of test1.jpg as a thumbnail.
 */
-print_r(exif_read_data(dirname(__FILE__).'/test2.jpg'));
+print_r(exif_read_data(__DIR__.'/test2.jpg'));
 ?>
 --EXPECTF--
 Array
diff --git a/ext/exif/tests/exif001.phpt b/ext/exif/tests/exif001.phpt
index 543a9bd4f5..75f423b461 100644
--- a/ext/exif/tests/exif001.phpt
+++ b/ext/exif/tests/exif001.phpt
@@ -12,7 +12,7 @@ zlib.output_compression=0
   test2.jpg is the same image but contains Exif/Comment information and a
             copy of test1.jpg as a thumbnail.
 */
-var_dump(exif_read_data(dirname(__FILE__).'/test2.jpg','',true,false));
+var_dump(exif_read_data(__DIR__.'/test2.jpg','',true,false));
 ?>
 --EXPECTF--
 array(5) {
diff --git a/ext/exif/tests/exif002.phpt b/ext/exif/tests/exif002.phpt
index 7f78ef2813..95e51a9efe 100644
--- a/ext/exif/tests/exif002.phpt
+++ b/ext/exif/tests/exif002.phpt
@@ -12,9 +12,9 @@ zlib.output_compression=0
   test2.jpg is the same image but contains Exif/Comment information and a
             copy of test1.jpg as a thumbnail.
 */
-$infile = dirname(__FILE__).'/test1.jpg';
+$infile = __DIR__.'/test1.jpg';
 echo md5_file($infile).'_'.filesize($infile);
-$thumb = exif_thumbnail(dirname(__FILE__).'/test2.jpg');
+$thumb = exif_thumbnail(__DIR__.'/test2.jpg');
 echo " == ";
 echo md5($thumb).'_'.strlen($thumb);
 echo "\n";
diff --git a/ext/exif/tests/exif003.phpt b/ext/exif/tests/exif003.phpt
index daaf77d83a..9d66e35ddc 100644
--- a/ext/exif/tests/exif003.phpt
+++ b/ext/exif/tests/exif003.phpt
@@ -19,7 +19,7 @@ exif.encode_unicode=ISO-8859-15
             copy of test1.jpg as a thumbnail.
   test3.jpg is the same as test2.jpg but with a UNICODE UserComment: &Auml;&Ouml;&&Uuml;&szlig;&auml;&ouml;&uuml;
 */
-var_dump(exif_read_data(dirname(__FILE__).'/test3.jpg','',true,false));
+var_dump(exif_read_data(__DIR__.'/test3.jpg','',true,false));
 ?>
 --EXPECTF--
 array(5) {
diff --git a/ext/exif/tests/exif004.phpt b/ext/exif/tests/exif004.phpt
index fd941cc4d4..2b2e978d52 100644
--- a/ext/exif/tests/exif004.phpt
+++ b/ext/exif/tests/exif004.phpt
@@ -17,7 +17,7 @@ exif.encode_unicode=ISO-8859-1
 /*
   test4.jpg is a 1*1 image that contains Exif tags written by WindowsXP
 */
-$image  = exif_read_data(dirname(__FILE__).'/test4.jpg','',true,false);
+$image  = exif_read_data(__DIR__.'/test4.jpg','',true,false);
 var_dump($image['WINXP']);
 ?>
 --EXPECT--
diff --git a/ext/exif/tests/exif005.phpt b/ext/exif/tests/exif005.phpt
index a2282aa1b0..6cfdf01f5f 100644
--- a/ext/exif/tests/exif005.phpt
+++ b/ext/exif/tests/exif005.phpt
@@ -8,7 +8,7 @@ zlib.output_compression=0
 --FILE--
 <?php
 // test5.jpg is a 1*1 image that contains an Exif section with ifd = 00000009h
-$image  = exif_read_data(dirname(__FILE__).'/test5.jpg','',true,false);
+$image  = exif_read_data(__DIR__.'/test5.jpg','',true,false);
 var_dump($image['IFD0']);
 ?>
 --EXPECT--
diff --git a/ext/exif/tests/exif007.phpt b/ext/exif/tests/exif007.phpt
index 0e37ad0a18..58de488a8d 100644
--- a/ext/exif/tests/exif007.phpt
+++ b/ext/exif/tests/exif007.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image007.jpg'));
+var_dump(exif_read_data(__DIR__.'/image007.jpg'));
 ?>
 --EXPECTF--
 array(7) {
diff --git a/ext/exif/tests/exif008.phpt b/ext/exif/tests/exif008.phpt
index 1936739b18..6744dbd8a0 100644
--- a/ext/exif/tests/exif008.phpt
+++ b/ext/exif/tests/exif008.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image008.jpg'));
+var_dump(exif_read_data(__DIR__.'/image008.jpg'));
 ?>
 --EXPECTF--
 array(16) {
diff --git a/ext/exif/tests/exif009.phpt b/ext/exif/tests/exif009.phpt
index 1ce3658136..0424798df3 100644
--- a/ext/exif/tests/exif009.phpt
+++ b/ext/exif/tests/exif009.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image009.jpg'));
+var_dump(exif_read_data(__DIR__.'/image009.jpg'));
 ?>
 --EXPECTF--
 array(16) {
diff --git a/ext/exif/tests/exif010.phpt b/ext/exif/tests/exif010.phpt
index 1e69610eb6..3104acd5c4 100644
--- a/ext/exif/tests/exif010.phpt
+++ b/ext/exif/tests/exif010.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image010.jpg'));
+var_dump(exif_read_data(__DIR__.'/image010.jpg'));
 ?>
 --EXPECTF--
 array(28) {
diff --git a/ext/exif/tests/exif011.phpt b/ext/exif/tests/exif011.phpt
index 0dac68842b..3d70bd1b50 100644
--- a/ext/exif/tests/exif011.phpt
+++ b/ext/exif/tests/exif011.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image011.jpg'));
+var_dump(exif_read_data(__DIR__.'/image011.jpg'));
 ?>
 --EXPECTF--
 array(28) {
diff --git a/ext/exif/tests/exif012.phpt b/ext/exif/tests/exif012.phpt
index 177bab8f43..d37a3611a5 100644
--- a/ext/exif/tests/exif012.phpt
+++ b/ext/exif/tests/exif012.phpt
diff --git a/ext/exif/tests/exif013.phpt b/ext/exif/tests/exif013.phpt
index e1f67aa3b3..3882ba93f2 100644
--- a/ext/exif/tests/exif013.phpt
+++ b/ext/exif/tests/exif013.phpt
diff --git a/ext/exif/tests/exif014.phpt b/ext/exif/tests/exif014.phpt
index 716a7bab1d..03dbd4a92f 100644
--- a/ext/exif/tests/exif014.phpt
+++ b/ext/exif/tests/exif014.phpt
diff --git a/ext/exif/tests/exif015.phpt b/ext/exif/tests/exif015.phpt
index f5b38cb657..d60581c2e2 100644
--- a/ext/exif/tests/exif015.phpt
+++ b/ext/exif/tests/exif015.phpt
diff --git a/ext/exif/tests/exif016.phpt b/ext/exif/tests/exif016.phpt
index cd5ab2d6be..e0123e8034 100644
--- a/ext/exif/tests/exif016.phpt
+++ b/ext/exif/tests/exif016.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image016.tiff'));
+var_dump(exif_read_data(__DIR__.'/image016.tiff'));
 ?>
 --EXPECTF--
 array(26) {
diff --git a/ext/exif/tests/exif017.phpt b/ext/exif/tests/exif017.phpt
index 3f1e1b7a59..65e1c572db 100644
--- a/ext/exif/tests/exif017.phpt
+++ b/ext/exif/tests/exif017.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image017.tiff'));
+var_dump(exif_read_data(__DIR__.'/image017.tiff'));
 ?>
 --EXPECTF--
 array(26) {
diff --git a/ext/exif/tests/exif018.phpt b/ext/exif/tests/exif018.phpt
index 516f409c04..5139ca62aa 100644
--- a/ext/exif/tests/exif018.phpt
+++ b/ext/exif/tests/exif018.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image018.tiff'));
+var_dump(exif_read_data(__DIR__.'/image018.tiff'));
 ?>
 --EXPECTF--
 array(37) {
diff --git a/ext/exif/tests/exif020.phpt b/ext/exif/tests/exif020.phpt
index 1e5e216582..82f0b1e430 100644
--- a/ext/exif/tests/exif020.phpt
+++ b/ext/exif/tests/exif020.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image020.tiff'));
+var_dump(exif_read_data(__DIR__.'/image020.tiff'));
 ?>
 --EXPECTF--
 array(34) {
diff --git a/ext/exif/tests/exif021.phpt b/ext/exif/tests/exif021.phpt
index e8dd93c04f..66f5d4c21c 100644
--- a/ext/exif/tests/exif021.phpt
+++ b/ext/exif/tests/exif021.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image021.tiff'));
+var_dump(exif_read_data(__DIR__.'/image021.tiff'));
 ?>
 --EXPECTF--
 array(34) {
diff --git a/ext/exif/tests/exif022.phpt b/ext/exif/tests/exif022.phpt
index 6fffe50ddd..68c7b4765c 100644
--- a/ext/exif/tests/exif022.phpt
+++ b/ext/exif/tests/exif022.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image022.tiff'));
+var_dump(exif_read_data(__DIR__.'/image022.tiff'));
 ?>
 --EXPECTF--
 array(45) {
diff --git a/ext/exif/tests/exif023.phpt b/ext/exif/tests/exif023.phpt
index 3c6803fc4c..f26a0fda01 100644
--- a/ext/exif/tests/exif023.phpt
+++ b/ext/exif/tests/exif023.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image023.tiff'));
+var_dump(exif_read_data(__DIR__.'/image023.tiff'));
 ?>
 --EXPECTF--
 array(45) {
diff --git a/ext/exif/tests/exif024.phpt b/ext/exif/tests/exif024.phpt
index a1ee94b487..f1e9c66c54 100644
--- a/ext/exif/tests/exif024.phpt
+++ b/ext/exif/tests/exif024.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image024.jpg'));
+var_dump(exif_read_data(__DIR__.'/image024.jpg'));
 ?>
 --EXPECTF--
 array(14) {
diff --git a/ext/exif/tests/exif025.phpt b/ext/exif/tests/exif025.phpt
index b224c91546..7ccbfd8875 100644
--- a/ext/exif/tests/exif025.phpt
+++ b/ext/exif/tests/exif025.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image025.jpg'));
+var_dump(exif_read_data(__DIR__.'/image025.jpg'));
 ?>
 --EXPECTF--
 array(14) {
diff --git a/ext/exif/tests/exif026.phpt b/ext/exif/tests/exif026.phpt
index c0a8bc60ab..ff65cc10f4 100644
--- a/ext/exif/tests/exif026.phpt
+++ b/ext/exif/tests/exif026.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image026.tiff'));
+var_dump(exif_read_data(__DIR__.'/image026.tiff'));
 ?>
 --EXPECTF--
 array(31) {
diff --git a/ext/exif/tests/exif027.phpt b/ext/exif/tests/exif027.phpt
index 58c94ccef3..79520c29b7 100644
--- a/ext/exif/tests/exif027.phpt
+++ b/ext/exif/tests/exif027.phpt
@@ -7,7 +7,7 @@ output_handler=
 zlib.output_compression=0
 --FILE--
 <?php
-var_dump(exif_read_data(dirname(__FILE__).'/image027.tiff'));
+var_dump(exif_read_data(__DIR__.'/image027.tiff'));
 ?>
 --EXPECTF--
 array(31) {
diff --git a/ext/exif/tests/exif_encoding_crash.phpt b/ext/exif/tests/exif_encoding_crash.phpt
index 1c4ad63860..a1222b1582 100644
--- a/ext/exif/tests/exif_encoding_crash.phpt
+++ b/ext/exif/tests/exif_encoding_crash.phpt
@@ -4,7 +4,7 @@ PHP crash when zend_multibyte_encoding_converter returns (size_t)-1)
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
 <?php
-$infile = dirname(__FILE__).'/exif_encoding_crash.jpg';
+$infile = __DIR__.'/exif_encoding_crash.jpg';
 $exif_data = exif_read_data($infile);
 echo "*** no core dump ***\n";
 ?>
diff --git a/ext/exif/tests/exif_imagetype_basic-mb.phpt b/ext/exif/tests/exif_imagetype_basic-mb.phpt
index a37090da41..11a5274615 100644
--- a/ext/exif/tests/exif_imagetype_basic-mb.phpt
+++ b/ext/exif/tests/exif_imagetype_basic-mb.phpt
@@ -14,7 +14,7 @@ zlib.output_compression=0
 */
 echo "*** Testing exif_imagetype() : basic functionality ***\n";
 
-var_dump(exif_imagetype(dirname(__FILE__).'/test2私はガラスを食べられます.jpg'));
+var_dump(exif_imagetype(__DIR__.'/test2私はガラスを食べられます.jpg'));
 ?>
 ===Done===
 --EXPECT--
diff --git a/ext/exif/tests/exif_imagetype_basic.phpt b/ext/exif/tests/exif_imagetype_basic.phpt
index d04c1f7c50..dbb0c8a7a9 100644
--- a/ext/exif/tests/exif_imagetype_basic.phpt
+++ b/ext/exif/tests/exif_imagetype_basic.phpt
@@ -14,7 +14,7 @@ zlib.output_compression=0
 */
 echo "*** Testing exif_imagetype() : basic functionality ***\n";
 
-var_dump(exif_imagetype(dirname(__FILE__).'/test2.jpg'));
+var_dump(exif_imagetype(__DIR__.'/test2.jpg'));
 ?>
 ===Done===
 --EXPECT--
diff --git a/ext/exif/tests/exif_imagetype_error.phpt b/ext/exif/tests/exif_imagetype_error.phpt
index 2098b2d273..765f01d1ea 100644
--- a/ext/exif/tests/exif_imagetype_error.phpt
+++ b/ext/exif/tests/exif_imagetype_error.phpt
@@ -13,7 +13,7 @@ Test exif_imagetype() function : error conditions
 echo "*** Testing exif_imagetype() : error conditions ***\n";
 
 echo "\n-- Testing exif_imagetype() function with an unknown file  --\n";
-var_dump( exif_imagetype(dirname(__FILE__).'/foo.jpg') );
+var_dump( exif_imagetype(__DIR__.'/foo.jpg') );
 
 
 ?>
diff --git a/ext/exif/tests/exif_read_data_0.phpt b/ext/exif/tests/exif_read_data_0.phpt
index 79e92f488c..5421a14d2e 100644
--- a/ext/exif/tests/exif_read_data_0.phpt
+++ b/ext/exif/tests/exif_read_data_0.phpt
@@ -4,7 +4,7 @@ Test exif_read_data on unavailable file
 <?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
 --FILE--
 <?php
-$infile = dirname(__FILE__).'/bug73115.JPG';
+$infile = __DIR__.'/bug73115.JPG';
 exif_read_data($infile);
 ?>
 ===DONE===