Merge branch '5.2' into 5.3

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

Author: nicolas-grekas

Tests/Command/TranslationPullCommandTest.php

@@ -27,16 +27,19 @@
  */
 class TranslationPullCommandTest extends TranslationProviderTestCase
 {
+    private $colSize;
+
     protected function setUp(): void
     {
-        putenv('COLUMNS=121');
+        $this->colSize = getenv('COLUMNS');
+        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
         parent::setUp();
     }
 
     protected function tearDown(): void
     {
         parent::tearDown();
-        putenv('COLUMNS');
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
     }
 
     public function testPullNewXlf12Messages()

Tests/Command/TranslationPushCommandTest.php

@@ -26,16 +26,19 @@
  */
 class TranslationPushCommandTest extends TranslationProviderTestCase
 {
+    private $colSize;
+
     protected function setUp(): void
     {
-        putenv('COLUMNS=121');
+        $this->colSize = getenv('COLUMNS');
+        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
         parent::setUp();
     }
 
     protected function tearDown(): void
     {
         parent::tearDown();
-        putenv('COLUMNS');
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
     }
 
     public function testPushNewMessages()