php-enqueue · makasim · Aug 13, 2018 · Aug 13, 2018
diff --git a/docs/async_event_dispatcher/quick_tour.md b/docs/async_event_dispatcher/quick_tour.md
@@ -39,7 +39,7 @@ $eventQueue = $context->createQueue('symfony_events');
 
 $registry = new SimpleRegistry(
     ['the_event' => 'default'], 
-    ['default' => new PhpSerializerEventTransformer($context, true)]
+    ['default' => new PhpSerializerEventTransformer($context)]
 );
 
 $asyncListener = new AsyncListener($context, $registry, $eventQueue);

diff --git a/pkg/async-event-dispatcher/AsyncProcessor.php b/pkg/async-event-dispatcher/AsyncProcessor.php
@@ -16,7 +16,7 @@ class AsyncProcessor implements PsrProcessor
     private $registry;
 
     /**
-     * @var AsyncEventDispatcher|OldAsyncEventDispatcher
+     * @var AsyncEventDispatcher
      */
     private $dispatcher;
 
@@ -28,11 +28,10 @@ public function __construct(Registry $registry, EventDispatcherInterface $dispat
     {
         $this->registry = $registry;
 
-        if (false == ($dispatcher instanceof AsyncEventDispatcher || $dispatcher instanceof OldAsyncEventDispatcher)) {
+        if (false == $dispatcher instanceof AsyncEventDispatcher) {
             throw new \InvalidArgumentException(sprintf(
-                'The dispatcher argument must be either instance of "%s" or "%s" but got "%s"',
+                'The dispatcher argument must be instance of "%s" but got "%s"',
                 AsyncEventDispatcher::class,
-                OldAsyncEventDispatcher::class,
                 get_class($dispatcher)
             ));
         }

diff --git a/pkg/async-event-dispatcher/DependencyInjection/AsyncEventDispatcherExtension.php b/pkg/async-event-dispatcher/DependencyInjection/AsyncEventDispatcherExtension.php
@@ -2,15 +2,11 @@
 
 namespace Enqueue\AsyncEventDispatcher\DependencyInjection;
 
-use Enqueue\AsyncEventDispatcher\OldAsyncEventDispatcher;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\HttpKernel\Kernel;
 
 class AsyncEventDispatcherExtension extends Extension
 {
@@ -25,13 +21,5 @@ public function load(array $configs, ContainerBuilder $container)
 
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
-
-        if (version_compare(Kernel::VERSION, '3.3', '<')) {
-            $container->setDefinition('enqueue.events.event_dispatcher', new Definition(OldAsyncEventDispatcher::class, [
-                new Reference('service_container'),
-                new Reference('event_dispatcher'),
-                new Reference('enqueue.events.async_listener'),
-            ]));
-        }
     }
 }
diff --git a/pkg/async-event-dispatcher/OldAsyncEventDispatcher.php b/pkg/async-event-dispatcher/OldAsyncEventDispatcher.php
diff --git a/pkg/async-event-dispatcher/PhpSerializerEventTransformer.php b/pkg/async-event-dispatcher/PhpSerializerEventTransformer.php
@@ -5,7 +5,6 @@
 use Interop\Queue\PsrContext;
 use Interop\Queue\PsrMessage;
 use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\HttpKernel\Kernel;
 
 class PhpSerializerEventTransformer implements EventTransformer
 {
@@ -14,28 +13,19 @@ class PhpSerializerEventTransformer implements EventTransformer
      */
     private $context;
 
-    /**
-     * @var bool
-     */
-    private $skipSymfonyVersionCheck;
-
     /**
      * @param PsrContext $context
-     * @param bool       $skipSymfonyVersionCheck It is useful when async dispatcher is used without Kernel. So there is no way to check the version.
      */
-    public function __construct(PsrContext $context, $skipSymfonyVersionCheck = false)
+    public function __construct(PsrContext $context)
     {
         $this->context = $context;
-        $this->skipSymfonyVersionCheck = $skipSymfonyVersionCheck;
     }
 
     /**
      * {@inheritdoc}
      */
     public function toMessage($eventName, Event $event = null)
     {
-        $this->assertSymfony30OrHigher();
-
         return $this->context->createMessage(serialize($event));
     }
 
@@ -44,24 +34,6 @@ public function toMessage($eventName, Event $event = null)
      */
     public function toEvent($eventName, PsrMessage $message)
     {
-        $this->assertSymfony30OrHigher();
-
         return unserialize($message->getBody());
     }
-
-    private function assertSymfony30OrHigher()
-    {
-        if ($this->skipSymfonyVersionCheck) {
-            return;
-        }
-
-        if (version_compare(Kernel::VERSION, '3.0', '<')) {
-            throw new \LogicException(
-                'This transformer does not work on Symfony prior 3.0. '.
-                'The event contains eventDispatcher and therefor could not be serialized. '.
-                'You have to register a transformer for every async event. '.
-                'Read the doc: https://github.com/php-enqueue/enqueue-dev/blob/master/docs/bundle/async_events.md#event-transformer'
-            );
-        }
-    }
 }
diff --git a/pkg/async-event-dispatcher/Tests/PhpSerializerEventTransformerTest.php b/pkg/async-event-dispatcher/Tests/PhpSerializerEventTransformerTest.php
@@ -10,7 +10,6 @@
 use Interop\Queue\PsrMessage;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\GenericEvent;
-use Symfony\Component\HttpKernel\Kernel;
 
 class PhpSerializerEventTransformerTest extends TestCase
 {
@@ -28,10 +27,6 @@ public function testCouldBeConstructedWithoutAnyArguments()
 
     public function testShouldReturnMessageWithPhpSerializedEventAsBodyOnToMessage()
     {
-        if (version_compare(Kernel::VERSION, '3.0', '<')) {
-            $this->markTestSkipped('This functionality only works on Symfony 3.0 or higher');
-        }
-
         $transformer = new PhpSerializerEventTransformer($this->createContextStub());
 
         $event = new GenericEvent('theSubject');
@@ -45,10 +40,6 @@ public function testShouldReturnMessageWithPhpSerializedEventAsBodyOnToMessage()
 
     public function testShouldReturnEventUnserializedFromMessageBodyOnToEvent()
     {
-        if (version_compare(Kernel::VERSION, '3.0', '<')) {
-            $this->markTestSkipped('This functionality only works on Symfony 3.0 or higher');
-        }
-
         $message = new NullMessage();
         $message->setBody(serialize(new GenericEvent('theSubject')));
 
@@ -60,34 +51,6 @@ public function testShouldReturnEventUnserializedFromMessageBodyOnToEvent()
         $this->assertEquals('theSubject', $event->getSubject());
     }
 
-    public function testThrowNotSupportedExceptionOnSymfonyPrior30OnToMessage()
-    {
-        if (version_compare(Kernel::VERSION, '3.0', '>=')) {
-            $this->markTestSkipped('This functionality only works on Symfony 3.0 or higher');
-        }
-
-        $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('This transformer does not work on Symfony prior 3.0.');
-
-        $transformer = new PhpSerializerEventTransformer($this->createContextStub());
-
-        $transformer->toMessage(new GenericEvent());
-    }
-
-    public function testThrowNotSupportedExceptionOnSymfonyPrior30OnToEvent()
-    {
-        if (version_compare(Kernel::VERSION, '3.0', '>=')) {
-            $this->markTestSkipped('This functionality only works on Symfony 3.0 or higher');
-        }
-
-        $this->expectException(\LogicException::class);
-        $this->expectExceptionMessage('This transformer does not work on Symfony prior 3.0.');
-
-        $transformer = new PhpSerializerEventTransformer($this->createContextStub());
-
-        $transformer->toEvent('anEvent', new NullMessage());
-    }
-
     /**
      * @return \PHPUnit_Framework_MockObject_MockObject|PsrContext
      */

diff --git a/pkg/enqueue-bundle/Tests/Functional/Events/AsyncListenerTest.php b/pkg/enqueue-bundle/Tests/Functional/Events/AsyncListenerTest.php
@@ -82,11 +82,12 @@ public function testShouldSendMessageIfDispatchedFromInsideListener()
         /** @var EventDispatcherInterface $dispatcher */
         $dispatcher = static::$container->get('event_dispatcher');
 
-        $dispatcher->addListener('foo', function (Event $event, $eventName, EventDispatcherInterface $dispatcher) {
+        $eventName = 'an_event_'.uniqid();
+        $dispatcher->addListener($eventName, function (Event $event, $eventName, EventDispatcherInterface $dispatcher) {
             $dispatcher->dispatch('test_async', new GenericEvent('theSubject', ['fooArg' => 'fooVal']));
         });
 
-        $dispatcher->dispatch('foo');
+        $dispatcher->dispatch($eventName);
 
         /** @var TraceableProducer $producer */
         $producer = static::$container->get('enqueue.producer');

diff --git a/pkg/enqueue-bundle/Tests/Functional/Events/AsyncProcessorTest.php b/pkg/enqueue-bundle/Tests/Functional/Events/AsyncProcessorTest.php
@@ -26,6 +26,8 @@ public function setUp()
         $asyncListener = static::$container->get('enqueue.events.async_listener');
 
         $asyncListener->resetSyncMode();
+        static::$container->get('test_async_subscriber')->calls = [];
+        static::$container->get('test_async_listener')->calls = [];
     }
 
     public function testCouldBeGetFromContainerAsService()

diff --git a/pkg/enqueue-bundle/Tests/Functional/Events/AsyncSubscriberTest.php b/pkg/enqueue-bundle/Tests/Functional/Events/AsyncSubscriberTest.php
@@ -82,11 +82,12 @@ public function testShouldSendMessageIfDispatchedFromInsideListener()
         /** @var EventDispatcherInterface $dispatcher */
         $dispatcher = static::$container->get('event_dispatcher');
 
-        $dispatcher->addListener('foo', function (Event $event, $eventName, EventDispatcherInterface $dispatcher) {
+        $eventName = 'anEvent'.uniqid();
+        $dispatcher->addListener($eventName, function (Event $event, $eventName, EventDispatcherInterface $dispatcher) {
             $dispatcher->dispatch('test_async_subscriber', new GenericEvent('theSubject', ['fooArg' => 'fooVal']));
         });
 
-        $dispatcher->dispatch('foo');
+        $dispatcher->dispatch($eventName);
 
         /** @var TraceableProducer $producer */
         $producer = static::$container->get('enqueue.producer');

diff --git a/pkg/enqueue-bundle/Tests/Functional/QueuesCommandTest.php b/pkg/enqueue-bundle/Tests/Functional/QueuesCommandTest.php
@@ -5,7 +5,6 @@
 use Enqueue\Client\RouterProcessor;
 use Enqueue\Symfony\Client\Meta\QueuesCommand;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * @group functional
@@ -30,15 +29,7 @@ public function testShouldDisplayRegisteredQueues()
 
         $this->assertContains(' default ', $display);
         $this->assertContains('enqueue.app.default', $display);
-
-        $displayId = RouterProcessor::class;
-        if (30300 > Kernel::VERSION_ID) {
-            // Symfony 3.2 and below make service identifiers lowercase, so we do the same.
-            // To be removed when dropping support for Symfony < 3.3.
-            $displayId = strtolower($displayId);
-        }
-
-        $this->assertContains($displayId, $display);
+        $this->assertContains(RouterProcessor::class, $display);
     }
 
     public function testShouldDisplayRegisteredCommand()

diff --git a/pkg/enqueue-bundle/Tests/Functional/TopicsCommandTest.php b/pkg/enqueue-bundle/Tests/Functional/TopicsCommandTest.php
@@ -6,7 +6,6 @@
 use Enqueue\Client\RouterProcessor;
 use Enqueue\Symfony\Client\Meta\TopicsCommand;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * @group functional
@@ -30,15 +29,7 @@ public function testShouldDisplayRegisteredTopics()
         $display = $tester->getDisplay();
 
         $this->assertContains('__router__', $display);
-
-        $displayId = RouterProcessor::class;
-        if (30300 > Kernel::VERSION_ID) {
-            // Symfony 3.2 and below make service identifiers lowercase, so we do the same.
-            // To be removed when dropping support for Symfony < 3.3.
-            $displayId = strtolower($displayId);
-        }
-
-        $this->assertContains($displayId, $display);
+        $this->assertContains(RouterProcessor::class, $display);
     }
 
     public function testShouldDisplayCommands()

diff --git a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php
@@ -93,14 +93,11 @@ public function provideEnqueueConfigs()
             ],
         ]];
 
-        // Symfony 2.x does not such env syntax
-        if (version_compare(Kernel::VERSION, '3.2', '>=')) {
-            yield 'default_dsn_as_env' => [[
-                'transport' => [
-                    'default' => '%env(AMQP_DSN)%',
-                ],
-            ]];
-        }
+        yield 'default_dsn_as_env' => [[
+            'transport' => [
+                'default' => '%env(AMQP_DSN)%',
+            ],
+        ]];
 
         yield 'default_dbal_as_dsn' => [[
             'transport' => [