php
diff --git a/‎Zend/tests/attributes/deprecated/traits/basic.phpt
Lines changed: 22 additions & 4 deletions b/‎Zend/tests/attributes/deprecated/traits/basic.phpt
Lines changed: 22 additions & 4 deletions
diff --git a/‎Zend/tests/attributes/deprecated/traits/conflicts_render_unused.phpt renamed to ‎Zend/tests/attributes/deprecated/traits/insteadof_unused_warnings.phpt
Lines changed: 1 addition & 1 deletion b/‎Zend/tests/attributes/deprecated/traits/conflicts_render_unused.phpt renamed to ‎Zend/tests/attributes/deprecated/traits/insteadof_unused_warnings.phpt
Lines changed: 1 addition & 1 deletion
diff --git a/‎Zend/tests/attributes/deprecated/traits/messages.phpt
Lines changed: 0 additions & 33 deletions b/‎Zend/tests/attributes/deprecated/traits/messages.phpt
Lines changed: 0 additions & 33 deletions
diff --git a/‎Zend/tests/attributes/deprecated/traits/exception.phpt renamed to ‎Zend/tests/attributes/deprecated/traits/throwing_error_handler.phpt b/‎Zend/tests/attributes/deprecated/traits/exception.phpt renamed to ‎Zend/tests/attributes/deprecated/traits/throwing_error_handler.phpt
@@ -3,13 +3,31 @@
 --FILE--
 <?php
 
-#[\Deprecated]
-trait DemoTrait {}
+#[\Deprecated("please do not use")]
+trait DemoTrait1 {}
+
+#[\Deprecated("will be removed in 3.0", since: "2.7")]
+trait DemoTrait2 {}
+
+#[\Deprecated(message: "going away")]
+trait DemoTrait3 {}
+
+#[\Deprecated(since: "3.5")]
+trait DemoTrait4 {}
 
 class DemoClass {
-	use DemoTrait;
+	use DemoTrait1;
+	use DemoTrait2;
+	use DemoTrait3;
+	use DemoTrait4;
 }
 
 ?>
 --EXPECTF--
-Deprecated: Trait DemoTrait used by DemoClass is deprecated in %s on line %d
+Deprecated: Trait DemoTrait1 used by DemoClass is deprecated, please do not use in %s on line %d
+
+Deprecated: Trait DemoTrait2 used by DemoClass is deprecated since 2.7, will be removed in 3.0 in %s on line %d
+
+Deprecated: Trait DemoTrait3 used by DemoClass is deprecated, going away in %s on line %d
+
+Deprecated: Trait DemoTrait4 used by DemoClass is deprecated since 3.5 in %s on line %d
@@ -1,5 +1,5 @@
 --TEST--
-#[\Deprecated]: Using multiple traits with conflict resolution meaning a trait is not used
+#[\Deprecated]: `insteadof` rendering a trait unused still triggers deprecation messages
 --FILE--
 <?php
-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 --TEST--
 -#[\Deprecated]: Using multiple traits with conflict resolution meaning a trait is not used
 +#[\Deprecated]: `insteadof` rendering a trait unused still triggers deprecation messages
 --FILE--
 <?php