diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.4' 

* 4.4:
  cleanup
  fix tests
This commit is contained in:
Nicolas Grekas 2019-09-20 13:25:39 +02:00
parent a0ff8c12e3 e11aead952
commit b6fc90ced7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -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 {}"

5
src/Symfony/Component/Messenger/Tests/Command/FailedMessagesRetryCommandTest.php
View File

@ -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()));