From bcc796f676ef7e871cdc44a096d74f1da92e232d Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sat, 6 Dec 2008 21:40:54 +0000
Subject: modify build system to use php instead of php4

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10967 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/Makefile.in                               |  34 +--
 Examples/php/class/Makefile                        |  10 +-
 Examples/php/class/runme.php                       |  64 ++++++
 Examples/php/class/runme.php4                      |  64 ------
 Examples/php/constants/Makefile                    |  10 +-
 Examples/php/constants/runme.php                   |  28 +++
 Examples/php/constants/runme.php4                  |  28 ---
 Examples/php/cpointer/Makefile                     |  10 +-
 Examples/php/cpointer/runme.php                    |  45 ++++
 Examples/php/cpointer/runme.php4                   |  45 ----
 Examples/php/disown/Makefile                       |  10 +-
 Examples/php/disown/runme.php                      |  49 +++++
 Examples/php/disown/runme.php4                     |  49 -----
 Examples/php/enum/Makefile                         |  10 +-
 Examples/php/enum/runme.php                        |  32 +++
 Examples/php/enum/runme.php4                       |  32 ---
 Examples/php/funcptr/Makefile                      |  10 +-
 Examples/php/funcptr/runme.php                     |  24 +++
 Examples/php/funcptr/runme.php4                    |  24 ---
 Examples/php/overloading/Makefile                  |  10 +-
 Examples/php/overloading/runme.php                 |  59 ++++++
 Examples/php/overloading/runme.php4                |  59 ------
 Examples/php/pointer/Makefile                      |  10 +-
 Examples/php/pointer/runme.php                     |  35 ++++
 Examples/php/pointer/runme.php4                    |  35 ----
 Examples/php/pragmas/Makefile                      |  10 +-
 Examples/php/pragmas/runme.php                     |   5 +
 Examples/php/pragmas/runme.php4                    |   5 -
 Examples/php/proxy/Makefile                        |  10 +-
 Examples/php/proxy/runme.php                       |  68 ++++++
 Examples/php/proxy/runme.php4                      |  68 ------
 Examples/php/reference/Makefile                    |  10 +-
 Examples/php/reference/runme.php                   |  78 +++++++
 Examples/php/reference/runme.php4                  |  78 -------
 Examples/php/simple/Makefile                       |  10 +-
 Examples/php/simple/runme.php                      |  25 +++
 Examples/php/simple/runme.php4                     |  25 ---
 Examples/php/sync/Makefile                         |  10 +-
 Examples/php/sync/runme.php                        |  15 ++
 Examples/php/sync/runme.php4                       |  15 --
 Examples/php/value/Makefile                        |  10 +-
 Examples/php/value/runme.php                       |  43 ++++
 Examples/php/value/runme.php4                      |  43 ----
 Examples/php/variables/Makefile                    |  10 +-
 Examples/php/variables/runme.php                   |  96 +++++++++
 Examples/php/variables/runme.php4                  |  96 ---------
 Examples/test-suite/php/Makefile.in                |  22 +-
 .../test-suite/php/abstract_inherit_ok_runme.php   |  12 ++
 .../test-suite/php/abstract_inherit_ok_runme.php4  |  12 --
 Examples/test-suite/php/abstract_inherit_runme.php |  14 ++
 .../test-suite/php/abstract_inherit_runme.php4     |  14 --
 Examples/test-suite/php/add_link_runme.php         |  23 +++
 Examples/test-suite/php/add_link_runme.php4        |  23 ---
 Examples/test-suite/php/argout_runme.php           |  37 ++++
 Examples/test-suite/php/argout_runme.php4          |  37 ----
 Examples/test-suite/php/arrayptr_runme.php         |  15 ++
 Examples/test-suite/php/arrayptr_runme.php4        |  15 --
 Examples/test-suite/php/arrays_global_runme.php    |  14 ++
 Examples/test-suite/php/arrays_global_runme.php4   |  14 --
 .../test-suite/php/arrays_global_twodim_runme.php  |  23 +++
 .../test-suite/php/arrays_global_twodim_runme.php4 |  23 ---
 Examples/test-suite/php/arrays_runme.php           |  19 ++
 Examples/test-suite/php/arrays_runme.php4          |  19 --
 Examples/test-suite/php/arrays_scope_runme.php     |  17 ++
 Examples/test-suite/php/arrays_scope_runme.php4    |  17 --
 Examples/test-suite/php/casts_runme.php            |  19 ++
 Examples/test-suite/php/casts_runme.php4           |  19 --
 Examples/test-suite/php/class_ignore_runme.php     |  17 ++
 Examples/test-suite/php/class_ignore_runme.php4    |  17 --
 .../test-suite/php/conversion_namespace_runme.php  |  14 ++
 .../test-suite/php/conversion_namespace_runme.php4 |  14 --
 .../php/conversion_ns_template_runme.php           |  10 +
 .../php/conversion_ns_template_runme.php4          |  10 -
 Examples/test-suite/php/conversion_runme.php       |  14 ++
 Examples/test-suite/php/conversion_runme.php4      |  14 --
 Examples/test-suite/php/cpp_static_runme.php       |  15 ++
 Examples/test-suite/php/cpp_static_runme.php4      |  15 --
 .../test-suite/php/enum_scope_template_runme.php   |  17 ++
 .../test-suite/php/enum_scope_template_runme.php4  |  17 --
 Examples/test-suite/php/evil_diamond_ns_runme.php  |  19 ++
 Examples/test-suite/php/evil_diamond_ns_runme.php4 |  19 --
 .../test-suite/php/evil_diamond_prop_runme.php     |  38 ++++
 .../test-suite/php/evil_diamond_prop_runme.php4    |  38 ----
 Examples/test-suite/php/evil_diamond_runme.php     |  17 ++
 Examples/test-suite/php/evil_diamond_runme.php4    |  17 --
 .../test-suite/php/extend_template_ns_runme.php    |  13 ++
 .../test-suite/php/extend_template_ns_runme.php4   |  13 --
 Examples/test-suite/php/extend_template_runme.php  |  13 ++
 Examples/test-suite/php/extend_template_runme.php4 |  13 --
 Examples/test-suite/php/grouping_runme.php         |  23 +++
 Examples/test-suite/php/grouping_runme.php4        |  23 ---
 Examples/test-suite/php/ignore_parameter_runme.php |  39 ++++
 .../test-suite/php/ignore_parameter_runme.php4     |  39 ----
 Examples/test-suite/php/li_carrays_runme.php       |  15 ++
 Examples/test-suite/php/li_carrays_runme.php4      |  15 --
 Examples/test-suite/php/li_std_string_runme.php    |  32 +++
 Examples/test-suite/php/li_std_string_runme.php4   |  32 ---
 Examples/test-suite/php/rename_scope_runme.php     |  17 ++
 Examples/test-suite/php/rename_scope_runme.php4    |  17 --
 Examples/test-suite/php/skel.php                   |  15 ++
 Examples/test-suite/php/skel.php4                  |  15 --
 .../test-suite/php/smart_pointer_rename_runme.php  |  28 +++
 .../test-suite/php/smart_pointer_rename_runme.php4 |  28 ---
 Examples/test-suite/php/sym_runme.php              |  23 +++
 Examples/test-suite/php/sym_runme.php4             |  23 ---
 .../test-suite/php/template_arg_typename_runme.php |  19 ++
 .../php/template_arg_typename_runme.php4           |  19 --
 .../test-suite/php/template_construct_runme.php    |  11 +
 .../test-suite/php/template_construct_runme.php4   |  11 -
 Examples/test-suite/php/tests.php                  | 227 +++++++++++++++++++++
 Examples/test-suite/php/tests.php4                 | 227 ---------------------
 .../test-suite/php/typedef_reference_runme.php     |  13 ++
 .../test-suite/php/typedef_reference_runme.php4    |  13 --
 Examples/test-suite/php/typemap_ns_using_runme.php |   9 +
 .../test-suite/php/typemap_ns_using_runme.php4     |   9 -
 Examples/test-suite/php/using1_runme.php           |   9 +
 Examples/test-suite/php/using1_runme.php4          |   9 -
 Examples/test-suite/php/using2_runme.php           |   9 +
 Examples/test-suite/php/using2_runme.php4          |   9 -
 .../test-suite/php/valuewrapper_base_runme.php     |  14 ++
 .../test-suite/php/valuewrapper_base_runme.php4    |  14 --
 Makefile.in                                        |   2 +-
 configure.in                                       |  46 ++---
 123 files changed, 1676 insertions(+), 1676 deletions(-)
 create mode 100644 Examples/php/class/runme.php
 delete mode 100644 Examples/php/class/runme.php4
 create mode 100644 Examples/php/constants/runme.php
 delete mode 100644 Examples/php/constants/runme.php4
 create mode 100644 Examples/php/cpointer/runme.php
 delete mode 100644 Examples/php/cpointer/runme.php4
 create mode 100644 Examples/php/disown/runme.php
 delete mode 100644 Examples/php/disown/runme.php4
 create mode 100644 Examples/php/enum/runme.php
 delete mode 100644 Examples/php/enum/runme.php4
 create mode 100644 Examples/php/funcptr/runme.php
 delete mode 100644 Examples/php/funcptr/runme.php4
 create mode 100644 Examples/php/overloading/runme.php
 delete mode 100644 Examples/php/overloading/runme.php4
 create mode 100644 Examples/php/pointer/runme.php
 delete mode 100644 Examples/php/pointer/runme.php4
 create mode 100755 Examples/php/pragmas/runme.php
 delete mode 100755 Examples/php/pragmas/runme.php4
 create mode 100644 Examples/php/proxy/runme.php
 delete mode 100644 Examples/php/proxy/runme.php4
 create mode 100644 Examples/php/reference/runme.php
 delete mode 100644 Examples/php/reference/runme.php4
 create mode 100755 Examples/php/simple/runme.php
 delete mode 100755 Examples/php/simple/runme.php4
 create mode 100644 Examples/php/sync/runme.php
 delete mode 100644 Examples/php/sync/runme.php4
 create mode 100644 Examples/php/value/runme.php
 delete mode 100644 Examples/php/value/runme.php4
 create mode 100644 Examples/php/variables/runme.php
 delete mode 100644 Examples/php/variables/runme.php4
 create mode 100644 Examples/test-suite/php/abstract_inherit_ok_runme.php
 delete mode 100644 Examples/test-suite/php/abstract_inherit_ok_runme.php4
 create mode 100644 Examples/test-suite/php/abstract_inherit_runme.php
 delete mode 100644 Examples/test-suite/php/abstract_inherit_runme.php4
 create mode 100644 Examples/test-suite/php/add_link_runme.php
 delete mode 100644 Examples/test-suite/php/add_link_runme.php4
 create mode 100644 Examples/test-suite/php/argout_runme.php
 delete mode 100644 Examples/test-suite/php/argout_runme.php4
 create mode 100644 Examples/test-suite/php/arrayptr_runme.php
 delete mode 100644 Examples/test-suite/php/arrayptr_runme.php4
 create mode 100644 Examples/test-suite/php/arrays_global_runme.php
 delete mode 100644 Examples/test-suite/php/arrays_global_runme.php4
 create mode 100644 Examples/test-suite/php/arrays_global_twodim_runme.php
 delete mode 100644 Examples/test-suite/php/arrays_global_twodim_runme.php4
 create mode 100644 Examples/test-suite/php/arrays_runme.php
 delete mode 100644 Examples/test-suite/php/arrays_runme.php4
 create mode 100644 Examples/test-suite/php/arrays_scope_runme.php
 delete mode 100644 Examples/test-suite/php/arrays_scope_runme.php4
 create mode 100644 Examples/test-suite/php/casts_runme.php
 delete mode 100644 Examples/test-suite/php/casts_runme.php4
 create mode 100644 Examples/test-suite/php/class_ignore_runme.php
 delete mode 100644 Examples/test-suite/php/class_ignore_runme.php4
 create mode 100644 Examples/test-suite/php/conversion_namespace_runme.php
 delete mode 100644 Examples/test-suite/php/conversion_namespace_runme.php4
 create mode 100644 Examples/test-suite/php/conversion_ns_template_runme.php
 delete mode 100644 Examples/test-suite/php/conversion_ns_template_runme.php4
 create mode 100644 Examples/test-suite/php/conversion_runme.php
 delete mode 100644 Examples/test-suite/php/conversion_runme.php4
 create mode 100644 Examples/test-suite/php/cpp_static_runme.php
 delete mode 100644 Examples/test-suite/php/cpp_static_runme.php4
 create mode 100644 Examples/test-suite/php/enum_scope_template_runme.php
 delete mode 100644 Examples/test-suite/php/enum_scope_template_runme.php4
 create mode 100644 Examples/test-suite/php/evil_diamond_ns_runme.php
 delete mode 100644 Examples/test-suite/php/evil_diamond_ns_runme.php4
 create mode 100644 Examples/test-suite/php/evil_diamond_prop_runme.php
 delete mode 100644 Examples/test-suite/php/evil_diamond_prop_runme.php4
 create mode 100644 Examples/test-suite/php/evil_diamond_runme.php
 delete mode 100644 Examples/test-suite/php/evil_diamond_runme.php4
 create mode 100644 Examples/test-suite/php/extend_template_ns_runme.php
 delete mode 100644 Examples/test-suite/php/extend_template_ns_runme.php4
 create mode 100644 Examples/test-suite/php/extend_template_runme.php
 delete mode 100644 Examples/test-suite/php/extend_template_runme.php4
 create mode 100644 Examples/test-suite/php/grouping_runme.php
 delete mode 100644 Examples/test-suite/php/grouping_runme.php4
 create mode 100644 Examples/test-suite/php/ignore_parameter_runme.php
 delete mode 100644 Examples/test-suite/php/ignore_parameter_runme.php4
 create mode 100644 Examples/test-suite/php/li_carrays_runme.php
 delete mode 100644 Examples/test-suite/php/li_carrays_runme.php4
 create mode 100644 Examples/test-suite/php/li_std_string_runme.php
 delete mode 100644 Examples/test-suite/php/li_std_string_runme.php4
 create mode 100644 Examples/test-suite/php/rename_scope_runme.php
 delete mode 100644 Examples/test-suite/php/rename_scope_runme.php4
 create mode 100644 Examples/test-suite/php/skel.php
 delete mode 100644 Examples/test-suite/php/skel.php4
 create mode 100644 Examples/test-suite/php/smart_pointer_rename_runme.php
 delete mode 100644 Examples/test-suite/php/smart_pointer_rename_runme.php4
 create mode 100644 Examples/test-suite/php/sym_runme.php
 delete mode 100644 Examples/test-suite/php/sym_runme.php4
 create mode 100644 Examples/test-suite/php/template_arg_typename_runme.php
 delete mode 100644 Examples/test-suite/php/template_arg_typename_runme.php4
 create mode 100644 Examples/test-suite/php/template_construct_runme.php
 delete mode 100644 Examples/test-suite/php/template_construct_runme.php4
 create mode 100644 Examples/test-suite/php/tests.php
 delete mode 100644 Examples/test-suite/php/tests.php4
 create mode 100644 Examples/test-suite/php/typedef_reference_runme.php
 delete mode 100644 Examples/test-suite/php/typedef_reference_runme.php4
 create mode 100644 Examples/test-suite/php/typemap_ns_using_runme.php
 delete mode 100644 Examples/test-suite/php/typemap_ns_using_runme.php4
 create mode 100644 Examples/test-suite/php/using1_runme.php
 delete mode 100644 Examples/test-suite/php/using1_runme.php4
 create mode 100644 Examples/test-suite/php/using2_runme.php
 delete mode 100644 Examples/test-suite/php/using2_runme.php4
 create mode 100644 Examples/test-suite/php/valuewrapper_base_runme.php
 delete mode 100644 Examples/test-suite/php/valuewrapper_base_runme.php4

diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 5dbf8b6b7..b95c7e33d 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -746,41 +746,41 @@ ruby_clean:
 ##################################################################
 
 # -------------------------------------------------------------------
-# Build a PHP4 dynamically loadable module (C)
+# Build a PHP dynamically loadable module (C)
 # -------------------------------------------------------------------
 
-PHP4_INCLUDE = @PHP4INC@
-PHP4_SO      = @PHP4_SO@
+PHP_INCLUDE = @PHPINC@
+PHP_SO      = @PHP_SO@
 
-php4: $(SRCS)
+php: $(SRCS)
 	$(SWIG) -php5 $(SWIGOPT) $(INTERFACEPATH)
-	$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP4_INCLUDE)
-	$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP_INCLUDE)
+	$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP_SO)
 
 # --------------------------------------------------------------------
-# Build a PHP4 dynamically loadable module (C++)
+# Build a PHP dynamically loadable module (C++)
 # --------------------------------------------------------------------
 
-php4_cpp: $(SRCS)
+php_cpp: $(SRCS)
 	$(SWIG) -php5 -cppext cxx -c++ $(SWIGOPT) $(INTERFACEPATH)
-	$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP4_INCLUDE)
-	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP_INCLUDE)
+	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP_SO)
 
 # -----------------------------------------------------------------
-# Running a PHP4 example
+# Running a PHP example
 # -----------------------------------------------------------------
 
-PHP4=@PHP4@
-PHP4SCRIPT ?= runme.php4
+PHP=@PHP@
+PHPSCRIPT ?= runme.php
 
-php4_run:
-	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PHP4) -n -q -d extension_dir=. $(PHP4SCRIPT)
+php_run:
+	env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(RUNTOOL) $(PHP) -n -q -d extension_dir=. $(PHPSCRIPT)
 
 # -----------------------------------------------------------------
-# Cleaning the PHP4 examples
+# Cleaning the PHP examples
 # -----------------------------------------------------------------
 
