Merge branch 'pr-354'

Author: makasim

pkg/amqp-bunny/AmqpContext.php

@@ -249,7 +249,7 @@ public function bind(InteropAmqpBind $bind)
                 (bool) ($bind->getFlags() & InteropAmqpBind::FLAG_NOWAIT),
                 $bind->getArguments()
             );
-            // bind queue to exchange
+        // bind queue to exchange
         } elseif ($bind->getSource() instanceof InteropAmqpQueue) {
             $this->getBunnyChannel()->queueBind(
                 $bind->getSource()->getQueueName(),
@@ -258,7 +258,7 @@ public function bind(InteropAmqpBind $bind)
                 (bool) ($bind->getFlags() & InteropAmqpBind::FLAG_NOWAIT),
                 $bind->getArguments()
             );
-            // bind exchange to queue
+        // bind exchange to queue
         } else {
             $this->getBunnyChannel()->queueBind(
                 $bind->getTarget()->getQueueName(),
@@ -288,15 +288,15 @@ public function unbind(InteropAmqpBind $bind)
                 (bool) ($bind->getFlags() & InteropAmqpBind::FLAG_NOWAIT),
                 $bind->getArguments()
             );
-            // bind queue to exchange
+        // bind queue to exchange
         } elseif ($bind->getSource() instanceof InteropAmqpQueue) {
             $this->getBunnyChannel()->queueUnbind(
                 $bind->getSource()->getQueueName(),
                 $bind->getTarget()->getTopicName(),
                 $bind->getRoutingKey(),
                 $bind->getArguments()
             );
-            // bind exchange to queue
+        // bind exchange to queue
         } else {
             $this->getBunnyChannel()->queueUnbind(
                 $bind->getTarget()->getQueueName(),

pkg/amqp-lib/AmqpContext.php

@@ -242,7 +242,7 @@ public function bind(InteropAmqpBind $bind)
                 (bool) ($bind->getFlags() & InteropAmqpBind::FLAG_NOWAIT),
                 $bind->getArguments()
             );
-            // bind queue to exchange
+        // bind queue to exchange
         } elseif ($bind->getSource() instanceof InteropAmqpQueue) {
             $this->getLibChannel()->queue_bind(
                 $bind->getSource()->getQueueName(),
@@ -251,7 +251,7 @@ public function bind(InteropAmqpBind $bind)
                 (bool) ($bind->getFlags() & InteropAmqpBind::FLAG_NOWAIT),
                 $bind->getArguments()
             );
-            // bind exchange to queue
+        // bind exchange to queue
         } else {
             $this->getLibChannel()->queue_bind(
                 $bind->getTarget()->getQueueName(),
@@ -281,15 +281,15 @@ public function unbind(InteropAmqpBind $bind)
                 (bool) ($bind->getFlags() & InteropAmqpBind::FLAG_NOWAIT),
                 $bind->getArguments()
             );
-            // bind queue to exchange
+        // bind queue to exchange
         } elseif ($bind->getSource() instanceof InteropAmqpQueue) {
             $this->getLibChannel()->queue_unbind(
                 $bind->getSource()->getQueueName(),
                 $bind->getTarget()->getTopicName(),
                 $bind->getRoutingKey(),
                 $bind->getArguments()
             );
-            // bind exchange to queue
+        // bind exchange to queue
         } else {
             $this->getLibChannel()->queue_unbind(
                 $bind->getTarget()->getQueueName(),

pkg/enqueue-bundle/DependencyInjection/Configuration.php

@@ -10,17 +10,21 @@
 
 class Configuration implements ConfigurationInterface
 {
+    private $debug;
+
     /**
      * @var TransportFactoryInterface[]
      */
     private $factories;
 
     /**
      * @param TransportFactoryInterface[] $factories
+     * @param bool                        $debug
      */
-    public function __construct(array $factories)
+    public function __construct(array $factories, $debug)
     {
         $this->factories = $factories;
+        $this->debug = $debug;
     }
 
     /**
@@ -42,7 +46,7 @@ public function getConfigTreeBuilder()
 
         $rootNode->children()
             ->arrayNode('client')->children()
-                ->booleanNode('traceable_producer')->defaultFalse()->end()
+                ->booleanNode('traceable_producer')->defaultValue($this->debug)->end()
                 ->scalarNode('prefix')->defaultValue('enqueue')->end()
                 ->scalarNode('app_name')->defaultValue('app')->end()
                 ->scalarNode('router_topic')->defaultValue(Config::DEFAULT_PROCESSOR_QUEUE_NAME)->cannotBeEmpty()->end()

pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php

@@ -56,7 +56,7 @@ public function addTransportFactory(TransportFactoryInterface $transportFactory)
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $config = $this->processConfiguration(new Configuration($this->factories), $configs);
+        $config = $this->processConfiguration($this->getConfiguration($configs, $container), $configs);
 
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
@@ -77,7 +77,7 @@ public function load(array $configs, ContainerBuilder $container)
                 }
             }
 
-            if (isset($config['transport']['default']['alias']) && false == isset($config['transport'][$config['transport']['default']['alias']])) {
+            if (isset($config['transport']['default']['alias']) && !isset($config['transport'][$config['transport']['default']['alias']])) {
                 throw new \LogicException(sprintf('Transport is not enabled: %s', $config['transport']['default']['alias']));
             }
 
@@ -95,7 +95,7 @@ public function load(array $configs, ContainerBuilder $container)
             $container->setParameter('enqueue.client.router_queue_name', $config['client']['router_queue']);
             $container->setParameter('enqueue.client.default_queue_name', $config['client']['default_processor_queue']);
 
-            if (false == empty($config['client']['traceable_producer'])) {
+            if ($config['client']['traceable_producer']) {
                 $container->register(TraceableProducer::class, TraceableProducer::class)
                     ->setDecoratedService(Producer::class)
                     ->addArgument(new Reference(sprintf('%s.inner', TraceableProducer::class)))
@@ -125,7 +125,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if ($config['job']) {
-            if (false == class_exists(Job::class)) {
+            if (!class_exists(Job::class)) {
                 throw new \LogicException('Seems "enqueue/job-queue" is not installed. Please fix this issue.');
             }
 
@@ -167,7 +167,7 @@ public function getConfiguration(array $config, ContainerBuilder $container)
 
         $container->addResource(new FileResource($rc->getFileName()));
 
-        return new Configuration($this->factories);
+        return new Configuration($this->factories, $container->getParameter('kernel.debug'));
     }
 
     public function prepend(ContainerBuilder $container)
@@ -177,19 +177,19 @@ public function prepend(ContainerBuilder $container)
 
     private function registerJobQueueDoctrineEntityMapping(ContainerBuilder $container)
     {
-        if (false == class_exists(Job::class)) {
+        if (!class_exists(Job::class)) {
             return;
         }
 
         $bundles = $container->getParameter('kernel.bundles');
 
-        if (false == isset($bundles['DoctrineBundle'])) {
+        if (!isset($bundles['DoctrineBundle'])) {
             return;
         }
 
         foreach ($container->getExtensionConfig('doctrine') as $config) {
             // do not register mappings if dbal not configured.
-            if (false == empty($config['dbal'])) {
+            if (!empty($config['dbal'])) {
                 $rc = new \ReflectionClass(Job::class);
                 $jobQueueRootDir = dirname($rc->getFileName());
                 $container->prependExtensionConfig('doctrine', [