php: Omit closing ?> in manual and examples

PSR-12 says "The closing ?> tag MUST be omitted from files containing
only PHP".

100 files changed, 0 insertions, 135 deletions

diff --git a/Doc/Manual/Php.html b/Doc/Manual/Php.html
index 4b9195889..1752168b2 100644
--- a/Doc/Manual/Php.html
+++ b/Doc/Manual/Php.html
@@ -476,7 +476,6 @@ $result=new_intp();
 add( $in1, $in2, $result );
 
 echo "The sum " . intp_value($in1) . " + " . intp_value($in2) . " = " . intp_value( $result) . "\n";
-?>
 </pre></div>
 
 <p>
@@ -508,7 +507,6 @@ $in2 = 5;
 $result= add($in1, $in2);  # Note using variables for the input is unnecessary.
 
 echo "The sum $in1 + $in2 = $result\n";
-?&gt;
 </pre></div>
 
 <p>
@@ -547,7 +545,6 @@ $result = 0;
 add($in1, $in2, $result);
 
 echo "The sum $in1 + $in2 = $result\n";
-?&gt;
 </pre></div>
 
 <p>
@@ -622,7 +619,6 @@ Would be used in the following way from PHP:
   $c-&gt;im = 0;
 
   # $c destructor called when $c goes out of scope.
-?&gt;
 </pre></div>
 
 <p>
diff --git a/Examples/php/callback/runme.php b/Examples/php/callback/runme.php
index 2be71994f..fe4cd8b95 100644
--- a/Examples/php/callback/runme.php
+++ b/Examples/php/callback/runme.php
@@ -43,5 +43,3 @@ $caller->delCallback();
 # All done.
 
 print "php exit\n";
-
-?>
diff --git a/Examples/php/class/runme.php b/Examples/php/class/runme.php
index 99c253b46..88b4cfc79 100644
--- a/Examples/php/class/runme.php
+++ b/Examples/php/class/runme.php
@@ -56,5 +56,3 @@ $o = NULL;
 
 print Shape::nshapes() . " shapes remain\n";
 print "Goodbye\n";
