Merge branch '4.4'
* 4.4: cleanup fix tests
This commit is contained in:
commit
b6fc90ced7
@ -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 {}"
|
||||
|
@ -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()));
|
||||
|
||||
|
Reference in New Issue
Block a user