WARN_* constants are user visible, so keep existing WARN_PHP4_* for

backward compatibility, but add preferred forms WARN_PHP_* and use
these ourselves.

Rename Lib/php4 to Lib/php, Source/Modules/php4.cxx to Source/Modules/php.cxx.
 
Add typemaps for const reference so Examples/test-suite/apply_signed_char.i
works.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10633 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Examples/test-suite/abstract_virtual.i

@@ -2,10 +2,10 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) D; /* C#, Java, Php4 multiple inheritance */
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) D; /* C#, Java, PHP multiple inheritance */
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) E; /* C#, Java, Php4 multiple inheritance */
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) E; /* C#, Java, PHP multiple inheritance */
 
 %inline %{
 #if defined(_MSC_VER)

Examples/test-suite/contract.i

@@ -3,7 +3,7 @@
 %warnfilter(SWIGWARN_RUBY_MULTIPLE_INHERITANCE,
 	    SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) C; /* Ruby, C#, Java, Php4 multiple inheritance */
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) C; /* Ruby, C#, Java, PHP multiple inheritance */
 
 #ifdef SWIGCSHARP
 %ignore B::bar; // otherwise get a warning: `C.bar' no suitable methods found to override

Examples/test-suite/default_constructor.i

@@ -5,11 +5,11 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) EB; /* C#, Java, Php4 multiple inheritance */
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) EB; /* C#, Java, PHP multiple inheritance */
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) AD; /* C#, Java, Php4 multiple inheritance */
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) AD; /* C#, Java, PHP multiple inheritance */
 
 %warnfilter(SWIGWARN_LANG_FRIEND_IGNORE) F; /* friend function */
 

Examples/test-suite/evil_diamond.i

@@ -6,7 +6,7 @@
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME,
 	    SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) spam;	// Ruby, wrong class name - C# & Java, Php4 multiple inheritance
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) spam;	// Ruby, wrong class name - C# & Java, PHP multiple inheritance
 
 %inline %{
 

Examples/test-suite/evil_diamond_ns.i

@@ -6,7 +6,7 @@
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME,
 	    SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) Blah::spam;	// Ruby, wrong class name - C# & Java, Php4 multiple inheritance
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) Blah::spam;	// Ruby, wrong class name - C# & Java, PHP multiple inheritance
 
 %inline %{
 namespace Blah {

Examples/test-suite/evil_diamond_prop.i

@@ -6,7 +6,7 @@
 %warnfilter(SWIGWARN_RUBY_WRONG_NAME,
 	    SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) spam;	// Ruby, wrong class name - C# & Java, Php4 multiple inheritance
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) spam;	// Ruby, wrong class name - C# & Java, PHP multiple inheritance
 
 %inline %{
 

Examples/test-suite/multiple_inheritance.i

@@ -5,11 +5,11 @@ It tests basic multiple inheritance */
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar;	/* C#, Java, Php4 multiple inheritance */
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar;	/* C#, Java, PHP multiple inheritance */
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBarSpam;	/* C#, Java, Php4 multiple inheritance */
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBarSpam;	/* C#, Java, PHP multiple inheritance */
 
 
 %inline %{

Examples/test-suite/pure_virtual.i

@@ -9,7 +9,7 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) E; /* C#, Java, Php4 multiple inheritance */
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) E; /* C#, Java, PHP multiple inheritance */
 
 %nodefaultctor C;
 %nodefaultdtor C;

Examples/test-suite/template_inherit_abstract.i

@@ -4,7 +4,7 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) oss::Module;	/* C#, Java, Php4 multiple inheritance */
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) oss::Module;	/* C#, Java, PHP multiple inheritance */
 
 %inline %{ 
  

Examples/test-suite/using_composition.i

@@ -2,13 +2,13 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar;   // C#, Java, Php4 multiple inheritance
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar;   // C#, Java, PHP multiple inheritance
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar2;   // C#, Java, Php4 multiple inheritance
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar2;   // C#, Java, PHP multiple inheritance
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar3;   // C#, Java, Php4 multiple inheritance
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar3;   // C#, Java, PHP multiple inheritance
 #ifdef SWIGLUA	// lua only has one numeric type, so some overloads shadow each other creating warnings
 %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) blah;
 #endif

Examples/test-suite/using_extend.i

@@ -2,7 +2,7 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) FooBar;   // C#, Java, Php4 multiple inheritance
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) FooBar;   // C#, Java, PHP multiple inheritance
 #ifdef SWIGLUA	// lua only has one numeric type, so some overloads shadow each other creating warnings
 %warnfilter(SWIGWARN_LANG_OVERLOAD_SHADOW) blah;
 #endif

Examples/test-suite/using_namespace.i

@@ -5,7 +5,7 @@
 
 %warnfilter(SWIGWARN_JAVA_MULTIPLE_INHERITANCE,
 	    SWIGWARN_CSHARP_MULTIPLE_INHERITANCE,
-	    SWIGWARN_PHP4_MULTIPLE_INHERITANCE) Hi<hello::Hello, hi::hi0>; // C#, Java, Php4 multiple inheritance
+	    SWIGWARN_PHP_MULTIPLE_INHERITANCE) Hi<hello::Hello, hi::hi0>; // C#, Java, PHP multiple inheritance
 
 %inline %{
   namespace hello

Lib/php/utils.i

@@ -29,7 +29,7 @@
 %enddef
 
 %define %pass_by_val( TYPE, CONVERT_IN )
-%typemap(in) TYPE
+%typemap(in) TYPE, const TYPE &
 %{
   CONVERT_IN($1,$1_ltype,$input);
 %}

Source/Include/swigwarn.h

@@ -247,10 +247,17 @@
 
 /* please leave 850-869 free for Modula 3 */
 
-#define WARN_PHP4_MULTIPLE_INHERITANCE         870
-#define WARN_PHP4_UNKNOWN_PRAGMA               871
+/* These are needed for backward compatibility, but you don't need to add
+ * PHP4 versions of new warnings since existing user interface files can't
+ * be using them.
+ */
+#define WARN_PHP4_MULTIPLE_INHERITANCE        870
+#define WARN_PHP4_UNKNOWN_PRAGMA              871
 
-/* please leave 870-889 free for Php */
+#define WARN_PHP_MULTIPLE_INHERITANCE         870
+#define WARN_PHP_UNKNOWN_PRAGMA               871
+
+/* please leave 870-889 free for PHP */
 
 
 /* Feel free to claim any number in this space that's not currently being used. Just make sure you

Source/Makefile.am

@@ -57,7 +57,7 @@ eswig_SOURCES =	CParse/cscanner.c		\
 		Modules/octave.cxx		\
 		Modules/overload.cxx		\
 		Modules/perl5.cxx		\
-		Modules/php4.cxx		\
+		Modules/php.cxx			\
 		Modules/pike.cxx		\
 		Modules/python.cxx		\
 		Modules/r.cxx			\