Merge branch '5.2' into 5.x

chalasr · chalasr · commit 332570f49ddf · 2021-03-06T14:50:37.000+01:00
* 5.2:
  [Security] Fix test
  fix test
  [Console] Fix tests
diff --git a/Tests/Console/ApplicationTest.php b/Tests/Console/ApplicationTest.php
@@ -205,7 +205,7 @@ public function testRunOnlyWarnsOnUnregistrableCommandAtTheEnd()
         $tester->run(['command' => 'list']);
 
         $this->assertSame(0, $tester->getStatusCode());
-        $display = explode('Lists commands', $tester->getDisplay());
+        $display = explode('List commands', $tester->getDisplay());
 
         $this->assertStringContainsString(trim('[WARNING] Some commands could not be registered:'), trim($display[1]));
     }
diff --git a/composer.json b/composer.json
@@ -74,7 +74,7 @@
         "phpunit/phpunit": "<5.4.3",
         "symfony/asset": "<5.3",
         "symfony/browser-kit": "<4.4",
-        "symfony/console": "<5.2",
+        "symfony/console": "<5.2.5",
         "symfony/dotenv": "<5.1",
         "symfony/dom-crawler": "<4.4",
         "symfony/http-client": "<4.4",

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public function testRunOnlyWarnsOnUnregistrableCommandAtTheEnd()`
`205`	`205`	`$tester->run(['command' => 'list']);`
`206`	`206`
`207`	`207`	`$this->assertSame(0, $tester->getStatusCode());`
`208`		`- $display = explode('Lists commands', $tester->getDisplay());`
	`208`	`+ $display = explode('List commands', $tester->getDisplay());`
`209`	`209`
`210`	`210`	`$this->assertStringContainsString(trim('[WARNING] Some commands could not be registered:'), trim($display[1]));`
`211`	`211`	`}`