[Console] fixed BC issue with static closures
This commit is contained in:
parent
04595dc707
commit
3247308c50
@ -283,7 +283,15 @@ class Command
|
|||||||
if (PHP_VERSION_ID >= 50400 && $code instanceof \Closure) {
|
if (PHP_VERSION_ID >= 50400 && $code instanceof \Closure) {
|
||||||
$r = new \ReflectionFunction($code);
|
$r = new \ReflectionFunction($code);
|
||||||
if (null === $r->getClosureThis()) {
|
if (null === $r->getClosureThis()) {
|
||||||
$code = \Closure::bind($code, $this);
|
if (PHP_VERSION_ID < 70000) {
|
||||||
|
// Bug in PHP5: https://bugs.php.net/bug.php?id=64761
|
||||||
|
// This means that we cannot bind static closures and therefore we must
|
||||||
|
// ignore any errors here. There is no way to test if the closure is
|
||||||
|
// bindable.
|
||||||
|
$code = @\Closure::bind($code, $this);
|
||||||
|
} else {
|
||||||
|
$code = \Closure::bind($code, $this);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -335,6 +335,29 @@ class CommandTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->assertEquals('interact called'.PHP_EOL.$expected.PHP_EOL, $tester->getDisplay());
|
$this->assertEquals('interact called'.PHP_EOL.$expected.PHP_EOL, $tester->getDisplay());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testSetCodeWithStaticClosure()
|
||||||
|
{
|
||||||
|
$command = new \TestCommand();
|
||||||
|
$command->setCode(self::createClosure());
|
||||||
|
$tester = new CommandTester($command);
|
||||||
|
$tester->execute(array());
|
||||||
|
|
||||||
|
if (PHP_VERSION_ID < 70000) {
|
||||||
|
// Cannot bind static closures in PHP 5
|
||||||
|
$this->assertEquals('interact called'.PHP_EOL.'not bound'.PHP_EOL, $tester->getDisplay());
|
||||||
|
} else {
|
||||||
|
// Can bind static closures in PHP 7
|
||||||
|
$this->assertEquals('interact called'.PHP_EOL.'bound'.PHP_EOL, $tester->getDisplay());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static function createClosure()
|
||||||
|
{
|
||||||
|
return function (InputInterface $input, OutputInterface $output) {
|
||||||
|
$output->writeln(isset($this) ? 'bound' : 'not bound');
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
public function testSetCodeWithNonClosureCallable()
|
public function testSetCodeWithNonClosureCallable()
|
||||||
{
|
{
|
||||||
$command = new \TestCommand();
|
$command = new \TestCommand();
|
||||||
|
Reference in New Issue
Block a user