Merge branch '5.2' into 5.3

* 5.2:
  [gha] Define COLUMNS properly
  [travis] keep compiling sodium

Author: nicolas-grekas

Tests/Functional/UserPasswordEncoderCommandTest.php

@@ -31,6 +31,18 @@ class UserPasswordEncoderCommandTest extends AbstractWebTestCase
 {
     /** @var CommandTester */
     private $passwordEncoderCommandTester;
+    private $colSize;
+
+    protected function setUp(): void
+    {
+        $this->colSize = getenv('COLUMNS');
+        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
+    }
+
+    protected function tearDown(): void
+    {
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
+    }
 
     public function testEncodePasswordEmptySalt()
     {
@@ -316,7 +328,6 @@ public function testThrowsExceptionOnNoConfiguredEncoders()
 
     protected function setUp(): void
     {
-        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
         $kernel = $this->createKernel(['test_case' => 'PasswordEncode']);
         $kernel->boot();
 
@@ -334,7 +345,6 @@ protected function tearDown(): void
 
     private function setupArgon2i()
     {
-        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
         $kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'argon2i.yml']);
         $kernel->boot();
 
@@ -347,7 +357,6 @@ private function setupArgon2i()
 
     private function setupArgon2id()
     {
-        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
         $kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'argon2id.yml']);
         $kernel->boot();
 
@@ -360,7 +369,6 @@ private function setupArgon2id()
 
     private function setupBcrypt()
     {
-        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
         $kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'bcrypt.yml']);
         $kernel->boot();
 
@@ -373,7 +381,6 @@ private function setupBcrypt()
 
     private function setupSodium()
     {
-        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
         $kernel = $this->createKernel(['test_case' => 'PasswordEncode', 'root_config' => 'sodium.yml']);
         $kernel->boot();