Merge pull request #482 from upyx/issue_477

Fixed config:dump-reference, fixed PHPUnit deprecated warning (#477)

Author: stloyd

DependencyInjection/OldSoundRabbitMqExtension.php

@@ -40,7 +40,7 @@ public function load(array $configs, ContainerBuilder $container)
         $loader = new XmlFileLoader($this->container, new FileLocator(array(__DIR__ . '/../Resources/config')));
         $loader->load('rabbitmq.xml');
 
-        $configuration = new Configuration($this->getAlias());
+        $configuration = $this->getConfiguration($configs, $container);
         $this->config = $this->processConfiguration($configuration, $configs);
 
         $this->collectorEnabled = $this->config['enable_collector'];
@@ -69,6 +69,11 @@ public function load(array $configs, ContainerBuilder $container)
         }
     }
 
+    public function getConfiguration(array $config, ContainerBuilder $container)
+    {
+        return new Configuration($this->getAlias());
+    }
+
     protected function loadConnections()
     {
         foreach ($this->config['connections'] as $key => $connection) {

Tests/RabbitMq/RpcClientTest.php

@@ -3,6 +3,7 @@
 namespace OldSound\RabbitMqBundle\Tests\RabbitMq;
 
 use OldSound\RabbitMqBundle\RabbitMq\RpcClient;
+use PhpAmqpLib\Message\AMQPMessage;
 
 class RpcClientTest extends \PHPUnit_Framework_TestCase
 {
@@ -13,16 +14,22 @@ public function testProcessMessageWithCustomUnserializer()
             ->setMethods(array('sendReply', 'maybeStopConsumer'))
             ->disableOriginalConstructor()
             ->getMock();
-        $message = $this->getMockBuilder('\PhpAmqpLib\Message\AMQPMessage')->setMethods(array('get'))->setConstructorArgs(array('message'))->getMock();
-        $serializer = $this->getMockBuilder('\Symfony\Component\Serializer\SerializerInterface')->setMethods(array('serialize', 'deserialize'))->getMock();
+        /** @var AMQPMessage $message */
+        $message = $this->getMockBuilder('\PhpAmqpLib\Message\AMQPMessage')
+            ->setMethods(array('get'))
+            ->setConstructorArgs(array('message'))
+            ->getMock();
+        $serializer = $this->getMockBuilder('\Symfony\Component\Serializer\SerializerInterface')
+            ->setMethods(array('serialize', 'deserialize'))
+            ->getMock();
         $serializer->expects($this->once())->method('deserialize')->with('message', 'json', null);
         $client->initClient(true);
         $client->setUnserializer(function($data) use ($serializer) {
             $serializer->deserialize($data, 'json', null);
         });
         $client->processMessage($message);
     }
-    
+
     public function testProcessMessageWithNotifyMethod()
     {
         /** @var RpcClient $client */
@@ -31,7 +38,11 @@ public function testProcessMessageWithNotifyMethod()
             ->disableOriginalConstructor()
             ->getMock();
         $expectedNotify = 'message';
-        $message = $this->getMock('\PhpAmqpLib\Message\AMQPMessage', array('get'), array($expectedNotify));
+        /** @var AMQPMessage $message */
+        $message = $this->getMockBuilder('\PhpAmqpLib\Message\AMQPMessage')
+            ->setMethods(array('get'))
+            ->setConstructorArgs(array($expectedNotify))
+            ->getMock();
         $notified = false;
         $client->notify(function ($message) use (&$notified) {
             $notified = $message;