Merge branch '7.4' into 8.0

* 7.4:
  chore: PHP CS Fixer - update heredoc handling

Author: nicolas-grekas

Tests/Command/UserPasswordHashCommandTest.php

@@ -263,8 +263,9 @@ public function testEncodePasswordAsksNonProvidedUserClass()
               [1] Custom\Class\Pbkdf2\User
               [2] Custom\Class\Test\User
               [3] Symfony\Component\Security\Core\User\InMemoryUser
-            EOTXT
-            , $this->passwordHasherCommandTester->getDisplay(true));
+            EOTXT,
+            $this->passwordHasherCommandTester->getDisplay(true)
+        );
     }
 
     public function testNonInteractiveEncodePasswordUsesFirstUserClass()