-php4_clean:
+php_clean:
 	rm -f *_wrap* *~ .~* example.php php_example.h
 	rm -f core @EXTRA_CLEAN@
 	rm -f *.@OBJEXT@ *@SO@
diff --git a/Examples/php/class/Makefile b/Examples/php/class/Makefile
index 39c4d2f23..252a72660 100644
--- a/Examples/php/class/Makefile
+++ b/Examples/php/class/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    = -noproxy
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/class/runme.php b/Examples/php/class/runme.php
new file mode 100644
index 000000000..a9ca657dc
--- /dev/null
+++ b/Examples/php/class/runme.php
@@ -0,0 +1,64 @@
+<?php
+
+# This file illustrates the low-level C++ interface
+# created by SWIG.  In this case, all of our C++ classes
+# get converted into function calls.
+
+require("example.php");
+
+# ----- Object creation -----
+
+print "Creating some objects:\n";
+$c = new_Circle(10);
+print "    Created circle $c\n";
+$s = new_Square(10);
+print "    Created square $s\n";
+
+# ----- Access a static member -----
+
+print "\nA total of " . nshapes() . " shapes were created\n";
+
+# ----- Member data access -----
+
+# Set the location of the object.
+# Note: methods in the base class Shape are used since
+# x and y are defined there.
+
+Shape_x_set($c, 20);
+Shape_y_set($c, 30);
+Shape_x_set($s,-10);
+Shape_y_set($s,5);
+
+print "\nHere is their current position:\n";
+print "    Circle = (" . Shape_x_get($c) . "," .  Shape_y_get($c) . ")\n";
+print "    Square = (" . Shape_x_get($s) . "," .  Shape_y_get($s) . ")\n";
+
+# ----- Call some methods -----
+
+# Notice how the Shape_area() and Shape_perimeter() functions really
+# invoke the appropriate virtual method on each object.
+print "\nHere are some properties of the shapes:\n";
+foreach (array($c,$s) as $o) {
+      print "    $o\n";
+      print "        area      = " .  Shape_area($o) .  "\n";
+      print "        perimeter = " .  Shape_perimeter($o) . "\n";
+  }
+
+# ----- Delete everything -----
+
+print "\nGuess I'll clean up now\n";
+
+# Note: this invokes the virtual destructor
+#delete_Shape($c);
+#delete_Shape($s);
+$c = NULL;
+$s = NULL;
+
+# and don't forget the $o from the for loop above.  It still refers to
+# the square.
+$o = NULL;
+
+print nshapes() . " shapes remain\n";
+print "Goodbye\n";
+
+?>
diff --git a/Examples/php/class/runme.php4 b/Examples/php/class/runme.php4
deleted file mode 100644
index a9ca657dc..000000000
--- a/Examples/php/class/runme.php4
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-# This file illustrates the low-level C++ interface
-# created by SWIG.  In this case, all of our C++ classes
-# get converted into function calls.
-
-require("example.php");
-
-# ----- Object creation -----
-
-print "Creating some objects:\n";
-$c = new_Circle(10);
-print "    Created circle $c\n";
-$s = new_Square(10);
-print "    Created square $s\n";
-
-# ----- Access a static member -----
-
-print "\nA total of " . nshapes() . " shapes were created\n";
-
-# ----- Member data access -----
-
-# Set the location of the object.
-# Note: methods in the base class Shape are used since
-# x and y are defined there.
-
-Shape_x_set($c, 20);
-Shape_y_set($c, 30);
-Shape_x_set($s,-10);
-Shape_y_set($s,5);
-
-print "\nHere is their current position:\n";
-print "    Circle = (" . Shape_x_get($c) . "," .  Shape_y_get($c) . ")\n";
-print "    Square = (" . Shape_x_get($s) . "," .  Shape_y_get($s) . ")\n";
-
-# ----- Call some methods -----
-
-# Notice how the Shape_area() and Shape_perimeter() functions really
-# invoke the appropriate virtual method on each object.
-print "\nHere are some properties of the shapes:\n";
-foreach (array($c,$s) as $o) {
-      print "    $o\n";
-      print "        area      = " .  Shape_area($o) .  "\n";
-      print "        perimeter = " .  Shape_perimeter($o) . "\n";
-  }
-
-# ----- Delete everything -----
-
-print "\nGuess I'll clean up now\n";
-
-# Note: this invokes the virtual destructor
-#delete_Shape($c);
-#delete_Shape($s);
-$c = NULL;
-$s = NULL;
-
-# and don't forget the $o from the for loop above.  It still refers to
-# the square.
-$o = NULL;
-
-print nshapes() . " shapes remain\n";
-print "Goodbye\n";
-
-?>
diff --git a/Examples/php/constants/Makefile b/Examples/php/constants/Makefile
index aed110eb2..23e2675d7 100644
--- a/Examples/php/constants/Makefile
+++ b/Examples/php/constants/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/constants/runme.php b/Examples/php/constants/runme.php
new file mode 100644
index 000000000..cea06485f
--- /dev/null
+++ b/Examples/php/constants/runme.php
@@ -0,0 +1,28 @@
+<?php
+
+require "example.php";
+
+print "ICONST  = " . ICONST . " (should be 42)\n";
+print "FCONST  = " . FCONST . " (should be 2.1828)\n";
+print "CCONST  = " . CCONST . " (should be 'x')\n";
+print "CCONST2 = " . CCONST2 . " (this should be on a new line)\n";
+print "SCONST  = " . SCONST . " (should be 'Hello World')\n";
+print "SCONST2 = " . SCONST2 . " (should be '\"Hello World\"')\n";
+print "EXPR    = " . EXPR  . " (should be 48.5484)\n";
+print "iconst  = " . iconst . " (should be 37)\n";
+print "fconst  = " . fconst . " (should be 3.14)\n";
+
+if (EXTERN!="EXTERN") {
+    print "EXTERN = " . EXTERN . " (Arg! This shouldn't print anything)\n";
+} else {
+    print "EXTERN defaults to 'EXTERN', it probably isn't defined (good)\n";
+}
+
+if (FOO!="FOO") {
+    print "FOO    = " . FOO . "(Arg! This shouldn't print anything)\n";
+} else {
+    print "FOO defaults to 'FOO', it probably isn't defined (good)\n";
+}
+
+
+?>
diff --git a/Examples/php/constants/runme.php4 b/Examples/php/constants/runme.php4
deleted file mode 100644
index cea06485f..000000000
--- a/Examples/php/constants/runme.php4
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-require "example.php";
-
-print "ICONST  = " . ICONST . " (should be 42)\n";
-print "FCONST  = " . FCONST . " (should be 2.1828)\n";
-print "CCONST  = " . CCONST . " (should be 'x')\n";
-print "CCONST2 = " . CCONST2 . " (this should be on a new line)\n";
-print "SCONST  = " . SCONST . " (should be 'Hello World')\n";
-print "SCONST2 = " . SCONST2 . " (should be '\"Hello World\"')\n";
-print "EXPR    = " . EXPR  . " (should be 48.5484)\n";
-print "iconst  = " . iconst . " (should be 37)\n";
-print "fconst  = " . fconst . " (should be 3.14)\n";
-
-if (EXTERN!="EXTERN") {
-    print "EXTERN = " . EXTERN . " (Arg! This shouldn't print anything)\n";
-} else {
-    print "EXTERN defaults to 'EXTERN', it probably isn't defined (good)\n";
-}
-
-if (FOO!="FOO") {
-    print "FOO    = " . FOO . "(Arg! This shouldn't print anything)\n";
-} else {
-    print "FOO defaults to 'FOO', it probably isn't defined (good)\n";
-}
-
-
-?>
diff --git a/Examples/php/cpointer/Makefile b/Examples/php/cpointer/Makefile
index caeec2d73..0862ce5ec 100644
--- a/Examples/php/cpointer/Makefile
+++ b/Examples/php/cpointer/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/cpointer/runme.php b/Examples/php/cpointer/runme.php
new file mode 100644
index 000000000..f5ef08a3c
--- /dev/null
+++ b/Examples/php/cpointer/runme.php
@@ -0,0 +1,45 @@
+<?php
+
+	require "example.php";
+
+	# First create some objects using the pointer library.
+
+	print "Testing the pointer library\n";
+
+	$a = new_intp();
+	$b = new_intp();
+	$c = new_intp();
+	intp_assign($a,37);
+	intp_assign($b,42);
+
+	print "	a = $a\n";
+	print "	b = $b\n";
+	print "	c = $c\n";
+
+	# Call the add() function wuth some pointers
+	add($a,$b,$c);
+
+	# Now get the result
+	$r = intp_value($c);
+
+	print "	38 + 42 = $r\n";
+
+	# Clean up the pointers
+	delete_intp($a);
+	delete_intp($b);
+	delete_intp($c);
+
+	# Now try the typemap library
+	# This should be much easier. Now how it is no longer
+	# necessary to manufacture pointers.
+
+	print "Trying the typemap library\n";
+	$r = sub(37,42);
+	print "	37 - 42 = $r\n";
+
+	# Now try the version with multiple return values
+	# print "Testing multiple return values\n";
+	# ($q,$r) = divide(42,37);
+	# print "	42/37 = $q remainder $r\n";
+
+?>
diff --git a/Examples/php/cpointer/runme.php4 b/Examples/php/cpointer/runme.php4
deleted file mode 100644
index f5ef08a3c..000000000
--- a/Examples/php/cpointer/runme.php4
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-	require "example.php";
-
-	# First create some objects using the pointer library.
-
-	print "Testing the pointer library\n";
-
-	$a = new_intp();
-	$b = new_intp();
-	$c = new_intp();
-	intp_assign($a,37);
-	intp_assign($b,42);
-
-	print "	a = $a\n";
-	print "	b = $b\n";
-	print "	c = $c\n";
-
-	# Call the add() function wuth some pointers
-	add($a,$b,$c);
-
-	# Now get the result
-	$r = intp_value($c);
-
-	print "	38 + 42 = $r\n";
-
-	# Clean up the pointers
-	delete_intp($a);
-	delete_intp($b);
-	delete_intp($c);
-
-	# Now try the typemap library
-	# This should be much easier. Now how it is no longer
-	# necessary to manufacture pointers.
-
-	print "Trying the typemap library\n";
-	$r = sub(37,42);
-	print "	37 - 42 = $r\n";
-
-	# Now try the version with multiple return values
-	# print "Testing multiple return values\n";
-	# ($q,$r) = divide(42,37);
-	# print "	42/37 = $q remainder $r\n";
-
-?>
diff --git a/Examples/php/disown/Makefile b/Examples/php/disown/Makefile
index ef3acc773..1bc0beaab 100644
--- a/Examples/php/disown/Makefile
+++ b/Examples/php/disown/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/disown/runme.php b/Examples/php/disown/runme.php
new file mode 100644
index 000000000..73d50786b
--- /dev/null
+++ b/Examples/php/disown/runme.php
@@ -0,0 +1,49 @@
+<?php
+
+# This file illustrates the low-level C++ interface
+# created by SWIG.  In this case, all of our C++ classes
+# get converted into function calls.
+
+require("example.php");
+
+# ----- Object creation -----
+
+print "Creating some objects:\n";
+$c = new Circle(10);
+print "    Created circle $c\n";
+$s = new Square(10);
+print "    Created square $s\n";
+
+# ----- Create the ShapeContainer ----
+
+$container = new ShapeContainer();
+
+$container->addShape($c);
+$container->addShape($s);
+
+# ----- Access a static member -----
+
+print "\nA total of " . Shape::nshapes() . " shapes were created\n";
+
+# ----- Delete by the old references -----
+# This should not truely delete the shapes because they are now owned
+# by the ShapeContainer.
+
+print "Delete the old references.";
+
+# Note: this invokes the virtual destructor
+$c = NULL;
+$s = NULL;
+
+print "\nA total of " . Shape::nshapes() . " shapes remain\n";
+
+# ----- Delete by the container -----
+# This should truely delete the shapes
+
+print "Delete the container.";
+$container = NULL;
+print "\nA total of " . Shape::nshapes() . " shapes remain\n";
+
+print "Goodbye\n";
+
+?>
diff --git a/Examples/php/disown/runme.php4 b/Examples/php/disown/runme.php4
deleted file mode 100644
index 73d50786b..000000000
--- a/Examples/php/disown/runme.php4
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-# This file illustrates the low-level C++ interface
-# created by SWIG.  In this case, all of our C++ classes
-# get converted into function calls.
-
-require("example.php");
-
-# ----- Object creation -----
-
-print "Creating some objects:\n";
-$c = new Circle(10);
-print "    Created circle $c\n";
-$s = new Square(10);
-print "    Created square $s\n";
-
-# ----- Create the ShapeContainer ----
-
-$container = new ShapeContainer();
-
-$container->addShape($c);
-$container->addShape($s);
-
-# ----- Access a static member -----
-
-print "\nA total of " . Shape::nshapes() . " shapes were created\n";
-
-# ----- Delete by the old references -----
-# This should not truely delete the shapes because they are now owned
-# by the ShapeContainer.
-
-print "Delete the old references.";
-
-# Note: this invokes the virtual destructor
-$c = NULL;
-$s = NULL;
-
-print "\nA total of " . Shape::nshapes() . " shapes remain\n";
-
-# ----- Delete by the container -----
-# This should truely delete the shapes
-
-print "Delete the container.";
-$container = NULL;
-print "\nA total of " . Shape::nshapes() . " shapes remain\n";
-
-print "Goodbye\n";
-
-?>
diff --git a/Examples/php/enum/Makefile b/Examples/php/enum/Makefile
index 39c4d2f23..252a72660 100644
--- a/Examples/php/enum/Makefile
+++ b/Examples/php/enum/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    = -noproxy
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/enum/runme.php b/Examples/php/enum/runme.php
new file mode 100644
index 000000000..55b0bc4c3
--- /dev/null
+++ b/Examples/php/enum/runme.php
@@ -0,0 +1,32 @@
+<?php
+
+require "example.php";
+
+# ----- Object creation -----
+
+# Print out the value of some enums
+print "*** color ***";
+print "    RED    =" . RED;
+print "    BLUE   =" . BLUE;
+print "    GREEN  =" . GREEN;
+
+print "\n*** Foo::speed ***";
+print "    Foo_IMPULSE   =" . Foo_IMPULSE;
+print "    Foo_WARP      =" . Foo_WARP;
+print "    Foo_LUDICROUS =" . Foo_LUDICROUS;
+
+print "\nTesting use of enums with functions\n";
+
+enum_test(RED, Foo_IMPULSE);
+enum_test(BLUE, Foo_WARP);
+enum_test(GREEN, Foo_LUDICROUS);
+enum_test(1234,5678);
+
+print "\nTesting use of enum with class method\n";
+$f = new_Foo();
+
+Foo_enum_test($f,Foo_IMPULSE);
+Foo_enum_test($f,Foo_WARP);
+Foo_enum_test($f,Foo_LUDICROUS);
+
+?>
diff --git a/Examples/php/enum/runme.php4 b/Examples/php/enum/runme.php4
deleted file mode 100644
index 55b0bc4c3..000000000
--- a/Examples/php/enum/runme.php4
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-require "example.php";
-
-# ----- Object creation -----
-
-# Print out the value of some enums
-print "*** color ***";
-print "    RED    =" . RED;
-print "    BLUE   =" . BLUE;
-print "    GREEN  =" . GREEN;
-
-print "\n*** Foo::speed ***";
-print "    Foo_IMPULSE   =" . Foo_IMPULSE;
-print "    Foo_WARP      =" . Foo_WARP;
-print "    Foo_LUDICROUS =" . Foo_LUDICROUS;
-
-print "\nTesting use of enums with functions\n";
-
-enum_test(RED, Foo_IMPULSE);
-enum_test(BLUE, Foo_WARP);
-enum_test(GREEN, Foo_LUDICROUS);
-enum_test(1234,5678);
-
-print "\nTesting use of enum with class method\n";
-$f = new_Foo();
-
-Foo_enum_test($f,Foo_IMPULSE);
-Foo_enum_test($f,Foo_WARP);
-Foo_enum_test($f,Foo_LUDICROUS);
-
-?>
diff --git a/Examples/php/funcptr/Makefile b/Examples/php/funcptr/Makefile
index caeec2d73..0862ce5ec 100644
--- a/Examples/php/funcptr/Makefile
+++ b/Examples/php/funcptr/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/funcptr/runme.php b/Examples/php/funcptr/runme.php
new file mode 100644
index 000000000..712d4147c
--- /dev/null
+++ b/Examples/php/funcptr/runme.php
@@ -0,0 +1,24 @@
+<?php
+
+require "example.php";
+
+$a = 37;
+$b = 42;
+
+# Now call our C function with a bunch of callbacks
+
+print "Trying some C callback functions\n";
+print "    a        = $a\n";
+print "    b        = $b\n";
+print "    ADD(a,b) = ". do_op($a,$b,ADD)."\n";
+print "    SUB(a,b) = ". do_op($a,$b,SUB)."\n";
+print "    MUL(a,b) = ". do_op($a,$b,MUL)."\n";
+
+print "Here is what the C callback function objects look like in php\n";
+print "Using swig style string pointers as we need them registered as constants\n";
+print "    ADD      = " . ADD . "\n";
+print "    SUB      = " . SUB . "\n";
+print "    MUL      = " . MUL . "\n";
+
+?>
+
diff --git a/Examples/php/funcptr/runme.php4 b/Examples/php/funcptr/runme.php4
deleted file mode 100644
index 712d4147c..000000000
--- a/Examples/php/funcptr/runme.php4
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-require "example.php";
-
-$a = 37;
-$b = 42;
-
-# Now call our C function with a bunch of callbacks
-
-print "Trying some C callback functions\n";
-print "    a        = $a\n";
-print "    b        = $b\n";
-print "    ADD(a,b) = ". do_op($a,$b,ADD)."\n";
-print "    SUB(a,b) = ". do_op($a,$b,SUB)."\n";
-print "    MUL(a,b) = ". do_op($a,$b,MUL)."\n";
-
-print "Here is what the C callback function objects look like in php\n";
-print "Using swig style string pointers as we need them registered as constants\n";
-print "    ADD      = " . ADD . "\n";
-print "    SUB      = " . SUB . "\n";
-print "    MUL      = " . MUL . "\n";
-
-?>
-
diff --git a/Examples/php/overloading/Makefile b/Examples/php/overloading/Makefile
index ef3acc773..1bc0beaab 100644
--- a/Examples/php/overloading/Makefile
+++ b/Examples/php/overloading/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/overloading/runme.php b/Examples/php/overloading/runme.php
new file mode 100644
index 000000000..5aa69048d
--- /dev/null
+++ b/Examples/php/overloading/runme.php
@@ -0,0 +1,59 @@
+<?php
+
+# This file illustrates the low-level C++ interface
+# created by SWIG.  In this case, all of our C++ classes
+# get converted into function calls.
+
+include("example.php");
+
+# ----- Object creation -----
+
+print "Creating some objects:\n";
+$c = new Circle(10);
+print "    Created circle $c\n";
+$s = new Square(10);
+print "    Created square $s\n";
+
+# ----- Access a static member -----
+
+print "\nA total of " . Shape::nshapes() . " shapes were created\n";
+
+# ----- Member data access -----
+
+# Set the location of the object.
+# Note: methods in the base class Shape are used since
+# x and y are defined there.
+
+$c->x = 20;
+$c->y = 30;
+$s->x = -10;
+$s->y = 5;
+
+print "\nHere is their current position:\n";
+print "    Circle = (" . $c->x . "," . $c->y . ")\n";
+print "    Square = (" . $s->x . "," . $s->y . ")\n";
+
+# ----- Call some methods -----
+
+print "\nHere are some properties of the shapes:\n";
+foreach (array(1, 2.1, "quick brown fox", $c, $s) as $o) {
+      print "    ".get_class($o)." $o\n";
+      print "        overloaded = " .  overloaded($o) . "\n";
+  }
+
+# Need to unset($o) or else we hang on to a reference to the Square object.
+unset($o);
+
+# ----- Delete everything -----
+
+print "\nGuess I'll clean up now\n";
+
+# Note: this invokes the virtual destructor
+unset($c);
+$s = 42;
+
+print Shape::nshapes() . " shapes remain\n";
+
+print "Goodbye\n";
+
+?>
diff --git a/Examples/php/overloading/runme.php4 b/Examples/php/overloading/runme.php4
deleted file mode 100644
index 5aa69048d..000000000
--- a/Examples/php/overloading/runme.php4
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-# This file illustrates the low-level C++ interface
-# created by SWIG.  In this case, all of our C++ classes
-# get converted into function calls.
-
-include("example.php");
-
-# ----- Object creation -----
-
-print "Creating some objects:\n";
-$c = new Circle(10);
-print "    Created circle $c\n";
-$s = new Square(10);
-print "    Created square $s\n";
-
-# ----- Access a static member -----
-
-print "\nA total of " . Shape::nshapes() . " shapes were created\n";
-
-# ----- Member data access -----
-
-# Set the location of the object.
-# Note: methods in the base class Shape are used since
-# x and y are defined there.
-
-$c->x = 20;
-$c->y = 30;
-$s->x = -10;
-$s->y = 5;
-
-print "\nHere is their current position:\n";
-print "    Circle = (" . $c->x . "," . $c->y . ")\n";
-print "    Square = (" . $s->x . "," . $s->y . ")\n";
-
-# ----- Call some methods -----
-
-print "\nHere are some properties of the shapes:\n";
-foreach (array(1, 2.1, "quick brown fox", $c, $s) as $o) {
-      print "    ".get_class($o)." $o\n";
-      print "        overloaded = " .  overloaded($o) . "\n";
-  }
-
-# Need to unset($o) or else we hang on to a reference to the Square object.
-unset($o);
-
-# ----- Delete everything -----
-
-print "\nGuess I'll clean up now\n";
-
-# Note: this invokes the virtual destructor
-unset($c);
-$s = 42;
-
-print Shape::nshapes() . " shapes remain\n";
-
-print "Goodbye\n";
-
-?>
diff --git a/Examples/php/pointer/Makefile b/Examples/php/pointer/Makefile
index caeec2d73..0862ce5ec 100644
--- a/Examples/php/pointer/Makefile
+++ b/Examples/php/pointer/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/pointer/runme.php b/Examples/php/pointer/runme.php
new file mode 100644
index 000000000..5e86de6a2
--- /dev/null
+++ b/Examples/php/pointer/runme.php
@@ -0,0 +1,35 @@
+<?php
+
+	require "example.php";
+
+	# First create some objects using the pointer library.
+
+	print "Testing the pointer library\n";
+
+	$a = 37.145;
+	$b = 42.555;
+	$c = "";  // $c must be defined and not null.
+
+	print "	a = $a\n";
+	print "	b = $b\n";
+	print "	c = $c\n";
+
+	# Call the add() function wuth some pointers
+	add(&$a,&$b,&$c);
+
+	print "	$a + $b = $c\n";
+
+	# Now try the typemap library
+	# This should be much easier. Now how it is no longer
+	# necessary to manufacture pointers.
+
+	print "Trying the typemap library\n";
+	$r = sub(37,42);
+	print "	37 - 42 = $r\n";
+
+	# Now try the version with multiple return values
+	# print "Testing multiple return values\n";
+	# ($q,$r) = divide(42,37);
+	# print "	42/37 = $q remainder $r\n";
+
+?>
diff --git a/Examples/php/pointer/runme.php4 b/Examples/php/pointer/runme.php4
deleted file mode 100644
index 5e86de6a2..000000000
--- a/Examples/php/pointer/runme.php4
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-	require "example.php";
-
-	# First create some objects using the pointer library.
-
-	print "Testing the pointer library\n";
-
-	$a = 37.145;
-	$b = 42.555;
-	$c = "";  // $c must be defined and not null.
-
-	print "	a = $a\n";
-	print "	b = $b\n";
-	print "	c = $c\n";
-
-	# Call the add() function wuth some pointers
-	add(&$a,&$b,&$c);
-
-	print "	$a + $b = $c\n";
-
-	# Now try the typemap library
-	# This should be much easier. Now how it is no longer
-	# necessary to manufacture pointers.
-
-	print "Trying the typemap library\n";
-	$r = sub(37,42);
-	print "	37 - 42 = $r\n";
-
-	# Now try the version with multiple return values
-	# print "Testing multiple return values\n";
-	# ($q,$r) = divide(42,37);
-	# print "	42/37 = $q remainder $r\n";
-
-?>
diff --git a/Examples/php/pragmas/Makefile b/Examples/php/pragmas/Makefile
index aed110eb2..23e2675d7 100644
--- a/Examples/php/pragmas/Makefile
+++ b/Examples/php/pragmas/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/pragmas/runme.php b/Examples/php/pragmas/runme.php
new file mode 100755
index 000000000..538548b6f
--- /dev/null
+++ b/Examples/php/pragmas/runme.php
@@ -0,0 +1,5 @@
+<?php
+
+require "example.php";
+
+?>
diff --git a/Examples/php/pragmas/runme.php4 b/Examples/php/pragmas/runme.php4
deleted file mode 100755
index 538548b6f..000000000
--- a/Examples/php/pragmas/runme.php4
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-require "example.php";
-
-?>
diff --git a/Examples/php/proxy/Makefile b/Examples/php/proxy/Makefile
index ef3acc773..1bc0beaab 100644
--- a/Examples/php/proxy/Makefile
+++ b/Examples/php/proxy/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/proxy/runme.php b/Examples/php/proxy/runme.php
new file mode 100644
index 000000000..dea80e358
--- /dev/null
+++ b/Examples/php/proxy/runme.php
@@ -0,0 +1,68 @@
+<?php
+
+# This file illustrates the low-level C++ interface
+# created by SWIG.  In this case, all of our C++ classes
+# get converted into function calls.
+
+include("example.php");
+
+# ----- Object creation -----
+
+print "Creating some objects:\n";
+$c = CircleFactory(10);
+print "    Created circle $c with area ". $c->area() ."\n";
+$s = new Square(10);
+print "    Created square $s\n";
+
+# ----- Access a static member -----
+
+print "\nA total of " . Shape::nshapes() . " shapes were created\n";
+
+# ----- Member data access -----
+
+# Set the location of the object.
+# Note: methods in the base class Shape are used since
+# x and y are defined there.
+
+$c->x = 20;
+$c->y = 30;
+$s->x = -10;
+$s->y = 5;
+
+print "\nHere is their current position:\n";
+print "    Circle = (" . $c->x . "," . $c->y . ")\n";
+print "    Square = (" . $s->x . "," . $s->y . ")\n";
+
+# ----- Call some methods -----
+
+print "\nHere are some properties of the shapes:\n";
+foreach (array($c,$s) as $o) {
+      print "    ".get_class($o)." $o\n";
+      print "        x         = " .  $o->x . "\n";
+      print "        y         = " .  $o->y . "\n";
+      print "        area      = " .  $o->area() . "\n";
+      print "        perimeter = " .  $o->perimeter() . "\n";
+  }
+
+# Need to unset($o) or else we hang on to a reference to the Square object.
+unset($o);
+
+# ----- Delete everything -----
+
+print "\nGuess I'll clean up now\n";
+
+# Note: this invokes the virtual destructor
+unset($c);
+$s = 42;
+
+print Shape::nshapes() . " shapes remain\n";
+
+print "Manually setting nshapes\n";
+
+Shape::nshapes(42);
+
+print Shape::get_nshapes() ." == 42\n";
+
+print "Goodbye\n";
+
+?>
diff --git a/Examples/php/proxy/runme.php4 b/Examples/php/proxy/runme.php4
deleted file mode 100644
index dea80e358..000000000
--- a/Examples/php/proxy/runme.php4
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-# This file illustrates the low-level C++ interface
-# created by SWIG.  In this case, all of our C++ classes
-# get converted into function calls.
-
-include("example.php");
-
-# ----- Object creation -----
-
-print "Creating some objects:\n";
-$c = CircleFactory(10);
-print "    Created circle $c with area ". $c->area() ."\n";
-$s = new Square(10);
-print "    Created square $s\n";
-
-# ----- Access a static member -----
-
-print "\nA total of " . Shape::nshapes() . " shapes were created\n";
-
-# ----- Member data access -----
-
-# Set the location of the object.
-# Note: methods in the base class Shape are used since
-# x and y are defined there.
-
-$c->x = 20;
-$c->y = 30;
-$s->x = -10;
-$s->y = 5;
-
-print "\nHere is their current position:\n";
-print "    Circle = (" . $c->x . "," . $c->y . ")\n";
-print "    Square = (" . $s->x . "," . $s->y . ")\n";
-
-# ----- Call some methods -----
-
-print "\nHere are some properties of the shapes:\n";
-foreach (array($c,$s) as $o) {
-      print "    ".get_class($o)." $o\n";
-      print "        x         = " .  $o->x . "\n";
-      print "        y         = " .  $o->y . "\n";
-      print "        area      = " .  $o->area() . "\n";
-      print "        perimeter = " .  $o->perimeter() . "\n";
-  }
-
-# Need to unset($o) or else we hang on to a reference to the Square object.
-unset($o);
-
-# ----- Delete everything -----
-
-print "\nGuess I'll clean up now\n";
-
-# Note: this invokes the virtual destructor
-unset($c);
-$s = 42;
-
-print Shape::nshapes() . " shapes remain\n";
-
-print "Manually setting nshapes\n";
-
-Shape::nshapes(42);
-
-print Shape::get_nshapes() ." == 42\n";
-
-print "Goodbye\n";
-
-?>
diff --git a/Examples/php/reference/Makefile b/Examples/php/reference/Makefile
index 39c4d2f23..252a72660 100644
--- a/Examples/php/reference/Makefile
+++ b/Examples/php/reference/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    = -noproxy
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/reference/runme.php b/Examples/php/reference/runme.php
new file mode 100644
index 000000000..00aaa5298
--- /dev/null
+++ b/Examples/php/reference/runme.php
@@ -0,0 +1,78 @@
+<?php
+
+# This file illustrates the manipulation of C++ references in Php.
+# This uses the low-level interface.  Proxy classes work differently.
+
+require "example.php";
+
+# ----- Object creation -----
+
+print "Creating some objects:\n";
+$a = new_Vector(3,4,5);
+$b = new_Vector(10,11,12);
+
+print "    Created a: $a " . Vector_print($a) . "\n";
+print "    Created b: $b " . Vector_print($b) . "\n";
+
+# ----- Call an overloaded operator -----
+
+# This calls the wrapper we placed around
+#
+#      operator+(const Vector &a, const Vector &) 
+#
+# It returns a new allocated object.
+
+print "Adding a+b\n";
+$c = addv($a,$b);
+print "    a+b =". Vector_print($c)."\n";
+
+# Note: Unless we free the result, a memory leak will occur
+$c = None;
+
+# ----- Create a vector array -----
+
+# Note: Using the high-level interface here
+print "Creating an array of vectors\n";
+$va = new_VectorArray(10);
+
+print "    va: $va size=".VectorArray_size($va)."\n";
+
+# ----- Set some values in the array -----
+
+# These operators copy the value of $a and $b to the vector array
+VectorArray_set($va,0,$a);
+VectorArray_set($va,1,$b);
+
+VectorArray_get($va,0);
+# This will work, but it will cause a memory leak!
+
+VectorArray_set($va,2,addv($a,$b));
+
+# The non-leaky way to do it
+
+$c = addv($a,$b);
+VectorArray_set($va,3,$c);
+$c = None;
+
+# Get some values from the array
+
+print "Getting some array values\n";
+for ($i = 0; $i < 5; $i++) {
+print "do $i\n";
+    print "    va($i) = ". Vector_print(VectorArray_get($va,$i)). "\n";
+}
+
+# Watch under resource meter to check on this
+#print "Making sure we don't leak memory.\n";
+#for ($i = 0; $i < 1000000; $i++) {
+#    $c = VectorArray_get($va,$i % 10);
+#}
+
+# ----- Clean up -----
+print "Cleaning up\n";
+# wants fixing FIXME
+$va = None;
+$a = None;
+$b = None;
+
+?>
diff --git a/Examples/php/reference/runme.php4 b/Examples/php/reference/runme.php4
deleted file mode 100644
index 00aaa5298..000000000
--- a/Examples/php/reference/runme.php4
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-# This file illustrates the manipulation of C++ references in Php.
-# This uses the low-level interface.  Proxy classes work differently.
-
-require "example.php";
-
-# ----- Object creation -----
-
-print "Creating some objects:\n";
-$a = new_Vector(3,4,5);
-$b = new_Vector(10,11,12);
-
-print "    Created a: $a " . Vector_print($a) . "\n";
-print "    Created b: $b " . Vector_print($b) . "\n";
-
-# ----- Call an overloaded operator -----
-
-# This calls the wrapper we placed around
-#
-#      operator+(const Vector &a, const Vector &) 
-#
-# It returns a new allocated object.
-
-print "Adding a+b\n";
-$c = addv($a,$b);
-print "    a+b =". Vector_print($c)."\n";
-
-# Note: Unless we free the result, a memory leak will occur
-$c = None;
-
-# ----- Create a vector array -----
-
-# Note: Using the high-level interface here
-print "Creating an array of vectors\n";
-$va = new_VectorArray(10);
-
-print "    va: $va size=".VectorArray_size($va)."\n";
-
-# ----- Set some values in the array -----
-
-# These operators copy the value of $a and $b to the vector array
-VectorArray_set($va,0,$a);
-VectorArray_set($va,1,$b);
-
-VectorArray_get($va,0);
-# This will work, but it will cause a memory leak!
-
-VectorArray_set($va,2,addv($a,$b));
-
-# The non-leaky way to do it
-
-$c = addv($a,$b);
-VectorArray_set($va,3,$c);
-$c = None;
-
-# Get some values from the array
-
-print "Getting some array values\n";
-for ($i = 0; $i < 5; $i++) {
-print "do $i\n";
-    print "    va($i) = ". Vector_print(VectorArray_get($va,$i)). "\n";
-}
-
-# Watch under resource meter to check on this
-#print "Making sure we don't leak memory.\n";
-#for ($i = 0; $i < 1000000; $i++) {
-#    $c = VectorArray_get($va,$i % 10);
-#}
-
-# ----- Clean up -----
-print "Cleaning up\n";
-# wants fixing FIXME
-$va = None;
-$a = None;
-$b = None;
-
-?>
diff --git a/Examples/php/simple/Makefile b/Examples/php/simple/Makefile
index caeec2d73..0862ce5ec 100644
--- a/Examples/php/simple/Makefile
+++ b/Examples/php/simple/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/simple/runme.php b/Examples/php/simple/runme.php
new file mode 100755
index 000000000..0e96fe800
--- /dev/null
+++ b/Examples/php/simple/runme.php
@@ -0,0 +1,25 @@
+<?php
+
+require "example.php";
+
+# Call our gcd() function
+
+$x = "42 aaa";
+$y = 105;
+$g = gcd($x,$y);
+print "The gcd of $x and $y is $g\n";
+
+# Manipulate the Foo global variable
+
+# Output its current value
+print "Foo = " . Foo_get() . "\n";
+
+# Change its value
+Foo_set(3.1415926);
+
+# See if the change took effect ( this isn't a good example for php, see
+#				  manual for why. )
+print "Foo = "  . Foo_get() . "\n";
+print_Foo();
+
+?>
diff --git a/Examples/php/simple/runme.php4 b/Examples/php/simple/runme.php4
deleted file mode 100755
index 0e96fe800..000000000
--- a/Examples/php/simple/runme.php4
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-require "example.php";
-
-# Call our gcd() function
-
-$x = "42 aaa";
-$y = 105;
-$g = gcd($x,$y);
-print "The gcd of $x and $y is $g\n";
-
-# Manipulate the Foo global variable
-
-# Output its current value
-print "Foo = " . Foo_get() . "\n";
-
-# Change its value
-Foo_set(3.1415926);
-
-# See if the change took effect ( this isn't a good example for php, see
-#				  manual for why. )
-print "Foo = "  . Foo_get() . "\n";
-print_Foo();
-
-?>
diff --git a/Examples/php/sync/Makefile b/Examples/php/sync/Makefile
index ef3acc773..1bc0beaab 100644
--- a/Examples/php/sync/Makefile
+++ b/Examples/php/sync/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4_cpp
+	php_cpp
 
 static::
 	$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_cpp_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_cpp_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/sync/runme.php b/Examples/php/sync/runme.php
