38 files changed, 47 insertions, 47 deletions
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.php4 b/Examples/test-suite/php/abstract_inherit_ok_runme.php
index 1182e4cec..c2d86499b 100644
--- a/Examples/test-suite/php/abstract_inherit_ok_runme.php4
+++ b/Examples/test-suite/php/abstract_inherit_ok_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "abstract_inherit_ok.php";
 
 check::classes(array(Foo,Spam));
diff --git a/Examples/test-suite/php/abstract_inherit_runme.php4 b/Examples/test-suite/php/abstract_inherit_runme.php
index fbc971711..3554e6fd8 100644
--- a/Examples/test-suite/php/abstract_inherit_runme.php4
+++ b/Examples/test-suite/php/abstract_inherit_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "abstract_inherit.php";
 
 check::classes(array(Foo,Bar,Spam,NRFilter_i,NRRCFilter_i,NRRCFilterpro_i,NRRCFilterpri_i));
diff --git a/Examples/test-suite/php/add_link_runme.php4 b/Examples/test-suite/php/add_link_runme.php
index b9d5334dd..4d8c31d5e 100644
--- a/Examples/test-suite/php/add_link_runme.php4
+++ b/Examples/test-suite/php/add_link_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "add_link.php";
 
 // No new functions, except the flat functions
diff --git a/Examples/test-suite/php/argout_runme.php4 b/Examples/test-suite/php/argout_runme.php
index 1328b0926..1c9026b6c 100644
--- a/Examples/test-suite/php/argout_runme.php4
+++ b/Examples/test-suite/php/argout_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "argout.php";
 
 check::functions(array(incp,incr,inctr,new_intp,copy_intp,delete_intp,intp_assign,intp_value,voidhandle,handle));
diff --git a/Examples/test-suite/php/arrayptr_runme.php4 b/Examples/test-suite/php/arrayptr_runme.php
index c057a6772..717c870d9 100644
--- a/Examples/test-suite/php/arrayptr_runme.php4
+++ b/Examples/test-suite/php/arrayptr_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "arrayptr.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/arrays_global_runme.php4 b/Examples/test-suite/php/arrays_global_runme.php
index d6a3955e1..59ff7bf2a 100644
--- a/Examples/test-suite/php/arrays_global_runme.php4
+++ b/Examples/test-suite/php/arrays_global_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "arrays_global.php";
 
 check::functions(array(test_a,test_b,new_simplestruct,new_material));
diff --git a/Examples/test-suite/php/arrays_global_twodim_runme.php4 b/Examples/test-suite/php/arrays_global_twodim_runme.php
index 352ad2568..d9b62de0d 100644
--- a/Examples/test-suite/php/arrays_global_twodim_runme.php4
+++ b/Examples/test-suite/php/arrays_global_twodim_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "arrays_global_twodim.php";
 
 check::functions(array(fn_taking_arrays,get_2d_array,new_simplestruct,new_material));
diff --git a/Examples/test-suite/php/arrays_runme.php4 b/Examples/test-suite/php/arrays_runme.php
index 407c32c31..97ee6bbbf 100644
--- a/Examples/test-suite/php/arrays_runme.php4
+++ b/Examples/test-suite/php/arrays_runme.php
@@ -1,6 +1,6 @@
 <?php
 // Sample test file
-require "tests.php4";
+require "tests.php";
 require "arrays.php";
 
 check::functions(array(fn_taking_arrays,newintpointer,setintfrompointer,getintfrompointer,array_pointer_func));
diff --git a/Examples/test-suite/php/arrays_scope_runme.php4 b/Examples/test-suite/php/arrays_scope_runme.php
index 75c7ccf27..92de96920 100644
--- a/Examples/test-suite/php/arrays_scope_runme.php4
+++ b/Examples/test-suite/php/arrays_scope_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "arrays_scope.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/casts_runme.php4 b/Examples/test-suite/php/casts_runme.php
index c3d19e29e..03ee6829c 100644
--- a/Examples/test-suite/php/casts_runme.php4
+++ b/Examples/test-suite/php/casts_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "casts.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/class_ignore_runme.php4 b/Examples/test-suite/php/class_ignore_runme.php
index 5da23e502..861576026 100644
--- a/Examples/test-suite/php/class_ignore_runme.php4
+++ b/Examples/test-suite/php/class_ignore_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "class_ignore.php";
 
 check::functions(array(do_blah,new_bar,bar_blah,new_boo,boo_away,new_far,new_hoo));
diff --git a/Examples/test-suite/php/conversion_namespace_runme.php4 b/Examples/test-suite/php/conversion_namespace_runme.php
index ae49d2002..e6866f871 100644
--- a/Examples/test-suite/php/conversion_namespace_runme.php4
+++ b/Examples/test-suite/php/conversion_namespace_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "conversion_namespace.php";
 
 check::classes(array("Foo","Bar"));
