jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove PHP-specific testcase workarounds

Browse source 
The changes on this branch mean these are no longer required.
This commit is contained in:
Olly Betts 2021-04-19 18:50:49 +12:00
commit 1bf23edc06
4 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Examples/test-suite/director_protected.i
View file

@ -11,13 +11,6 @@
%newobject *::create(); %newobject *::create();
#ifdef SWIGPHP
// TODO: Currently we do not track the dynamic type of returned objects
// in PHP, so we need the factory helper.
%include factory.i
%factory(Foo *Bar::create, Bar);
#endif
%rename(a) Bar::hello; %rename(a) Bar::hello;
%rename(s) Foo::p; %rename(s) Foo::p;
%rename(q) Foo::r; %rename(q) Foo::r;

6
Examples/test-suite/php/director_classic_runme.php
View file

@ -81,11 +81,7 @@ function mycheck($person, $expected) {
$ret = $baseclass->id(); $ret = $baseclass->id();
if ($debug) if ($debug)
print $ret . "\n"; print $ret . "\n";
# TODO: Currently we do not track the dynamic type of returned check::equal($ret, $expected, "#3 failed");
# objects, so in case it's possible that the dynamic type is not equal
# to the static type, we skip this check.
if (get_parent_class($person) === false)
check::equal($ret, $expected, "#3 failed");
$caller->resetCallback(); $caller->resetCallback();
if ($debug) if ($debug)

4
Examples/test-suite/php/director_exception_runme.php
View file

@ -38,9 +38,7 @@ class MyFoo3 extends Foo {
# MyFoo.pong(). # MyFoo.pong().
$ok = 0; $ok = 0;
$a = new MyFoo(); $a = new MyFoo();
# TODO: Currently we do not track the dynamic type of returned $b = director_exception::launder($a);
# objects, so we skip the launder() call.
#$b = director_exception::launder($a);
$b = $a; $b = $a;
try { try {
$b->pong(); $b->pong();

5
Examples/test-suite/php/director_nested_runme.php
View file

@ -60,10 +60,7 @@ class C extends FooBar_int {
} }
$cc = new C(); $cc = new C();
# TODO: Currently we do not track the dynamic type of returned $c = Foobar_int::get_self($cc);
# objects, so we skip the get_self() call.
#$c = Foobar_int::get_self($cc);
$c = $cc;
$c->advance(); $c->advance();
check::equal($c->get_name(), "FooBar::get_name hello", "get_name failed"); check::equal($c->get_name(), "FooBar::get_name hello", "get_name failed");