new file mode 100644
index 000000000..a7c43474f
--- /dev/null
+++ b/Examples/php/sync/runme.php
@@ -0,0 +1,15 @@
+<?
+
+// Load module and PHP classes.
+include("example.php");
+
+echo "Got new object\n";
+echo "Got string $s and value $x \n";
+
+$s = new Sync();
+echo "Got new object\n";
+
+$s->printer();
+
+?>
+
diff --git a/Examples/php/sync/runme.php4 b/Examples/php/sync/runme.php4
deleted file mode 100644
index a7c43474f..000000000
--- a/Examples/php/sync/runme.php4
+++ /dev/null
@@ -1,15 +0,0 @@
-<?
-
-// Load module and PHP classes.
-include("example.php");
-
-echo "Got new object\n";
-echo "Got string $s and value $x \n";
-
-$s = new Sync();
-echo "Got new object\n";
-
-$s->printer();
-
-?>
-
diff --git a/Examples/php/value/Makefile b/Examples/php/value/Makefile
index cc383ea3f..9e69d00a4 100644
--- a/Examples/php/value/Makefile
+++ b/Examples/php/value/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    = -noproxy
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/value/runme.php b/Examples/php/value/runme.php
new file mode 100644
index 000000000..49115376c
--- /dev/null
+++ b/Examples/php/value/runme.php
@@ -0,0 +1,43 @@
+<?php
+
+	require "example.php";
+
+
+	$v = new_vector();
+        vector_x_set($v,1.0);
+        vector_y_set($v,2.0);
+        vector_z_set($v,3.0);
+
+	$w = new_vector();
+        vector_x_set($w,10.0);
+        vector_y_set($w,11.0);
+        vector_z_set($w,12.0);
+
+	echo "I just created the following vector\n";
+	vector_print($v);
+	vector_print($w);
+
+	echo "\nNow I'm going to compute the dot product\n";
+
+	$d = dot_product($v, $w);
+
+	echo "dot product = $d (should be 68)\n";
+
+	echo "\nNow I'm going to add the vectors together\n";
+
+        $r = new_vector();
+	vector_add($v, $w, $r);
+
+	vector_print($r);
+
+	echo "The value should be (11,13,15)\n";
+
+	echo "\nNow I'm going to clean up the return result\n";
+
+#	free($r);
+
+	echo "Good\n";
+
+?>
+
+
diff --git a/Examples/php/value/runme.php4 b/Examples/php/value/runme.php4
deleted file mode 100644
index 49115376c..000000000
--- a/Examples/php/value/runme.php4
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-	require "example.php";
-
-
-	$v = new_vector();
-        vector_x_set($v,1.0);
-        vector_y_set($v,2.0);
-        vector_z_set($v,3.0);
-
-	$w = new_vector();
-        vector_x_set($w,10.0);
-        vector_y_set($w,11.0);
-        vector_z_set($w,12.0);
-
-	echo "I just created the following vector\n";
-	vector_print($v);
-	vector_print($w);
-
-	echo "\nNow I'm going to compute the dot product\n";
-
-	$d = dot_product($v, $w);
-
-	echo "dot product = $d (should be 68)\n";
-
-	echo "\nNow I'm going to add the vectors together\n";
-
-        $r = new_vector();
-	vector_add($v, $w, $r);
-
-	vector_print($r);
-
-	echo "The value should be (11,13,15)\n";
-
-	echo "\nNow I'm going to clean up the return result\n";
-
-#	free($r);
-
-	echo "Good\n";
-
-?>
-
-
diff --git a/Examples/php/variables/Makefile b/Examples/php/variables/Makefile
index caeec2d73..0862ce5ec 100644
--- a/Examples/php/variables/Makefile
+++ b/Examples/php/variables/Makefile
@@ -9,16 +9,16 @@ SWIGOPT    =
 all::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
 	SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' \
-	php4
+	php
 
 static::
 	$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
