Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit fbc562935556 · 2021-06-27T14:22:47.000+02:00
* 5.2:
  [gha] Define COLUMNS properly
  [travis] keep compiling sodium
diff --git a/Tests/Console/Descriptor/TextDescriptorTest.php b/Tests/Console/Descriptor/TextDescriptorTest.php
@@ -18,15 +18,17 @@
 class TextDescriptorTest extends AbstractDescriptorTest
 {
     private $fileLinkFormatter = null;
+    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
`@@ -18,15 +18,17 @@`
`18`	`18`	`class TextDescriptorTest extends AbstractDescriptorTest`
`19`	`19`	`{`
`20`	`20`	`private $fileLinkFormatter = null;`
	`21`	`+ private $colSize;`
`21`	`22`
`22`	`23`	`protected function setUp(): void`
`23`	`24`	`{`
`24`		`- putenv('COLUMNS=121');`
	`25`	`+ $this->colSize = getenv('COLUMNS');`
	`26`	`+ putenv('COLUMNS='.(119 + \strlen(\PHP_EOL)));`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`protected function tearDown(): void`
`28`	`30`	`{`
`29`		`- putenv('COLUMNS');`
	`31`	`+ putenv($this->colSize ? 'COLUMNS='.$this->colSize : 'COLUMNS');`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`protected function getDescriptor()`