From 1b332bb2ae461e834bf3a8bef3660bab8dc37bf7 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 30 Jan 2019 12:58:26 +0100
Subject: [PATCH] Removed read_exif_data() alias

---
 UPGRADING                                     |  3 +
 ext/exif/exif.c                               |  1 -
 .../tests/exif_read_exif_data_basic-mb.phpt   | 64 -------------------
 ext/exif/tests/exif_read_exif_data_basic.phpt | 64 -------------------
 4 files changed, 3 insertions(+), 129 deletions(-)
 delete mode 100644 ext/exif/tests/exif_read_exif_data_basic-mb.phpt
 delete mode 100644 ext/exif/tests/exif_read_exif_data_basic.phpt

diff --git a/UPGRADING b/UPGRADING
index 85da44d04f342..eee50fee3e44f 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -38,6 +38,9 @@ PHP 8.0 UPGRADE NOTES
   . mktime() and gmmktime() now require at least one argument. time() can be
     used to get the current timestamp.
 
+- Exif:
+  . Removed read_exif_data(). exif_read_data() should be used instead.
+
 - Filter:
   . The FILTER_FLAG_SCHEME_REQUIRED and FILTER_FLAG_HOST_REQUIRED flags for the
     FILTER_VALIDATE_URL filter have been removed. The scheme and host are (and
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 8d221ccc35d0f..83b8c3f03840d 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -97,7 +97,6 @@ ZEND_END_ARG_INFO()
  */
 static const zend_function_entry exif_functions[] = {
 	PHP_FE(exif_read_data, arginfo_exif_read_data)
-	PHP_DEP_FALIAS(read_exif_data, exif_read_data, arginfo_exif_read_data)
 	PHP_FE(exif_tagname, arginfo_exif_tagname)
 	PHP_FE(exif_thumbnail, arginfo_exif_thumbnail)
 	PHP_FE(exif_imagetype, arginfo_exif_imagetype)
diff --git a/ext/exif/tests/exif_read_exif_data_basic-mb.phpt b/ext/exif/tests/exif_read_exif_data_basic-mb.phpt
deleted file mode 100644
index b70be2427879b..0000000000000
--- a/ext/exif/tests/exif_read_exif_data_basic-mb.phpt
+++ /dev/null
@@ -1,64 +0,0 @@
---TEST--
-Check for read_exif_data default behaviour
---SKIPIF--
-<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
---INI--
-output_handler=
-zlib.output_compression=0
---FILE--
-<?php
-
-/* Prototype  : array read_exif_data  ( string $filename  [, string $sections  [, bool $arrays  [, bool $thumbnail  ]]] )
- * Description: Alias of exif_read_data()
- * Source code: ext/exif/exif.c
-*/
-echo "*** Testing read_exif_data() : basic functionality ***\n";
-
-print_r(read_exif_data(dirname(__FILE__).'/test2私はガラスを食べられます.jpg'));
-?>
-===Done===
---EXPECTF--
-*** Testing read_exif_data() : basic functionality ***
-
-Deprecated: Function read_exif_data() is deprecated in %sexif_read_exif_data_basic-mb.php on line 9
-Array
-(
-    [FileName] => test2私はガラスを食べられます.jpg
-    [FileDateTime] => %d
-    [FileSize] => 1240
-    [FileType] => 2
-    [MimeType] => image/jpeg
-    [SectionsFound] => ANY_TAG, IFD0, THUMBNAIL, COMMENT
-    [COMPUTED] => Array
-        (
-            [html] => width="1" height="1"
-            [Height] => 1
-            [Width] => 1
-            [IsColor] => 1
-            [ByteOrderMotorola] => 1
-            [UserComment] => Exif test image.
-            [UserCommentEncoding] => ASCII
-            [Copyright] => Photo (c) M.Boerger, Edited by M.Boerger.
-            [Copyright.Photographer] => Photo (c) M.Boerger
-            [Copyright.Editor] => Edited by M.Boerger.
-            [Thumbnail.FileType] => 2
-            [Thumbnail.MimeType] => image/jpeg
-        )
-
-    [Copyright] => Photo (c) M.Boerger
-    [UserComment] => ASCII
-    [THUMBNAIL] => Array
-        (
-            [JPEGInterchangeFormat] => 134
-            [JPEGInterchangeFormatLength] => 523
-        )
-
-    [COMMENT] => Array
-        (
-            [0] => Comment #1.
-            [1] => Comment #2.
-            [2] => Comment #3end
-        )
-
-)
-===Done===
diff --git a/ext/exif/tests/exif_read_exif_data_basic.phpt b/ext/exif/tests/exif_read_exif_data_basic.phpt
deleted file mode 100644
index b2799909d3476..0000000000000
--- a/ext/exif/tests/exif_read_exif_data_basic.phpt
+++ /dev/null
@@ -1,64 +0,0 @@
---TEST--
-Check for read_exif_data default behaviour
---SKIPIF--
-<?php if (!extension_loaded('exif')) print 'skip exif extension not available';?>
---INI--
-output_handler=
-zlib.output_compression=0
---FILE--
-<?php
-
-/* Prototype  : array read_exif_data  ( string $filename  [, string $sections  [, bool $arrays  [, bool $thumbnail  ]]] )
- * Description: Alias of exif_read_data()
- * Source code: ext/exif/exif.c
-*/
-echo "*** Testing read_exif_data() : basic functionality ***\n";
-
-print_r(read_exif_data(dirname(__FILE__).'/test2.jpg'));
-?>
-===Done===
---EXPECTF--
-*** Testing read_exif_data() : basic functionality ***
-
-Deprecated: Function read_exif_data() is deprecated in %sexif_read_exif_data_basic.php on line 9
-Array
-(
-    [FileName] => test2.jpg
-    [FileDateTime] => %d
-    [FileSize] => 1240
-    [FileType] => 2
-    [MimeType] => image/jpeg
-    [SectionsFound] => ANY_TAG, IFD0, THUMBNAIL, COMMENT
-    [COMPUTED] => Array
-        (
-            [html] => width="1" height="1"
-            [Height] => 1
-            [Width] => 1
-            [IsColor] => 1
-            [ByteOrderMotorola] => 1
-            [UserComment] => Exif test image.
-            [UserCommentEncoding] => ASCII
-            [Copyright] => Photo (c) M.Boerger, Edited by M.Boerger.
-            [Copyright.Photographer] => Photo (c) M.Boerger
-            [Copyright.Editor] => Edited by M.Boerger.
-            [Thumbnail.FileType] => 2
-            [Thumbnail.MimeType] => image/jpeg
-        )
-
-    [Copyright] => Photo (c) M.Boerger
-    [UserComment] => ASCII
-    [THUMBNAIL] => Array
-        (
-            [JPEGInterchangeFormat] => 134
-            [JPEGInterchangeFormatLength] => 523
-        )
-
-    [COMMENT] => Array
-        (
-            [0] => Comment #1.
-            [1] => Comment #2.
-            [2] => Comment #3end
-        )
-
-)
-===Done===