Deprecated the read_exif_data() alias

diff --git a/NEWS b/NEWS
index 6df4666626f3eaa8f9fc82cb4d83114b520719ea..b181ee6b9dd27d4a0b08a0f9bfdf05f1e738e756 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ PHP                                                                        NEWS
   . Fixed bug #74878 (Data race in ZTS builds). (Nikita)
        
 - EXIF:
+  . Deprecated the read_exif_data() alias. (Kalle)
   . Fixed bug #74428 (exif_read_data(): "Illegal IFD size" warning occurs with 
     correct exif format). (bradpiccho at gmail dot com, Kalle)
   . Fixed bug #72819 (EXIF thumbnails not read anymore). (Kalle)

diff --git a/UPGRADING b/UPGRADING
index 56a07bba289d77c41393d54b883d60f4ac3247d7..7f4817ab24dcccba31c67556ba056ca7c195b193 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -164,6 +164,9 @@ PHP 8.0.
   . The create_function() function has been deprecated, use anonymous functions
     instead.
   . The each() function has been deprecated, use a foreach loop instead.
+  
+- EXIF:
+  . The read_exif_data() alias have been deprecated, use exif_read_data() instead.
 
 - GD:
   . png2wbmp() and jpeg2wbmp() have been deprecated.

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 769c8693b478d2f333d5b0a732c932afe2ef71c9..51be18adc3a2655e5c73373499c214f86f4a89b9 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -120,7 +120,7 @@ ZEND_END_ARG_INFO()
  */
 const zend_function_entry exif_functions[] = {
        PHP_FE(exif_read_data, arginfo_exif_read_data)
-       PHP_FALIAS(read_exif_data, 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.phpt b/ext/exif/tests/exif_read_exif_data_basic.phpt
index 435f13752ac3cca777e1fa2ddd50124884f3a1b3..ddf847de05cd0ed0db7e8370bf939613754991a2 100644 (file)
--- a/ext/exif/tests/exif_read_exif_data_basic.phpt
+++ b/ext/exif/tests/exif_read_exif_data_basic.phpt
@@ -19,6 +19,8 @@ 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