Don't generate a .php wrapper file by default

It's now only generated if something to put in it is specified via:

%pragma(php) include=...

or

%pragma(php) code=...

Examples/test-suite/php/abstract_inherit_ok_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "abstract_inherit_ok.php";
 
 check::classes(array('Foo','Spam'));
 $spam=new Spam();

Examples/test-suite/php/abstract_inherit_runme.php

@@ -1,7 +1,6 @@
 <?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

Examples/test-suite/php/add_link_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "add_link.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/argout_runme.php

@@ -1,7 +1,6 @@
 <?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'));
 

Examples/test-suite/php/arrays_global_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "arrays_global.php";
 
 check::functions(array('test_a','test_b'));
 check::classes(array('arrays_global','SimpleStruct','Material'));

Examples/test-suite/php/arrays_global_twodim_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "arrays_global_twodim.php";
 
 check::functions(array('fn_taking_arrays','get_2d_array',));
 check::classes(array('arrays_global_twodim','SimpleStruct','Material'));

Examples/test-suite/php/arrays_runme.php

@@ -1,6 +1,6 @@
 <?php
+
 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'));

Examples/test-suite/php/arrays_scope_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "arrays_scope.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/callback_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "callback.php";
 
 // In 2.0.6 and earlier, the constant was misnamed.
 check::equal(gettype(callback::FOO_I_Cb_Ptr), 'object', "callback::FOO_I_Cb_Ptr not an object");

Examples/test-suite/php/casts_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "casts.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/char_strings_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "char_strings.php";
 
 $CPLUSPLUS_MSG = "A message from the deep dark world of C++, where anything is possible.";
 $OTHERLAND_MSG_10 = "Little message from the safe world.10";

Examples/test-suite/php/class_ignore_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "class_ignore.php";
 
 check::functions(array('do_blah'));
 check::classes(array('class_ignore','Bar','Boo','Far','Hoo'));

Examples/test-suite/php/conversion_namespace_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "conversion_namespace.php";
 
 check::classes(array("Foo","Bar"));
 $bar=new Bar;

Examples/test-suite/php/conversion_ns_template_runme.php

@@ -1,7 +1,6 @@
 <?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,

Examples/test-suite/php/conversion_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "conversion.php";
 
 check::classes(array("Foo","Bar"));
 $bar=new Bar;