-	SWIGOPT='$(SWIGOPT)' TARGET='myphp4' INTERFACE='$(INTERFACE)' \
-	php4_static
+	SWIGOPT='$(SWIGOPT)' TARGET='myphp' INTERFACE='$(INTERFACE)' \
+	php_static
 
 clean::
-	$(MAKE) -f $(TOP)/Makefile php4_clean
+	$(MAKE) -f $(TOP)/Makefile php_clean
 	rm -f $(TARGET).php
 
 check: all
-	$(MAKE) -f $(TOP)/Makefile php4_run
+	$(MAKE) -f $(TOP)/Makefile php_run
diff --git a/Examples/php/variables/runme.php b/Examples/php/variables/runme.php
new file mode 100644
index 000000000..bbfeb610b
--- /dev/null
+++ b/Examples/php/variables/runme.php
@@ -0,0 +1,96 @@
+<?php
+
+	require "example.php";
+	echo "\nVariables (values printed from C)\n";
+
+	print_vars();
+
+	echo "Variables (values printed from PHP)\n";
+
+	echo "ivar	= ".ivar_get()."\n";
+	echo "svar	= ".svar_get()."\n";
+	echo "lvar	= ".lvar_get()."\n";
+	echo "uivar	= ".uivar_get()."\n";
+	echo "usvar	= ".usvar_get()."\n";
+	echo "ulvar	= ".ulvar_get()."\n";
+	echo "scvar	= ".scvar_get()."\n";
+	echo "ucvar	= ".ucvar_get()."\n";
+	echo "cvar	= ".cvar_get()."\n";
+	echo "fvar	= ".fvar_get()."\n";
+	echo "dvar	= ".dvar_get()."\n";
+	echo "strvar	= ".strvar_get()."\n";
+	echo "cstrvar	= ".cstrvar_get()."\n";
+	echo "iptrvar	= ".iptrvar_get()."\n";
+	echo "name	= \"".name_get()."\"\n";
+	echo "ptptr	= ".ptptr_get() , point_print(ptptr_get()) , "\n";
+	echo "pt	= ".pt_get(), point_print(pt_get()) , "\n";
+
+	/* Try to set the values of some global variables */
+$a = "42.14";
+
+	ivar_set($a);
+echo "a = $a\n";
+	svar_set(-31000);
+	lvar_set(65537);
+	uivar_set(123456);
+	usvar_set(61000);
+	ulvar_set(654321);
+	scvar_set(-13);
+	ucvar_set(251);
+	cvar_set("S");
+	fvar_set(3.14159);
+	dvar_set(2.1828);
+	strvar_set("Hello World");
+	iptrvar_set(new_int(37));
+	ptptr_set(new_point(37,42));
+	name_set("B");
+
+	echo "Variables (values printed from PHP)\n";
+
+	echo "ivar	= ".ivar_get()."\n";
+	echo "svar	= ".svar_get()."\n";
+	echo "lvar	= ".lvar_get()."\n";
+	echo "uivar	= ".uivar_get()."\n";
+	echo "usvar	= ".usvar_get()."\n";
+	echo "ulvar	= ".ulvar_get()."\n";
+	echo "scvar	= ".scvar_get()."\n";
+	echo "ucvar	= ".ucvar_get()."\n";
+	echo "cvar	= ".cvar_get()."\n";
+	echo "fvar	= ".fvar_get()."\n";
+	echo "dvar	= ".dvar_get()."\n";
+	echo "strvar	= ".strvar_get()."\n";
+	echo "cstrvar	= ".cstrvar_get()."\n";
+	echo "iptrvar	= ".iptrvar_get()."\n";
+	echo "name	= ".name_get()."\n";
+	echo "ptptr	= ".ptptr_get() , point_print(ptptr_get()) , "\n";
+	echo "pt	= ".pt_get(), point_print(pt_get()) , "\n";
+
+	echo "\nVariables (values printed from C)\n";
+
+	print_vars();
+
+	echo "\nI'm going to try and update a structure variable.\n";
+
+	pt_set(ptptr_get());
+
+	echo "The new value is \n";
+
+	pt_print();
+
+	echo "You should see the value", point_print(ptptr_get()), "\n";
+
+	echo "\nNow I'm going to try and modify some read only variables\n";
+
+	echo "Trying to set 'path'\n";
+
+	//path_set("Whoa!");
+	echo "Path = ".path_get()."\n";
+
+	echo "Trying to set 'status'\n";
+
+	/* And this */
+	//status_set(0);
+	echo "Status = ".status_get()."\n";
+
+?>
+
diff --git a/Examples/php/variables/runme.php4 b/Examples/php/variables/runme.php4
deleted file mode 100644
index bbfeb610b..000000000
--- a/Examples/php/variables/runme.php4
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-	require "example.php";
-	echo "\nVariables (values printed from C)\n";
-
-	print_vars();
-
-	echo "Variables (values printed from PHP)\n";
-
-	echo "ivar	= ".ivar_get()."\n";
-	echo "svar	= ".svar_get()."\n";
-	echo "lvar	= ".lvar_get()."\n";
-	echo "uivar	= ".uivar_get()."\n";
-	echo "usvar	= ".usvar_get()."\n";
-	echo "ulvar	= ".ulvar_get()."\n";
-	echo "scvar	= ".scvar_get()."\n";
-	echo "ucvar	= ".ucvar_get()."\n";
-	echo "cvar	= ".cvar_get()."\n";
-	echo "fvar	= ".fvar_get()."\n";
-	echo "dvar	= ".dvar_get()."\n";
-	echo "strvar	= ".strvar_get()."\n";
-	echo "cstrvar	= ".cstrvar_get()."\n";
-	echo "iptrvar	= ".iptrvar_get()."\n";
-	echo "name	= \"".name_get()."\"\n";
-	echo "ptptr	= ".ptptr_get() , point_print(ptptr_get()) , "\n";
-	echo "pt	= ".pt_get(), point_print(pt_get()) , "\n";
-
-	/* Try to set the values of some global variables */
-$a = "42.14";
-
-	ivar_set($a);
-echo "a = $a\n";
-	svar_set(-31000);
-	lvar_set(65537);
-	uivar_set(123456);
-	usvar_set(61000);
-	ulvar_set(654321);
-	scvar_set(-13);
-	ucvar_set(251);
-	cvar_set("S");
-	fvar_set(3.14159);
-	dvar_set(2.1828);
-	strvar_set("Hello World");
-	iptrvar_set(new_int(37));
-	ptptr_set(new_point(37,42));
-	name_set("B");
-
-	echo "Variables (values printed from PHP)\n";
-
-	echo "ivar	= ".ivar_get()."\n";
-	echo "svar	= ".svar_get()."\n";
-	echo "lvar	= ".lvar_get()."\n";
-	echo "uivar	= ".uivar_get()."\n";
-	echo "usvar	= ".usvar_get()."\n";
-	echo "ulvar	= ".ulvar_get()."\n";
-	echo "scvar	= ".scvar_get()."\n";
-	echo "ucvar	= ".ucvar_get()."\n";
-	echo "cvar	= ".cvar_get()."\n";
-	echo "fvar	= ".fvar_get()."\n";
-	echo "dvar	= ".dvar_get()."\n";
-	echo "strvar	= ".strvar_get()."\n";
-	echo "cstrvar	= ".cstrvar_get()."\n";
-	echo "iptrvar	= ".iptrvar_get()."\n";
-	echo "name	= ".name_get()."\n";
-	echo "ptptr	= ".ptptr_get() , point_print(ptptr_get()) , "\n";
-	echo "pt	= ".pt_get(), point_print(pt_get()) , "\n";
-
-	echo "\nVariables (values printed from C)\n";
-
-	print_vars();
-
-	echo "\nI'm going to try and update a structure variable.\n";
-
-	pt_set(ptptr_get());
-
-	echo "The new value is \n";
-
-	pt_print();
-
-	echo "You should see the value", point_print(ptptr_get()), "\n";
-
-	echo "\nNow I'm going to try and modify some read only variables\n";
-
-	echo "Trying to set 'path'\n";
-
-	//path_set("Whoa!");
-	echo "Path = ".path_get()."\n";
-
-	echo "Trying to set 'status'\n";
-
-	/* And this */
-	//status_set(0);
-	echo "Status = ".status_get()."\n";
-
-?>
-
diff --git a/Examples/test-suite/php/Makefile.in b/Examples/test-suite/php/Makefile.in
index 9f412bc56..b8aeaaa11 100644
--- a/Examples/test-suite/php/Makefile.in
+++ b/Examples/test-suite/php/Makefile.in
@@ -1,9 +1,9 @@
 #######################################################################
-# Makefile for php4 test-suite
+# Makefile for php test-suite
 #######################################################################
 
-LANGUAGE     = php4
-SCRIPTSUFFIX = _runme.php4
+LANGUAGE     = php
+SCRIPTSUFFIX = _runme.php
 srcdir       = @srcdir@
 top_srcdir   = @top_srcdir@
 top_builddir = @top_builddir@
@@ -25,19 +25,19 @@ makectests:
 	@bash -ec 'for test in $(C_TEST_CASES) ; do $($(MAKE)) clean && $(MAKE) $${test}.cpptest; done'
 
 runcpptests:
-	@bash -ec 'for test in $(CPP_TEST_CASES) ; do if [ -f $${test}_runme.php4 ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi ; done'
+	@bash -ec 'for test in $(CPP_TEST_CASES) ; do if [ -f $${test}_runme.php ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi ; done'
 
 runctests:
-	@bash -ec 'for test in $(C_TEST_CASES) ; do if [ -f $${test}_runme.php4 ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi; done'
+	@bash -ec 'for test in $(C_TEST_CASES) ; do if [ -f $${test}_runme.php ] ; then $(MAKE) clean && $(MAKE) $${test}.cpptest; fi; done'
 
 runtests: runcpptests runctests
 
-# write out tests without a _runme.php4
+# write out tests without a _runme.php
 missingcpptests:
-	@bash -ec 'for test in $(CPP_TEST_CASES) ; do test -f $${test}_runme.php4 || echo $${test}; done'
+	@bash -ec 'for test in $(CPP_TEST_CASES) ; do test -f $${test}_runme.php || echo $${test}; done'
 
 missingctests:
-	@bash -ec 'for test in $(C_TEST_CASES) ; do test -f $${test}_runme.php4 || echo $${test}; done'
+	@bash -ec 'for test in $(C_TEST_CASES) ; do test -f $${test}_runme.php || echo $${test}; done'
 
 missingtests: missingcpptests missingctests
 
@@ -58,10 +58,10 @@ missingtests: missingcpptests missingctests
 	+$(run_testcase)
 
 # Runs the testcase. A testcase is only run if
-# a file is found which has _runme.php4 appended after the testcase name.
+# a file is found which has _runme.php appended after the testcase name.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then (	  \
-	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHP4SCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php4_run;) \
+	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile PHPSCRIPT=$(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) RUNTOOL=$(RUNTOOL) php_run;) \
 	fi;
 
 # Clean: remove the generated .php file
@@ -69,4 +69,4 @@ run_testcase = \
 	@rm -f $*.php;
 
 clean:
