Merge branch '5.2' into 5.3

* 5.2: [gha] Define COLUMNS properly [travis] keep compiling sodium
symfony · Jun 27, 2021 · 380b8c9 · 380b8c9
2 parents 7e2603b + ecf9ee0
commit 380b8c9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Tests/Command/TranslationPullCommandTest.php b/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()

diff --git a/Tests/Command/TranslationPushCommandTest.php b/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()