Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 33f072c00aff · 2021-07-13T12:08:27.000+02:00
* 5.4:
  Use PHP_OS_FAMILY if possible
  Fix tests
  Fix typos in error messages
  Fix minor typos
  [WebProfilerBundle] Fix the values of some CSS properties
  [Messenger] Fixed an exception message
  [Yaml] Fixed an exception message
  Fix ctype_digit deprecation
  Add a Special Case for Translating Choices in en_US_POSIX
diff --git a/Tests/Transport/ConnectionTest.php b/Tests/Transport/ConnectionTest.php
@@ -580,7 +580,7 @@ public function testAmqpStampHeadersAreUsed()
         $connection->publish('body', ['Foo' => 'X'], 0, new AmqpStamp(null, \AMQP_NOPARAM, ['headers' => ['Bar' => 'Y']]));
     }
 
-    public function testAmqpStampDelireryModeIsUsed()
+    public function testAmqpStampDeliveryModeIsUsed()
     {
         $factory = new TestAmqpFactory(
             $this->createMock(\AMQPConnection::class),

Original file line number	Diff line number	Diff line change
`@@ -580,7 +580,7 @@ public function testAmqpStampHeadersAreUsed()`
`580`	`580`	`$connection->publish('body', ['Foo' => 'X'], 0, new AmqpStamp(null, \AMQP_NOPARAM, ['headers' => ['Bar' => 'Y']]));`
`581`	`581`	`}`
`582`	`582`
`583`		`- public function testAmqpStampDelireryModeIsUsed()`
	`583`	`+ public function testAmqpStampDeliveryModeIsUsed()`
`584`	`584`	`{`
`585`	`585`	`$factory = new TestAmqpFactory(`
`586`	`586`	`$this->createMock(\AMQPConnection::class),`