-	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile php4_clean
+	$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile php_clean
diff --git a/Examples/test-suite/php/abstract_inherit_ok_runme.php b/Examples/test-suite/php/abstract_inherit_ok_runme.php
new file mode 100644
index 000000000..c2d86499b
--- /dev/null
+++ b/Examples/test-suite/php/abstract_inherit_ok_runme.php
@@ -0,0 +1,12 @@
+<?php
+
+require "tests.php";
+require "abstract_inherit_ok.php";
+
+check::classes(array(Foo,Spam));
+$spam=new Spam();
+
+check::equal(0,$spam->blah(),"spam object method");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/abstract_inherit_ok_runme.php4 b/Examples/test-suite/php/abstract_inherit_ok_runme.php4
deleted file mode 100644
index 1182e4cec..000000000
--- a/Examples/test-suite/php/abstract_inherit_ok_runme.php4
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-require "tests.php4";
-require "abstract_inherit_ok.php";
-
-check::classes(array(Foo,Spam));
-$spam=new Spam();
-
-check::equal(0,$spam->blah(),"spam object method");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/abstract_inherit_runme.php b/Examples/test-suite/php/abstract_inherit_runme.php
new file mode 100644
index 000000000..3554e6fd8
--- /dev/null
+++ b/Examples/test-suite/php/abstract_inherit_runme.php
@@ -0,0 +1,14 @@
+<?php
+
+require "tests.php";
+require "abstract_inherit.php";
+
+check::classes(array(Foo,Bar,Spam,NRFilter_i,NRRCFilter_i,NRRCFilterpro_i,NRRCFilterpri_i));
+// This constructor attempt should fail as there isn't one
+//$spam=new Spam();
+
+//check::equal(0,$spam->blah(),"spam object method");
+//check::equal(0,Spam::blah($spam),"spam class method");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/abstract_inherit_runme.php4 b/Examples/test-suite/php/abstract_inherit_runme.php4
deleted file mode 100644
index fbc971711..000000000
--- a/Examples/test-suite/php/abstract_inherit_runme.php4
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require "tests.php4";
-require "abstract_inherit.php";
-
-check::classes(array(Foo,Bar,Spam,NRFilter_i,NRRCFilter_i,NRRCFilterpro_i,NRRCFilterpri_i));
-// This constructor attempt should fail as there isn't one
-//$spam=new Spam();
-
-//check::equal(0,$spam->blah(),"spam object method");
-//check::equal(0,Spam::blah($spam),"spam class method");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/add_link_runme.php b/Examples/test-suite/php/add_link_runme.php
new file mode 100644
index 000000000..4d8c31d5e
--- /dev/null
+++ b/Examples/test-suite/php/add_link_runme.php
@@ -0,0 +1,23 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "add_link.php";
+
+// No new functions, except the flat functions
+check::functions(array(new_foo,foo_blah));
+
+check::classes(array(Foo));
+
+$foo=new foo();
+check::is_a($foo,foo);
+
+$foo_blah=$foo->blah();
+check::is_a($foo_blah,foo);
+
+//fails, can't be called as a class method, should allow and make it nil?
+//$class_foo_blah=foo::blah();
+//check::is_a($class_foo_blah,foo);
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/add_link_runme.php4 b/Examples/test-suite/php/add_link_runme.php4
deleted file mode 100644
index b9d5334dd..000000000
--- a/Examples/test-suite/php/add_link_runme.php4
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "add_link.php";
-
-// No new functions, except the flat functions
-check::functions(array(new_foo,foo_blah));
-
-check::classes(array(Foo));
-
-$foo=new foo();
-check::is_a($foo,foo);
-
-$foo_blah=$foo->blah();
-check::is_a($foo_blah,foo);
-
-//fails, can't be called as a class method, should allow and make it nil?
-//$class_foo_blah=foo::blah();
-//check::is_a($class_foo_blah,foo);
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/argout_runme.php b/Examples/test-suite/php/argout_runme.php
new file mode 100644
index 000000000..1c9026b6c
--- /dev/null
+++ b/Examples/test-suite/php/argout_runme.php
@@ -0,0 +1,37 @@
+<?php
+
+require "tests.php";
+require "argout.php";
+
+check::functions(array(incp,incr,inctr,new_intp,copy_intp,delete_intp,intp_assign,intp_value,voidhandle,handle));
+
+$ip=copy_intp(42);
+check::equal(42,incp($ip),"42==incp($ip)");
+check::equal(43,intp_value($ip),"43=$ip");
+
+$p=copy_intp(2);
+check::equal(2,incp($p),"2==incp($p)");
+check::equal(3,intp_value($p),"3==$p");
+
+$r=copy_intp(7);
+check::equal(7,incr($r),"7==incr($r)");
+check::equal(8,intp_value($r),"8==$r");
+
+$tr=copy_intp(4);
+check::equal(4,inctr($tr),"4==incr($tr)");
+check::equal(5,intp_value($tr),"5==$tr");
+
+# Check the voidhandle call, first with null
+unset($handle);
+voidhandle(&$handle);
+check::resource($handle,"_p_void",'$handle is not _p_void');
+$handledata=handle($handle);
+check::equal($handledata,"Here it is","\$handledata != \"Here it is\"");
+
+unset($handle);
+// without reference, should fatal error so can't test here
+//voidhandle($handle);
+//check::isnull($handle,'$handle not null');
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/argout_runme.php4 b/Examples/test-suite/php/argout_runme.php4
deleted file mode 100644
index 1328b0926..000000000
--- a/Examples/test-suite/php/argout_runme.php4
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-require "tests.php4";
-require "argout.php";
-
-check::functions(array(incp,incr,inctr,new_intp,copy_intp,delete_intp,intp_assign,intp_value,voidhandle,handle));
-
-$ip=copy_intp(42);
-check::equal(42,incp($ip),"42==incp($ip)");
-check::equal(43,intp_value($ip),"43=$ip");
-
-$p=copy_intp(2);
-check::equal(2,incp($p),"2==incp($p)");
-check::equal(3,intp_value($p),"3==$p");
-
-$r=copy_intp(7);
-check::equal(7,incr($r),"7==incr($r)");
-check::equal(8,intp_value($r),"8==$r");
-
-$tr=copy_intp(4);
-check::equal(4,inctr($tr),"4==incr($tr)");
-check::equal(5,intp_value($tr),"5==$tr");
-
-# Check the voidhandle call, first with null
-unset($handle);
-voidhandle(&$handle);
-check::resource($handle,"_p_void",'$handle is not _p_void');
-$handledata=handle($handle);
-check::equal($handledata,"Here it is","\$handledata != \"Here it is\"");
-
-unset($handle);
-// without reference, should fatal error so can't test here
-//voidhandle($handle);
-//check::isnull($handle,'$handle not null');
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/arrayptr_runme.php b/Examples/test-suite/php/arrayptr_runme.php
new file mode 100644
index 000000000..717c870d9
--- /dev/null
+++ b/Examples/test-suite/php/arrayptr_runme.php
@@ -0,0 +1,15 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "arrayptr.php";
+
+// No new functions
+check::functions(array(foo));
+// No new classes
+check::classes(array());
+// now new vars
+check::globals(array());
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/arrayptr_runme.php4 b/Examples/test-suite/php/arrayptr_runme.php4
deleted file mode 100644
index c057a6772..000000000
--- a/Examples/test-suite/php/arrayptr_runme.php4
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "arrayptr.php";
-
-// No new functions
-check::functions(array(foo));
-// No new classes
-check::classes(array());
-// now new vars
-check::globals(array());
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/arrays_global_runme.php b/Examples/test-suite/php/arrays_global_runme.php
new file mode 100644
index 000000000..59ff7bf2a
--- /dev/null
+++ b/Examples/test-suite/php/arrays_global_runme.php
@@ -0,0 +1,14 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "arrays_global.php";
+
+check::functions(array(test_a,test_b,new_simplestruct,new_material));
+check::classes(array(arrays_global,SimpleStruct,Material));
+check::globals(array(array_c,array_sc,array_uc,array_s,array_us,array_i,array_ui,array_l,array_ul,array_ll,array_f,array_d,array_struct,array_structpointers,array_ipointers,array_enum,array_enumpointers,array_const_i,beginstring_fix44a,beginstring_fix44b,beginstring_fix44c,beginstring_fix44d,beginstring_fix44e,beginstring_fix44f,chitmat,hitmat_val,hitmat));
+check::set(array_c,"hac");
+check::equal("ha",check::get(array_c,"ha"),"set array_c");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/arrays_global_runme.php4 b/Examples/test-suite/php/arrays_global_runme.php4
deleted file mode 100644
index d6a3955e1..000000000
--- a/Examples/test-suite/php/arrays_global_runme.php4
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "arrays_global.php";
-
-check::functions(array(test_a,test_b,new_simplestruct,new_material));
-check::classes(array(arrays_global,SimpleStruct,Material));
-check::globals(array(array_c,array_sc,array_uc,array_s,array_us,array_i,array_ui,array_l,array_ul,array_ll,array_f,array_d,array_struct,array_structpointers,array_ipointers,array_enum,array_enumpointers,array_const_i,beginstring_fix44a,beginstring_fix44b,beginstring_fix44c,beginstring_fix44d,beginstring_fix44e,beginstring_fix44f,chitmat,hitmat_val,hitmat));
-check::set(array_c,"hac");
-check::equal("ha",check::get(array_c,"ha"),"set array_c");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/arrays_global_twodim_runme.php b/Examples/test-suite/php/arrays_global_twodim_runme.php
new file mode 100644
index 000000000..d9b62de0d
--- /dev/null
+++ b/Examples/test-suite/php/arrays_global_twodim_runme.php
@@ -0,0 +1,23 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "arrays_global_twodim.php";
+
+check::functions(array(fn_taking_arrays,get_2d_array,new_simplestruct,new_material));
+check::classes(array(arrays_global_twodim,SimpleStruct,Material));
+check::globals(array(array_c,array_sc,array_uc,array_s,array_us,array_i,array_ui,array_l,array_ul,array_ll,array_f,array_d,array_struct,array_structpointers,array_ipointers,array_enum,array_enumpointers,array_const_i,chitmat,hitmat_val,hitmat));
+$a1=array(10,11,12,13);
+$a2=array(14,15,16,17);
+$a=array($a1,$a2);
+
+$_a=check::get(array_const_i);
+
+for($x=0;$x<count($a1);$x++) {
+  for($y=0;$y<2;$y++) {
+    check::equal($a[$y][$x],get_2d_array($_a,$y,$x),"check array $x,$y");
+  }
+}
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/arrays_global_twodim_runme.php4 b/Examples/test-suite/php/arrays_global_twodim_runme.php4
deleted file mode 100644
index 352ad2568..000000000
--- a/Examples/test-suite/php/arrays_global_twodim_runme.php4
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "arrays_global_twodim.php";
-
-check::functions(array(fn_taking_arrays,get_2d_array,new_simplestruct,new_material));
-check::classes(array(arrays_global_twodim,SimpleStruct,Material));
-check::globals(array(array_c,array_sc,array_uc,array_s,array_us,array_i,array_ui,array_l,array_ul,array_ll,array_f,array_d,array_struct,array_structpointers,array_ipointers,array_enum,array_enumpointers,array_const_i,chitmat,hitmat_val,hitmat));
-$a1=array(10,11,12,13);
-$a2=array(14,15,16,17);
-$a=array($a1,$a2);
-
-$_a=check::get(array_const_i);
-
-for($x=0;$x<count($a1);$x++) {
-  for($y=0;$y<2;$y++) {
-    check::equal($a[$y][$x],get_2d_array($_a,$y,$x),"check array $x,$y");
-  }
-}
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/arrays_runme.php b/Examples/test-suite/php/arrays_runme.php
new file mode 100644
index 000000000..97ee6bbbf
--- /dev/null
+++ b/Examples/test-suite/php/arrays_runme.php
@@ -0,0 +1,19 @@
+<?php
+// Sample test file
+require "tests.php";
+require "arrays.php";
+
+check::functions(array(fn_taking_arrays,newintpointer,setintfrompointer,getintfrompointer,array_pointer_func));
+check::classes(array(arrays,SimpleStruct,ArrayStruct,CartPoseData_t));
+// No new vars
+check::globals(array());
+
+$ss=new simplestruct();
+check::classname(simplestruct,$ss);
+
+$as=new arraystruct();
+$as->array_c="abc";
+check::equal($as->array_c,"ab",'$as->array_c=="ab"');
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/arrays_runme.php4 b/Examples/test-suite/php/arrays_runme.php4
deleted file mode 100644
index 407c32c31..000000000
--- a/Examples/test-suite/php/arrays_runme.php4
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-// Sample test file
-require "tests.php4";
-require "arrays.php";
-
-check::functions(array(fn_taking_arrays,newintpointer,setintfrompointer,getintfrompointer,array_pointer_func));
-check::classes(array(arrays,SimpleStruct,ArrayStruct,CartPoseData_t));
-// No new vars
-check::globals(array());
-
-$ss=new simplestruct();
-check::classname(simplestruct,$ss);
-
-$as=new arraystruct();
-$as->array_c="abc";
-check::equal($as->array_c,"ab",'$as->array_c=="ab"');
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/arrays_scope_runme.php b/Examples/test-suite/php/arrays_scope_runme.php
new file mode 100644
index 000000000..92de96920
--- /dev/null
+++ b/Examples/test-suite/php/arrays_scope_runme.php
@@ -0,0 +1,17 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "arrays_scope.php";
+
+// No new functions
+check::functions(array(new_bar,bar_blah));
+// No new classes
+check::classes(array(arrays_scope,Bar));
+// now new vars
+check::globals(array());
+
+$bar=new bar();
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/arrays_scope_runme.php4 b/Examples/test-suite/php/arrays_scope_runme.php4
deleted file mode 100644
index 75c7ccf27..000000000
--- a/Examples/test-suite/php/arrays_scope_runme.php4
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "arrays_scope.php";
-
-// No new functions
-check::functions(array(new_bar,bar_blah));
-// No new classes
-check::classes(array(arrays_scope,Bar));
-// now new vars
-check::globals(array());
-
-$bar=new bar();
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/casts_runme.php b/Examples/test-suite/php/casts_runme.php
new file mode 100644
index 000000000..03ee6829c
--- /dev/null
+++ b/Examples/test-suite/php/casts_runme.php
@@ -0,0 +1,19 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "casts.php";
+
+// No new functions
+check::functions(array(new_a,a_hello,new_b));
+// No new classes
+check::classes(array(A,B));
+// now new vars
+check::globals(array());
+
+# Make sure $b inherites hello() from class A
+$b=new B();
+$b->hello();
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/casts_runme.php4 b/Examples/test-suite/php/casts_runme.php4
deleted file mode 100644
index c3d19e29e..000000000
--- a/Examples/test-suite/php/casts_runme.php4
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "casts.php";
-
-// No new functions
-check::functions(array(new_a,a_hello,new_b));
-// No new classes
-check::classes(array(A,B));
-// now new vars
-check::globals(array());
-
-# Make sure $b inherites hello() from class A
-$b=new B();
-$b->hello();
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/class_ignore_runme.php b/Examples/test-suite/php/class_ignore_runme.php
new file mode 100644
index 000000000..861576026
--- /dev/null
+++ b/Examples/test-suite/php/class_ignore_runme.php
@@ -0,0 +1,17 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "class_ignore.php";
+
+check::functions(array(do_blah,new_bar,bar_blah,new_boo,boo_away,new_far,new_hoo));
+check::classes(array(class_ignore,Bar,Boo,Far,Hoo));
+// No new vars
+check::globals(array());
+
+$bar=new bar();
+do_blah($bar);
+check::classparent($bar,"");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/class_ignore_runme.php4 b/Examples/test-suite/php/class_ignore_runme.php4
deleted file mode 100644
index 5da23e502..000000000
--- a/Examples/test-suite/php/class_ignore_runme.php4
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "class_ignore.php";
-
-check::functions(array(do_blah,new_bar,bar_blah,new_boo,boo_away,new_far,new_hoo));
-check::classes(array(class_ignore,Bar,Boo,Far,Hoo));
-// No new vars
-check::globals(array());
-
-$bar=new bar();
-do_blah($bar);
-check::classparent($bar,"");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/conversion_namespace_runme.php b/Examples/test-suite/php/conversion_namespace_runme.php
new file mode 100644
index 000000000..e6866f871
--- /dev/null
+++ b/Examples/test-suite/php/conversion_namespace_runme.php
@@ -0,0 +1,14 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "conversion_namespace.php";
+
+check::classes(array("Foo","Bar"));
+$bar=new Bar;
+check::classname("bar",$bar);
+$foo=$bar->toFoo();
+check::classname("foo",$foo);
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/conversion_namespace_runme.php4 b/Examples/test-suite/php/conversion_namespace_runme.php4
deleted file mode 100644
index ae49d2002..000000000
--- a/Examples/test-suite/php/conversion_namespace_runme.php4
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "conversion_namespace.php";
-
-check::classes(array("Foo","Bar"));
-$bar=new Bar;
-check::classname("bar",$bar);
-$foo=$bar->toFoo();
-check::classname("foo",$foo);
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/conversion_ns_template_runme.php b/Examples/test-suite/php/conversion_ns_template_runme.php
new file mode 100644
index 000000000..9702eedb7
--- /dev/null
+++ b/Examples/test-suite/php/conversion_ns_template_runme.php
@@ -0,0 +1,10 @@
+<?php
+
+require "tests.php";
+require "conversion_ns_template.php";
+
+check::classes(array("conversion_ns_template","Foo_One","Bar_One","Hi"));
+// this is too hard, I'm not sure what to test for,
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/conversion_ns_template_runme.php4 b/Examples/test-suite/php/conversion_ns_template_runme.php4
deleted file mode 100644
index e799cdd48..000000000
--- a/Examples/test-suite/php/conversion_ns_template_runme.php4
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-require "tests.php4";
-require "conversion_ns_template.php";
-
-check::classes(array("conversion_ns_template","Foo_One","Bar_One","Hi"));
-// this is too hard, I'm not sure what to test for,
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/conversion_runme.php b/Examples/test-suite/php/conversion_runme.php
new file mode 100644
index 000000000..69ade46db
--- /dev/null
+++ b/Examples/test-suite/php/conversion_runme.php
@@ -0,0 +1,14 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "conversion.php";
+
+check::classes(array("Foo","Bar"));
+$bar=new Bar;
+check::classname("bar",$bar);
+$foo=$bar->toFoo();
+check::classname("foo",$foo);
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/conversion_runme.php4 b/Examples/test-suite/php/conversion_runme.php4
deleted file mode 100644
index 7941a7bbe..000000000
--- a/Examples/test-suite/php/conversion_runme.php4
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "conversion.php";
-
-check::classes(array("Foo","Bar"));
-$bar=new Bar;
-check::classname("bar",$bar);
-$foo=$bar->toFoo();
-check::classname("foo",$foo);
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/cpp_static_runme.php b/Examples/test-suite/php/cpp_static_runme.php
new file mode 100644
index 000000000..54dbfc7d8
--- /dev/null
+++ b/Examples/test-suite/php/cpp_static_runme.php
@@ -0,0 +1,15 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "cpp_static.php";
+
+// No new functions
+check::functions(array());
+// No new classes
+check::classes(array(StaticMemberTest,StaticFunctionTest));
+// now new vars
+check::globals(array());
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/cpp_static_runme.php4 b/Examples/test-suite/php/cpp_static_runme.php4
deleted file mode 100644
index b7f987505..000000000
--- a/Examples/test-suite/php/cpp_static_runme.php4
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "cpp_static.php";
-
-// No new functions
-check::functions(array());
-// No new classes
-check::classes(array(StaticMemberTest,StaticFunctionTest));
-// now new vars
-check::globals(array());
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/enum_scope_template_runme.php b/Examples/test-suite/php/enum_scope_template_runme.php
new file mode 100644
index 000000000..7cea23911
--- /dev/null
+++ b/Examples/test-suite/php/enum_scope_template_runme.php
@@ -0,0 +1,17 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "enum_scope_template.php";
+
+check::classes(array("enum_scope_template", "TreeInt"));
+check::functions("chops");
+check::equal(0,TreeInt_Oak,"0==TreeInt_Oak");
+check::equal(1,TreeInt_Fir,"0==TreeInt_Fir");
+check::equal(2,TreeInt_Cedar,"0==TreeInt_Cedar");
+check::equal(TreeInt_Oak,chops(TreeInt_Oak),"TreeInt_Oak==chops(TreeInt_Oak)");
+check::equal(TreeInt_Fir,chops(TreeInt_Fir),"TreeInt_Fir==chops(TreeInt_Fir)");
+check::equal(TreeInt_Cedar,chops(TreeInt_Cedar),"TreeInt_Cedar==chops(TreeInt_Cedar)");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/enum_scope_template_runme.php4 b/Examples/test-suite/php/enum_scope_template_runme.php4
deleted file mode 100644
index 40efc5743..000000000
--- a/Examples/test-suite/php/enum_scope_template_runme.php4
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "enum_scope_template.php";
-
-check::classes(array("enum_scope_template", "TreeInt"));
-check::functions("chops");
-check::equal(0,TreeInt_Oak,"0==TreeInt_Oak");
-check::equal(1,TreeInt_Fir,"0==TreeInt_Fir");
-check::equal(2,TreeInt_Cedar,"0==TreeInt_Cedar");
-check::equal(TreeInt_Oak,chops(TreeInt_Oak),"TreeInt_Oak==chops(TreeInt_Oak)");
-check::equal(TreeInt_Fir,chops(TreeInt_Fir),"TreeInt_Fir==chops(TreeInt_Fir)");
-check::equal(TreeInt_Cedar,chops(TreeInt_Cedar),"TreeInt_Cedar==chops(TreeInt_Cedar)");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/evil_diamond_ns_runme.php b/Examples/test-suite/php/evil_diamond_ns_runme.php
new file mode 100644
index 000000000..b76d1443f
--- /dev/null
+++ b/Examples/test-suite/php/evil_diamond_ns_runme.php
@@ -0,0 +1,19 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "evil_diamond_ns.php";
+
+check::classes(array("evil_diamond_ns","foo","bar","baz","spam"));
+check::functions("test");
+check::is_a("bar","foo");
+check::is_a("baz","foo");
+check::is_a("spam","foo");
+check::is_a("spam","bar");
+//No multiple inheritance
+//check::is_a("spam","baz");
+$spam=new spam();
+$_spam=test($spam);
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/evil_diamond_ns_runme.php4 b/Examples/test-suite/php/evil_diamond_ns_runme.php4
deleted file mode 100644
index 29e8cd520..000000000
--- a/Examples/test-suite/php/evil_diamond_ns_runme.php4
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "evil_diamond_ns.php";
-
-check::classes(array("evil_diamond_ns","foo","bar","baz","spam"));
-check::functions("test");
-check::is_a("bar","foo");
-check::is_a("baz","foo");
-check::is_a("spam","foo");
-check::is_a("spam","bar");
-//No multiple inheritance
-//check::is_a("spam","baz");
-$spam=new spam();
-$_spam=test($spam);
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/evil_diamond_prop_runme.php b/Examples/test-suite/php/evil_diamond_prop_runme.php
new file mode 100644
index 000000000..6f66d01c5
--- /dev/null
+++ b/Examples/test-suite/php/evil_diamond_prop_runme.php
@@ -0,0 +1,38 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "evil_diamond_prop.php";
+
+check::classes(array("evil_diamond_prop","foo","bar","baz","spam"));
+check::functions("test");
+check::is_a("bar","foo");
+check::is_a("baz","foo");
+check::is_a("spam","foo");
+check::is_a("spam","bar");
+//No multiple inheritance introspection yet
+//check::is_a("spam","baz");
+
+$foo=new foo();
+check::is_a($foo,"foo");
+check::equal(1,$foo->_foo,"1==foo->_foo");
+
+$bar=new bar();
+check::is_a($bar,"bar");
+check::equal(1,$bar->_foo,"1==bar->_foo");
+check::equal(2,$bar->_bar,"2==bar->_bar");
+
+$baz=new baz();
+check::is_a($baz,"baz");
+check::equal(1,$baz->_foo,"1==baz->_foo");
+check::equal(3,$baz->_baz,"3==baz->_baz");
+
+$spam=new spam();
+check::is_a($spam,"spam");
+check::equal(1,$spam->_foo,"1==spam->_foo");
+check::equal(2,$spam->_bar,"2==spam->_bar");
+check::equal(3,$spam->_baz,"3==spam->_baz");
+check::equal(4,$spam->_spam,"4==spam->_spam");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/evil_diamond_prop_runme.php4 b/Examples/test-suite/php/evil_diamond_prop_runme.php4
deleted file mode 100644
index c0b157fca..000000000
--- a/Examples/test-suite/php/evil_diamond_prop_runme.php4
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "evil_diamond_prop.php";
-
-check::classes(array("evil_diamond_prop","foo","bar","baz","spam"));
-check::functions("test");
-check::is_a("bar","foo");
-check::is_a("baz","foo");
-check::is_a("spam","foo");
-check::is_a("spam","bar");
-//No multiple inheritance introspection yet
-//check::is_a("spam","baz");
-
-$foo=new foo();
-check::is_a($foo,"foo");
-check::equal(1,$foo->_foo,"1==foo->_foo");
-
-$bar=new bar();
-check::is_a($bar,"bar");
-check::equal(1,$bar->_foo,"1==bar->_foo");
-check::equal(2,$bar->_bar,"2==bar->_bar");
-
-$baz=new baz();
-check::is_a($baz,"baz");
-check::equal(1,$baz->_foo,"1==baz->_foo");
-check::equal(3,$baz->_baz,"3==baz->_baz");
-
-$spam=new spam();
-check::is_a($spam,"spam");
-check::equal(1,$spam->_foo,"1==spam->_foo");
-check::equal(2,$spam->_bar,"2==spam->_bar");
-check::equal(3,$spam->_baz,"3==spam->_baz");
-check::equal(4,$spam->_spam,"4==spam->_spam");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/evil_diamond_runme.php b/Examples/test-suite/php/evil_diamond_runme.php
new file mode 100644
index 000000000..a6ef211b1
--- /dev/null
+++ b/Examples/test-suite/php/evil_diamond_runme.php
@@ -0,0 +1,17 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "evil_diamond.php";
+
+check::classes(array("evil_diamond","foo","bar","baz","spam"));
+check::functions("test");
+check::is_a("bar","foo");
+check::is_a("baz","foo");
+check::is_a("spam","foo");
+check::is_a("spam","bar");
+//No multiple inheritance
+//check::is_a("spam","baz");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/evil_diamond_runme.php4 b/Examples/test-suite/php/evil_diamond_runme.php4
deleted file mode 100644
index 677813bfa..000000000
--- a/Examples/test-suite/php/evil_diamond_runme.php4
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "evil_diamond.php";
-
-check::classes(array("evil_diamond","foo","bar","baz","spam"));
-check::functions("test");
-check::is_a("bar","foo");
-check::is_a("baz","foo");
-check::is_a("spam","foo");
-check::is_a("spam","bar");
-//No multiple inheritance
-//check::is_a("spam","baz");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/extend_template_ns_runme.php b/Examples/test-suite/php/extend_template_ns_runme.php
new file mode 100644
index 000000000..604e0470e
--- /dev/null
+++ b/Examples/test-suite/php/extend_template_ns_runme.php
@@ -0,0 +1,13 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "extend_template_ns.php";
+
+check::classes(array("extend_template_ns","Foo_One"));
+$foo=new Foo_One();
+check::equal(2,$foo->test1(2),"test1");
+check::equal(3,$foo->test2(3),"test2");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/extend_template_ns_runme.php4 b/Examples/test-suite/php/extend_template_ns_runme.php4
deleted file mode 100644
index 16a6434bf..000000000
--- a/Examples/test-suite/php/extend_template_ns_runme.php4
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "extend_template_ns.php";
-
-check::classes(array("extend_template_ns","Foo_One"));
-$foo=new Foo_One();
-check::equal(2,$foo->test1(2),"test1");
-check::equal(3,$foo->test2(3),"test2");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/extend_template_runme.php b/Examples/test-suite/php/extend_template_runme.php
new file mode 100644
index 000000000..bf77e9b1c
--- /dev/null
+++ b/Examples/test-suite/php/extend_template_runme.php
@@ -0,0 +1,13 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "extend_template.php";
+
+check::classes(array("Foo_0"));
+$foo=new Foo_0();
+check::equal(2,$foo->test1(2),"test1");
+check::equal(3,$foo->test2(3),"test2");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/extend_template_runme.php4 b/Examples/test-suite/php/extend_template_runme.php4
deleted file mode 100644
index c12f330a5..000000000
--- a/Examples/test-suite/php/extend_template_runme.php4
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "extend_template.php";
-
-check::classes(array("Foo_0"));
-$foo=new Foo_0();
-check::equal(2,$foo->test1(2),"test1");
-check::equal(3,$foo->test2(3),"test2");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/grouping_runme.php b/Examples/test-suite/php/grouping_runme.php
new file mode 100644
index 000000000..8a2a88fa9
--- /dev/null
+++ b/Examples/test-suite/php/grouping_runme.php
@@ -0,0 +1,23 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "grouping.php";
+
+check::functions(array("test1","test2","do_unary","negate"));
+check::equal(5,test1(5),"5==test1(5)");
+check::resource(test2(7),"_p_int","_p_int==test2(7)");
+check::globals(array(test3));
+
+//check::equal(37,test3_get(),'37==test3_get()');
+check::equal(37,check::get("test3"),'37==get(test3)');
+//test3_set(38);
+check::set(test3,38); 
+//check::equal(38,test3_get(),'38==test3_get() after test3_set(37)');
+check::equal(38,check::get(test3),'38==get(test3) after set(test)');
+
+check::equal(-5,negate(5),"-5==negate(5)");
+check::equal(7,do_unary(-7,NEGATE),"7=do_unary(-7,NEGATE)");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/grouping_runme.php4 b/Examples/test-suite/php/grouping_runme.php4
deleted file mode 100644
index 45e321fd3..000000000
--- a/Examples/test-suite/php/grouping_runme.php4
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "grouping.php";
-
-check::functions(array("test1","test2","do_unary","negate"));
-check::equal(5,test1(5),"5==test1(5)");
-check::resource(test2(7),"_p_int","_p_int==test2(7)");
-check::globals(array(test3));
-
-//check::equal(37,test3_get(),'37==test3_get()');
-check::equal(37,check::get("test3"),'37==get(test3)');
-//test3_set(38);
-check::set(test3,38); 
-//check::equal(38,test3_get(),'38==test3_get() after test3_set(37)');
-check::equal(38,check::get(test3),'38==get(test3) after set(test)');
-
-check::equal(-5,negate(5),"-5==negate(5)");
-check::equal(7,do_unary(-7,NEGATE),"7=do_unary(-7,NEGATE)");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/ignore_parameter_runme.php b/Examples/test-suite/php/ignore_parameter_runme.php
new file mode 100644
index 000000000..745720c3c
--- /dev/null
+++ b/Examples/test-suite/php/ignore_parameter_runme.php
@@ -0,0 +1,39 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "ignore_parameter.php";
+
+// No new functions
+check::functions(array(jaguar,lotus,tvr,ferrari));
+// No new classes
+check::classes(array(sportscars,minicooper,morrisminor,fordanglia,austinallegro));
+// now new vars
+check::globals(array());
+
+check::equal(jaguar(2,3.4),"hello",'jaguar(2,3.4)=="hello"');
+check::equal(lotus("eek",3.4),101,'lotus("eek",3.4)==101');
+check::equal(tvr("eek",2),8.8,'tvr("eek",2)==8.8');
+check::equal(ferrari(),101,'ferrari(2)==101');
+
+$sc=new sportscars();
+check::classname("sportscars",$sc);
+check::equal($sc->daimler(2,3.4),"hello",'$sc->daimler(2,3.4)=="hello"');
+check::equal($sc->astonmartin("eek",3.4),101,'$sc->mastonmartin("eek",3.4)==101');
+check::equal($sc->bugatti("eek",2),8.8,'$sc->bugatti("eek",2)==8.8');
+check::equal($sc->lamborghini(),101,'$sc->lamborghini(2)==101');
+
+$mc=new minicooper(2,3.4);
+check::classname("minicooper",$mc);
+
+$mm=new morrisminor("eek",3.4);
+check::classname("morrisminor",$mm);
+
+$fa=new fordanglia("eek",2);
+check::classname("fordanglia",$fa);
+
+$aa=new austinallegro();
+check::classname("austinallegro",$aa);
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/ignore_parameter_runme.php4 b/Examples/test-suite/php/ignore_parameter_runme.php4
deleted file mode 100644
index 8a2bf899e..000000000
--- a/Examples/test-suite/php/ignore_parameter_runme.php4
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "ignore_parameter.php";
-
-// No new functions
-check::functions(array(jaguar,lotus,tvr,ferrari));
-// No new classes
-check::classes(array(sportscars,minicooper,morrisminor,fordanglia,austinallegro));
-// now new vars
-check::globals(array());
-
-check::equal(jaguar(2,3.4),"hello",'jaguar(2,3.4)=="hello"');
-check::equal(lotus("eek",3.4),101,'lotus("eek",3.4)==101');
-check::equal(tvr("eek",2),8.8,'tvr("eek",2)==8.8');
-check::equal(ferrari(),101,'ferrari(2)==101');
-
-$sc=new sportscars();
-check::classname("sportscars",$sc);
-check::equal($sc->daimler(2,3.4),"hello",'$sc->daimler(2,3.4)=="hello"');
-check::equal($sc->astonmartin("eek",3.4),101,'$sc->mastonmartin("eek",3.4)==101');
-check::equal($sc->bugatti("eek",2),8.8,'$sc->bugatti("eek",2)==8.8');
-check::equal($sc->lamborghini(),101,'$sc->lamborghini(2)==101');
-
-$mc=new minicooper(2,3.4);
-check::classname("minicooper",$mc);
-
-$mm=new morrisminor("eek",3.4);
-check::classname("morrisminor",$mm);
-
-$fa=new fordanglia("eek",2);
-check::classname("fordanglia",$fa);
-
-$aa=new austinallegro();
-check::classname("austinallegro",$aa);
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/li_carrays_runme.php b/Examples/test-suite/php/li_carrays_runme.php
new file mode 100644
index 000000000..babf8443b
--- /dev/null
+++ b/Examples/test-suite/php/li_carrays_runme.php
@@ -0,0 +1,15 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "li_carrays.php";
+
+// No new functions
+check::functions(array(new_intarray,delete_intarray,intarray_getitem,intarray_setitem));
+// No new classes
+check::classes(array(doubleArray));
+// now new vars
+check::globals(array());
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/li_carrays_runme.php4 b/Examples/test-suite/php/li_carrays_runme.php4
deleted file mode 100644
index b0b93dafe..000000000
--- a/Examples/test-suite/php/li_carrays_runme.php4
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "li_carrays.php";
-
-// No new functions
-check::functions(array(new_intarray,delete_intarray,intarray_getitem,intarray_setitem));
-// No new classes
-check::classes(array(doubleArray));
-// now new vars
-check::globals(array());
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/li_std_string_runme.php b/Examples/test-suite/php/li_std_string_runme.php
new file mode 100644
index 000000000..c7270df3d
--- /dev/null
+++ b/Examples/test-suite/php/li_std_string_runme.php
@@ -0,0 +1,32 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "li_std_string.php";
+
+// Global variables
+//$s="initial string";
+//check::equal(GlobalString2_get() ,"global string 2", "GlobalString2 test 1");
+
+// Global variables
+$s = "initial string";
+check::equal(GlobalString2_get(), "global string 2", "GlobalString2 test 1");
+GlobalString2_set($s);
+check::equal(GlobalString2_get(), $s, "GlobalString2 test 2");
+check::equal(ConstGlobalString_get(), "const global string", "ConstGlobalString test");
+
+// Member variables
+$myStructure = new Structure();
+check::equal($myStructure->MemberString2, "member string 2", "MemberString2 test 1");
+$myStructure->MemberString2 = $s;
+check::equal($myStructure->MemberString2, $s, "MemberString2 test 2");
+check::equal($myStructure->ConstMemberString, "const member string", "ConstMemberString test");
+
+check::equal(Structure::StaticMemberString2(), "static member string 2", "StaticMemberString2 test 1");
+Structure::StaticMemberString2($s);
+check::equal(Structure::StaticMemberString2(), $s, "StaticMemberString2 test 2");
+// below broken ?
+//check::equal(Structure::ConstStaticMemberString(), "const static member string", "ConstStaticMemberString test");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/li_std_string_runme.php4 b/Examples/test-suite/php/li_std_string_runme.php4
deleted file mode 100644
index fb3da3598..000000000
--- a/Examples/test-suite/php/li_std_string_runme.php4
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "li_std_string.php";
-
-// Global variables
-//$s="initial string";
-//check::equal(GlobalString2_get() ,"global string 2", "GlobalString2 test 1");
-
-// Global variables
-$s = "initial string";
-check::equal(GlobalString2_get(), "global string 2", "GlobalString2 test 1");
-GlobalString2_set($s);
-check::equal(GlobalString2_get(), $s, "GlobalString2 test 2");
-check::equal(ConstGlobalString_get(), "const global string", "ConstGlobalString test");
-
-// Member variables
-$myStructure = new Structure();
-check::equal($myStructure->MemberString2, "member string 2", "MemberString2 test 1");
-$myStructure->MemberString2 = $s;
-check::equal($myStructure->MemberString2, $s, "MemberString2 test 2");
-check::equal($myStructure->ConstMemberString, "const member string", "ConstMemberString test");
-
-check::equal(Structure::StaticMemberString2(), "static member string 2", "StaticMemberString2 test 1");
-Structure::StaticMemberString2($s);
-check::equal(Structure::StaticMemberString2(), $s, "StaticMemberString2 test 2");
-// below broken ?
-//check::equal(Structure::ConstStaticMemberString(), "const static member string", "ConstStaticMemberString test");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/rename_scope_runme.php b/Examples/test-suite/php/rename_scope_runme.php
new file mode 100644
index 000000000..33925a6db
--- /dev/null
+++ b/Examples/test-suite/php/rename_scope_runme.php
@@ -0,0 +1,17 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "rename_scope.php";
+
+check::classes(array("rename_scope","Interface_UP","Interface_BP","Natural_UP","Natural_BP","Bucket"));
+
+check::classmethods("Interface_UP",array("interface_up"));
+check::classmethods("Interface_BP",array("interface_bp"));
+check::classmethods("Natural_UP",array("interface_up","natural_up","rtest"));
+check::classmethods("Natural_BP",array("interface_bp","natural_bp","rtest"));
+check::classparent("Natural_UP","interface_up");
+check::classparent("Natural_BP","interface_bp");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/rename_scope_runme.php4 b/Examples/test-suite/php/rename_scope_runme.php4
deleted file mode 100644
index ad86321d3..000000000
--- a/Examples/test-suite/php/rename_scope_runme.php4
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "rename_scope.php";
-
-check::classes(array("rename_scope","Interface_UP","Interface_BP","Natural_UP","Natural_BP","Bucket"));
-
-check::classmethods("Interface_UP",array("interface_up"));
-check::classmethods("Interface_BP",array("interface_bp"));
-check::classmethods("Natural_UP",array("interface_up","natural_up","rtest"));
-check::classmethods("Natural_BP",array("interface_bp","natural_bp","rtest"));
-check::classparent("Natural_UP","interface_up");
-check::classparent("Natural_BP","interface_bp");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/skel.php b/Examples/test-suite/php/skel.php
new file mode 100644
index 000000000..780a999ed
--- /dev/null
+++ b/Examples/test-suite/php/skel.php
@@ -0,0 +1,15 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "____.php";
+
+// No new functions
+check::functions(array());
+// No new classes
+check::classes(array());
+// now new vars
+check::globals(array());
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/skel.php4 b/Examples/test-suite/php/skel.php4
deleted file mode 100644
index d6f33758d..000000000
--- a/Examples/test-suite/php/skel.php4
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "____.php";
-
-// No new functions
-check::functions(array());
-// No new classes
-check::classes(array());
-// now new vars
-check::globals(array());
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/smart_pointer_rename_runme.php b/Examples/test-suite/php/smart_pointer_rename_runme.php
new file mode 100644
index 000000000..a1759cb95
--- /dev/null
+++ b/Examples/test-suite/php/smart_pointer_rename_runme.php
@@ -0,0 +1,28 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "smart_pointer_rename.php";
+
+check::classes(array("Foo","Bar"));
+check::classmethods("foo",array("foo","ftest1","ftest2"));
+check::classmethods("bar",array("__deref__","bar","test","ftest1","ftest2"));
+$foo=new foo();
+check::classname("foo",$foo);
+$bar=new bar($foo);
+check::classname("bar",$bar);
+
+# check foo's ftest1, ftest2
+check::equal(1,$foo->ftest1(1),"foo->ftest1");
+check::equal(2,$foo->ftest2(1,2),"foo->ftest2");
+
+# check bar's ftest1, ftest2, ftest
+check::equal(1,$bar->ftest1(1),"bar->ftest1");
+check::equal(2,$bar->ftest2(1,2),"bar->ftest2");
+check::equal(3,$bar->test(),"bar->test");
+
+# check deref returns foo
+check::classname("foo",$bar->__deref__());
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/smart_pointer_rename_runme.php4 b/Examples/test-suite/php/smart_pointer_rename_runme.php4
deleted file mode 100644
index 5f21b6dda..000000000
--- a/Examples/test-suite/php/smart_pointer_rename_runme.php4
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "smart_pointer_rename.php";
-
-check::classes(array("Foo","Bar"));
-check::classmethods("foo",array("foo","ftest1","ftest2"));
-check::classmethods("bar",array("__deref__","bar","test","ftest1","ftest2"));
-$foo=new foo();
-check::classname("foo",$foo);
-$bar=new bar($foo);
-check::classname("bar",$bar);
-
-# check foo's ftest1, ftest2
-check::equal(1,$foo->ftest1(1),"foo->ftest1");
-check::equal(2,$foo->ftest2(1,2),"foo->ftest2");
-
-# check bar's ftest1, ftest2, ftest
-check::equal(1,$bar->ftest1(1),"bar->ftest1");
-check::equal(2,$bar->ftest2(1,2),"bar->ftest2");
-check::equal(3,$bar->test(),"bar->test");
-
-# check deref returns foo
-check::classname("foo",$bar->__deref__());
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/sym_runme.php b/Examples/test-suite/php/sym_runme.php
new file mode 100644
index 000000000..a6d2a6c74
--- /dev/null
+++ b/Examples/test-suite/php/sym_runme.php
@@ -0,0 +1,23 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "sym.php";
+
+// No new functions
+check::functions(array());
+// No new classes
+check::classes(array(flim,flam));
+// now new vars
+check::globals(array());
+
+$flim=new flim();
+$flam=new flam();
+
+check::equal($flim->hulahoops(),"flim-jam","flim()->hulahoops==flim-jam");
+check::equal($flim->jar(),"flim-jar","flim()->jar==flim-jar");
+check::equal($flam->jam(),"flam-jam","flam()->jam==flam-jam");
+check::equal($flam->jar(),"flam-jar","flam()->jar==flam-jar");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/sym_runme.php4 b/Examples/test-suite/php/sym_runme.php4
deleted file mode 100644
index ce89ea4b2..000000000
--- a/Examples/test-suite/php/sym_runme.php4
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "sym.php";
-
-// No new functions
-check::functions(array());
-// No new classes
-check::classes(array(flim,flam));
-// now new vars
-check::globals(array());
-
-$flim=new flim();
-$flam=new flam();
-
-check::equal($flim->hulahoops(),"flim-jam","flim()->hulahoops==flim-jam");
-check::equal($flim->jar(),"flim-jar","flim()->jar==flim-jar");
-check::equal($flam->jam(),"flam-jam","flam()->jam==flam-jam");
-check::equal($flam->jar(),"flam-jar","flam()->jar==flam-jar");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/template_arg_typename_runme.php b/Examples/test-suite/php/template_arg_typename_runme.php
new file mode 100644
index 000000000..58835eafe
--- /dev/null
+++ b/Examples/test-suite/php/template_arg_typename_runme.php
@@ -0,0 +1,19 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "template_arg_typename.php";
+
+// No new functions
+check::functions(array());
+// No new classes
+check::classes(array(UnaryFunction_bool_bool,BoolUnaryFunction_bool));
+$ufbb=new unaryfunction_bool_bool();
+check::is_a($ufbb,"unaryfunction_bool_bool");
+
+unset($whatisthis);
+$bufb=new boolunaryfunction_bool(&$whatisthis);
+check::is_a($bufb,"boolunaryfunction_bool");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/template_arg_typename_runme.php4 b/Examples/test-suite/php/template_arg_typename_runme.php4
deleted file mode 100644
index 7062c674e..000000000
--- a/Examples/test-suite/php/template_arg_typename_runme.php4
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "template_arg_typename.php";
-
-// No new functions
-check::functions(array());
-// No new classes
-check::classes(array(UnaryFunction_bool_bool,BoolUnaryFunction_bool));
-$ufbb=new unaryfunction_bool_bool();
-check::is_a($ufbb,"unaryfunction_bool_bool");
-
-unset($whatisthis);
-$bufb=new boolunaryfunction_bool(&$whatisthis);
-check::is_a($bufb,"boolunaryfunction_bool");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/template_construct_runme.php b/Examples/test-suite/php/template_construct_runme.php
new file mode 100644
index 000000000..3a3986f7e
--- /dev/null
+++ b/Examples/test-suite/php/template_construct_runme.php
@@ -0,0 +1,11 @@
+<?php
+
+require "tests.php";
+require "template_construct.php";
+
+check::classes(array(Foo_int));
+$foo_int=new foo_int(3);
+check::is_a($foo_int,"foo_int","Made a foo_int");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/template_construct_runme.php4 b/Examples/test-suite/php/template_construct_runme.php4
deleted file mode 100644
index d0fbc9bb7..000000000
--- a/Examples/test-suite/php/template_construct_runme.php4
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-require "tests.php4";
-require "template_construct.php";
-
-check::classes(array(Foo_int));
-$foo_int=new foo_int(3);
-check::is_a($foo_int,"foo_int","Made a foo_int");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/tests.php b/Examples/test-suite/php/tests.php
new file mode 100644
index 000000000..36e9f4163
--- /dev/null
+++ b/Examples/test-suite/php/tests.php
@@ -0,0 +1,227 @@
+<?php
+
+// do we have true global vars or just GETSET functions?
+// Used to filter out get/set global functions to fake vars...
+define(GETSET,1);
+
+$_original_functions=get_defined_functions();
+$_original_globals=1;
+$_original_classes=get_declared_classes();
+$_original_globals=array_keys($GLOBALS);
+
+class check {
+  function get_extra_classes($ref=FALSE) {
+    static $extra;
+    global $_original_classes;
+    if ($ref===FALSE) $f=$_original_classes;
+    if (! is_array($extra)) {
+      $df=array_flip(get_declared_classes());
+      foreach($_original_classes as $class) unset($df[$class]);
+      $extra=array_keys($df);
+    }
+    return $extra;
+  }
+
+  function get_extra_functions($ref=FALSE,$gs=false) {
+    static $extra;
+    static $extrags; // for get/setters
+    global $_original_functions;
+    if ($ref===FALSE) $f=$_original_functions;
+    if (! is_array($extra) || $gs) {
+      $extra=array();
+      $extrags=array();
+      $df=get_defined_functions();
+      $df=array_flip($df[internal]);
+      foreach($_original_functions[internal] as $func) unset($df[$func]);
+      // Now chop out any get/set accessors
+      foreach(array_keys($df) as $func) if (GETSET && ereg('_[gs]et$',$func)) $extrags[]=$func;
+      else $extra[]=$func;
+//      $extra=array_keys($df);
+    }
+    if ($gs) return $extrags;
+    return $extra;
+  }
+
+  function get_extra_globals($ref=FALSE) {
+    static $extra;
+    global $_original_globals;
+    if (! is_array($extra)) {
+      if (GETSET) {
+        $_extra=array();
+        foreach(check::get_extra_functions(false,1) as $global) {
+          if (ereg('^(.*)_[sg]et$',$global,$match)) $_extra[$match[1]]=1;
+        }
+        $extra=array_keys($_extra);
+      } else {
+        if ($ref===FALSE) $ref=$_original_globals;
+        if (! is_array($extra)) {
+          $df=array_flip(array_keys($GLOBALS));
+          foreach($_original_globals as $func) unset($df[$func]);
+          // MASK xxxx_LOADED__ variables
+          foreach(array_keys($df) as $func) if (ereg('_LOADED__$',$func)) unset($df[$func]);
+          $extra=array_keys($df);
+        }
+      }
+    }
+    return $extra;
+  }
+
+  function classname($string,$object) {
+    if (strtolower($string)!=strtolower($classname=get_class($object))) return check::fail("Object: \$object is of class %s not class %s",$classname,$string);
+    return TRUE;
+  }
+
+  function classmethods($classname,$methods) {
+    if (is_object($classname)) $classname=get_class($classname);
+    $classmethods=array_flip(get_class_methods($classname));
+    $missing=array();
+    $extra=array();
+    foreach($methods as $method) {
+      if (! isset($classmethods[$method])) $missing[]=$method;
+      else unset($classmethods[$method]);
+    }
+    $extra=array_keys($classmethods);
+    if ($missing) $message[]="does not have these methods:\n  ".join(",",$missing);
+    if ($message) {
+      return check::fail("Class %s %s\nFull class list:\n  %s\n",$classname,join("\nbut ",$message),join("\n  ",get_class_methods($classname)));
+    }
+    if ($extra) $message[]="Class ".$classname." has these extra methods:\n  ".join(",",$extra);
+    if ($message) return check::warn(join("\n  ",$message));
+    return TRUE;
+  }
+
+  function set($var,$value) {
+    $func=$var."_set";
+    if (GETSET) $func($value);
+    else $_GLOBALS[$var]=$value;
+  }
+
+  function &get($var) {
+    $func=$var."_get";
+    if (GETSET) return $func();
+    else return $_GLOBALS[$var];
+  }
+
+  function is_a($a,$b) {
+    if (is_object($a)) $a=strtolower(get_class($a));
+    if (is_object($b)) $a=strtolower(get_class($b));
+    $parents=array();
+    $c=$a;
+    while($c!=$b && $c) {
+      $parents[]=$c;
+      $c=strtolower(get_parent_class($c));
+    }
+    if ($c!=$b) return check::fail("Class $a does not inherit from class $b\nHierachy:\n  %s\n",join("\n  ",$parents));
+    return TRUE;
+  }
+
+  function classparent($a,$b) {
+    if (is_object($a)) $a=get_class($a);
+    if (is_object($b)) $a=get_class($b);
+    $parent=get_parent_class($a);
+
+    if ($parent!=$b) return check::fail("Class $a parent not actually $b but $parent");
+    return TRUE;
+  }
+
+  function classes($classes) {
+    if (! is_array($classes)) $classes=array($classes);
+    $message=array();
+    $missing=array();
+    $extra=array_flip(check::get_extra_classes());
+    foreach($classes as $class) {
+      if (! class_exists($class)) $missing[]=$class;
+      else unset($extra[$class]);
+    }
+    if ($missing) $message[]=sprintf("Classes missing: %s",join(",",$missing));
+    if ($message) return check::fail(join("\n  ",$message));
+    if ($extra) $message[]=sprintf("These extra classes are defined: %s",join(",",array_keys($extra)));
+    if ($message) return check::warn(join("\n  ",$message));
+    return TRUE;    
+  }
+
+  function functions($functions) {
+    if (! is_array($functions)) $functions=array($functions);
+    $message=array();
+    $missing=array();
+    $extra=array_flip(check::get_extra_functions());
+
+    foreach ($functions as $func) {
+      if (! function_exists($func)) $missing[]=$func;
+      else unset($extra[$func]);
+    }
+    if ($missing) $message[]=sprintf("Functions missing: %s",join(",",$missing));
+    if ($message) return check::fail(join("\n  ",$message));
+    if ($extra) $message[]=sprintf("These extra functions are defined: %s",join(",",array_keys($extra)));
+    if ($message) return check::warn(join("\n  ",$message));
+    return TRUE;    
+  }
+
+  function globals($globals) {
+    if (! is_array($globals)) $globals=array($globals);
+    $message=array();
+    $missing=array();
+    $extra=array_flip(check::get_extra_globals());
+    foreach ($globals as $glob) {
+      if (GETSET) {
+        if (! isset($extra[$glob])) $missing[]=$glob;
+        else unset($extra[$glob]);
+      } else {
+        if (! isset($GLOBALS[$glob])) $missing[]=$glob;
+        else unset($extra[$glob]);
+      }
+    }
+    if ($missing) $message[]=sprintf("Globals missing: %s",join(",",$missing));
+    if ($message) return check::fail(join("\n  ",$message));
+    if ($extra) $message[]=sprintf("These extra globals are defined: %s",join(",",array_keys($extra)));
+    if ($message) return check::warn(join("\n  ",$message));
+    return TRUE;    
+
+  }
+
+  function functionref($a,$type,$message) {
+    if (! eregi("^_[a-f0-9]+$type$",$a)) return check::fail($message);
+    return TRUE;
+  }
+
+  function equal($a,$b,$message) {
+    if (! ($a===$b)) return check::fail($message);
+    return TRUE;
+  }
+
+  function resource($a,$b,$message) {
+    $resource=trim(check::var_dump($a));
+    if (! eregi("^resource\([0-9]+\) of type \($b\)",$resource)) return check::fail($message);
+    return TRUE;
+  }
+
+  function isnull($a,$message) {
+    $value=trim(check::var_dump($a));
+    return check::equal($value,"NULL",$message);
+  }
+
+  function var_dump($arg) {
+    ob_start();
+    var_dump($arg);
+    $result=ob_get_contents();
+    ob_end_clean();
+    return $result;
+  }
+
+  function fail($pattern) {
+    $args=func_get_args();
+    print("Failed on: ".call_user_func_array("sprintf",$args)."\n");
+    exit(1);
+  }
+
+  function warn($pattern) {
+    $args=func_get_args();
+    print("Warning on: ".call_user_func_array("sprintf",$args)."\n");
+    return FALSE;
+  }
+
+  function done() {
+#    print $_SERVER[argv][0]." ok\n";
+  }
+}
+?>
diff --git a/Examples/test-suite/php/tests.php4 b/Examples/test-suite/php/tests.php4
deleted file mode 100644
index 36e9f4163..000000000
--- a/Examples/test-suite/php/tests.php4
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-
-// do we have true global vars or just GETSET functions?
-// Used to filter out get/set global functions to fake vars...
-define(GETSET,1);
-
-$_original_functions=get_defined_functions();
-$_original_globals=1;
-$_original_classes=get_declared_classes();
-$_original_globals=array_keys($GLOBALS);
-
-class check {
-  function get_extra_classes($ref=FALSE) {
-    static $extra;
-    global $_original_classes;
-    if ($ref===FALSE) $f=$_original_classes;
-    if (! is_array($extra)) {
-      $df=array_flip(get_declared_classes());
-      foreach($_original_classes as $class) unset($df[$class]);
-      $extra=array_keys($df);
-    }
-    return $extra;
-  }
-
-  function get_extra_functions($ref=FALSE,$gs=false) {
-    static $extra;
-    static $extrags; // for get/setters
-    global $_original_functions;
-    if ($ref===FALSE) $f=$_original_functions;
-    if (! is_array($extra) || $gs) {
-      $extra=array();
-      $extrags=array();
-      $df=get_defined_functions();
-      $df=array_flip($df[internal]);
-      foreach($_original_functions[internal] as $func) unset($df[$func]);
-      // Now chop out any get/set accessors
-      foreach(array_keys($df) as $func) if (GETSET && ereg('_[gs]et$',$func)) $extrags[]=$func;
-      else $extra[]=$func;
-//      $extra=array_keys($df);
-    }
-    if ($gs) return $extrags;
-    return $extra;
-  }
-
-  function get_extra_globals($ref=FALSE) {
-    static $extra;
-    global $_original_globals;
-    if (! is_array($extra)) {
-      if (GETSET) {
-        $_extra=array();
-        foreach(check::get_extra_functions(false,1) as $global) {
-          if (ereg('^(.*)_[sg]et$',$global,$match)) $_extra[$match[1]]=1;
-        }
-        $extra=array_keys($_extra);
-      } else {
-        if ($ref===FALSE) $ref=$_original_globals;
-        if (! is_array($extra)) {
-          $df=array_flip(array_keys($GLOBALS));
-          foreach($_original_globals as $func) unset($df[$func]);
-          // MASK xxxx_LOADED__ variables
-          foreach(array_keys($df) as $func) if (ereg('_LOADED__$',$func)) unset($df[$func]);
-          $extra=array_keys($df);
-        }
-      }
-    }
-    return $extra;
-  }
-
-  function classname($string,$object) {
-    if (strtolower($string)!=strtolower($classname=get_class($object))) return check::fail("Object: \$object is of class %s not class %s",$classname,$string);
-    return TRUE;
-  }
-
-  function classmethods($classname,$methods) {
-    if (is_object($classname)) $classname=get_class($classname);
-    $classmethods=array_flip(get_class_methods($classname));
-    $missing=array();
-    $extra=array();
-    foreach($methods as $method) {
-      if (! isset($classmethods[$method])) $missing[]=$method;
-      else unset($classmethods[$method]);
-    }
-    $extra=array_keys($classmethods);
-    if ($missing) $message[]="does not have these methods:\n  ".join(",",$missing);
-    if ($message) {
-      return check::fail("Class %s %s\nFull class list:\n  %s\n",$classname,join("\nbut ",$message),join("\n  ",get_class_methods($classname)));
-    }
-    if ($extra) $message[]="Class ".$classname." has these extra methods:\n  ".join(",",$extra);
-    if ($message) return check::warn(join("\n  ",$message));
-    return TRUE;
-  }
-
-  function set($var,$value) {
-    $func=$var."_set";
-    if (GETSET) $func($value);
-    else $_GLOBALS[$var]=$value;
-  }
-
-  function &get($var) {
-    $func=$var."_get";
-    if (GETSET) return $func();
-    else return $_GLOBALS[$var];
-  }
-
-  function is_a($a,$b) {
-    if (is_object($a)) $a=strtolower(get_class($a));
-    if (is_object($b)) $a=strtolower(get_class($b));
-    $parents=array();
-    $c=$a;
-    while($c!=$b && $c) {
-      $parents[]=$c;
-      $c=strtolower(get_parent_class($c));
-    }
-    if ($c!=$b) return check::fail("Class $a does not inherit from class $b\nHierachy:\n  %s\n",join("\n  ",$parents));
-    return TRUE;
-  }
-
-  function classparent($a,$b) {
-    if (is_object($a)) $a=get_class($a);
-    if (is_object($b)) $a=get_class($b);
-    $parent=get_parent_class($a);
-
-    if ($parent!=$b) return check::fail("Class $a parent not actually $b but $parent");
-    return TRUE;
-  }
-
-  function classes($classes) {
-    if (! is_array($classes)) $classes=array($classes);
-    $message=array();
-    $missing=array();
-    $extra=array_flip(check::get_extra_classes());
-    foreach($classes as $class) {
-      if (! class_exists($class)) $missing[]=$class;
-      else unset($extra[$class]);
-    }
-    if ($missing) $message[]=sprintf("Classes missing: %s",join(",",$missing));
-    if ($message) return check::fail(join("\n  ",$message));
-    if ($extra) $message[]=sprintf("These extra classes are defined: %s",join(",",array_keys($extra)));
-    if ($message) return check::warn(join("\n  ",$message));
-    return TRUE;    
-  }
-
-  function functions($functions) {
-    if (! is_array($functions)) $functions=array($functions);
-    $message=array();
-    $missing=array();
-    $extra=array_flip(check::get_extra_functions());
-
-    foreach ($functions as $func) {
-      if (! function_exists($func)) $missing[]=$func;
-      else unset($extra[$func]);
-    }
-    if ($missing) $message[]=sprintf("Functions missing: %s",join(",",$missing));
-    if ($message) return check::fail(join("\n  ",$message));
-    if ($extra) $message[]=sprintf("These extra functions are defined: %s",join(",",array_keys($extra)));
-    if ($message) return check::warn(join("\n  ",$message));
-    return TRUE;    
-  }
-
-  function globals($globals) {
-    if (! is_array($globals)) $globals=array($globals);
-    $message=array();
-    $missing=array();
-    $extra=array_flip(check::get_extra_globals());
-    foreach ($globals as $glob) {
-      if (GETSET) {
-        if (! isset($extra[$glob])) $missing[]=$glob;
-        else unset($extra[$glob]);
-      } else {
-        if (! isset($GLOBALS[$glob])) $missing[]=$glob;
-        else unset($extra[$glob]);
-      }
-    }
-    if ($missing) $message[]=sprintf("Globals missing: %s",join(",",$missing));
-    if ($message) return check::fail(join("\n  ",$message));
-    if ($extra) $message[]=sprintf("These extra globals are defined: %s",join(",",array_keys($extra)));
-    if ($message) return check::warn(join("\n  ",$message));
-    return TRUE;    
-
-  }
-
-  function functionref($a,$type,$message) {
-    if (! eregi("^_[a-f0-9]+$type$",$a)) return check::fail($message);
-    return TRUE;
-  }
-
-  function equal($a,$b,$message) {
-    if (! ($a===$b)) return check::fail($message);
-    return TRUE;
-  }
-
-  function resource($a,$b,$message) {
-    $resource=trim(check::var_dump($a));
-    if (! eregi("^resource\([0-9]+\) of type \($b\)",$resource)) return check::fail($message);
-    return TRUE;
-  }
-
-  function isnull($a,$message) {
-    $value=trim(check::var_dump($a));
-    return check::equal($value,"NULL",$message);
-  }
-
-  function var_dump($arg) {
-    ob_start();
-    var_dump($arg);
-    $result=ob_get_contents();
-    ob_end_clean();
-    return $result;
-  }
-
-  function fail($pattern) {
-    $args=func_get_args();
-    print("Failed on: ".call_user_func_array("sprintf",$args)."\n");
-    exit(1);
-  }
-
-  function warn($pattern) {
-    $args=func_get_args();
-    print("Warning on: ".call_user_func_array("sprintf",$args)."\n");
-    return FALSE;
-  }
-
-  function done() {
-#    print $_SERVER[argv][0]." ok\n";
-  }
-}
-?>
diff --git a/Examples/test-suite/php/typedef_reference_runme.php b/Examples/test-suite/php/typedef_reference_runme.php
new file mode 100644
index 000000000..88a70f8d3
--- /dev/null
+++ b/Examples/test-suite/php/typedef_reference_runme.php
@@ -0,0 +1,13 @@
+<?php
+
+require "tests.php";
+require "typedef_reference.php";
+
+check::functions(array(somefunc,otherfunc,new_intp,copy_intp,delete_intp,intp_assign,intp_value));
+$int2=copy_intp(2);
+check::equal(2,somefunc($int2)," test passing intp to somefunc");
+$int3=copy_intp(3);
+check::equal(3,otherfunc($int3)," test passing intp to otherfunc");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/typedef_reference_runme.php4 b/Examples/test-suite/php/typedef_reference_runme.php4
deleted file mode 100644
index 2c64efce6..000000000
--- a/Examples/test-suite/php/typedef_reference_runme.php4
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-require "tests.php4";
-require "typedef_reference.php";
-
-check::functions(array(somefunc,otherfunc,new_intp,copy_intp,delete_intp,intp_assign,intp_value));
-$int2=copy_intp(2);
-check::equal(2,somefunc($int2)," test passing intp to somefunc");
-$int3=copy_intp(3);
-check::equal(3,otherfunc($int3)," test passing intp to otherfunc");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/typemap_ns_using_runme.php b/Examples/test-suite/php/typemap_ns_using_runme.php
new file mode 100644
index 000000000..6a599f008
--- /dev/null
+++ b/Examples/test-suite/php/typemap_ns_using_runme.php
@@ -0,0 +1,9 @@
+<?php
+
+require "tests.php";
+require "typemap_ns_using.php";
+if (! class_exists("_fooimpl")) die("_fooimpl class not found\n");
+if (! 3==spam(3)) die("spam function not working right\n");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/typemap_ns_using_runme.php4 b/Examples/test-suite/php/typemap_ns_using_runme.php4
deleted file mode 100644
index 44403d138..000000000
--- a/Examples/test-suite/php/typemap_ns_using_runme.php4
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-require "tests.php4";
-require "typemap_ns_using.php";
-if (! class_exists("_fooimpl")) die("_fooimpl class not found\n");
-if (! 3==spam(3)) die("spam function not working right\n");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/using1_runme.php b/Examples/test-suite/php/using1_runme.php
new file mode 100644
index 000000000..51841bc78
--- /dev/null
+++ b/Examples/test-suite/php/using1_runme.php
@@ -0,0 +1,9 @@
+<?php
+
+require "tests.php";
+require "using1.php";
+if (! class_exists("_fooimpl")) die("_fooimpl class not found\n");
+if (! 3==spam(3)) die("spam function not working right\n");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/using1_runme.php4 b/Examples/test-suite/php/using1_runme.php4
deleted file mode 100644
index ed7e32b06..000000000
--- a/Examples/test-suite/php/using1_runme.php4
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-require "tests.php4";
-require "using1.php";
-if (! class_exists("_fooimpl")) die("_fooimpl class not found\n");
-if (! 3==spam(3)) die("spam function not working right\n");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/using2_runme.php b/Examples/test-suite/php/using2_runme.php
new file mode 100644
index 000000000..391a98f52
--- /dev/null
+++ b/Examples/test-suite/php/using2_runme.php
@@ -0,0 +1,9 @@
+<?php
+
+require "tests.php";
+require "using2.php";
+if (! class_exists("_fooimpl")) die("_fooimpl class not found\n");
+if (! 3==spam(3)) die("spam function not working right\n");
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/using2_runme.php4 b/Examples/test-suite/php/using2_runme.php4
deleted file mode 100644
index e57f0ce9a..000000000
--- a/Examples/test-suite/php/using2_runme.php4
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-require "tests.php4";
-require "using2.php";
-if (! class_exists("_fooimpl")) die("_fooimpl class not found\n");
-if (! 3==spam(3)) die("spam function not working right\n");
-
-check::done();
-?>
diff --git a/Examples/test-suite/php/valuewrapper_base_runme.php b/Examples/test-suite/php/valuewrapper_base_runme.php
new file mode 100644
index 000000000..aff88486e
--- /dev/null
+++ b/Examples/test-suite/php/valuewrapper_base_runme.php
@@ -0,0 +1,14 @@
+<?php
+// Sample test file
+
+require "tests.php";
+require "valuewrapper_base.php";
+
+check::classes(array("valuewrapper_base","Base","Interface_BP"));
+check::functions("make_interface_bp");
+
+$ibp=make_interface_bp();
+check::classname("interface_bp",$ibp);
+
+check::done();
+?>
diff --git a/Examples/test-suite/php/valuewrapper_base_runme.php4 b/Examples/test-suite/php/valuewrapper_base_runme.php4
deleted file mode 100644
index 355bb41c5..000000000
--- a/Examples/test-suite/php/valuewrapper_base_runme.php4
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-// Sample test file
-
-require "tests.php4";
-require "valuewrapper_base.php";
-
-check::classes(array("valuewrapper_base","Base","Interface_BP"));
-check::functions("make_interface_bp");
-
-$ibp=make_interface_bp();
-check::classname("interface_bp",$ibp);
-
-check::done();
-?>
diff --git a/Makefile.in b/Makefile.in
index 3c41c0394..5fa9e55ef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,7 +49,7 @@ skip-guilescm   = test -n "@SKIP_GUILESCM@"
 skip-guile	= test -n "@SKIP_GUILE@"
 skip-mzscheme	= test -n "@SKIP_MZSCHEME@"
 skip-ruby	= test -n "@SKIP_RUBY@"