diff --git a/Examples/test-suite/php/conversion_ns_template_runme.php4 b/Examples/test-suite/php/conversion_ns_template_runme.php
index e799cdd48..9702eedb7 100644
--- a/Examples/test-suite/php/conversion_ns_template_runme.php4
+++ b/Examples/test-suite/php/conversion_ns_template_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "conversion_ns_template.php";
 
 check::classes(array("conversion_ns_template","Foo_One","Bar_One","Hi"));
diff --git a/Examples/test-suite/php/conversion_runme.php4 b/Examples/test-suite/php/conversion_runme.php
index 7941a7bbe..69ade46db 100644
--- a/Examples/test-suite/php/conversion_runme.php4
+++ b/Examples/test-suite/php/conversion_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "conversion.php";
 
 check::classes(array("Foo","Bar"));
diff --git a/Examples/test-suite/php/cpp_static_runme.php4 b/Examples/test-suite/php/cpp_static_runme.php
index b7f987505..54dbfc7d8 100644
--- a/Examples/test-suite/php/cpp_static_runme.php4
+++ b/Examples/test-suite/php/cpp_static_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "cpp_static.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/enum_scope_template_runme.php4 b/Examples/test-suite/php/enum_scope_template_runme.php
index 40efc5743..7cea23911 100644
--- a/Examples/test-suite/php/enum_scope_template_runme.php4
+++ b/Examples/test-suite/php/enum_scope_template_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "enum_scope_template.php";
 
 check::classes(array("enum_scope_template", "TreeInt"));
diff --git a/Examples/test-suite/php/evil_diamond_ns_runme.php4 b/Examples/test-suite/php/evil_diamond_ns_runme.php
index 29e8cd520..b76d1443f 100644
--- a/Examples/test-suite/php/evil_diamond_ns_runme.php4
+++ b/Examples/test-suite/php/evil_diamond_ns_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "evil_diamond_ns.php";
 
 check::classes(array("evil_diamond_ns","foo","bar","baz","spam"));
diff --git a/Examples/test-suite/php/evil_diamond_prop_runme.php4 b/Examples/test-suite/php/evil_diamond_prop_runme.php
index c0b157fca..6f66d01c5 100644
--- a/Examples/test-suite/php/evil_diamond_prop_runme.php4
+++ b/Examples/test-suite/php/evil_diamond_prop_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "evil_diamond_prop.php";
 
 check::classes(array("evil_diamond_prop","foo","bar","baz","spam"));
diff --git a/Examples/test-suite/php/evil_diamond_runme.php4 b/Examples/test-suite/php/evil_diamond_runme.php
index 677813bfa..a6ef211b1 100644
--- a/Examples/test-suite/php/evil_diamond_runme.php4
+++ b/Examples/test-suite/php/evil_diamond_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "evil_diamond.php";
 
 check::classes(array("evil_diamond","foo","bar","baz","spam"));
diff --git a/Examples/test-suite/php/extend_template_ns_runme.php4 b/Examples/test-suite/php/extend_template_ns_runme.php
index 16a6434bf..604e0470e 100644
--- a/Examples/test-suite/php/extend_template_ns_runme.php4
+++ b/Examples/test-suite/php/extend_template_ns_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "extend_template_ns.php";
 
 check::classes(array("extend_template_ns","Foo_One"));
diff --git a/Examples/test-suite/php/extend_template_runme.php4 b/Examples/test-suite/php/extend_template_runme.php
index c12f330a5..bf77e9b1c 100644
--- a/Examples/test-suite/php/extend_template_runme.php4
+++ b/Examples/test-suite/php/extend_template_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "extend_template.php";
 
 check::classes(array("Foo_0"));
diff --git a/Examples/test-suite/php/grouping_runme.php4 b/Examples/test-suite/php/grouping_runme.php
index 45e321fd3..8a2a88fa9 100644
--- a/Examples/test-suite/php/grouping_runme.php4
+++ b/Examples/test-suite/php/grouping_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "grouping.php";
 
 check::functions(array("test1","test2","do_unary","negate"));
diff --git a/Examples/test-suite/php/ignore_parameter_runme.php4 b/Examples/test-suite/php/ignore_parameter_runme.php
index 8a2bf899e..745720c3c 100644
--- a/Examples/test-suite/php/ignore_parameter_runme.php4
+++ b/Examples/test-suite/php/ignore_parameter_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "ignore_parameter.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/li_carrays_runme.php4 b/Examples/test-suite/php/li_carrays_runme.php
index b0b93dafe..babf8443b 100644
--- a/Examples/test-suite/php/li_carrays_runme.php4
+++ b/Examples/test-suite/php/li_carrays_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "li_carrays.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/li_std_string_runme.php4 b/Examples/test-suite/php/li_std_string_runme.php
index fb3da3598..c7270df3d 100644
--- a/Examples/test-suite/php/li_std_string_runme.php4
+++ b/Examples/test-suite/php/li_std_string_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "li_std_string.php";
 
 // Global variables
