Merge branch 'master' of github.com:php-enqueue/enqueue-dev

Author: makasim

pkg/enqueue-bundle/DependencyInjection/Configuration.php

@@ -53,6 +53,7 @@ public function getConfigTreeBuilder()
             ->arrayNode('extensions')->addDefaultsIfNotSet()->children()
                 ->booleanNode('doctrine_ping_connection_extension')->defaultFalse()->end()
                 ->booleanNode('doctrine_clear_identity_map_extension')->defaultFalse()->end()
+                ->booleanNode('signal_extension')->defaultValue(function_exists('pcntl_signal_dispatch'))->end()
             ->end()->end()
         ;
 

pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php

@@ -1,8 +1,8 @@
 <?php
 namespace Enqueue\Bundle\DependencyInjection;
 
-use Enqueue\JobQueue\Job;
 use Enqueue\Client\TraceableMessageProducer;
+use Enqueue\JobQueue\Job;
 use Enqueue\Symfony\TransportFactoryInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Resource\FileResource;
@@ -111,6 +111,10 @@ public function load(array $configs, ContainerBuilder $container)
         if ($config['extensions']['doctrine_clear_identity_map_extension']) {
             $loader->load('extensions/doctrine_clear_identity_map_extension.yml');
         }
+
+        if ($config['extensions']['signal_extension']) {
+            $loader->load('extensions/signal_extension.yml');
+        }
     }
 
     /**

pkg/enqueue-bundle/Resources/config/extensions/signal_extension.yml

@@ -0,0 +1,6 @@
+services:
+    enqueue.consumption.signal_extension:
+        class: 'Enqueue\Consumption\Extension\SignalExtension'
+        public: false
+        tags:
+            - { name: 'enqueue.consumption.extension' }

pkg/enqueue-bundle/Resources/config/services.yml

@@ -5,12 +5,6 @@ services:
         arguments:
             - []
 
-    enqueue.consumption.signal_extension:
-        class: 'Enqueue\Consumption\Extension\SignalExtension'
-        public: false
-        tags:
-            - { name: 'enqueue.consumption.extension' }
-
     enqueue.consumption.queue_consumer:
         class: 'Enqueue\Consumption\QueueConsumer'
         arguments:

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

@@ -1,11 +1,11 @@
 <?php
 namespace Enqueue\Bundle\Tests\Unit\DependencyInjection;
 
+use Enqueue\Bundle\DependencyInjection\Configuration;
+use Enqueue\Bundle\Tests\Unit\Mocks\FooTransportFactory;
 use Enqueue\Symfony\DefaultTransportFactory;
 use Enqueue\Symfony\NullTransportFactory;
 use Enqueue\Test\ClassExtensionTrait;
-use Enqueue\Bundle\DependencyInjection\Configuration;
-use Enqueue\Bundle\Tests\Unit\Mocks\FooTransportFactory;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\Definition\Processor;
@@ -312,4 +312,39 @@ public function testDoctrineClearIdentityMapExtensionCouldBeEnabled()
             ],
         ], $config);
     }
+
+    public function testSignalExtensionShouldBeEnabledByDefault()
+    {
+        $configuration = new Configuration([]);
+
+        $processor = new Processor();
+        $config = $processor->processConfiguration($configuration, [[
+            'transport' => [],
+        ]]);
+
+        $this->assertArraySubset([
+            'extensions' => [
+                'signal_extension' => true,
+            ],
+        ], $config);
+    }
+
+    public function testSignalExtensionCouldBeDisabled()
+    {
+        $configuration = new Configuration([]);
+
+        $processor = new Processor();
+        $config = $processor->processConfiguration($configuration, [[
+            'transport' => [],
+            'extensions' => [
+                'signal_extension' => false,
+            ],
+        ]]);
+
+        $this->assertArraySubset([
+            'extensions' => [
+                'signal_extension' => false,
+            ],
+        ], $config);
+    }
 }

pkg/enqueue-bundle/Tests/Unit/DependencyInjection/FormaproMessageQueueExtensionTest.php renamed to pkg/enqueue-bundle/Tests/Unit/DependencyInjection/EnqueueExtensionTest.php

@@ -1,15 +1,15 @@
 <?php
 namespace Enqueue\Bundle\Tests\Unit\DependencyInjection;
 
+use Enqueue\Bundle\DependencyInjection\Configuration;
+use Enqueue\Bundle\DependencyInjection\EnqueueExtension;
+use Enqueue\Bundle\Tests\Unit\Mocks\FooTransportFactory;
 use Enqueue\Client\MessageProducer;
 use Enqueue\Client\TraceableMessageProducer;
 use Enqueue\Symfony\DefaultTransportFactory;
 use Enqueue\Symfony\NullTransportFactory;
 use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Transport\Null\NullContext;
-use Enqueue\Bundle\DependencyInjection\Configuration;
-use Enqueue\Bundle\DependencyInjection\EnqueueExtension;
-use Enqueue\Bundle\Tests\Unit\Mocks\FooTransportFactory;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -398,4 +398,38 @@ public function testShouldNotLoadDoctrineClearIdentityMapExtensionServiceIfDisab
 
         self::assertFalse($container->hasDefinition('enqueue.consumption.doctrine_clear_identity_map_extension'));
     }
+
+    public function testShouldLoadSignalExtensionServiceIfEnabled()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', true);
+
+        $extension = new EnqueueExtension();
+
+        $extension->load([[
+            'transport' => [],
+            'extensions' => [
+                'signal_extension' => true,
+            ],
+        ]], $container);
+
+        self::assertTrue($container->hasDefinition('enqueue.consumption.signal_extension'));
+    }
+
+    public function testShouldNotLoadSignalExtensionServiceIfDisabled()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('kernel.debug', true);
+
+        $extension = new EnqueueExtension();
+
+        $extension->load([[
+            'transport' => [],
+            'extensions' => [
+                'signal_extension' => false,
+            ],
+        ]], $container);
+
+        self::assertFalse($container->hasDefinition('enqueue.consumption.signal_extension'));
+    }
 }

pkg/enqueue-bundle/Tests/Unit/FormaproMessageQueueBundleTest.php renamed to pkg/enqueue-bundle/Tests/Unit/EnqueueBundleTest.php

@@ -3,9 +3,6 @@
 
 use Enqueue\AmqpExt\Symfony\AmqpTransportFactory;
 use Enqueue\AmqpExt\Symfony\RabbitMqTransportFactory;
-use Enqueue\Symfony\DefaultTransportFactory;
-use Enqueue\Symfony\NullTransportFactory;
-use Enqueue\Test\ClassExtensionTrait;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildClientRoutingPass;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildExtensionsPass;
 use Enqueue\Bundle\DependencyInjection\Compiler\BuildMessageProcessorRegistryPass;
@@ -15,6 +12,9 @@
 use Enqueue\Bundle\EnqueueBundle;
 use Enqueue\Stomp\Symfony\RabbitMqStompTransportFactory;
 use Enqueue\Stomp\Symfony\StompTransportFactory;
+use Enqueue\Symfony\DefaultTransportFactory;
+use Enqueue\Symfony\NullTransportFactory;
+use Enqueue\Test\ClassExtensionTrait;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;