-skip-php	= test -n "@SKIP_PHP4@"
+skip-php	= test -n "@SKIP_PHP@"
 skip-ocaml      = test -n "@SKIP_OCAML@"
 skip-octave     = test -n "@SKIP_OCTAVE@"
 skip-pike       = test -n "@SKIP_PIKE@"
diff --git a/configure.in b/configure.in
index 16ed08374..749d95197 100644
--- a/configure.in
+++ b/configure.in
@@ -243,10 +243,10 @@ case $host in
    *) GUILE_SO=$SO;;
 esac
 
-AC_SUBST(PHP4_SO)
+AC_SUBST(PHP_SO)
 case $host in
-   *-*-darwin*) PHP4_SO=.so;;
-   *) PHP4_SO=$SO;;
+   *-*-darwin*) PHP_SO=.so;;
+   *) PHP_SO=$SO;;
 esac
 
 AC_SUBST(MZSCHEME_SO)
@@ -1329,37 +1329,37 @@ AC_SUBST(RUBYDYNAMICLINKING)
 # Look for PHP
 #-------------------------------------------------------------------------
 
-PHP4BIN=
+PHPBIN=
 
 AC_ARG_WITH(php, AS_HELP_STRING([--without-php], [Disable PHP])
-AS_HELP_STRING([--with-php=path], [Set location of PHP executable]),[ PHP4BIN="$withval"], [PHP4BIN=yes])
+AS_HELP_STRING([--with-php=path], [Set location of PHP executable]),[ PHPBIN="$withval"], [PHPBIN=yes])
 
 # First, check for "--without-php" or "--with-php=no".
