Replace @deprecated by #[\Deprecated] for internal functions / cl…

…ass constants Co-authored-by: Gina Peter Banyard <girgias@php.net>
php · Jul 1, 2024 · 4045cf3 · 4045cf3
1 parent 9caad37
commit 4045cf3
Show file tree

Hide file tree

Showing 79 changed files with 733 additions and 215 deletions.
diff --git a/Zend/tests/bug69802_2.phpt b/Zend/tests/bug69802_2.phpt
@@ -7,7 +7,7 @@ $r = new ReflectionMethod($f, '__invoke');
 var_dump($r->getParameters()[0]->getClass());
 ?>
 --EXPECTF--
-Deprecated: Method ReflectionParameter::getClass() is deprecated in %s on line %d
+Deprecated: Method ReflectionParameter::getClass() is deprecated, use ReflectionParameter::getType() instead in %s on line %d
 object(ReflectionClass)#4 (1) {
   ["name"]=>
   string(11) "Traversable"

diff --git a/Zend/tests/type_declarations/callable_002.phpt b/Zend/tests/type_declarations/callable_002.phpt
@@ -21,11 +21,11 @@ var_dump($rc->getParameters()[0]->isCallable());
 
 ?>
 --EXPECTF--
-Deprecated: Method ReflectionParameter::isCallable() is deprecated in %s on line %d
+Deprecated: Method ReflectionParameter::isCallable() is deprecated, use ReflectionParameter::getType() instead in %s on line %d
 bool(true)
 
-Deprecated: Method ReflectionParameter::isCallable() is deprecated in %s on line %d
+Deprecated: Method ReflectionParameter::isCallable() is deprecated, use ReflectionParameter::getType() instead in %s on line %d
 bool(true)
 
-Deprecated: Method ReflectionParameter::isCallable() is deprecated in %s on line %d
+Deprecated: Method ReflectionParameter::isCallable() is deprecated, use ReflectionParameter::getType() instead in %s on line %d
 bool(true)
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -20,6 +20,7 @@
 #include "ext/standard/info.h"
 #include "ext/standard/php_versioning.h"
 #include "php_date.h"
+#include "zend_attributes.h"
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
 #include "lib/timelib.h"

diff --git a/ext/date/php_date.stub.php b/ext/date/php_date.stub.php
@@ -120,14 +120,14 @@ function checkdate(int $month, int $day, int $year): bool {}
 
 /**
  * @refcount 1
- * @deprecated
  */
+#[\Deprecated]
 function strftime(string $format, ?int $timestamp = null): string|false {}
 
 /**
  * @refcount 1
- * @deprecated
  */
+#[\Deprecated]
 function gmstrftime(string $format, ?int $timestamp = null): string|false {}
 
 function time(): int {}
@@ -260,17 +260,17 @@ function date_default_timezone_get(): string {}
 
 /**
  * @refcount 1
- * @deprecated
  */
+#[\Deprecated]
 function date_sunrise(
     int $timestamp, int $returnFormat = SUNFUNCS_RET_STRING,
     ?float $latitude = null, ?float $longitude = null, ?float $zenith = null,
     ?float $utcOffset = null): string|int|float|false {}
 
 /**
  * @refcount 1
- * @deprecated
  */
