diff --git a/Examples/php/enum/Makefile b/Examples/php/enum/Makefile index 4483f781e..063a0645f 100644 --- a/Examples/php/enum/Makefile +++ b/Examples/php/enum/Makefile @@ -5,7 +5,7 @@ CXXSRCS = example.cxx TARGET = example INTERFACE = example.i LIBS = -SWIGOPT = -noproxy +SWIGOPT = check: build $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' php_run diff --git a/Examples/php/enum/runme.php b/Examples/php/enum/runme.php index 55b0bc4c3..813476645 100644 --- a/Examples/php/enum/runme.php +++ b/Examples/php/enum/runme.php @@ -11,22 +11,22 @@ 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 " 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(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(); +$f = new Foo(); -Foo_enum_test($f,Foo_IMPULSE); -Foo_enum_test($f,Foo_WARP); -Foo_enum_test($f,Foo_LUDICROUS); +$f->enum_test(Foo::IMPULSE); +$f->enum_test(Foo::WARP); +$f->enum_test(Foo::LUDICROUS); ?> diff --git a/Examples/php/value/Makefile b/Examples/php/value/Makefile index 28fc3a127..47e5ed9f9 100644 --- a/Examples/php/value/Makefile +++ b/Examples/php/value/Makefile @@ -5,7 +5,7 @@ SRCS = example.c TARGET = example INTERFACE = example.i LIBS = -SWIGOPT = -noproxy +SWIGOPT = check: build $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' php_run diff --git a/Examples/php/value/runme.php b/Examples/php/value/runme.php index 49115376c..569c87cf5 100644 --- a/Examples/php/value/runme.php +++ b/Examples/php/value/runme.php @@ -3,15 +3,15 @@ require "example.php"; - $v = new_vector(); - vector_x_set($v,1.0); - vector_y_set($v,2.0); - vector_z_set($v,3.0); + $v = new Vector(); + $v->x = 1.0; + $v->y = 2.0; + $v->z = 3.0; - $w = new_vector(); - vector_x_set($w,10.0); - vector_y_set($w,11.0); - vector_z_set($w,12.0); + $w = new Vector(); + $w->x = 10.0; + $w->y = 11.0; + $w->z = 12.0; echo "I just created the following vector\n"; vector_print($v); @@ -25,7 +25,7 @@ echo "\nNow I'm going to add the vectors together\n"; - $r = new_vector(); + $r = new Vector(); vector_add($v, $w, $r); vector_print($r);