-if test x"${PHP4BIN}" = xno -o x"${with_alllang}" = xno ; then 
+if test x"${PHPBIN}" = xno -o x"${with_alllang}" = xno ; then 
     AC_MSG_NOTICE([Disabling PHP])
-    PHP4=
+    PHP=
 else
 
-    if test "x$PHP4BIN" = xyes; then
-      AC_CHECK_PROGS(PHP4, [php5 php])
+    if test "x$PHPBIN" = xyes; then
+      AC_CHECK_PROGS(PHP, [php5 php])
     else
-      PHP4=$PHP4BIN
+      PHP=$PHPBIN
     fi
 
     AC_MSG_CHECKING(for PHP header files)
     dnl /usr/bin/php5 -> /usr/bin/php-config5
-    case $PHP4 in
+    case $PHP in
       *5)
-	PHP4CONFIG=`echo "$PHP4"|sed 's/5$/-config5/'` ;;
+	PHPCONFIG=`echo "$PHP"|sed 's/5$/-config5/'` ;;
       *)
-	PHP4CONFIG=$PHP4-config ;;
+	PHPCONFIG=$PHP-config ;;
     esac
-    php_version=`$PHP4CONFIG --version 2>/dev/null`
+    php_version=`$PHPCONFIG --version 2>/dev/null`
     case $php_version in
     5*) 
