Merge branch '6.1' into 6.2

derrabus · derrabus · commit f3212cdd50bf · 2022-12-20T17:41:15.000+01:00
* 6.1:
  Fix CS
  Compatibility with doctrine/annotations 2
  [Console] Fix a test when pcntl is not available (following #48329)
  [FrameworkBundle] fix: fix typo about help
diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
@@ -2005,6 +2005,10 @@ public function testSetSignalsToDispatchEvent()
 
     public function testSignalableCommandInterfaceWithoutSignals()
     {
+        if (!\defined('SIGUSR1')) {
+            $this->markTestSkipped('SIGUSR1 not available');
+        }
+
         $command = new SignableCommand(false);
 
         $dispatcher = new EventDispatcher();

Original file line number	Diff line number	Diff line change
`@@ -2005,6 +2005,10 @@ public function testSetSignalsToDispatchEvent()`
`2005`	`2005`
`2006`	`2006`	`public function testSignalableCommandInterfaceWithoutSignals()`
`2007`	`2007`	`{`
	`2008`	`+ if (!\defined('SIGUSR1')) {`
	`2009`	`+ $this->markTestSkipped('SIGUSR1 not available');`
	`2010`	`+ }`
	`2011`	`+`
`2008`	`2012`	`$command = new SignableCommand(false);`
`2009`	`2013`
`2010`	`2014`	`$dispatcher = new EventDispatcher();`