[Console] Bind the closure (code) to the Command if possible

lyrixx · lyrixx · commit 1400f4ecdaf8 · 2015-04-22T10:27:58.000+02:00
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
@@ -284,6 +284,10 @@ public function setCode($code)
             throw new \InvalidArgumentException('Invalid callable provided to Command::setCode.');
         }
 
+        if (PHP_VERSION_ID >= 50400 && $code instanceof \Closure) {
+            $code = \Closure::bind($code, $this);
+        }
+
         $this->code = $code;
 
         return $this;
diff --git a/src/Symfony/Component/Console/Tests/Command/CommandTest.php b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
@@ -293,6 +293,21 @@ public function testSetCode()
         $this->assertEquals('interact called'.PHP_EOL.'from the code...'.PHP_EOL, $tester->getDisplay());
     }
 
+    public function testSetCodeBindToClosure()
+    {
+        if (PHP_VERSION_ID < 50400) {
+            $this->markTestSkipped('Test skipped, for PHP 5.4+ only.');
+        }
+
+        $command = new \TestCommand();
+        $ret = $command->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->writeln(get_class($this));
+        });
+        $tester = new CommandTester($command);
+        $tester->execute(array());
+        $this->assertEquals('interact called'.PHP_EOL.'TestCommand'.PHP_EOL, $tester->getDisplay());
+    }
+
     public function testSetCodeWithNonClosureCallable()
     {
         $command = new \TestCommand();

Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,10 @@ public function setCode($code)`
`284`	`284`	`throw new \InvalidArgumentException('Invalid callable provided to Command::setCode.');`
`285`	`285`	`}`
`286`	`286`
	`287`	`+ if (PHP_VERSION_ID >= 50400 && $code instanceof \Closure) {`
	`288`	`+ $code = \Closure::bind($code, $this);`
	`289`	`+ }`
	`290`	`+`
`287`	`291`	`$this->code = $code;`
`288`	`292`
`289`	`293`	`return $this;`