From 276f190d22c1c38688ad1cfdb0c3a11bdd392ce8 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 20 Sep 2019 23:40:23 +0200 Subject: [PATCH 1/2] fix typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dfa3300974..67d68a0867 100644 --- a/.travis.yml +++ b/.travis.yml @@ -196,7 +196,7 @@ install: - | # Install the phpunit-bridge from a PR if required # - # To run a PR with a patched phpunit-bridge, first submit the path for the + # To run a PR with a patched phpunit-bridge, first submit the patch for the # phpunit-bridge as a separate PR against the next feature-branch then # uncomment and update the following line with that PR number #SYMFONY_PHPUNIT_BRIDGE_PR=32886 From 8ccb42bb722a7d736ad9685e1ff8455e3aa1d42f Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sat, 21 Sep 2019 01:13:06 +0200 Subject: [PATCH 2/2] [FrameworkBundle] fix tests --- .../Fixtures/php/messenger_routing.php | 4 ++-- .../Fixtures/xml/messenger_routing.xml | 4 ++-- .../Fixtures/yml/messenger_routing.yml | 4 ++-- .../FrameworkExtensionTest.php | 2 +- .../Tests/Fixtures/Messenger/DummyMessage.php | 18 ++++++++++++++++++ .../Messenger/DummyMessageInterface.php | 7 +++++++ .../Tests/Fixtures/Messenger/SecondMessage.php | 7 +++++++ 7 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyMessage.php create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyMessageInterface.php create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/SecondMessage.php diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php index 9badc06505..0cecbd71a5 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_routing.php @@ -7,8 +7,8 @@ $container->loadFromExtension('framework', [ 'default_serializer' => 'messenger.transport.symfony_serializer', ], 'routing' => [ - 'Symfony\Component\Messenger\Tests\Fixtures\DummyMessage' => ['amqp', 'audit'], - 'Symfony\Component\Messenger\Tests\Fixtures\SecondMessage' => [ + 'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage' => ['amqp', 'audit'], + 'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\SecondMessage' => [ 'senders' => ['amqp', 'audit'], ], '*' => 'amqp', diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml index 43be6fc709..62028169ea 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_routing.xml @@ -9,11 +9,11 @@ - + - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing.yml index ae060529ff..540d0d8ad0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_routing.yml @@ -4,8 +4,8 @@ framework: serializer: default_serializer: messenger.transport.symfony_serializer routing: - 'Symfony\Component\Messenger\Tests\Fixtures\DummyMessage': [amqp, audit] - 'Symfony\Component\Messenger\Tests\Fixtures\SecondMessage': + 'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage': [amqp, audit] + 'Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\SecondMessage': senders: [amqp, audit] '*': amqp transports: diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index dc3e6f2052..8f54c30c09 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -15,6 +15,7 @@ use Doctrine\Common\Annotations\Annotation; use Psr\Log\LoggerAwareInterface; use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass; use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension; +use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage; use Symfony\Bundle\FrameworkBundle\Tests\TestCase; use Symfony\Bundle\FullStack; use Symfony\Component\Cache\Adapter\AdapterInterface; @@ -36,7 +37,6 @@ use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpClient\ScopingHttpClient; use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass; -use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage; use Symfony\Component\Messenger\Transport\TransportFactory; use Symfony\Component\PropertyAccess\PropertyAccessor; use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader; diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyMessage.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyMessage.php new file mode 100644 index 0000000000..7f25eb4e5b --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyMessage.php @@ -0,0 +1,18 @@ +message = $message; + } + + public function getMessage(): string + { + return $this->message; + } +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyMessageInterface.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyMessageInterface.php new file mode 100644 index 0000000000..a7243368af --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Messenger/DummyMessageInterface.php @@ -0,0 +1,7 @@ +