Commit5988fe6

authored

Merge pull request#80 from TheDragonCode/3.x

Fixed a bug when working with text values like function names

2 parents3fee304 +3eea010 commit5988fe6Copy full SHA for 5988fe6

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,12 @@ trait Call`
`10`	`10`
`11`	`11`	`protectedfunctioncall(mixed$callback =null):mixed`
`12`	`12`	`{`
`13`		`-return$this->isCallable($callback) ?$callback() :$callback;`
	`13`	`+return$this->isCallable($callback)&& !$this->isFunction($callback)?$callback() :$callback;`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`protectedfunctionmakeCallable($value):callable`
`17`	`17`	`{`
`18`		`-if ($this->isCallable($value)) {`
	`18`	`+if ($this->isCallable($value) && !$this->isFunction($value)) {`
`19`	`19`	`return$value;`
`20`	`20`	`}`
`21`	`21`
`@@ -28,4 +28,9 @@ protected function isCallable($value): bool`
`28`	`28`	`{`
`29`	`29`	`returnis_callable($value);`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+protectedfunctionisFunction($value):bool`
	`33`	`+ {`
	`34`	`+returnis_string($value) &&function_exists($value);`
	`35`	`+ }`
`31`	`36`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@ abstract class TestCase extends BaseTestCase`
`28`	`28`
`29`	`29`	`protectedarray$keys = ['Foo','Bar','Baz'];`
`30`	`30`
`31`		`-protectedmixed$value ='Foo';`
	`31`	`+protectedmixed$value ='value';`
`32`	`32`
`33`		`-protectedstring$value_second ='Bar';`
	`33`	`+protectedstring$value_second ='Foo';`
`34`	`34`
`35`	`35`	`protectedfunctiongetPackageProviders($app):array`
`36`	`36`	`{`

Comments

(0)