Merge pull request #401 from nurolopher/master

stloyd · web-flow · commit a632e174a6e8 · 2016-11-01T15:45:31.000+01:00
Fixed PHPUnit deprecated warnings, removed unused imports and duplicate codes.
diff --git a/Command/DynamicConsumerCommand.php b/Command/DynamicConsumerCommand.php
@@ -10,7 +10,6 @@
  */
 namespace OldSound\RabbitMqBundle\Command;
 
-use OldSound\RabbitMqBundle\Command\BaseConsumerCommand;
 use Symfony\Component\Console\Input\InputArgument;
 
 class DynamicConsumerCommand extends BaseConsumerCommand
diff --git a/RabbitMq/AnonConsumer.php b/RabbitMq/AnonConsumer.php
@@ -2,7 +2,6 @@
 
 namespace OldSound\RabbitMqBundle\RabbitMq;
 
-use OldSound\RabbitMqBundle\RabbitMq\Consumer;
 use PhpAmqpLib\Connection\AbstractConnection;
 
 class AnonConsumer extends Consumer
diff --git a/RabbitMq/BaseAmqp.php b/RabbitMq/BaseAmqp.php
@@ -8,7 +8,6 @@
 use PhpAmqpLib\Connection\AMQPLazyConnection;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
-use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 abstract class BaseAmqp
diff --git a/RabbitMq/Consumer.php b/RabbitMq/Consumer.php
@@ -5,7 +5,6 @@
 use OldSound\RabbitMqBundle\Event\AfterProcessingMessageEvent;
 use OldSound\RabbitMqBundle\Event\BeforeProcessingMessageEvent;
 use OldSound\RabbitMqBundle\Event\OnConsumeEvent;
-use OldSound\RabbitMqBundle\RabbitMq\BaseConsumer;
 use PhpAmqpLib\Message\AMQPMessage;
 
 class Consumer extends BaseConsumer
diff --git a/RabbitMq/RpcClient.php b/RabbitMq/RpcClient.php
@@ -2,7 +2,6 @@
 
 namespace OldSound\RabbitMqBundle\RabbitMq;
 
-use OldSound\RabbitMqBundle\RabbitMq\BaseAmqp;
 use PhpAmqpLib\Message\AMQPMessage;
 
 class RpcClient extends BaseAmqp
diff --git a/Tests/Command/BaseCommandTest.php b/Tests/Command/BaseCommandTest.php
@@ -17,7 +17,7 @@ protected function setUp()
         $this->definition = $this->getMockBuilder('Symfony\\Component\\Console\\Input\\InputDefinition')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->helperSet = $this->getMock('Symfony\\Component\\Console\\Helper\\HelperSet');
+        $this->helperSet = $this->getMockBuilder('Symfony\\Component\\Console\\Helper\\HelperSet')->getMock();
 
         $this->application->expects($this->any())
             ->method('getDefinition')
diff --git a/Tests/Command/ConsumerCommandTest.php b/Tests/Command/ConsumerCommandTest.php
@@ -31,21 +31,22 @@ protected function setUp()
      */
     public function testInputsDefinitionCommand()
     {
+        $definition = $this->command->getDefinition();
         // check argument
-        $this->assertTrue($this->command->getDefinition()->hasArgument('name'));
-        $this->assertTrue($this->command->getDefinition()->getArgument('name')->isRequired()); // Name is required to find the service
+        $this->assertTrue($definition->hasArgument('name'));
+        $this->assertTrue($definition->getArgument('name')->isRequired()); // Name is required to find the service
 
         //check options
-        $this->assertTrue($this->command->getDefinition()->hasOption('messages'));
-        $this->assertTrue($this->command->getDefinition()->getOption('messages')->isValueOptional()); // It should accept value
+        $this->assertTrue($definition->hasOption('messages'));
+        $this->assertTrue($definition->getOption('messages')->isValueOptional()); // It should accept value
 
-        $this->assertTrue($this->command->getDefinition()->hasOption('route'));
-        $this->assertTrue($this->command->getDefinition()->getOption('route')->isValueOptional()); // It should accept value
+        $this->assertTrue($definition->hasOption('route'));
+        $this->assertTrue($definition->getOption('route')->isValueOptional()); // It should accept value
 
-        $this->assertTrue($this->command->getDefinition()->hasOption('without-signals'));
-        $this->assertFalse($this->command->getDefinition()->getOption('without-signals')->acceptValue()); // It shouldn't accept value because it is a true/false input
+        $this->assertTrue($definition->hasOption('without-signals'));
+        $this->assertFalse($definition->getOption('without-signals')->acceptValue()); // It shouldn't accept value because it is a true/false input
 
-        $this->assertTrue($this->command->getDefinition()->hasOption('debug'));
-        $this->assertFalse($this->command->getDefinition()->getOption('debug')->acceptValue()); // It shouldn't accept value because it is a true/false input
+        $this->assertTrue($definition->hasOption('debug'));
+        $this->assertFalse($definition->getOption('debug')->acceptValue()); // It shouldn't accept value because it is a true/false input
     }
 }
