From cfd6d645ef7c3240f478a5a40f848c51fad1612e Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Fri, 20 Sep 2019 12:40:48 +0200
Subject: [PATCH 1/2] fix tests

---
 .../Tests/Command/FailedMessagesRetryCommandTest.php         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRetryCommandTest.php b/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRetryCommandTest.php
index bc69a1c2e8..8fa0915bc9 100644
--- a/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRetryCommandTest.php
+++ b/src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRetryCommandTest.php
@@ -13,7 +13,8 @@ namespace Symfony\Component\Messenger\Tests\Command;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\Debug\Exception\FlattenException;
+use Symfony\Component\Debug\Exception\FlattenException as LegacyFlattenException;
+use Symfony\Component\ErrorRenderer\Exception\FlattenException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Messenger\Command\FailedMessagesRetryCommand;
 use Symfony\Component\Messenger\Envelope;
@@ -71,7 +72,7 @@ class FailedMessagesRetryCommandTest extends TestCase
 
                 return $lastRedeliveryStamp instanceof RedeliveryStamp &&
                     \is_string($lastRedeliveryStamp->getExceptionMessage()) &&
-                    $lastRedeliveryStamp->getFlattenException() instanceof FlattenException;
+                    ($lastRedeliveryStamp->getFlattenException() instanceof FlattenException || $lastRedeliveryStamp->getFlattenException() instanceof LegacyFlattenException);
             }))
             ->willReturn(new Envelope(new \stdClass()));
 

From e11aead952b72dcda335fe19b76a29755cb5d593 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 20 Sep 2019 13:17:55 +0200
Subject: [PATCH 2/2] cleanup

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c553157c90..48c249787a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -281,7 +281,7 @@ install:
                   composer install --optimize-autoloader
                   php .github/patch-types.php
                   php .github/patch-types.php # ensure the script is idempotent
-                  export PHPUNIT_X="$PHPUNIT_X,issue-32995,legacy"
+                  export PHPUNIT_X="$PHPUNIT_X,legacy"
               fi
 
               echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"