Merge branch '5.1' into 5.2

* 5.1: "export-ignore" contracts and phpunit-bridge [Console][Command] Fix Closure code binding when it is a static anonymous function Use class const in test [Security] [HttpFoundation] Use class const in test [PropertyInfo] Fix breaking change with has*(arguments...) methods
symfony · Jan 23, 2021 · c525b23 · c525b23
2 parents 08ceb3a + 7db4781
commit c525b23
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/Command/Command.php b/Command/Command.php
@@ -282,7 +282,14 @@ public function setCode(callable $code)
         if ($code instanceof \Closure) {
             $r = new \ReflectionFunction($code);
             if (null === $r->getClosureThis()) {
-                $code = \Closure::bind($code, $this);
+                set_error_handler(static function () {});
+                try {
+                    if ($c = \Closure::bind($code, $this)) {
+                        $code = $c;
+                    }
+                } finally {
+                    restore_error_handler();
+                }
             }
         }
 

diff --git a/Tests/Command/CommandTest.php b/Tests/Command/CommandTest.php
@@ -391,6 +391,18 @@ public function callableMethodCommand(InputInterface $input, OutputInterface $ou
     {
         $output->writeln('from the code...');
     }
+
+    public function testSetCodeWithStaticAnonymousFunction()
+    {
+        $command = new \TestCommand();
+        $command->setCode(static function (InputInterface $input, OutputInterface $output) {
+            $output->writeln(isset($this) ? 'bound' : 'not bound');
+        });
+        $tester = new CommandTester($command);
+        $tester->execute([]);
+
+        $this->assertEquals('interact called'.\PHP_EOL.'not bound'.\PHP_EOL, $tester->getDisplay());
+    }
 }
 
 // In order to get an unbound closure, we should create it outside a class

diff --git a/Tests/Logger/ConsoleLoggerTest.php b/Tests/Logger/ConsoleLoggerTest.php
@@ -20,8 +20,6 @@
 use Symfony\Component\Console\Tests\Fixtures\DummyOutput;
 
 /**
- * Console logger test.
- *
  * @author Kévin Dunglas <[email protected]>
  * @author Jordi Boggiano <[email protected]>
  */
@@ -157,9 +155,9 @@ public function testContextReplacement()
     public function testObjectCastToString()
     {
         if (method_exists($this, 'createPartialMock')) {
-            $dummy = $this->createPartialMock('Symfony\Component\Console\Tests\Logger\DummyTest', ['__toString']);
+            $dummy = $this->createPartialMock(DummyTest::class, ['__toString']);
         } else {
-            $dummy = $this->createPartialMock('Symfony\Component\Console\Tests\Logger\DummyTest', ['__toString']);
+            $dummy = $this->createPartialMock(DummyTest::class, ['__toString']);
         }
         $dummy->method('__toString')->willReturn('DUMMY');