Skip to content

Commit a632e17

Browse files
stloydstloyd
authored
Merge pull request #401 from nurolopher/master
Fixed PHPUnit deprecated warnings, removed unused imports and duplicate codes.
2 parents 2b34ed0 + 5a22fa2 commit a632e17

12 files changed

+44
-40
lines changed

‎Command/DynamicConsumerCommand.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*/
1111
namespace OldSound\RabbitMqBundle\Command;
1212

13-
use OldSound\RabbitMqBundle\Command\BaseConsumerCommand;
1413
use Symfony\Component\Console\Input\InputArgument;
1514

1615
class DynamicConsumerCommand extends BaseConsumerCommand

‎RabbitMq/AnonConsumer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace OldSound\RabbitMqBundle\RabbitMq;
44

5-
use OldSound\RabbitMqBundle\RabbitMq\Consumer;
65
use PhpAmqpLib\Connection\AbstractConnection;
76

87
class AnonConsumer extends Consumer

‎RabbitMq/BaseAmqp.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use PhpAmqpLib\Connection\AMQPLazyConnection;
99
use Psr\Log\LoggerInterface;
1010
use Psr\Log\NullLogger;
11-
use Symfony\Component\EventDispatcher\Event;
1211
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
1312

1413
abstract class BaseAmqp

‎RabbitMq/Consumer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use OldSound\RabbitMqBundle\Event\AfterProcessingMessageEvent;
66
use OldSound\RabbitMqBundle\Event\BeforeProcessingMessageEvent;
77
use OldSound\RabbitMqBundle\Event\OnConsumeEvent;
8-
use OldSound\RabbitMqBundle\RabbitMq\BaseConsumer;
98
use PhpAmqpLib\Message\AMQPMessage;
109

1110
class Consumer extends BaseConsumer

‎RabbitMq/RpcClient.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace OldSound\RabbitMqBundle\RabbitMq;
44

5-
use OldSound\RabbitMqBundle\RabbitMq\BaseAmqp;
65
use PhpAmqpLib\Message\AMQPMessage;
76

87
class RpcClient extends BaseAmqp

‎Tests/Command/BaseCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ protected function setUp()
1717
$this->definition = $this->getMockBuilder('Symfony\\Component\\Console\\Input\\InputDefinition')
1818
->disableOriginalConstructor()
1919
->getMock();
20-
$this->helperSet = $this->getMock('Symfony\\Component\\Console\\Helper\\HelperSet');
20+
$this->helperSet = $this->getMockBuilder('Symfony\\Component\\Console\\Helper\\HelperSet')->getMock();
2121

2222
$this->application->expects($this->any())
2323
->method('getDefinition')

‎Tests/Command/ConsumerCommandTest.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,22 @@ protected function setUp()
3131
*/
3232
public function testInputsDefinitionCommand()
3333
{
34+
$definition = $this->command->getDefinition();
3435
// check argument
35-
$this->assertTrue($this->command->getDefinition()->hasArgument('name'));
36-
$this->assertTrue($this->command->getDefinition()->getArgument('name')->isRequired()); // Name is required to find the service
36+
$this->assertTrue($definition->hasArgument('name'));
37+
$this->assertTrue($definition->getArgument('name')->isRequired()); // Name is required to find the service
3738

3839
//check options
39-
$this->assertTrue($this->command->getDefinition()->hasOption('messages'));
40-
$this->assertTrue($this->command->getDefinition()->getOption('messages')->isValueOptional()); // It should accept value
40+
$this->assertTrue($definition->hasOption('messages'));
41+
$this->assertTrue($definition->getOption('messages')->isValueOptional()); // It should accept value
4142

42-
$this->assertTrue($this->command->getDefinition()->hasOption('route'));
43-
$this->assertTrue($this->command->getDefinition()->getOption('route')->isValueOptional()); // It should accept value
43+
$this->assertTrue($definition->hasOption('route'));
44+
$this->assertTrue($definition->getOption('route')->isValueOptional()); // It should accept value
4445

45-
$this->assertTrue($this->command->getDefinition()->hasOption('without-signals'));
46-
$this->assertFalse($this->command->getDefinition()->getOption('without-signals')->acceptValue()); // It shouldn't accept value because it is a true/false input
46+
$this->assertTrue($definition->hasOption('without-signals'));
47+
$this->assertFalse($definition->getOption('without-signals')->acceptValue()); // It shouldn't accept value because it is a true/false input
4748

48-
$this->assertTrue($this->command->getDefinition()->hasOption('debug'));
49-
$this->assertFalse($this->command->getDefinition()->getOption('debug')->acceptValue()); // It shouldn't accept value because it is a true/false input
49+
$this->assertTrue($definition->hasOption('debug'));
50+
$this->assertFalse($definition->getOption('debug')->acceptValue()); // It shouldn't accept value because it is a true/false input
5051
}
5152
}

