Merge branch 'rtests2'

* rtests2:
  more r tests
  more r tests
  added testcase pointer_reference
  [PHP] Update docs for removal of -noproxy in SWIG 4.1.0

Conflicts:
	CHANGES.current

2 files changed, 6 insertions, 29 deletions

diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html
index 97a48b707..fad7f6a2f 100644
--- a/Doc/Manual/Php.html
+++ b/Doc/Manual/Php.html
@@ -635,19 +635,13 @@ variable, or assigning <tt>NULL</tt> to a variable.
 
 
 <p>
-SWIG defaults to wrapping C++ structs and classes with PHP classes.
+SWIG wraps C++ structs and classes with PHP classes.
 Since SWIG 4.1.0, this is done entirely via PHP's C API - earlier SWIG
 versions generated a PHP wrapper script which defined proxy classes
 which called a set of flat functions which actually wrapped the C++ class.
 </p>
 
 <p>
-If you don't want the class wrappers, you can pass the command-line option
-"-noproxy" in which case you'll get C++ classes wrapped as flat functions
-as described below.
-</p>
-
-<p>
 This interface file
 </p>
 
@@ -699,33 +693,16 @@ Member variables and methods are accessed using the <tt>-&gt;</tt> operator.
 
 
 <p>
-The <tt>-noproxy</tt> option flattens the object structure and
-generates collections of named functions.  The above example results
-in the following PHP functions:
+SWIG/PHP used to support a <tt>-noproxy</tt> option to flatten the class
+structure and generate collections of named flat functions.  This is no
+longer supported as of SWIG 4.1.0.
 </p>
 
-<div class="code"><pre>
-new_Vector();
-Vector_x_set($obj, $d);
-Vector_x_get($obj);
-Vector_y_set($obj, $d);
-Vector_y_get($obj);
-Vector_z_set($obj, $d);
-Vector_z_get($obj);
-Vector_magnitude($obj);
-new_Complex();
-Complex_re_set($obj, $d);
-Complex_re_get($obj);
-Complex_im_set($obj, $d);
-Complex_im_get($obj);
-</pre></div>
-
 <H4><a name="Php_nn2_6_2">32.2.6.2 Constructors and Destructors</a></H4>
 
 
 <p>
-The constructor is called when <tt>new Object()</tt> (or
-<tt>new_Object()</tt> if using <tt>-noproxy</tt>) is used to create an
+The constructor is called when <tt>new Object()</tt> is used to create an
 instance of the object. If multiple constructors are defined for an
 object, function overloading will be used to determine which
 constructor to execute.
diff --git a/Doc/Manual/SWIGPlus.html b/Doc/Manual/SWIGPlus.html
index cc33d6152..3c5e0620b 100644
--- a/Doc/Manual/SWIGPlus.html
+++ b/Doc/Manual/SWIGPlus.html
@@ -255,7 +255,7 @@ details.  The SWIG Wiki also has further details.
 </p>
 
 <b>Compatibility Note:</b> Early versions of SWIG generated just a flattened low-level C style API to C++ classes by default.
-The <tt>-noproxy</tt> commandline option is recognised by many target languages and will generate just this
+The <tt>-noproxy</tt> commandline option is recognised by some target languages and will generate just this
 interface as in earlier versions.
 
 <H2><a name="SWIGPlus_nn38">6.5 Proxy classes</a></H2>