From 74236fc998ac84864ce8029c6acbd82fd3e3b02d Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 5 Jan 2022 13:54:51 +0100
Subject: [PATCH 1/2] [Console] Fix compact table style to avoid outputting a
 leading space

---
 Helper/Table.php           |  4 ++--
 Tests/Helper/TableTest.php | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Helper/Table.php b/Helper/Table.php
index 1d0a22baa..868374ab3 100644
--- a/Helper/Table.php
+++ b/Helper/Table.php
@@ -804,9 +804,9 @@ private static function initStyles(): array
         $compact = new TableStyle();
         $compact
             ->setHorizontalBorderChars('')
-            ->setVerticalBorderChars(' ')
+            ->setVerticalBorderChars('')
             ->setDefaultCrossingChar('')
-            ->setCellRowContentFormat('%s')
+            ->setCellRowContentFormat('%s ')
         ;
 
         $styleGuide = new TableStyle();
diff --git a/Tests/Helper/TableTest.php b/Tests/Helper/TableTest.php
index eed0b1662..d69e81742 100644
--- a/Tests/Helper/TableTest.php
+++ b/Tests/Helper/TableTest.php
@@ -118,11 +118,11 @@ public function renderProvider()
                 $books,
                 'compact',
 <<<'TABLE'
- ISBN          Title                    Author           
- 99921-58-10-7 Divine Comedy            Dante Alighieri  
- 9971-5-0210-0 A Tale of Two Cities     Charles Dickens  
- 960-425-059-0 The Lord of the Rings    J. R. R. Tolkien 
- 80-902734-1-6 And Then There Were None Agatha Christie  
+ISBN          Title                    Author           
+99921-58-10-7 Divine Comedy            Dante Alighieri  
+9971-5-0210-0 A Tale of Two Cities     Charles Dickens  
+960-425-059-0 The Lord of the Rings    J. R. R. Tolkien 
+80-902734-1-6 And Then There Were None Agatha Christie  
 
 TABLE
             ],

From bdcc66f3140421038f495e5b50e3ca6ffa14c773 Mon Sep 17 00:00:00 2001
From: acoulton <andrew@ingenerator.com>
Date: Sat, 26 Mar 2022 00:17:43 +0000
Subject: [PATCH 2/2] [Console] Fix exit status on uncaught exception with
 negative code

As described in #45850, if an application threw an exception with
the `code` property set to a negative number this could in some
cases cause the process to appear to exit 'successfully' with a
zero exit status.

Exiting with any negative number produces potentially unexpected
results - the reported exit status will not appear to match the
value that was set. This is due to the binary handling /
truncation of exit codes.

This may theoretically break BC for applications that were
intentionally throwing exceptions with negative codes and
performing some action based on that status. However, given they
would have had to implement an algorithm to map e.g. `-10` in
PHP to `246` as the actual exit status, it seems unlikely this
is a common usage. It is certainly outside the defined behaviour
of POSIX exit codes.

Therefore I believe it is essentially safe to assume that exceptions
with negative codes are e.g. being thrown by lower-level components,
and are not intended to set a shell exit status.

Coalescing all negative numbers to 1 matches the existing behaviour
with other 'invalid' exception codes e.g. empty / zero / non-numeric.

This therefore feels the most robust fix and eliminates any potential
for confusion.

Fixes #45850
---
 Application.php           |  2 +-
 Tests/ApplicationTest.php | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Application.php b/Application.php
index 15d537dac..1021a900f 100644
--- a/Application.php
+++ b/Application.php
@@ -157,7 +157,7 @@ public function run(InputInterface $input = null, OutputInterface $output = null
             $exitCode = $e->getCode();
             if (is_numeric($exitCode)) {
                 $exitCode = (int) $exitCode;
-                if (0 === $exitCode) {
+                if ($exitCode <= 0) {
                     $exitCode = 1;
                 }
             } else {
diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
index 6e9953dd2..fae8d2dcf 100644
--- a/Tests/ApplicationTest.php
+++ b/Tests/ApplicationTest.php
@@ -1175,6 +1175,25 @@ public function testRunDispatchesExitCodeOneForExceptionCodeZero()
         $this->assertTrue($passedRightValue, '-> exit code 1 was passed in the console.terminate event');
     }
 
+    /**
+     * @testWith [-1]
+     *           [-32000]
+     */
+    public function testRunReturnsExitCodeOneForNegativeExceptionCode($exceptionCode)
+    {
+        $exception = new \Exception('', $exceptionCode);
+
+        $application = $this->getMockBuilder(Application::class)->setMethods(['doRun'])->getMock();
+        $application->setAutoExit(false);
+        $application->expects($this->once())
+            ->method('doRun')
+            ->willThrowException($exception);
+
+        $exitCode = $application->run(new ArrayInput([]), new NullOutput());
+
+        $this->assertSame(1, $exitCode, '->run() returns exit code 1 when exception code is '.$exceptionCode);
+    }
+
     public function testAddingOptionWithDuplicateShortcut()
     {
         $this->expectException(\LogicException::class);