Merge branch '5.2' into 5.3

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

Author: nicolas-grekas

Tests/Command/UserPasswordHashCommandTest.php

@@ -25,6 +25,18 @@ class UserPasswordHashCommandTest extends TestCase
 {
     /** @var CommandTester */
     private $passwordHasherCommandTester;
+    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()
     {
@@ -287,7 +299,6 @@ public function testThrowsExceptionOnNoConfiguredHashers()
 
     protected function setUp(): void
     {
-        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
         $hasherFactory = new PasswordHasherFactory([
             InMemoryUser::class => ['algorithm' => 'plaintext'],
             'Custom\Class\Native\User' => ['algorithm' => 'native', 'cost' => 10],
@@ -308,8 +319,6 @@ protected function tearDown(): void
 
     private function setupArgon2i()
     {
-        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
-
         $hasherFactory = new PasswordHasherFactory([
             'Custom\Class\Argon2i\User' => ['algorithm' => 'argon2i'],
         ]);
@@ -321,8 +330,6 @@ private function setupArgon2i()
 
     private function setupArgon2id()
     {
-        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
-
         $hasherFactory = new PasswordHasherFactory([
             'Custom\Class\Argon2id\User' => ['algorithm' => 'argon2id'],
         ]);
@@ -334,8 +341,6 @@ private function setupArgon2id()
 
     private function setupBcrypt()
     {
-        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
-
         $hasherFactory = new PasswordHasherFactory([
             'Custom\Class\Bcrypt\User' => ['algorithm' => 'bcrypt'],
         ]);
@@ -348,8 +353,6 @@ private function setupBcrypt()
 
     private function setupSodium()
     {
-        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
-
         $hasherFactory = new PasswordHasherFactory([
             'Custom\Class\Sodium\User' => ['algorithm' => 'sodium'],
         ]);