diff --git a/Tests/Command/DynamicConsumerCommandTest.php b/Tests/Command/DynamicConsumerCommandTest.php
@@ -32,23 +32,24 @@ protected function setUp()
     public function testInputsDefinitionCommand()
     {
         // check argument
-        $this->assertTrue($this->command->getDefinition()->hasArgument('name'));
-        $this->assertTrue($this->command->getDefinition()->getArgument('name')->isRequired()); // Name is required to find the service
+        $definition = $this->command->getDefinition();
+        $this->assertTrue($definition->hasArgument('name'));
+        $this->assertTrue($definition->getArgument('name')->isRequired()); // Name is required to find the service
         
-        $this->assertTrue($this->command->getDefinition()->hasArgument('context'));
-        $this->assertTrue($this->command->getDefinition()->getArgument('context')->isRequired()); // Context is required for the queue options provider
+        $this->assertTrue($definition->hasArgument('context'));
+        $this->assertTrue($definition->getArgument('context')->isRequired()); // Context is required for the queue options provider
 
         //check options
-        $this->assertTrue($this->command->getDefinition()->hasOption('messages'));
-        $this->assertTrue($this->command->getDefinition()->getOption('messages')->isValueOptional()); // It should accept value
+        $this->assertTrue($definition->hasOption('messages'));
+        $this->assertTrue($definition->getOption('messages')->isValueOptional()); // It should accept value
 
-        $this->assertTrue($this->command->getDefinition()->hasOption('route'));
-        $this->assertTrue($this->command->getDefinition()->getOption('route')->isValueOptional()); // It should accept value
+        $this->assertTrue($definition->hasOption('route'));
+        $this->assertTrue($definition->getOption('route')->isValueOptional()); // It should accept value
 
-        $this->assertTrue($this->command->getDefinition()->hasOption('without-signals'));
-        $this->assertFalse($this->command->getDefinition()->getOption('without-signals')->acceptValue()); // It shouldn't accept value because it is a true/false input
+        $this->assertTrue($definition->hasOption('without-signals'));
+        $this->assertFalse($definition->getOption('without-signals')->acceptValue()); // It shouldn't accept value because it is a true/false input
 
-        $this->assertTrue($this->command->getDefinition()->hasOption('debug'));
-        $this->assertFalse($this->command->getDefinition()->getOption('debug')->acceptValue()); // It shouldn't accept value because it is a true/false input
+        $this->assertTrue($definition->hasOption('debug'));
+        $this->assertFalse($definition->getOption('debug')->acceptValue()); // It shouldn't accept value because it is a true/false input
     }
 }
diff --git a/Tests/Command/PurgeCommandTest.php b/Tests/Command/PurgeCommandTest.php
@@ -2,8 +2,6 @@
 
 namespace OldSound\RabbitMqBundle\Tests\Command;
 
-use OldSound\RabbitMqBundle\Command\ConsumerCommand;
-
 use OldSound\RabbitMqBundle\Command\PurgeConsumerCommand;
 use Symfony\Component\Console\Input\InputOption;
 
