Merge branch 'pr-452'

Author: makasim

pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php

@@ -3,7 +3,9 @@
 namespace Enqueue\Bundle\DependencyInjection;
 
 use Enqueue\AsyncEventDispatcher\DependencyInjection\AsyncEventDispatcherExtension;
+use Enqueue\Client\CommandSubscriberInterface;
 use Enqueue\Client\Producer;
+use Enqueue\Client\TopicSubscriberInterface;
 use Enqueue\Client\TraceableProducer;
 use Enqueue\Consumption\QueueConsumer;
 use Enqueue\JobQueue\Job;
@@ -72,6 +74,8 @@ public function load(array $configs, ContainerBuilder $container)
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
 
+        $this->setupAutowiringForProcessors($container);
+
         foreach ($config['transport'] as $name => $transportConfig) {
             $this->factories[$name]->createConnectionFactory($container, $transportConfig);
             $this->factories[$name]->createContext($container, $transportConfig);
@@ -220,4 +224,19 @@ private function registerJobQueueDoctrineEntityMapping(ContainerBuilder $contain
             }
         }
     }
+
+    private function setupAutowiringForProcessors(ContainerBuilder $container)
+    {
+        if (!method_exists($container, 'registerForAutoconfiguration')) {
+            return;
+        }
+
+        $container->registerForAutoconfiguration(TopicSubscriberInterface::class)
+            ->setPublic(true)
+            ->addTag('enqueue.client.processor');
+
+        $container->registerForAutoconfiguration(CommandSubscriberInterface::class)
+            ->setPublic(true)
+            ->addTag('enqueue.client.processor');
+    }
 }

pkg/enqueue-bundle/Tests/Unit/DependencyInjection/EnqueueExtensionTest.php

@@ -6,8 +6,10 @@
 use Enqueue\Bundle\DependencyInjection\EnqueueExtension;
 use Enqueue\Bundle\Tests\Unit\Mocks\FooTransportFactory;
 use Enqueue\Bundle\Tests\Unit\Mocks\TransportFactoryWithoutDriverFactory;
+use Enqueue\Client\CommandSubscriberInterface;
 use Enqueue\Client\Producer;
 use Enqueue\Client\ProducerInterface;
+use Enqueue\Client\TopicSubscriberInterface;
 use Enqueue\Client\TraceableProducer;
 use Enqueue\Consumption\QueueConsumer;
 use Enqueue\JobQueue\JobRunner;
@@ -633,6 +635,31 @@ public function testShouldThrowIfPackageShouldBeInstalledToUseTransport()
         ]], $container);
     }
 
+    public function testShouldLoadProcessAutoconfigureChildDefinition()
+    {
+        if (30300 >= Kernel::VERSION_ID) {
+            $this->markTestSkipped('The autoconfigure feature is available since Symfony 3.3 version');
+        }
+
+        $container = $this->getContainerBuilder(true);
+        $extension = new EnqueueExtension();
+
+        $extension->load([[
+            'client' => [],
+            'transport' => [],
+        ]], $container);
+
+        $autoconfigured = $container->getAutoconfiguredInstanceof();
+
+        self::assertArrayHasKey(CommandSubscriberInterface::class, $autoconfigured);
+        self::assertTrue($autoconfigured[CommandSubscriberInterface::class]->hasTag('enqueue.client.processor'));
+        self::assertTrue($autoconfigured[CommandSubscriberInterface::class]->isPublic());
+
+        self::assertArrayHasKey(TopicSubscriberInterface::class, $autoconfigured);
+        self::assertTrue($autoconfigured[TopicSubscriberInterface::class]->hasTag('enqueue.client.processor'));
+        self::assertTrue($autoconfigured[TopicSubscriberInterface::class]->isPublic());
+    }
+
     /**
      * @param bool $debug
      *

pkg/sqs/SqsProducer.php

@@ -42,11 +42,11 @@ public function send(PsrDestination $destination, PsrMessage $message)
         InvalidMessageException::assertMessageInstanceOf($message, SqsMessage::class);
 
         $body = $message->getBody();
-        if (is_scalar($body) || null === $body) {
+        if (is_scalar($body) && strlen($body) > 0) {
             $body = (string) $body;
         } else {
             throw new InvalidMessageException(sprintf(
-                'The message body must be a scalar or null. Got: %s',
+                'The message body must be a non-empty string. Got: %s',
                 is_object($body) ? get_class($body) : gettype($body)
             ));
         }

pkg/sqs/Tests/SqsProducerTest.php

@@ -31,7 +31,7 @@ public function testCouldBeConstructedWithRequiredArguments()
     public function testShouldThrowIfBodyOfInvalidType()
     {
         $this->expectException(InvalidMessageException::class);
-        $this->expectExceptionMessage('The message body must be a scalar or null. Got: stdClass');
+        $this->expectExceptionMessage('The message body must be a non-empty string. Got: stdClass');
 
         $producer = new SqsProducer($this->createSqsContextMock());
 
@@ -72,7 +72,7 @@ public function testShouldThrowIfSendMessageFailed()
         ;
 
         $destination = new SqsDestination('queue-name');
-        $message = new SqsMessage();
+        $message = new SqsMessage('foo');
 
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionMessage('Message was not sent');