diff --git a/Examples/test-suite/php/rename_scope_runme.php4 b/Examples/test-suite/php/rename_scope_runme.php
index ad86321d3..33925a6db 100644
--- a/Examples/test-suite/php/rename_scope_runme.php4
+++ b/Examples/test-suite/php/rename_scope_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "rename_scope.php";
 
 check::classes(array("rename_scope","Interface_UP","Interface_BP","Natural_UP","Natural_BP","Bucket"));
diff --git a/Examples/test-suite/php/skel.php4 b/Examples/test-suite/php/skel.php
index d6f33758d..780a999ed 100644
--- a/Examples/test-suite/php/skel.php4
+++ b/Examples/test-suite/php/skel.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "____.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/smart_pointer_rename_runme.php4 b/Examples/test-suite/php/smart_pointer_rename_runme.php
index 5f21b6dda..a1759cb95 100644
--- a/Examples/test-suite/php/smart_pointer_rename_runme.php4
+++ b/Examples/test-suite/php/smart_pointer_rename_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "smart_pointer_rename.php";
 
 check::classes(array("Foo","Bar"));
diff --git a/Examples/test-suite/php/sym_runme.php4 b/Examples/test-suite/php/sym_runme.php
index ce89ea4b2..a6d2a6c74 100644
--- a/Examples/test-suite/php/sym_runme.php4
+++ b/Examples/test-suite/php/sym_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "sym.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/template_arg_typename_runme.php4 b/Examples/test-suite/php/template_arg_typename_runme.php
index 7062c674e..58835eafe 100644
--- a/Examples/test-suite/php/template_arg_typename_runme.php4
+++ b/Examples/test-suite/php/template_arg_typename_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "template_arg_typename.php";
 
 // No new functions
diff --git a/Examples/test-suite/php/template_construct_runme.php4 b/Examples/test-suite/php/template_construct_runme.php
index d0fbc9bb7..3a3986f7e 100644
--- a/Examples/test-suite/php/template_construct_runme.php4
+++ b/Examples/test-suite/php/template_construct_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "template_construct.php";
 
 check::classes(array(Foo_int));
diff --git a/Examples/test-suite/php/tests.php4 b/Examples/test-suite/php/tests.php
index 36e9f4163..36e9f4163 100644
--- a/Examples/test-suite/php/tests.php4
+++ b/Examples/test-suite/php/tests.php
diff --git a/Examples/test-suite/php/typedef_reference_runme.php4 b/Examples/test-suite/php/typedef_reference_runme.php
index 2c64efce6..88a70f8d3 100644
--- a/Examples/test-suite/php/typedef_reference_runme.php4
+++ b/Examples/test-suite/php/typedef_reference_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+require "tests.php";
 require "typedef_reference.php";
 
 check::functions(array(somefunc,otherfunc,new_intp,copy_intp,delete_intp,intp_assign,intp_value));
diff --git a/Examples/test-suite/php/typemap_ns_using_runme.php4 b/Examples/test-suite/php/typemap_ns_using_runme.php
index 44403d138..6a599f008 100644
--- a/Examples/test-suite/php/typemap_ns_using_runme.php4
+++ b/Examples/test-suite/php/typemap_ns_using_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+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");
diff --git a/Examples/test-suite/php/using1_runme.php4 b/Examples/test-suite/php/using1_runme.php
index ed7e32b06..51841bc78 100644
--- a/Examples/test-suite/php/using1_runme.php4
+++ b/Examples/test-suite/php/using1_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+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");
diff --git a/Examples/test-suite/php/using2_runme.php4 b/Examples/test-suite/php/using2_runme.php
index e57f0ce9a..391a98f52 100644
--- a/Examples/test-suite/php/using2_runme.php4
+++ b/Examples/test-suite/php/using2_runme.php
@@ -1,6 +1,6 @@
 <?php
 
-require "tests.php4";
+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");
diff --git a/Examples/test-suite/php/valuewrapper_base_runme.php4 b/Examples/test-suite/php/valuewrapper_base_runme.php
index 355bb41c5..aff88486e 100644
--- a/Examples/test-suite/php/valuewrapper_base_runme.php4
+++ b/Examples/test-suite/php/valuewrapper_base_runme.php
@@ -1,7 +1,7 @@
 <?php
 // Sample test file
 
-require "tests.php4";
+require "tests.php";
 require "valuewrapper_base.php";
 
 check::classes(array("valuewrapper_base","Base","Interface_BP"));