@@ -31,11 +29,12 @@ protected function setUp()
     public function testInputsDefinitionCommand()
     {
         // check argument
-        $this->assertTrue($this->command->getDefinition()->hasArgument('name'));
-        $this->assertTrue($this->command->getDefinition()->getArgument('name')->isRequired()); // Name is required to find the service
+        $definition = $this->command->getDefinition();
+        $this->assertTrue($definition->hasArgument('name'));
+        $this->assertTrue($definition->getArgument('name')->isRequired()); // Name is required to find the service
 
         //check options
-        $this->assertTrue($this->command->getDefinition()->hasOption('no-confirmation'));
-        $this->assertFalse($this->command->getDefinition()->getOption('no-confirmation')->acceptValue()); // It shouldn't accept value because it is a true/false input
+        $this->assertTrue($definition->hasOption('no-confirmation'));
+        $this->assertFalse($definition->getOption('no-confirmation')->acceptValue()); // It shouldn't accept value because it is a true/false input
     }
 }
diff --git a/Tests/RabbitMq/BaseAmqpTest.php b/Tests/RabbitMq/BaseAmqpTest.php
@@ -3,7 +3,6 @@
 namespace OldSound\RabbitMqBundle\Tests\RabbitMq;
 
 use OldSound\RabbitMqBundle\Event\AMQPEvent;
-use OldSound\RabbitMqBundle\Event\OnConsumeEvent;
 use OldSound\RabbitMqBundle\RabbitMq\BaseAmqp;
 use OldSound\RabbitMqBundle\RabbitMq\Consumer;
 use PhpAmqpLib\Connection\AMQPLazyConnection;
diff --git a/Tests/RabbitMq/RpcClientTest.php b/Tests/RabbitMq/RpcClientTest.php
@@ -13,8 +13,8 @@ public function testProcessMessageWithCustomUnserializer()
             ->setMethods(array('sendReply', 'maybeStopConsumer'))
             ->disableOriginalConstructor()
             ->getMock();
-        $message = $this->getMock('\PhpAmqpLib\Message\AMQPMessage', array('get'), array('message'));
-        $serializer = $this->getMock('\Symfony\Component\Serializer\SerializerInterface', array('serialize', 'deserialize'));
+        $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) {
diff --git a/Tests/RabbitMq/RpcServerTest.php b/Tests/RabbitMq/RpcServerTest.php
@@ -14,19 +14,28 @@ public function testProcessMessageWithCustomSerializer()
             ->setMethods(array('sendReply', 'maybeStopConsumer'))
             ->disableOriginalConstructor()
             ->getMock();
-        $message = $this->getMock('\PhpAmqpLib\Message\AMQPMessage', array('get'));
+        $message = $this->getMockBuilder('\PhpAmqpLib\Message\AMQPMessage')
+            ->setMethods( array('get'))
+            ->getMock();
         $message->delivery_info = array(
-            'channel' => $this->getMock('\PhpAmqpLib\Channel\AMQPChannel', array(), array(), '', false),
+            'channel' => $this->getMockBuilder('\PhpAmqpLib\Channel\AMQPChannel')
+                ->setMethods(array())->setConstructorArgs(array())
+                ->setMockClassName('')
+                ->disableOriginalConstructor()
+                ->getMock(),
             'delivery_tag' => null
         );
         $server->setCallback(function() {
             return 'message';
         });
-        $serializer = $this->getMock('\Symfony\Component\Serializer\SerializerInterface', array('serialize', 'deserialize'));
+        $serializer = $this->getMockBuilder('\Symfony\Component\Serializer\SerializerInterface')
+            ->setMethods(array('serialize', 'deserialize'))
+            ->getMock();
         $serializer->expects($this->once())->method('serialize')->with('message', 'json');
         $server->setSerializer(function($data) use ($serializer) {
             $serializer->serialize($data, 'json');
         });
         $server->processMessage($message);
     }
 }
+
