From 74ad648bc85a97bebc922933f8c47a71251e8c40 Mon Sep 17 00:00:00 2001
From: Adam Harvey <aharvey@php.net>
Date: Fri, 8 Jan 2016 01:35:24 +0000
Subject: [PATCH] Improve removal warnings for call_user_method*.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@338430 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/classobj/functions/call-user-method-array.xml | 9 ++++++++-
 reference/classobj/functions/call-user-method.xml       | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/reference/classobj/functions/call-user-method-array.xml b/reference/classobj/functions/call-user-method-array.xml
index 0fdf575024..57bffb9111 100644
--- a/reference/classobj/functions/call-user-method-array.xml
+++ b/reference/classobj/functions/call-user-method-array.xml
@@ -5,6 +5,14 @@
   <refname>call_user_method_array</refname>
   <refpurpose>Call a user method given with an array of parameters</refpurpose>
  </refnamediv>
+ <refsynopsisdiv>
+  <warning>
+   &warn.deprecated.function.4-1-0.removed.7-0-0.alternatives;
+   <simplelist role="alternatives">
+    <member><function>call_user_func_array</function></member>
+   </simplelist>
+  </warning>
+ </refsynopsisdiv>
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -13,7 +21,6 @@
    <methodparam><type>object</type><parameter role="reference">obj</parameter></methodparam>
    <methodparam><type>array</type><parameter>params</parameter></methodparam>
   </methodsynopsis>
-  &warn.deprecated.function-4-1-0.removed-7-0-0;
  </refsect1>
  <refsect1 role="parameters"><!-- {{{ -->
   &reftitle.parameters;
diff --git a/reference/classobj/functions/call-user-method.xml b/reference/classobj/functions/call-user-method.xml
index 82f3bbf645..5c0636c21f 100644
--- a/reference/classobj/functions/call-user-method.xml
+++ b/reference/classobj/functions/call-user-method.xml
@@ -5,6 +5,14 @@
   <refname>call_user_method</refname>
   <refpurpose>Call a user method on an specific object</refpurpose>
  </refnamediv>
+ <refsynopsisdiv>
+  <warning>
+   &warn.deprecated.function.4-1-0.removed.7-0-0.alternatives;
+   <simplelist role="alternatives">
+    <member><function>call_user_func</function></member>
+   </simplelist>
+  </warning>
+ </refsynopsisdiv>
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
@@ -14,7 +22,6 @@
    <methodparam choice="opt"><type>mixed</type><parameter>parameter</parameter></methodparam>
    <methodparam choice="opt"><type>mixed</type><parameter>...</parameter></methodparam>
   </methodsynopsis>
-  &warn.deprecated.function-4-1-0.removed-7-0-0;
  </refsect1>
  
  <refsect1 role="parameters"><!-- {{{ -->