-	PHP4INC=`$PHP4CONFIG --includes 2>/dev/null`
-	if test -n "$PHP4INC"; then
-	  AC_MSG_RESULT($PHP4INC)
+	PHPINC=`$PHPCONFIG --includes 2>/dev/null`
+	if test -n "$PHPINC"; then
+	  AC_MSG_RESULT($PHPINC)
 	else
 	  AC_MSG_RESULT(not found)
 	fi
@@ -1368,8 +1368,8 @@ else
 	AC_MSG_RESULT([found PHP $version, but only PHP 5 is supported]) ;;
     esac
 fi
-AC_SUBST(PHP4)
-AC_SUBST(PHP4INC)
+AC_SUBST(PHP)
+AC_SUBST(PHPINC)
 
 #----------------------------------------------------------------
 # Look for ocaml
@@ -2003,11 +2003,11 @@ fi
 AC_SUBST(SKIP_RUBY)
 
 
-SKIP_PHP4=
-if test -z "$PHP4" || test -z "$PHP4INC" ; then
-    SKIP_PHP4="1"
+SKIP_PHP=
+if test -z "$PHP" || test -z "$PHPINC" ; then
+    SKIP_PHP="1"
 fi
-AC_SUBST(SKIP_PHP4)
+AC_SUBST(SKIP_PHP)
 
 
 SKIP_OCAML=
-- 
cgit v1.2.1