Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit 563eb3664157 · 2021-06-27T14:22:47.000+02:00
* 5.2:
  [gha] Define COLUMNS properly
  [travis] keep compiling sodium
diff --git a/Tests/Console/Descriptor/JsonDescriptorTest.php b/Tests/Console/Descriptor/JsonDescriptorTest.php
@@ -15,14 +15,17 @@
 
 class JsonDescriptorTest extends AbstractDescriptorTest
 {
+    private $colSize;
+
     protected function setUp(): void
     {
-        putenv('COLUMNS=121');
+        $this->colSize = getenv('COLUMNS');
+        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
     }
 
     protected function tearDown(): void
     {
-        putenv('COLUMNS');
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
     }
 
     protected function getDescriptor()
diff --git a/Tests/Console/Descriptor/TextDescriptorTest.php b/Tests/Console/Descriptor/TextDescriptorTest.php
@@ -15,14 +15,17 @@
 
 class TextDescriptorTest extends AbstractDescriptorTest
 {
+    private $colSize;
+
     protected function setUp(): void
     {
-        putenv('COLUMNS=121');
+        $this->colSize = getenv('COLUMNS');
+        putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));
     }
 
     protected function tearDown(): void
     {
-        putenv('COLUMNS');
+        putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');
     }
 
     protected function getDescriptor()

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,17 @@`
`15`	`15`
`16`	`16`	`class JsonDescriptorTest extends AbstractDescriptorTest`
`17`	`17`	`{`
	`18`	`+ private $colSize;`
	`19`	`+`
`18`	`20`	`protected function setUp(): void`
`19`	`21`	`{`
`20`		`- putenv('COLUMNS=121');`
	`22`	`+ $this->colSize = getenv('COLUMNS');`
	`23`	`+ putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));`
`21`	`24`	`}`
`22`	`25`
`23`	`26`	`protected function tearDown(): void`
`24`	`27`	`{`
`25`		`- putenv('COLUMNS');`
	`28`	`+ putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`protected function getDescriptor()`