‎Tests/Command/DynamicConsumerCommandTest.php

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,23 +32,24 @@ protected function setUp()
3232
public function testInputsDefinitionCommand()
3333
{
3434
// check argument
35-
$this->assertTrue($this->command->getDefinition()->hasArgument('name'));
36-
$this->assertTrue($this->command->getDefinition()->getArgument('name')->isRequired()); // Name is required to find the service
35+
$definition = $this->command->getDefinition();
36+
$this->assertTrue($definition->hasArgument('name'));
37+
$this->assertTrue($definition->getArgument('name')->isRequired()); // Name is required to find the service
3738

38-
$this->assertTrue($this->command->getDefinition()->hasArgument('context'));
39-
$this->assertTrue($this->command->getDefinition()->getArgument('context')->isRequired()); // Context is required for the queue options provider
39+
$this->assertTrue($definition->hasArgument('context'));
40+
$this->assertTrue($definition->getArgument('context')->isRequired()); // Context is required for the queue options provider
4041

4142
//check options
42-
$this->assertTrue($this->command->getDefinition()->hasOption('messages'));
43-
$this->assertTrue($this->command->getDefinition()->getOption('messages')->isValueOptional()); // It should accept value
43+
$this->assertTrue($definition->hasOption('messages'));
44+
$this->assertTrue($definition->getOption('messages')->isValueOptional()); // It should accept value
4445

45-
$this->assertTrue($this->command->getDefinition()->hasOption('route'));
46-
$this->assertTrue($this->command->getDefinition()->getOption('route')->isValueOptional()); // It should accept value
46+
$this->assertTrue($definition->hasOption('route'));
47+
$this->assertTrue($definition->getOption('route')->isValueOptional()); // It should accept value
4748

48-
$this->assertTrue($this->command->getDefinition()->hasOption('without-signals'));
49-
$this->assertFalse($this->command->getDefinition()->getOption('without-signals')->acceptValue()); // It shouldn't accept value because it is a true/false input
49+
$this->assertTrue($definition->hasOption('without-signals'));
50+
$this->assertFalse($definition->getOption('without-signals')->acceptValue()); // It shouldn't accept value because it is a true/false input
5051

51-
$this->assertTrue($this->command->getDefinition()->hasOption('debug'));
52-
$this->assertFalse($this->command->getDefinition()->getOption('debug')->acceptValue()); // It shouldn't accept value because it is a true/false input
52+
$this->assertTrue($definition->hasOption('debug'));
53+
$this->assertFalse($definition->getOption('debug')->acceptValue()); // It shouldn't accept value because it is a true/false input
5354
}
5455
}

‎Tests/Command/PurgeCommandTest.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
namespace OldSound\RabbitMqBundle\Tests\Command;
44

5-
use OldSound\RabbitMqBundle\Command\ConsumerCommand;
6-
75
use OldSound\RabbitMqBundle\Command\PurgeConsumerCommand;
86
use Symfony\Component\Console\Input\InputOption;
97