+#[\Deprecated]
 function date_sunset(
     int $timestamp, int $returnFormat = SUNFUNCS_RET_STRING,
     ?float $latitude = null, ?float $longitude = null, ?float $zenith = null,

diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h
diff --git a/ext/enchant/enchant.c b/ext/enchant/enchant.c
@@ -22,6 +22,7 @@
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
+#include "Zend/zend_attributes.h"
 #include "Zend/zend_exceptions.h"
 #include <enchant.h>
 #include "php_enchant.h"

diff --git a/ext/enchant/enchant.stub.php b/ext/enchant/enchant.stub.php
@@ -40,15 +40,15 @@ final class EnchantDictionary
 
 function enchant_broker_init(): EnchantBroker|false {}
 
-/** @deprecated */
+#[\Deprecated(message: 'EnchantBroker object is freed automatically', since: '8.1')]
 function enchant_broker_free(EnchantBroker $broker): bool {}
 
 function enchant_broker_get_error(EnchantBroker $broker): string|false {}
 
-/** @deprecated */
+#[\Deprecated(since: '8.1')]
 function enchant_broker_set_dict_path(EnchantBroker $broker, int $type, string $path): bool {}
 
-/** @deprecated */
+#[\Deprecated(since: '8.1')]
 function enchant_broker_get_dict_path(EnchantBroker $broker, int $type): string|false {}
 
 /**
@@ -61,7 +61,7 @@ function enchant_broker_request_dict(EnchantBroker $broker, string $tag): Enchan
 
 function enchant_broker_request_pwl_dict(EnchantBroker $broker, string $filename): EnchantDictionary|false {}
 
-/** @deprecated */
+#[\Deprecated(message: 'EnchantDictionary object is freed automatically', since: '8.1')]
 function enchant_broker_free_dict(EnchantDictionary $dictionary): bool {}
 
 function enchant_broker_dict_exists(EnchantBroker $broker, string $tag): bool {}
@@ -89,8 +89,8 @@ function enchant_dict_add(EnchantDictionary $dictionary, string $word): void {}
 
 /**
 * @alias enchant_dict_add
-* @deprecated
 */
+#[\Deprecated(since: '8.1')]
 function enchant_dict_add_to_personal(EnchantDictionary $dictionary, string $word): void {}
 
 function enchant_dict_add_to_session(EnchantDictionary $dictionary, string $word): void {}
@@ -99,8 +99,8 @@ function enchant_dict_is_added(EnchantDictionary $dictionary, string $word): boo
 
 /**
 * @alias enchant_dict_is_added
-* @deprecated
 */
+#[\Deprecated(since: '8.1')]
 function enchant_dict_is_in_session(EnchantDictionary $dictionary, string $word): bool {}
 
 function enchant_dict_store_replacement(EnchantDictionary $dictionary, string $misspelled, string $correct): void {}

diff --git a/ext/enchant/enchant_arginfo.h b/ext/enchant/enchant_arginfo.h
diff --git a/ext/enchant/tests/broker_free.phpt b/ext/enchant/tests/broker_free.phpt
@@ -23,5 +23,5 @@ echo "OK\n";
 --EXPECTF--
 OK
 
-Deprecated: Function enchant_broker_free() is deprecated in %s
+Deprecated: Function enchant_broker_free() is deprecated since 8.1, EnchantBroker object is freed automatically in %s
 OK
diff --git a/ext/enchant/tests/broker_free_dict.phpt b/ext/enchant/tests/broker_free_dict.phpt
@@ -50,6 +50,6 @@ OK
 OK
 NULL
 
-Deprecated: Function enchant_broker_free_dict() is deprecated in %s
+Deprecated: Function enchant_broker_free_dict() is deprecated since 8.1, EnchantDictionary object is freed automatically in %s
 OK
 OK
diff --git a/ext/enchant/tests/bug53070.phpt b/ext/enchant/tests/bug53070.phpt
@@ -16,14 +16,14 @@ var_dump(enchant_broker_get_dict_path($broker, ENCHANT_ISPELL));
 --EXPECTF--
 Deprecated: Constant ENCHANT_MYSPELL is deprecated in %s
 
-Deprecated: Function enchant_broker_get_dict_path() is deprecated in %s
+Deprecated: Function enchant_broker_get_dict_path() is deprecated since 8.1 in %s
 
 Warning: enchant_broker_get_dict_path(): dict_path not set in %s on line %d
 bool(false)
 
 Deprecated: Constant ENCHANT_ISPELL is deprecated in %s
 
-Deprecated: Function enchant_broker_get_dict_path() is deprecated in %s
+Deprecated: Function enchant_broker_get_dict_path() is deprecated since 8.1 in %s
 
 Warning: enchant_broker_get_dict_path(): dict_path not set in %s on line %d
 bool(false)
diff --git a/ext/enchant/tests/enchant_broker_set_dict_path.phpt b/ext/enchant/tests/enchant_broker_set_dict_path.phpt
@@ -51,13 +51,13 @@ if (is_object($broker)) {
 --EXPECTF--
 OK
 
-Deprecated: Function enchant_broker_set_dict_path() is deprecated in %s
+Deprecated: Function enchant_broker_set_dict_path() is deprecated since 8.1 in %s
 OK
 
-Deprecated: Function enchant_broker_set_dict_path() is deprecated in %s
+Deprecated: Function enchant_broker_set_dict_path() is deprecated since 8.1 in %s
 OK
 
-Deprecated: Function enchant_broker_get_dict_path() is deprecated in %s
+Deprecated: Function enchant_broker_get_dict_path() is deprecated since 8.1 in %s
 
-Deprecated: Function enchant_broker_get_dict_path() is deprecated in %s
+Deprecated: Function enchant_broker_get_dict_path() is deprecated since 8.1 in %s
 OK
diff --git a/ext/hash/hash.stub.php b/ext/hash/hash.stub.php
@@ -70,28 +70,28 @@ function hash_equals(#[\SensitiveParameter] string $known_string, #[\SensitivePa
 function hash_hkdf(string $algo, #[\SensitiveParameter] string $key, int $length = 0, string $info = "", string $salt = ""): string {}
 
 #ifdef PHP_MHASH_BC
-/** @deprecated */
+#[\Deprecated]
 function mhash_get_block_size(int $algo): int|false {}
 
 /**
  * @refcount 1
- * @deprecated
  */
+#[\Deprecated]
 function mhash_get_hash_name(int $algo): string|false {}
 
 /**
  * @refcount 1
- * @deprecated
  */
+#[\Deprecated]
 function mhash_keygen_s2k(int $algo, string $password, string $salt, int $length): string|false {}
 
-/** @deprecated */
+#[\Deprecated]
 function mhash_count(): int {}
 
 /**
  * @refcount 1
- * @deprecated
  */
+#[\Deprecated]
 function mhash(int $algo, string $data, ?string $key = null): string|false {}
 #endif
 

diff --git a/ext/hash/hash_arginfo.h b/ext/hash/hash_arginfo.h
diff --git a/ext/intl/formatter/formatter.stub.php b/ext/intl/formatter/formatter.stub.php
@@ -180,9 +180,9 @@ class NumberFormatter
     /** @cvalue FORMAT_TYPE_DOUBLE */
     public const int TYPE_DOUBLE = UNKNOWN;
     /**
-     * @deprecated
      * @cvalue FORMAT_TYPE_CURRENCY
      */
+    #[\Deprecated(since: '8.3')]
     public const int TYPE_CURRENCY = UNKNOWN;
 
     public function __construct(string $locale, int $style, ?string $pattern = null) {}

diff --git a/ext/intl/formatter/formatter_arginfo.h b/ext/intl/formatter/formatter_arginfo.h
diff --git a/ext/intl/formatter/formatter_class.c b/ext/intl/formatter/formatter_class.c
@@ -18,11 +18,13 @@
 #include "php_intl.h"
 #include "formatter_data.h"
 #include "formatter_format.h"
-#include "formatter_arginfo.h"
 
 #include <zend_exceptions.h>
+#include "Zend/zend_attributes.h"
 #include "Zend/zend_interfaces.h"
 
+#include "formatter_arginfo.h"
+
 zend_class_entry *NumberFormatter_ce_ptr = NULL;
 static zend_object_handlers NumberFormatter_handlers;
 

diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c
@@ -72,6 +72,8 @@
 
 #include "php_ini.h"
 
+#include "zend_attributes.h"
+
 #include "php_intl_arginfo.h"
 
 /*