Examples/test-suite/php/cpp11_strongly_typed_enumerations_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "cpp11_strongly_typed_enumerations.php";
 
 function enumCheck($actual, $expected) {
   check::equal($actual, $expected, "Enum value mismatch");

Examples/test-suite/php/cpp_basic_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "cpp_basic.php";
 
 // New functions
 check::functions(array('get_func1_ptr','get_func2_ptr','test_func_ptr'));

Examples/test-suite/php/cpp_static_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "cpp_static.php";
 
 // New functions
 check::functions(array('is_python_builtin'));

Examples/test-suite/php/director_abstract_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_abstract.php";
 
 // New functions
 check::functions(array('g'));

Examples/test-suite/php/director_basic_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_basic.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/director_classic_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_classic.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/director_default_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_default.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/director_detect_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_detect.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/director_enum_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_enum.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/director_exception_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_exception.php";
 
 // New functions
 check::functions(array('launder','is_python_builtin'));

Examples/test-suite/php/director_extend_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_extend.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/director_finalizer_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_finalizer.php";
 
 // New functions
 check::functions(array('deletefoo','getstatus','launder','resetstatus'));

Examples/test-suite/php/director_frob_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_frob.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/director_nested_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_nested.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/director_overload_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_overload.php";
 
 check::functions(array());
 check::classes(array('OverloadedClass','OverloadedPointers','OverloadedGetSet'));

Examples/test-suite/php/director_pass_by_value_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_pass_by_value.php";
 
 $passByVal = null;
 

Examples/test-suite/php/director_profile_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_profile.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/director_protected_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_protected.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/director_stl_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_stl.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/director_string_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_string.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/director_thread_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_thread.php";
 
 # Fails in a ZTS-build of PHP5 - see: https://github.com/swig/swig/pull/155
 # FIXME: Does this still fail in a threaded build of PHP7?

Examples/test-suite/php/director_unroll_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "director_unroll.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/enum_scope_template_runme.php

@@ -1,6 +1,5 @@
 <?php
 require "tests.php";
-require "enum_scope_template.php";
 
 check::functions(array("chops"));
 check::classes(array("enum_scope_template", "TreeInt"));

Examples/test-suite/php/evil_diamond_ns_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "evil_diamond_ns.php";
 
 check::classes(array("evil_diamond_ns","foo","bar","baz","spam"));
 check::functions("test");

Examples/test-suite/php/evil_diamond_prop_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "evil_diamond_prop.php";
 
 check::classes(array("evil_diamond_prop","foo","bar","baz","spam"));
 check::functions("test");

Examples/test-suite/php/evil_diamond_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "evil_diamond.php";
 
 check::classes(array("evil_diamond","foo","bar","baz","spam"));
 check::functions("test");

Examples/test-suite/php/exception_order_runme.php

@@ -1,6 +1,5 @@
 <?
 require "tests.php";
-require "exception_order.php";
 
 check::functions(array('is_python_builtin'));
 check::classes(array('A','E1','E2','E3','exception_order','ET_i','ET_d'));

Examples/test-suite/php/extend_template_ns_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "extend_template_ns.php";
 
 check::classes(array("extend_template_ns","Foo_One"));
 $foo=new Foo_One();

Examples/test-suite/php/extend_template_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "extend_template.php";
 
 check::classes(array("Foo_0"));
 $foo=new Foo_0();

Examples/test-suite/php/global_vars_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "global_vars.php";
 
 check::functions(array('init','read_b','read_x'));
 check::classes(array('A','global_vars'));

Examples/test-suite/php/grouping_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "grouping.php";
 
 check::functions(array("test1","test2","do_unary","negate"));
 check::equal(5,test1(5),"5==test1(5)");

Examples/test-suite/php/ignore_parameter_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "ignore_parameter.php";
 
 // New functions
 check::functions(array('jaguar','lotus','tvr','ferrari','fiat'));

Examples/test-suite/php/import_nomodule_runme.php

@@ -1,6 +1,6 @@
 <?php
+
 require "tests.php";
-require "import_nomodule.php";
 
 check::functions(array('is_python_builtin'));
 check::classes(array('import_nomodule'));

Examples/test-suite/php/li_carrays_cpp_runme.php

@@ -1,6 +1,6 @@
 <?php
+
 require "tests.php";
-require "li_carrays_cpp.php";
 
 // Check functions.
 check::functions(array('new_intarray','delete_intarray','intarray_getitem','intarray_setitem','new_abarray','delete_abarray','abarray_getitem','abarray_setitem','sum_array'));

Examples/test-suite/php/li_carrays_runme.php

@@ -1,6 +1,6 @@
 <?php
+
 require "tests.php";
-require "li_carrays.php";
 
 // Check functions.
 check::functions(array('new_intarray','delete_intarray','intarray_getitem','intarray_setitem','new_abarray','delete_abarray','abarray_getitem','abarray_setitem','sum_array'));

Examples/test-suite/php/li_factory_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "li_factory.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/li_std_string_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "li_std_string.php";
 
 # Checking expected use of %typemap(in) std::string {}
 li_std_string::test_value("Fee");

Examples/test-suite/php/li_std_vector_member_var_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "li_std_vector_member_var.php";
 
 $t = new Test();
 

Examples/test-suite/php/multivalue_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "multivalue.php";
 
 // New functions
 check::functions(array('divide_l','divide_v','divide_mv'));

Examples/test-suite/php/newobject1_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "newobject1.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/newobject3_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "newobject3.php";
 
 $factory = new factory();
 

Examples/test-suite/php/overload_null_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "overload_null.php";
 
 $o = new Overload();
 $x = new X();

Examples/test-suite/php/overload_polymorphic_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "overload_polymorphic.php";
 
 $t = new Derived();
 

Examples/test-suite/php/overload_rename_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "overload_rename.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/overload_return_type_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "overload_return_type.php";
 
 $b = new B;
 check::equal($b->foo(1), 0, "");

Examples/test-suite/php/php_iterator_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "php_iterator.php";
 
 // No new functions.
 check::functions(array());

Examples/test-suite/php/php_pragma_runme.php

@@ -1,8 +1,6 @@
 <?php
 
 require "tests.php";
-require "php_pragma.php";
-
 
 check::equal('1.5',(new ReflectionExtension('php_pragma'))->getVersion(),"1.5==version(php_pragma)");
 

Examples/test-suite/php/pointer_reference_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "pointer_reference.php";
 
 $s  = pointer_reference::get();
 check::equal($s->value, 10, "pointer_reference::get() failed");

Examples/test-suite/php/prefix_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "prefix.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/preproc_constants_c_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "preproc_constants_c.php";
 
 // Same as preproc_constants.i testcase, but bool types are int instead
 check::equal(gettype(preproc_constants_c::CONST_INT1), "integer", "preproc_constants.CONST_INT1 has unexpected type");

Examples/test-suite/php/preproc_constants_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "preproc_constants.php";
 
 check::equal(gettype(preproc_constants::CONST_INT1), "integer", "preproc_constants.CONST_INT1 has unexpected type");
 check::equal(gettype(preproc_constants::CONST_INT2), "integer", "preproc_constants.CONST_INT2 has unexpected type");

Examples/test-suite/php/primitive_ref_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "primitive_ref.php";
 
 # A large long long number is too big, so PHP makes treats it as a double, but SWIG opts to return it as a string.
 # The conversion to double can lose precision so this isn't an exact comparison.

Examples/test-suite/php/rename_scope_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "rename_scope.php";
 
 check::classes(array("rename_scope","Interface_UP","Interface_BP","Natural_UP","Natural_BP","Bucket"));
 

Examples/test-suite/php/skel.php

@@ -2,7 +2,6 @@
 // Sample test file
 
 require "tests.php";
-require "____.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/smart_pointer_rename_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "smart_pointer_rename.php";
 
 check::classes(array("Foo","Bar"));
 check::classmethods("foo",array("ftest1","ftest2","__set","__isset","__get","__construct"));

Examples/test-suite/php/swig_exception_runme.php

@@ -1,6 +1,5 @@
 <?php
 
-require("swig_exception.php");
 require("tests.php");
 
 $c = new Circle(10);

Examples/test-suite/php/sym_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "sym.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/template_arg_typename_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "template_arg_typename.php";
 
 // No new functions
 check::functions(array());

Examples/test-suite/php/template_construct_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "template_construct.php";
 
 check::classes(array('Foo_int'));
 $foo_int=new foo_int(3);

Examples/test-suite/php/threads_exception_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "threads_exception.php";
 
 // Check functions
 check::functions(array('is_python_builtin'));

Examples/test-suite/php/typedef_reference_runme.php

@@ -1,7 +1,6 @@
 <?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);

Examples/test-suite/php/typemap_ns_using_runme.php

@@ -1,7 +1,7 @@
 <?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");
 

Examples/test-suite/php/using1_runme.php

@@ -1,7 +1,7 @@
 <?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");
 

Examples/test-suite/php/using2_runme.php

@@ -1,7 +1,7 @@
 <?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");
 

Examples/test-suite/php/valuewrapper_base_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "valuewrapper_base.php";
 
 check::classes(array("valuewrapper_base","Base","Interface_BP"));
 check::functions("make_interface_bp");

Examples/test-suite/php/virtual_vs_nonvirtual_base_runme.php

@@ -1,7 +1,6 @@
 <? 
 
 require "tests.php";
-require "virtual_vs_nonvirtual_base.php";
 
 $fail = new SimpleClassFail();
 $work = new SimpleClassWork();

Examples/test-suite/php/wrapmacro_runme.php

@@ -1,7 +1,6 @@
 <?php
 
 require "tests.php";
-require "wrapmacro.php";
 
 check::functions(array('guint16_swap_le_be_constant', 'maximum'));