@@ -31,11 +29,12 @@ protected function setUp()
3129
public function testInputsDefinitionCommand()
3230
{
3331
// check argument
34-
$this->assertTrue($this->command->getDefinition()->hasArgument('name'));
35-
$this->assertTrue($this->command->getDefinition()->getArgument('name')->isRequired()); // Name is required to find the service
32+
$definition = $this->command->getDefinition();
33+
$this->assertTrue($definition->hasArgument('name'));
34+
$this->assertTrue($definition->getArgument('name')->isRequired()); // Name is required to find the service
3635

3736
//check options
38-
$this->assertTrue($this->command->getDefinition()->hasOption('no-confirmation'));
39-
$this->assertFalse($this->command->getDefinition()->getOption('no-confirmation')->acceptValue()); // It shouldn't accept value because it is a true/false input
37+
$this->assertTrue($definition->hasOption('no-confirmation'));
38+
$this->assertFalse($definition->getOption('no-confirmation')->acceptValue()); // It shouldn't accept value because it is a true/false input
4039
}
4140
}

‎Tests/RabbitMq/BaseAmqpTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace OldSound\RabbitMqBundle\Tests\RabbitMq;
44

55
use OldSound\RabbitMqBundle\Event\AMQPEvent;
6-
use OldSound\RabbitMqBundle\Event\OnConsumeEvent;
76
use OldSound\RabbitMqBundle\RabbitMq\BaseAmqp;
87
use OldSound\RabbitMqBundle\RabbitMq\Consumer;
98
use PhpAmqpLib\Connection\AMQPLazyConnection;

‎Tests/RabbitMq/RpcClientTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public function testProcessMessageWithCustomUnserializer()
1313
->setMethods(array('sendReply', 'maybeStopConsumer'))
1414
->disableOriginalConstructor()
1515
->getMock();
16-
$message = $this->getMock('\PhpAmqpLib\Message\AMQPMessage', array('get'), array('message'));
17-
$serializer = $this->getMock('\Symfony\Component\Serializer\SerializerInterface', array('serialize', 'deserialize'));
16+
$message = $this->getMockBuilder('\PhpAmqpLib\Message\AMQPMessage')->setMethods(array('get'))->setConstructorArgs(array('message'))->getMock();
17+
$serializer = $this->getMockBuilder('\Symfony\Component\Serializer\SerializerInterface')->setMethods(array('serialize', 'deserialize'))->getMock();
1818
$serializer->expects($this->once())->method('deserialize')->with('message', 'json', null);
1919
$client->initClient(true);
2020
$client->setUnserializer(function($data) use ($serializer) {

‎Tests/RabbitMq/RpcServerTest.php

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,28 @@ public function testProcessMessageWithCustomSerializer()
1414
->setMethods(array('sendReply', 'maybeStopConsumer'))
1515
->disableOriginalConstructor()
1616
->getMock();
17-
$message = $this->getMock('\PhpAmqpLib\Message\AMQPMessage', array('get'));
17+
$message = $this->getMockBuilder('\PhpAmqpLib\Message\AMQPMessage')
18+
->setMethods( array('get'))
19+
->getMock();
1820
$message->delivery_info = array(
19-
'channel' => $this->getMock('\PhpAmqpLib\Channel\AMQPChannel', array(), array(), '', false),
21+
'channel' => $this->getMockBuilder('\PhpAmqpLib\Channel\AMQPChannel')
22+
->setMethods(array())->setConstructorArgs(array())
23+
->setMockClassName('')
24+
->disableOriginalConstructor()
25+
->getMock(),
2026
'delivery_tag' => null
2127
);
2228
$server->setCallback(function() {
2329
return 'message';
2430
});
25-
$serializer = $this->getMock('\Symfony\Component\Serializer\SerializerInterface', array('serialize', 'deserialize'));
31+
$serializer = $this->getMockBuilder('\Symfony\Component\Serializer\SerializerInterface')
32+
->setMethods(array('serialize', 'deserialize'))
33+
->getMock();
2634
$serializer->expects($this->once())->method('serialize')->with('message', 'json');
2735
$server->setSerializer(function($data) use ($serializer) {
2836
$serializer->serialize($data, 'json');
2937
});
3038
$server->processMessage($message);
3139
}
3240
}
41+

0 commit comments

Comments
 (0)