bugfix

devthejo · devthejo · commit bcbe2d7de567 · 2016-05-26T11:43:18.000+02:00
diff --git a/CallTrait.php b/CallTrait.php
@@ -31,7 +31,7 @@ function __call($func,$args){
 			$m = new \ReflectionMethod($c, __FUNCTION__);
 			$dc1 = $m->getDeclaringClass()->name;
 			$dc2 = (new \ReflectionMethod($this, __FUNCTION__))->getDeclaringClass()->name;
-			if($dc1!=$dc2)
+			if($dc1!=$dc2||$dc2!=get_class($this))
 				return parent::__call($func,$args);
 		}
 		throw new \BadMethodCallException('Call to undefined method '.get_class($this).'->'.$func);

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ function __call($func,$args){`
`31`	`31`	`$m = new \ReflectionMethod($c, __FUNCTION__);`
`32`	`32`	`$dc1 = $m->getDeclaringClass()->name;`
`33`	`33`	`$dc2 = (new \ReflectionMethod($this, __FUNCTION__))->getDeclaringClass()->name;`
`34`		`- if($dc1!=$dc2)`
	`34`	`+ if($dc1!=$dc2\|\|$dc2!=get_class($this))`
`35`	`35`	`return parent::__call($func,$args);`
`36`	`36`	`}`
`37`	`37`	`throw new \BadMethodCallException('Call to undefined method '.get_class($this).'->'.$func);`