Restore checks for flat functions in php testcases

Examples/test-suite/php/add_link_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "add_link.php";
 
-// No new functions, except the flat functions
-check::functions(array('new_foo','foo_blah'));
+// No new functions
+check::functions(array());
 
 check::classes(array('Foo'));
 

Examples/test-suite/php/arrays_global_runme.php

@@ -3,7 +3,7 @@
 require "tests.php";
 require "arrays_global.php";
 
-check::functions(array('test_a','test_b','new_simplestruct','new_material'));
+check::functions(array('test_a','test_b'));
 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'));
 

Examples/test-suite/php/arrays_global_twodim_runme.php

@@ -3,7 +3,7 @@
 require "tests.php";
 require "arrays_global_twodim.php";
 
-check::functions(array('fn_taking_arrays','get_2d_array','new_simplestruct','new_material'));
+check::functions(array('fn_taking_arrays','get_2d_array',));
 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'));
 

Examples/test-suite/php/arrays_scope_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "arrays_scope.php";
 
-// New functions
-check::functions(array('new_bar','bar_blah'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('arrays_scope','Bar'));
 // No new globals

Examples/test-suite/php/casts_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "casts.php";
 
-// New functions
-check::functions(array('new_a','a_hello','new_b'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('A','B'));
 // No new vars

Examples/test-suite/php/class_ignore_runme.php

@@ -3,7 +3,7 @@
 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::functions(array('do_blah'));
 check::classes(array('class_ignore','Bar','Boo','Far','Hoo'));
 // No new vars
 check::globals(array());

Examples/test-suite/php/cpp_basic_runme.php

@@ -4,7 +4,7 @@ require "tests.php";
 require "cpp_basic.php";
 
 // New functions
-check::functions(array('foo_func1','foo_func2','foo___str__','foosubsub___str__','bar_test','bar_testfoo','get_func1_ptr','get_func2_ptr','test_func_ptr','fl_window_show'));
+check::functions(array('get_func1_ptr','get_func2_ptr','test_func_ptr'));
 // New classes
 check::classes(array('cpp_basic','Foo','FooSub','FooSubSub','Bar','Fl_Window'));
 // No new vars

Examples/test-suite/php/cpp_static_runme.php

@@ -4,7 +4,7 @@ require "tests.php";
 require "cpp_static.php";
 
 // New functions
-check::functions(array('staticfunctiontest_static_func','staticfunctiontest_static_func_2','staticfunctiontest_static_func_3','is_python_builtin','staticmembertest_grab_int','staticbase_grab_statty_base','staticderived_grab_statty_derived'));
+check::functions(array('is_python_builtin'));
 // New classes
 check::classes(array('StaticMemberTest','StaticFunctionTest','cpp_static','StaticBase','StaticDerived'));
 // No new vars

Examples/test-suite/php/director_abstract_runme.php

@@ -4,7 +4,7 @@ require "tests.php";
 require "director_abstract.php";
 
 // New functions
-check::functions(array('foo_ping','foo_pong','example0_getxsize','example0_color','example0_get_color','example1_getxsize','example1_color','example1_get_color','example2_getxsize','example2_color','example2_get_color','example4_getxsize','example4_color','example4_get_color','example3_i_color','example3_i_get_color','g','a_f'));
+check::functions(array('g'));
 // New classes
 check::classes(array('director_abstract','Foo','Example0','Example1','Example2','Example4','Example3_i','A'));
 // No new vars

Examples/test-suite/php/director_basic_runme.php

@@ -3,7 +3,8 @@
 require "tests.php";
 require "director_basic.php";
 
-check::functions(array('foo_ping','foo_pong','foo_get_self','a_f','a_rg','a1_ff','myclass_method','myclass_vmethod','myclass_pmethod','myclass_cmethod','myclass_get_self','myclass_call_pmethod','myclasst_i_method','myclass_nonvirtual','myclass_nonoverride','myclass_call_nonvirtual','myclass_call_nonoverride','myclass_connect','constptrclass_getconstptr'));
+// No new functions
+check::functions(array());
 check::classes(array('Foo','A','A1','Bar','MyClass','MyClassT_i','ConstPtrClass'));
 // No new vars
 check::globals(array());

Examples/test-suite/php/director_classic_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "director_classic.php";
 
-// New functions
-check::functions(array('being_id','person_id','child_id','grandchild_id','caller_delcallback','caller_setcallback','caller_resetcallback','caller_call','caller_baseclass'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('Being','Person','Child','GrandChild','OrphanPerson','OrphanChild','Caller'));
 // No new vars

Examples/test-suite/php/director_default_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "director_default.php";
 
-// New functions
-check::functions(array('foo_msg','foo_getmsg','bar_msg','bar_getmsg','defaultsbase_defaultargs','defaultsderived_defaultargs'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('Foo','Bar','DefaultsBase','DefaultsDerived'));
 // No new vars

Examples/test-suite/php/director_detect_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "director_detect.php";
 
-// New functions
-check::functions(array('foo_cloner','foo_get_value','foo_get_class','foo_just_do_it','bar_baseclass','bar_cloner','bar_get_value','bar_get_class','bar_just_do_it'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('A','Foo','Bar'));
 // No new vars

Examples/test-suite/php/director_enum_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "director_enum.php";
 
-// New functions
-check::functions(array('foo_say_hello','foo_say_hi','foo_say_bye','foo_say_hi_ref','foo_ping','foo_ping_ref','foo_ping_member_enum','a_f','a2_f'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('director_enum','Foo','A','B','A2','B2'));
 // No new vars

Examples/test-suite/php/director_exception_runme.php

@@ -4,7 +4,7 @@ require "tests.php";
 require "director_exception.php";
 
 // New functions
-check::functions(array('foo_ping','foo_pong','launder','bar_ping','bar_pong','returnalltypes_return_int','returnalltypes_return_double','returnalltypes_return_const_char_star','returnalltypes_return_std_string','returnalltypes_return_bar','returnalltypes_call_int','returnalltypes_call_double','returnalltypes_call_const_char_star','returnalltypes_call_std_string','returnalltypes_call_bar','is_python_builtin'));
+check::functions(array('launder','is_python_builtin'));
 // New classes
 check::classes(array('director_exception','Foo','Exception1','Exception2','Base','Bar','ReturnAllTypes'));
 // No new vars

Examples/test-suite/php/director_extend_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "director_extend.php";
 
-// New functions
-check::functions(array('spobject_getfoobar','spobject_dummy','spobject_exceptionmethod'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('SpObject'));
 // No new vars

Examples/test-suite/php/director_finalizer_runme.php

@@ -4,7 +4,7 @@ require "tests.php";
 require "director_finalizer.php";
 
 // New functions
-check::functions(array('foo_orstatus','deletefoo','getstatus','launder','resetstatus'));
+check::functions(array('deletefoo','getstatus','launder','resetstatus'));
 // New classes
 check::classes(array('director_finalizer','Foo'));
 // No new vars

Examples/test-suite/php/director_frob_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "director_frob.php";
 
-// New functions
-check::functions(array('alpha_abs_method','bravo_abs_method','charlie_abs_method','ops_opint','ops_opintstarstarconst','ops_opintamp','ops_opintstar','ops_opconstintintstar','prims_ull','prims_callull','corecallbacks_on3dengineredrawn','corecallbacks_on3dengineredrawn2'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('Alpha','Bravo','Charlie','Delta','Ops','Prims','corePoint3d','coreCallbacks_On3dEngineRedrawnData','coreCallbacksOn3dEngineRedrawnData','coreCallbacks'));
 // No new vars

Examples/test-suite/php/director_nested_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "director_nested.php";
 
-// New functions
-check::functions(array('foo_int_advance','foo_int_do_advance','bar_step','bar_do_advance','bar_do_step','foobar_int_get_value','foobar_int_get_name','foobar_int_name','foobar_int_get_self','foobar_int_do_advance','foobar_int_do_step'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('Foo_int','Bar','FooBar_int'));
 // No new vars

Examples/test-suite/php/director_overload_runme.php

@@ -3,8 +3,7 @@
 require "tests.php";
 require "director_overload.php";
 
-check::functions(array('new_overloadedClass','new_overloadedPointers','new_overloadedGetSet','overloadedclass_method1','overloadedclass_method3','overloadedclass_method2','overloadedpointers_method','overloadedpointers_notover','overloadedgetset_rw'));
-
+check::functions(array());
 check::classes(array('OverloadedClass','OverloadedPointers','OverloadedGetSet'));
 check::globals(array());
 

Examples/test-suite/php/director_protected_runme.php

@@ -3,7 +3,8 @@
 require "tests.php";
 require "director_protected.php";
 
-check::functions(array('foo_pong','foo_s','foo_q','foo_ping','foo_pang','foo_used','foo_cheer','bar_create','bar_callping','bar_callcheer','bar_cheer','bar_pong','bar_used','bar_ping','bar_pang','a_draw','b_draw'));
+// No new functions
+check::functions(array());
 check::classes(array('Foo','Bar','PrivateFoo','A','B','AA','BB'));
 // No new vars
 check::globals(array());

Examples/test-suite/php/director_string_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "director_string.php";
 
-// New functions
-check::functions(array('a_get_first','a_call_get_first','a_string_length','a_process_text','a_call_process_func','stringvector_size','stringvector_is_empty','stringvector_clear','stringvector_push','stringvector_pop','stringvector_capacity','stringvector_reserve'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('A','StringVector'));
 // No new vars

Examples/test-suite/php/director_unroll_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "director_unroll.php";
 
-// New functions
-check::functions(array('foo_ping','foo_pong'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('Foo','Bar'));
 // No new vars

Examples/test-suite/php/enum_scope_template_runme.php

@@ -2,8 +2,8 @@
 require "tests.php";
 require "enum_scope_template.php";
 
+check::functions(array("chops"));
 check::classes(array("enum_scope_template", "TreeInt"));
-check::functions(array("chops","treeint_chops"));
 // No new vars
 check::globals(array());
 

Examples/test-suite/php/exception_order_runme.php

@@ -2,7 +2,7 @@
 require "tests.php";
 require "exception_order.php";
 
-check::functions(array('a_foo','a_bar','a_foobar','a_barfoo','is_python_builtin'));
+check::functions(array('is_python_builtin'));
 check::classes(array('A','E1','E2','E3','exception_order','ET_i','ET_d'));
 check::globals(array('efoovar','foovar','cfoovar'));
 

Examples/test-suite/php/ignore_parameter_runme.php

@@ -4,7 +4,7 @@ require "tests.php";
 require "ignore_parameter.php";
 
 // New functions
-check::functions(array('jaguar','lotus','tvr','ferrari','fiat','sportscars_daimler','sportscars_astonmartin','sportscars_bugatti','sportscars_lamborghini','sportscars_maseratti'));
+check::functions(array('jaguar','lotus','tvr','ferrari','fiat'));
 // New classes
 check::classes(array('ignore_parameter','SportsCars','MiniCooper','MorrisMinor','FordAnglia','AustinAllegro'));
 // No new vars

Examples/test-suite/php/import_nomodule_runme.php

@@ -2,7 +2,7 @@
 require "tests.php";
 require "import_nomodule.php";
 
-check::functions(array('create_foo','delete_foo','test1','is_python_builtin'));
+check::functions(array('is_python_builtin'));
 check::classes(array('import_nomodule'));
 // No new globals
 check::globals(array());

Examples/test-suite/php/li_carrays_cpp_runme.php

@@ -3,7 +3,7 @@ require "tests.php";
 require "li_carrays_cpp.php";
 
 // Check functions.
-check::functions(array('new_intarray','delete_intarray','intarray_getitem','intarray_setitem','doublearray_getitem','doublearray_setitem','doublearray_cast','doublearray_frompointer','xyarray_getitem','xyarray_setitem','xyarray_cast','xyarray_frompointer','delete_abarray','abarray_getitem','abarray_setitem','shortarray_getitem','shortarray_setitem','shortarray_cast','shortarray_frompointer','sum_array'));
+check::functions(array('delete_intarray','intarray_getitem','intarray_setitem','delete_abarray','abarray_getitem','abarray_setitem','sum_array'));
 
 // Check classes.
 // NB An "li_carrays_cpp" class is created as a mock namespace.

Examples/test-suite/php/li_carrays_runme.php

@@ -3,7 +3,7 @@ require "tests.php";
 require "li_carrays.php";
 
 // Check functions.
-check::functions(array('new_intarray','delete_intarray','intarray_getitem','intarray_setitem','doublearray_getitem','doublearray_setitem','doublearray_cast','doublearray_frompointer','xyarray_getitem','xyarray_setitem','xyarray_cast','xyarray_frompointer','delete_abarray','abarray_getitem','abarray_setitem','shortarray_getitem','shortarray_setitem','shortarray_cast','shortarray_frompointer','sum_array'));
+check::functions(array('delete_intarray','intarray_getitem','intarray_setitem','delete_abarray','abarray_getitem','abarray_setitem','sum_array'));
 
 // Check classes.
 // NB An "li_carrays" class is created as a mock namespace.

Examples/test-suite/php/li_factory_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "li_factory.php";
 
-// New functions
-check::functions(array('geometry_draw','geometry_create','geometry_clone_','point_draw','point_width','point_clone_','circle_draw','circle_radius','circle_clone_'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('Geometry','Point','Circle'));
 // No new vars

Examples/test-suite/php/newobject1_runme.php

@@ -3,8 +3,8 @@
 require "tests.php";
 require "newobject1.php";
 
-// New functions
-check::functions(array('foo_makefoo','foo_makemore','foo_foocount'));
+// No new functions
+check::functions(array());
 // New classes
 check::classes(array('Foo'));
 // No new vars

Examples/test-suite/php/php_iterator_runme.php

@@ -3,7 +3,8 @@
 require "tests.php";
 require "php_iterator.php";
 
-check::functions(array('myiterator_rewind','myiterator_key','myiterator_current','myiterator_next','myiterator_valid'));
+// No new functions.
+check::functions(array());
 check::classes(array('MyIterator'));
 // No new global variables.
 check::globals(array());

Examples/test-suite/php/tests.php

@@ -161,7 +161,6 @@ class check {
   }
 
   static function functions($functions) {
-    return TRUE;
     if (! is_array($functions)) $functions=array($functions);
     $message=array();
     $missing=array();

Examples/test-suite/php/threads_exception_runme.php

@@ -4,7 +4,7 @@ require "tests.php";
 require "threads_exception.php";
 
 // Check functions
-check::functions(array('test_simple','test_message','test_hosed','test_unknown','test_multi','is_python_builtin'));
+check::functions(array('is_python_builtin'));
 // Check classes.
 check::classes(array('Exc','Test','threads_exception'));
 // No new vars