-
-?>
diff --git a/Examples/php/constants/runme.php b/Examples/php/constants/runme.php
index 91c597a40..ef923829d 100644
--- a/Examples/php/constants/runme.php
+++ b/Examples/php/constants/runme.php
@@ -19,6 +19,3 @@ if (array_key_exists("EXTERN", $c)) {
 if (array_key_exists("FOO", $c)) {
     print "FOO    = " . $c["FOO"] . " (Arg! This shouldn't print anything)\n";
 }
-
-
-?>
diff --git a/Examples/php/cpointer/runme.php b/Examples/php/cpointer/runme.php
index 22e8a681a..3a0f19ec2 100644
--- a/Examples/php/cpointer/runme.php
+++ b/Examples/php/cpointer/runme.php
@@ -43,5 +43,3 @@
 	# $q = $a[0]
 	# $r = $a[1]
 	# print "	42/37 = $q remainder $r\n";
-
-?>
diff --git a/Examples/php/disown/runme.php b/Examples/php/disown/runme.php
index a70d7b061..9bdaecb3f 100644
--- a/Examples/php/disown/runme.php
+++ b/Examples/php/disown/runme.php
@@ -45,5 +45,3 @@ $container = NULL;
 print "\nA total of " . Shape::nshapes() . " shapes remain\n";
 
 print "Goodbye\n";
-
-?>
diff --git a/Examples/php/enum/runme.php b/Examples/php/enum/runme.php
index 813476645..23d4fbc10 100644
--- a/Examples/php/enum/runme.php
+++ b/Examples/php/enum/runme.php
@@ -28,5 +28,3 @@ $f = new Foo();
 $f->enum_test(Foo::IMPULSE);
 $f->enum_test(Foo::WARP);
 $f->enum_test(Foo::LUDICROUS);
-
-?>
diff --git a/Examples/php/extend/runme.php b/Examples/php/extend/runme.php
index 158683142..94a59e69e 100644
--- a/Examples/php/extend/runme.php
+++ b/Examples/php/extend/runme.php
@@ -72,5 +72,3 @@ print "----------------------\n";
 # All done.
 
 print "php exit\n";
-
-?>
diff --git a/Examples/php/funcptr/runme.php b/Examples/php/funcptr/runme.php
index 712d4147c..ba49e7319 100644
--- a/Examples/php/funcptr/runme.php
+++ b/Examples/php/funcptr/runme.php
@@ -19,6 +19,3 @@ print "Using swig style string pointers as we need them registered as constants\
 print "    ADD      = " . ADD . "\n";
 print "    SUB      = " . SUB . "\n";
 print "    MUL      = " . MUL . "\n";
-
-?>
-
diff --git a/Examples/php/overloading/runme.php b/Examples/php/overloading/runme.php
index 56d515138..ffa7e1167 100644
--- a/Examples/php/overloading/runme.php
+++ b/Examples/php/overloading/runme.php
@@ -54,5 +54,3 @@ $s = 42;
 print Shape::nshapes() . " shapes remain\n";
 
 print "Goodbye\n";
-
-?>
diff --git a/Examples/php/pointer/runme.php b/Examples/php/pointer/runme.php
index e79b23810..a6059f18f 100644
--- a/Examples/php/pointer/runme.php
+++ b/Examples/php/pointer/runme.php
@@ -31,5 +31,3 @@
 	# print "Testing multiple return values\n";
 	# ($q,$r) = divide(42,37);
 	# print "	42/37 = $q remainder $r\n";
-
-?>
diff --git a/Examples/php/pragmas/include.php b/Examples/php/pragmas/include.php
index 11d985d66..442f8e2e0 100644
--- a/Examples/php/pragmas/include.php
+++ b/Examples/php/pragmas/include.php
@@ -2,6 +2,3 @@
 
 # This code is inserted into example.php
 echo "This is include.php\n";
-
-
-?>
diff --git a/Examples/php/pragmas/runme.php b/Examples/php/pragmas/runme.php
index 7b2c179cb..e2b276313 100644
--- a/Examples/php/pragmas/runme.php
+++ b/Examples/php/pragmas/runme.php
@@ -6,4 +6,3 @@ set_include_path(realpath(dirname(__FILE__)) . PATH_SEPARATOR . get_include_path
 require "example.php";
 
 echo "Version - " . ((new ReflectionExtension('example'))->getVersion()) . "\n";
-?>
diff --git a/Examples/php/proxy/runme.php b/Examples/php/proxy/runme.php
index e70ab229f..8a2926517 100644
--- a/Examples/php/proxy/runme.php
+++ b/Examples/php/proxy/runme.php
@@ -64,5 +64,3 @@ Shape::nshapes(42);
 print Shape::get_nshapes() ." == 42\n";
 
 print "Goodbye\n";
-
-?>
diff --git a/Examples/php/reference/runme.php b/Examples/php/reference/runme.php
index 5d264ee43..722acdb60 100644
--- a/Examples/php/reference/runme.php
+++ b/Examples/php/reference/runme.php
@@ -45,5 +45,3 @@ print "Getting some array values\n";
 for ($i = 0; $i < 5; $i++) {
     print "    va[$i] = {$va->get($i)->as_string()}\n";
 }
-
-?>
diff --git a/Examples/php/simple/runme.php b/Examples/php/simple/runme.php
index 0e96fe800..7cb84dc0b 100644
--- a/Examples/php/simple/runme.php
+++ b/Examples/php/simple/runme.php
@@ -21,5 +21,3 @@ Foo_set(3.1415926);
 #				  manual for why. )
 print "Foo = "  . Foo_get() . "\n";
 print_Foo();
-
-?>
diff --git a/Examples/php/sync/runme.php b/Examples/php/sync/runme.php
index a7c43474f..cdda2f2e3 100644
--- a/Examples/php/sync/runme.php
+++ b/Examples/php/sync/runme.php
@@ -10,6 +10,3 @@ $s = new Sync();
 echo "Got new object\n";
 
 $s->printer();
-
-?>
-
diff --git a/Examples/php/value/runme.php b/Examples/php/value/runme.php
index 569c87cf5..977b99cc8 100644
--- a/Examples/php/value/runme.php
+++ b/Examples/php/value/runme.php
@@ -37,7 +37,3 @@
 #	free($r);
 
 	echo "Good\n";
-
-?>
-
-
diff --git a/Examples/php/variables/runme.php b/Examples/php/variables/runme.php
index 14f27f389..126b54216 100644
--- a/Examples/php/variables/runme.php
+++ b/Examples/php/variables/runme.php
@@ -91,6 +91,3 @@
 	/* And this */
 	//status_set(0);
 	echo "Status = ".status_get()."\n";
-
-?>
-
diff --git a/Examples/test-suite/php/abstract_inherit_ok_runme.php b/Examples/test-suite/php/abstract_inherit_ok_runme.php
index c2c343dac..e5000e071 100644
--- a/Examples/test-suite/php/abstract_inherit_ok_runme.php
+++ b/Examples/test-suite/php/abstract_inherit_ok_runme.php
@@ -9,4 +9,3 @@ $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
index 514bbc3b0..a5ecfbc46 100644
--- a/Examples/test-suite/php/abstract_inherit_runme.php
+++ b/Examples/test-suite/php/abstract_inherit_runme.php
@@ -11,4 +11,3 @@ check::classes(array('Foo','Bar','Spam','NRFilter_i','NRRCFilter_i','NRRCFilterp
 //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
index 3e16fa1df..92c76accd 100644
--- a/Examples/test-suite/php/add_link_runme.php
+++ b/Examples/test-suite/php/add_link_runme.php
@@ -19,4 +19,3 @@ check::is_a($foo_blah,'foo');
 //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
index 8b66613fd..f9f8f937f 100644
--- a/Examples/test-suite/php/argout_runme.php
+++ b/Examples/test-suite/php/argout_runme.php
@@ -35,4 +35,3 @@ 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
index 86b7f8628..0af14158e 100644
--- a/Examples/test-suite/php/arrayptr_runme.php
+++ b/Examples/test-suite/php/arrayptr_runme.php
@@ -11,4 +11,3 @@ check::classes(array());
 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
index 95a300775..03ae02a6f 100644
--- a/Examples/test-suite/php/arrays_global_runme.php
+++ b/Examples/test-suite/php/arrays_global_runme.php
@@ -16,4 +16,3 @@ check::set("array_c","h");
 check::equal("h",check::get("array_c"),"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
index d9f50a6de..a664889a9 100644
--- a/Examples/test-suite/php/arrays_global_twodim_runme.php
+++ b/Examples/test-suite/php/arrays_global_twodim_runme.php
@@ -19,4 +19,3 @@ for($x=0;$x<count($a1);$x++) {
 }
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/arrays_runme.php b/Examples/test-suite/php/arrays_runme.php
index c6e9e8f70..8ad3a1ada 100644
--- a/Examples/test-suite/php/arrays_runme.php
+++ b/Examples/test-suite/php/arrays_runme.php
@@ -15,4 +15,3 @@ check::equal($as->array_c,"a",'$as->array_c=="a"');
 check::equal(isset($as->array_const_i),TRUE,'isset($as->array_const_i)');
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/arrays_scope_runme.php b/Examples/test-suite/php/arrays_scope_runme.php
index 11c180870..34976ec9e 100644
--- a/Examples/test-suite/php/arrays_scope_runme.php
+++ b/Examples/test-suite/php/arrays_scope_runme.php
@@ -13,4 +13,3 @@ check::globals(array('bar_adata','bar_bdata','bar_cdata'));
 $bar=new bar();
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/callback_runme.php b/Examples/test-suite/php/callback_runme.php
index fefa32502..590c282df 100644
--- a/Examples/test-suite/php/callback_runme.php
+++ b/Examples/test-suite/php/callback_runme.php
@@ -6,4 +6,3 @@ require "callback.php";
 if (gettype(callback::FOO_I_Cb_Ptr) !== 'resource') die("callback::FOO_I_Cb_Ptr not a resource\n");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/casts_runme.php b/Examples/test-suite/php/casts_runme.php
index a9623a328..84f4ba6cc 100644
--- a/Examples/test-suite/php/casts_runme.php
+++ b/Examples/test-suite/php/casts_runme.php
@@ -15,4 +15,3 @@ $b=new B();
 $b->hello();
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/char_strings_runme.php b/Examples/test-suite/php/char_strings_runme.php
index e06ee9d2b..58e444a3a 100644
--- a/Examples/test-suite/php/char_strings_runme.php
+++ b/Examples/test-suite/php/char_strings_runme.php
@@ -40,4 +40,3 @@ check::equal(GetConstCharPointerRef(), $CPLUSPLUS_MSG, "failed GetConstCharPoint
 check::equal(SetConstCharPointerRef($OTHERLAND_MSG_10, 10), true, "failed SetConstCharPointerRef");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/class_ignore_runme.php b/Examples/test-suite/php/class_ignore_runme.php
index ae4881f27..7025fcc5d 100644
--- a/Examples/test-suite/php/class_ignore_runme.php
+++ b/Examples/test-suite/php/class_ignore_runme.php
@@ -13,4 +13,3 @@ 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
index e21ff7438..60c2885fc 100644
--- a/Examples/test-suite/php/conversion_namespace_runme.php
+++ b/Examples/test-suite/php/conversion_namespace_runme.php
@@ -10,4 +10,3 @@ $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
index 9702eedb7..bfdfd9fc4 100644
--- a/Examples/test-suite/php/conversion_ns_template_runme.php
+++ b/Examples/test-suite/php/conversion_ns_template_runme.php
@@ -7,4 +7,3 @@ 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
index 1a10ff4f4..6658c9d01 100644
--- a/Examples/test-suite/php/conversion_runme.php
+++ b/Examples/test-suite/php/conversion_runme.php
@@ -10,4 +10,3 @@ $foo=$bar->toFoo();
 check::classname("foo",$foo);
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/cpp11_strongly_typed_enumerations_runme.php b/Examples/test-suite/php/cpp11_strongly_typed_enumerations_runme.php
index bee59b209..df4dd9989 100644
--- a/Examples/test-suite/php/cpp11_strongly_typed_enumerations_runme.php
+++ b/Examples/test-suite/php/cpp11_strongly_typed_enumerations_runme.php
@@ -165,5 +165,3 @@ enumCheck($class1->class1Test2(Class1::Enum12_Val5c), 1121);
 enumCheck(globalTest1(Enum1_Val5a), 13);
 enumCheck(globalTest2(Class1::Enum12_Val5c), 1121);
 #enumCheck(globalTest3(Class1::Struct1.Enum12_Val5f), 3121);
-
-?>
diff --git a/Examples/test-suite/php/cpp_basic_runme.php b/Examples/test-suite/php/cpp_basic_runme.php
index b24cf7000..8e145aba0 100644
--- a/Examples/test-suite/php/cpp_basic_runme.php
+++ b/Examples/test-suite/php/cpp_basic_runme.php
@@ -17,4 +17,3 @@ $f->func_ptr = get_func2_ptr();
 check::equal(test_func_ptr($f, 7), -7*3, "get_func2_ptr() didn't work");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/cpp_static_runme.php b/Examples/test-suite/php/cpp_static_runme.php
index 20b50dd9e..f794fbd66 100644
--- a/Examples/test-suite/php/cpp_static_runme.php
+++ b/Examples/test-suite/php/cpp_static_runme.php
@@ -11,4 +11,3 @@ check::classes(array('StaticMemberTest','StaticFunctionTest','cpp_static','Stati
 check::globals(array('staticmembertest_static_int','staticbase_statty','staticderived_statty'));
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_abstract_runme.php b/Examples/test-suite/php/director_abstract_runme.php
index 1a119cfd5..b26878da8 100644
--- a/Examples/test-suite/php/director_abstract_runme.php
+++ b/Examples/test-suite/php/director_abstract_runme.php
@@ -59,4 +59,3 @@ $class = new ReflectionClass('Example3_i');
 check::equal($class->isAbstract(), true, "Example3_i abstractness failed");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_basic_runme.php b/Examples/test-suite/php/director_basic_runme.php
index db5cd6c5a..e92762d96 100644
--- a/Examples/test-suite/php/director_basic_runme.php
+++ b/Examples/test-suite/php/director_basic_runme.php
@@ -52,4 +52,3 @@ check::equal($bc->x, 34, "bc failed");
 check::equal($bd->x, 16, "bd failed");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_classic_runme.php b/Examples/test-suite/php/director_classic_runme.php
index a44881e04..cd6141699 100644
--- a/Examples/test-suite/php/director_classic_runme.php
+++ b/Examples/test-suite/php/director_classic_runme.php
@@ -147,4 +147,3 @@ mycheck($person, "TargetLangOrphanChild");
 unset($person);
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_default_runme.php b/Examples/test-suite/php/director_default_runme.php
index c459ce3ec..cb3de56c8 100644
--- a/Examples/test-suite/php/director_default_runme.php
+++ b/Examples/test-suite/php/director_default_runme.php
@@ -17,4 +17,3 @@ $f = new Bar();
 $f = new Bar(1);
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_detect_runme.php b/Examples/test-suite/php/director_detect_runme.php
index a6d3aebd6..8ac288c3c 100644
--- a/Examples/test-suite/php/director_detect_runme.php
+++ b/Examples/test-suite/php/director_detect_runme.php
@@ -52,4 +52,3 @@ check::equal($b->val, 5, "b: Bad virtual detection");
 check::equal($vc, 6, "c: Bad virtual detection");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_enum_runme.php b/Examples/test-suite/php/director_enum_runme.php
index 0571ec0da..18a96f7cf 100644
--- a/Examples/test-suite/php/director_enum_runme.php
+++ b/Examples/test-suite/php/director_enum_runme.php
@@ -22,4 +22,3 @@ $a = new MyFoo();
 check::equal($a->say_hi(director_enum::hello), $b->say_hello(director_enum::hi), "say failed");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_exception_runme.php b/Examples/test-suite/php/director_exception_runme.php
index dd2d04e8a..297aaea3c 100644
--- a/Examples/test-suite/php/director_exception_runme.php
+++ b/Examples/test-suite/php/director_exception_runme.php
@@ -124,4 +124,3 @@ try {
 }
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_extend_runme.php b/Examples/test-suite/php/director_extend_runme.php
index 7aa2e0f78..9650031e0 100644
--- a/Examples/test-suite/php/director_extend_runme.php
+++ b/Examples/test-suite/php/director_extend_runme.php
@@ -21,4 +21,3 @@ check::equal($m->dummy(), 666, "1st call");
 check::equal($m->dummy(), 666, "2st call"); // Locked system
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_finalizer_runme.php b/Examples/test-suite/php/director_finalizer_runme.php
index 96bb5c179..d29ca61c7 100644
--- a/Examples/test-suite/php/director_finalizer_runme.php
+++ b/Examples/test-suite/php/director_finalizer_runme.php
@@ -58,4 +58,3 @@ check::equal(getStatus(), 3, "getStatus() failed #5");
 resetStatus();
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_frob_runme.php b/Examples/test-suite/php/director_frob_runme.php
index 450a1234b..cb3b79dc2 100644
--- a/Examples/test-suite/php/director_frob_runme.php
+++ b/Examples/test-suite/php/director_frob_runme.php
@@ -16,4 +16,3 @@ $s = $foo->abs_method();
 check::equal($s, "Bravo::abs_method()", "s failed");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_nested_runme.php b/Examples/test-suite/php/director_nested_runme.php
index 9a094a182..4b5737b81 100644
--- a/Examples/test-suite/php/director_nested_runme.php
+++ b/Examples/test-suite/php/director_nested_runme.php
@@ -71,4 +71,3 @@ check::equal($c->get_name(), "FooBar::get_name hello", "get_name failed");
 check::equal($c->name(), "FooBar::get_name hello", "name failed");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_overload_runme.php b/Examples/test-suite/php/director_overload_runme.php
index f5fc56b65..4dcf529fd 100644
--- a/Examples/test-suite/php/director_overload_runme.php
+++ b/Examples/test-suite/php/director_overload_runme.php
@@ -15,4 +15,3 @@ check::equal($o->rw(7), null, "get_set() failed to set");
 check::equal($o->rw(), 7, "get_set() didn't return back set value");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_pass_by_value_runme.php b/Examples/test-suite/php/director_pass_by_value_runme.php
index 8a8b84d67..e8a5324d0 100644
--- a/Examples/test-suite/php/director_pass_by_value_runme.php
+++ b/Examples/test-suite/php/director_pass_by_value_runme.php
@@ -21,4 +21,3 @@ if ($ret != 0x12345678) {
 }
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_profile_runme.php b/Examples/test-suite/php/director_profile_runme.php
index c6f4c3c94..6ccb72793 100644
--- a/Examples/test-suite/php/director_profile_runme.php
+++ b/Examples/test-suite/php/director_profile_runme.php
@@ -50,4 +50,3 @@ while ($i) {
 print $a . "\n";
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_protected_runme.php b/Examples/test-suite/php/director_protected_runme.php
index e759fed25..2d9203a79 100644
--- a/Examples/test-suite/php/director_protected_runme.php
+++ b/Examples/test-suite/php/director_protected_runme.php
@@ -67,4 +67,3 @@ check::equal($fb3->callping(), "Bar::ping();", "bad fb3::callping");
 check::equal($fb3->callcheer(), "FooBar3::cheer();", "bad fb3::callcheer");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_stl_runme.php b/Examples/test-suite/php/director_stl_runme.php
index f7a5c0aa0..70a33168e 100644
--- a/Examples/test-suite/php/director_stl_runme.php
+++ b/Examples/test-suite/php/director_stl_runme.php
@@ -57,4 +57,3 @@ $vs;
 $a->tvidents($vs);*/
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_string_runme.php b/Examples/test-suite/php/director_string_runme.php
index 77e84c9bf..afde255a6 100644
--- a/Examples/test-suite/php/director_string_runme.php
+++ b/Examples/test-suite/php/director_string_runme.php
@@ -31,4 +31,3 @@ $b->call_process_func();
 check::equal($b->smem, "hello", "smem failed");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_thread_runme.php b/Examples/test-suite/php/director_thread_runme.php
index 2a640a022..dbcd14191 100644
--- a/Examples/test-suite/php/director_thread_runme.php
+++ b/Examples/test-suite/php/director_thread_runme.php
@@ -30,4 +30,3 @@ if ($d->val >= 0) {
 $d->stop();
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/director_unroll_runme.php b/Examples/test-suite/php/director_unroll_runme.php
index e3101887d..c462fe7a6 100644
--- a/Examples/test-suite/php/director_unroll_runme.php
+++ b/Examples/test-suite/php/director_unroll_runme.php
@@ -29,4 +29,3 @@ $c = $b->get();
 //check::equal($a->_cPtr, $c->_cPtr, "_cPtr check failed");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/enum_scope_template_runme.php b/Examples/test-suite/php/enum_scope_template_runme.php
index 85ba467b7..10924bc64 100644
--- a/Examples/test-suite/php/enum_scope_template_runme.php
+++ b/Examples/test-suite/php/enum_scope_template_runme.php
@@ -12,4 +12,3 @@ 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
index fcce0f767..bcf5aafd4 100644
--- a/Examples/test-suite/php/evil_diamond_ns_runme.php
+++ b/Examples/test-suite/php/evil_diamond_ns_runme.php
@@ -15,4 +15,3 @@ $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
index 645328aff..dd572faab 100644
--- a/Examples/test-suite/php/evil_diamond_prop_runme.php
+++ b/Examples/test-suite/php/evil_diamond_prop_runme.php
@@ -37,4 +37,3 @@ restore_error_handler();
 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
index a587ca359..d298eeb57 100644
--- a/Examples/test-suite/php/evil_diamond_runme.php
+++ b/Examples/test-suite/php/evil_diamond_runme.php
@@ -13,4 +13,3 @@ check::is_a("spam","bar");
 //check::is_a("spam","baz");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/exception_order_runme.php b/Examples/test-suite/php/exception_order_runme.php
index 77f115fa1..854cd3a66 100644
--- a/Examples/test-suite/php/exception_order_runme.php
+++ b/Examples/test-suite/php/exception_order_runme.php
@@ -36,4 +36,3 @@ try {
 } catch (Exception $e) {
     check::equal($e->getMessage(), 'C++ E2 * exception thrown', '');
 }
-?>
diff --git a/Examples/test-suite/php/extend_template_ns_runme.php b/Examples/test-suite/php/extend_template_ns_runme.php
index e6d3e9f73..47661249f 100644
--- a/Examples/test-suite/php/extend_template_ns_runme.php
+++ b/Examples/test-suite/php/extend_template_ns_runme.php
@@ -9,4 +9,3 @@ 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
index 41bde4458..58e3f6f98 100644
--- a/Examples/test-suite/php/extend_template_runme.php
+++ b/Examples/test-suite/php/extend_template_runme.php
@@ -9,4 +9,3 @@ 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
index 8bad7cd4c..c040115d3 100644
--- a/Examples/test-suite/php/grouping_runme.php
+++ b/Examples/test-suite/php/grouping_runme.php
@@ -19,4 +19,3 @@ 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
index b9c2b777d..4d5264c97 100644
--- a/Examples/test-suite/php/ignore_parameter_runme.php
+++ b/Examples/test-suite/php/ignore_parameter_runme.php
@@ -35,4 +35,3 @@ $aa=new austinallegro();
 check::classname("austinallegro",$aa);
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/import_nomodule_runme.php b/Examples/test-suite/php/import_nomodule_runme.php
index e5ea761f7..6e4f5a79a 100644
--- a/Examples/test-suite/php/import_nomodule_runme.php
+++ b/Examples/test-suite/php/import_nomodule_runme.php
@@ -17,4 +17,3 @@ $b = new Bar();
 import_nomodule::test1($b,37);
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/li_carrays_cpp_runme.php b/Examples/test-suite/php/li_carrays_cpp_runme.php
index 3e8a443f6..cceb76d25 100644
--- a/Examples/test-suite/php/li_carrays_cpp_runme.php
+++ b/Examples/test-suite/php/li_carrays_cpp_runme.php
@@ -19,4 +19,3 @@ $d->setitem(5, $d->getitem(0) + 3);
 check::equal($d->getitem(0) + $d->getitem(5), 17., "7+10==17");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/li_carrays_runme.php b/Examples/test-suite/php/li_carrays_runme.php
index abe358101..97144edd7 100644
--- a/Examples/test-suite/php/li_carrays_runme.php
+++ b/Examples/test-suite/php/li_carrays_runme.php
@@ -19,4 +19,3 @@ $d->setitem(5, $d->getitem(0) + 3);
 check::equal($d->getitem(0) + $d->getitem(5), 17., "7+10==17");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/li_factory_runme.php b/Examples/test-suite/php/li_factory_runme.php
index 982d7b1fd..a865ae1c4 100644
--- a/Examples/test-suite/php/li_factory_runme.php
+++ b/Examples/test-suite/php/li_factory_runme.php
@@ -19,4 +19,3 @@ $w = $point->width();
 check::equal($w, 1.0, "w failed");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/li_std_string_runme.php b/Examples/test-suite/php/li_std_string_runme.php
index 04ee3fc86..e83e7c0fa 100644
--- a/Examples/test-suite/php/li_std_string_runme.php
+++ b/Examples/test-suite/php/li_std_string_runme.php
@@ -31,4 +31,3 @@ check::equal(Structure::StaticMemberString2(), $s, "StaticMemberString2 test 2")
 li_std_string::test_const_reference_returning_void("foo");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/li_std_vector_member_var_runme.php b/Examples/test-suite/php/li_std_vector_member_var_runme.php
index 238350352..f463efb50 100644
--- a/Examples/test-suite/php/li_std_vector_member_var_runme.php
+++ b/Examples/test-suite/php/li_std_vector_member_var_runme.php
@@ -27,4 +27,3 @@ check::equal($T->start_t->x, 4, "S::x != 4");
 check::equal($T->length, 7, "T::length != 7");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/newobject1_runme.php b/Examples/test-suite/php/newobject1_runme.php
index 863e3e423..03bba0c07 100644
--- a/Examples/test-suite/php/newobject1_runme.php
+++ b/Examples/test-suite/php/newobject1_runme.php
@@ -16,4 +16,3 @@ $bar = $foo->makeMore();
 check::equal(get_class($bar), "Foo", "regular failed");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/newobject3_runme.php b/Examples/test-suite/php/newobject3_runme.php
index edd5d8608..9b7e14340 100644
--- a/Examples/test-suite/php/newobject3_runme.php
+++ b/Examples/test-suite/php/newobject3_runme.php
@@ -14,5 +14,3 @@ check::isnull($factory->create(0), "create(0) should be NULL");
 check::isnull($factory->create(7, -1), "create(7, -1) should be NULL");
 check::isnull($factory->create(0, -1), "create(0, -1) should be NULL");
 check::isnull($factory->create("bad", -1), "create(\"bad\", -1) should be NULL");
-
-?>
diff --git a/Examples/test-suite/php/overload_null_runme.php b/Examples/test-suite/php/overload_null_runme.php
index 22824d4fb..03932dc16 100644
--- a/Examples/test-suite/php/overload_null_runme.php
+++ b/Examples/test-suite/php/overload_null_runme.php
@@ -43,4 +43,3 @@ check::equal(21, $o->byval1forwardref($x), "test 21");
 check::equal(22, $o->byval2forwardref($x), "test 22");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/overload_polymorphic_runme.php b/Examples/test-suite/php/overload_polymorphic_runme.php
index 0afe16808..6c20374bb 100644
--- a/Examples/test-suite/php/overload_polymorphic_runme.php
+++ b/Examples/test-suite/php/overload_polymorphic_runme.php
@@ -11,4 +11,3 @@ check::equal(overload_polymorphic::test2($t), 1, "test2(Derived)");
 check::equal(overload_polymorphic::test3($t, null, $t), 1, "test3(Derived, null, Derived)");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/overload_rename_runme.php b/Examples/test-suite/php/overload_rename_runme.php
index 0357f91a6..982db5c88 100644
--- a/Examples/test-suite/php/overload_rename_runme.php
+++ b/Examples/test-suite/php/overload_rename_runme.php
@@ -16,4 +16,3 @@ $f = Foo::Foo_int(1.0,1);
 $f = Foo::Foo_int(1.0,1,1.0);
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/overload_return_type_runme.php b/Examples/test-suite/php/overload_return_type_runme.php
index 4fa19d22a..2fadb7a7d 100644
--- a/Examples/test-suite/php/overload_return_type_runme.php
+++ b/Examples/test-suite/php/overload_return_type_runme.php
@@ -9,5 +9,3 @@ check::classname("A", $b->foo("test"));
 
 check::equal(overload_return_type::foo(), 1, "overload_return_type::foo() should be 1");
 check::equal(overload_return_type::bar(), 1, "overload_return_type::bar() should be 1");
-
-?>
diff --git a/Examples/test-suite/php/php_iterator_runme.php b/Examples/test-suite/php/php_iterator_runme.php
index fd645ccb2..48021bf7d 100644
--- a/Examples/test-suite/php/php_iterator_runme.php
+++ b/Examples/test-suite/php/php_iterator_runme.php
@@ -21,4 +21,3 @@ foreach (new MyIterator(2, 5) as $k => $v) {
 check::equal($s, '(0=>2)(1=>3)(2=>4)', 'Simple iteration failed');
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/php_pragma_runme.php b/Examples/test-suite/php/php_pragma_runme.php
index c76cfc9b5..76359dc54 100644
--- a/Examples/test-suite/php/php_pragma_runme.php
+++ b/Examples/test-suite/php/php_pragma_runme.php
@@ -7,5 +7,3 @@ require "php_pragma.php";
 check::equal('1.5',(new ReflectionExtension('php_pragma'))->getVersion(),"1.5==version(php_pragma)");
 
 check::done();
-
-?>
diff --git a/Examples/test-suite/php/pointer_reference_runme.php b/Examples/test-suite/php/pointer_reference_runme.php
index 52946177e..3fa3c6a85 100644
--- a/Examples/test-suite/php/pointer_reference_runme.php
+++ b/Examples/test-suite/php/pointer_reference_runme.php
@@ -15,4 +15,3 @@ check::equal(pointer_reference::overloading(1), 111, "overload test 1 failed");
 check::equal(pointer_reference::overloading($ss), 222, "overload test 2 failed");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/prefix_runme.php b/Examples/test-suite/php/prefix_runme.php
index fcf7c66f6..d8f77ecdc 100644
--- a/Examples/test-suite/php/prefix_runme.php
+++ b/Examples/test-suite/php/prefix_runme.php
@@ -15,4 +15,3 @@ $f = new ProjectFoo();
 $f->get_self();
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/preproc_constants_c_runme.php b/Examples/test-suite/php/preproc_constants_c_runme.php
index 20868dcc0..5f520167a 100644
--- a/Examples/test-suite/php/preproc_constants_c_runme.php
+++ b/Examples/test-suite/php/preproc_constants_c_runme.php
@@ -65,5 +65,3 @@ check::equal(gettype(preproc_constants_c::EXPR_CONDITIONAL), "double", "preproc_
 check::equal(gettype(preproc_constants_c::EXPR_MIXED1), "double", "preproc_constants.EXPR_MIXED1 has unexpected type");
 check::equal(gettype(preproc_constants_c::EXPR_WCHAR_MAX), "integer", "preproc_constants.EXPR_WCHAR_MAX has unexpected type");
 check::equal(gettype(preproc_constants_c::EXPR_WCHAR_MIN), "integer", "preproc_constants.EXPR_WCHAR_MIN has unexpected type");
-
-?>
diff --git a/Examples/test-suite/php/preproc_constants_runme.php b/Examples/test-suite/php/preproc_constants_runme.php
index bd216c269..476eba811 100644
--- a/Examples/test-suite/php/preproc_constants_runme.php
+++ b/Examples/test-suite/php/preproc_constants_runme.php
@@ -64,5 +64,3 @@ check::equal(gettype(preproc_constants::EXPR_CONDITIONAL), "double", "preproc_co
 check::equal(gettype(preproc_constants::EXPR_MIXED1), "double", "preproc_constants.EXPR_MIXED1 has unexpected type");
 check::equal(gettype(preproc_constants::EXPR_WCHAR_MAX), "integer", "preproc_constants.EXPR_WCHAR_MAX has unexpected type");
 check::equal(gettype(preproc_constants::EXPR_WCHAR_MIN), "integer", "preproc_constants.EXPR_WCHAR_MIN has unexpected type");
-
-?>
diff --git a/Examples/test-suite/php/primitive_ref_runme.php b/Examples/test-suite/php/primitive_ref_runme.php
index 263a28074..efa9c526a 100644
--- a/Examples/test-suite/php/primitive_ref_runme.php
+++ b/Examples/test-suite/php/primitive_ref_runme.php
@@ -31,4 +31,3 @@ long_long_equal(ref_longlong(0x123456789ABCDEF0), 0x123456789ABCDEF0, "ref_longl
 long_long_equal(ref_ulonglong(0xF23456789ABCDEF0), 0xF23456789ABCDEF0, "ref_ulonglong failed");
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/rename_scope_runme.php b/Examples/test-suite/php/rename_scope_runme.php
index df620d796..1fd85f829 100644
--- a/Examples/test-suite/php/rename_scope_runme.php
+++ b/Examples/test-suite/php/rename_scope_runme.php
@@ -13,4 +13,3 @@ 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
index 780a999ed..351cad729 100644
--- a/Examples/test-suite/php/skel.php
+++ b/Examples/test-suite/php/skel.php
@@ -12,4 +12,3 @@ check::classes(array());
 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
index 26692dde5..8cc47dc5f 100644
--- a/Examples/test-suite/php/smart_pointer_rename_runme.php
+++ b/Examples/test-suite/php/smart_pointer_rename_runme.php
@@ -24,4 +24,3 @@ check::equal(3,$bar->test(),"bar->test");
 check::classname("foo",$bar->__deref__());
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/swig_exception_runme.php b/Examples/test-suite/php/swig_exception_runme.php
index 76641996e..66758ed29 100644
--- a/Examples/test-suite/php/swig_exception_runme.php
+++ b/Examples/test-suite/php/swig_exception_runme.php
@@ -29,5 +29,3 @@ $e = NULL;
 if (Shape::nshapes() != 0) {
     check::fail("Shape::nshapes() should be 0, actually ".Shape::nshapes());
 }
-
-?>
diff --git a/Examples/test-suite/php/sym_runme.php b/Examples/test-suite/php/sym_runme.php
index 127d28fd9..fb126f164 100644
--- a/Examples/test-suite/php/sym_runme.php
+++ b/Examples/test-suite/php/sym_runme.php
@@ -19,4 +19,3 @@ 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
index e609240e7..fd1d5e5ac 100644
--- a/Examples/test-suite/php/template_arg_typename_runme.php
+++ b/Examples/test-suite/php/template_arg_typename_runme.php
@@ -15,4 +15,3 @@ $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
index b227d9fec..a8e554bb9 100644
--- a/Examples/test-suite/php/template_construct_runme.php
+++ b/Examples/test-suite/php/template_construct_runme.php
@@ -8,4 +8,3 @@ $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
index 20fa1ed98..264d4d3d8 100644
--- a/Examples/test-suite/php/tests.php
+++ b/Examples/test-suite/php/tests.php
@@ -246,4 +246,3 @@ class check {
 #    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
index 83e75fb66..ee6cf488a 100644
--- a/Examples/test-suite/php/typedef_reference_runme.php
+++ b/Examples/test-suite/php/typedef_reference_runme.php
@@ -10,4 +10,3 @@ $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
index 6a599f008..d679af936 100644
--- a/Examples/test-suite/php/typemap_ns_using_runme.php
+++ b/Examples/test-suite/php/typemap_ns_using_runme.php
@@ -6,4 +6,3 @@ 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
index 51841bc78..0f3c9155e 100644
--- a/Examples/test-suite/php/using1_runme.php
+++ b/Examples/test-suite/php/using1_runme.php
@@ -6,4 +6,3 @@ 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
index 391a98f52..fa79cb256 100644
--- a/Examples/test-suite/php/using2_runme.php
+++ b/Examples/test-suite/php/using2_runme.php
@@ -6,4 +6,3 @@ 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
index 6a1abdbd2..d20df4ecf 100644
--- a/Examples/test-suite/php/valuewrapper_base_runme.php
+++ b/Examples/test-suite/php/valuewrapper_base_runme.php
@@ -10,4 +10,3 @@ $ibp=valuewrapper_base::make_interface_bp();
 check::classname("interface_bp",$ibp);
 
 check::done();
-?>
diff --git a/Examples/test-suite/php/virtual_vs_nonvirtual_base_runme.php b/Examples/test-suite/php/virtual_vs_nonvirtual_base_runme.php
index 0d4aa3d5f..d83210e9a 100644
--- a/Examples/test-suite/php/virtual_vs_nonvirtual_base_runme.php
+++ b/Examples/test-suite/php/virtual_vs_nonvirtual_base_runme.php
@@ -7,5 +7,3 @@ $fail = new SimpleClassFail();
 $work = new SimpleClassWork();
 
 check::equal($work->getInner()->get(), $fail->getInner()->get(), "should both be 10");
-
-?>
diff --git a/Examples/test-suite/php/wrapmacro_runme.php b/Examples/test-suite/php/wrapmacro_runme.php
index f32da990e..f79ddf975 100644
--- a/Examples/test-suite/php/wrapmacro_runme.php
+++ b/Examples/test-suite/php/wrapmacro_runme.php
@@ -9,4 +9,3 @@ check::equal(maximum(2.3, 2.4), 2.4, "maximum() doesn't work");
 check::equal(guint16_swap_le_be_constant(0x1234), 0x3412, "GUINT16_SWAP_LE_BE_CONSTANT() doesn't work");
 
 check::done();
-?>