Skip to content

Commit 37c033e

Browse files
NaktibaldaNaktibalda
committed
Improved code style
1 parent 24833fd commit 37c033e

File tree

5 files changed

+69
-58
lines changed

5 files changed

+69
-58
lines changed

‎src/Codeception/Lib/Driver/AmazonSQS.php‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,12 @@ public function openConnection(array $config): void
4848
*/
4949
public function addMessageToQueue(string $message, string $queueName): void
5050
{
51-
$this->queue->sendMessage([
51+
$this->queue->sendMessage(
52+
[
5253
'QueueUrl' => $this->getQueueURL($queueName),
5354
'MessageBody' => $message,
54-
]);
55+
]
56+
);
5557
}
5658

5759
/**
@@ -76,21 +78,25 @@ public function getQueues(): array
7678
*/
7779
public function getMessagesCurrentCountOnQueue(string $queueName): int
7880
{
79-
return (int)$this->queue->getQueueAttributes([
80-
'QueueUrl' => $this->getQueueURL($queueName),
81-
'AttributeNames' => ['ApproximateNumberOfMessages'],
82-
])->get('Attributes')['ApproximateNumberOfMessages'];
81+
return (int)$this->queue->getQueueAttributes(
82+
[
83+
'QueueUrl' => $this->getQueueURL($queueName),
84+
'AttributeNames' => ['ApproximateNumberOfMessages'],
85+
]
86+
)->get('Attributes')['ApproximateNumberOfMessages'];
8387
}
8488

8589
/**
8690
* Count the total number of messages on the queue.
8791
*/
8892
public function getMessagesTotalCountOnQueue(string $queueName): int
8993
{
90-
return (int)$this->queue->getQueueAttributes([
91-
'QueueUrl' => $this->getQueueURL($queueName),
92-
'AttributeNames' => ['ApproximateNumberOfMessages'],
93-
])->get('Attributes')['ApproximateNumberOfMessages'];
94+
return (int)$this->queue->getQueueAttributes(
95+
[
96+
'QueueUrl' => $this->getQueueURL($queueName),
97+
'AttributeNames' => ['ApproximateNumberOfMessages'],
98+
]
99+
)->get('Attributes')['ApproximateNumberOfMessages'];
94100
}
95101

96102
public function clearQueue(string $queueName): void
@@ -104,10 +110,12 @@ public function clearQueue(string $queueName): void
104110
}
105111

106112
foreach ($res->getPath('Messages') as $msg) {
107-
$this->queue->deleteMessage([
108-
'QueueUrl' => $queueURL,
109-
'ReceiptHandle' => $msg['ReceiptHandle']
110-
]);
113+
$this->queue->deleteMessage(
114+
[
115+
'QueueUrl' => $queueURL,
116+
'ReceiptHandle' => $msg['ReceiptHandle']
117+
]
118+
);
111119
}
112120
}
113121
}

‎src/Codeception/Lib/Driver/Iron.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ class Iron implements Queue
1818
*/
1919
public function openConnection(array $config): void
2020
{
21-
$this->queue = new IronMQ([
22-
"token" => $config['token'],
23-
"project_id" => $config['project'],
24-
"host" => $config['host']
25-
]);
21+
$this->queue = new IronMQ(
22+
[
23+
"token" => $config['token'],
24+
"project_id" => $config['project'],
25+
"host" => $config['host']
26+
]
27+
);
2628
}
2729

2830
/**

‎src/Codeception/Module/Queue.php‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Pheanstalk\Contract\JobIdInterface as PheanstalkJobIdInterface;
1515

1616
/**
17-
*
1817
* Works with Queue servers.
1918
*
2019
* Testing with a selection of remote/local queueing services, including Amazon's SQS service
@@ -125,7 +124,6 @@
125124
* Queue:
126125
* 'type': 'aws',
127126
* 'region': 'us-west-2'
128-
*
129127
*/
130128
class Queue extends Module
131129
{
@@ -156,27 +154,27 @@ protected function validateConfig(): void
156154
protected function createQueueDriver(): \Codeception\Lib\Interfaces\Queue
157155
{
158156
switch ($this->config['type']) {
159-
case 'aws':
160-
case 'sqs':
161-
case 'aws_sqs':
162-
return new AmazonSQS();
163-
case 'iron':
164-
case 'iron_mq':
165-
return new Iron();
166-
case 'beanstalk':
167-
case 'beanstalkd':
168-
case 'beanstalkq':
169-
// Account for different versions of Pheanstalk.
170-
if (interface_exists(PheanstalkJobIdInterface::class)) {
171-
return new Pheanstalk4();
172-
} else {
173-
return new Beanstalk();
174-
}
175-
default:
176-
throw new ModuleConfigException(
177-
__CLASS__,
178-
"Unknown queue type {$this->config['type']}; Supported queue types are: aws, iron, beanstalk"
179-
);
157+
case 'aws':
158+
case 'sqs':
159+
case 'aws_sqs':
160+
return new AmazonSQS();
161+
case 'iron':
162+
case 'iron_mq':
163+
return new Iron();
164+
case 'beanstalk':
165+
case 'beanstalkd':
166+
case 'beanstalkq':
167+
// Account for different versions of Pheanstalk.
168+
if (interface_exists(PheanstalkJobIdInterface::class)) {
169+
return new Pheanstalk4();
170+
} else {
171+
return new Beanstalk();
172+
}
173+
default:
174+
throw new ModuleConfigException(
175+
__CLASS__,
176+
"Unknown queue type {$this->config['type']}; Supported queue types are: aws, iron, beanstalk"
177+
);
180178
}
181179
}
182180

@@ -250,8 +248,8 @@ public function dontSeeEmptyQueue(string $queue): void
250248
* $I->seeQueueHasCurrentCount('default', 10);
251249
* ```
252250
*
253-
* @param string $queue Queue name
254-
* @param int $expected Number of messages expected
251+
* @param string $queue Queue name
252+
* @param int $expected Number of messages expected
255253
*/
256254
public function seeQueueHasCurrentCount(string $queue, int $expected): void
257255
{
@@ -266,8 +264,8 @@ public function seeQueueHasCurrentCount(string $queue, int $expected): void
266264
* $I->dontSeeQueueHasCurrentCount('default', 10);
267265
* ```
268266
*
269-
* @param string $queue Queue name
270-
* @param int $expected Number of messages expected
267+
* @param string $queue Queue name
268+
* @param int $expected Number of messages expected
271269
*/
272270
public function dontSeeQueueHasCurrentCount(string $queue, int $expected): void
273271
{
@@ -282,8 +280,8 @@ public function dontSeeQueueHasCurrentCount(string $queue, int $expected): void
282280
* $I->seeQueueHasTotalCount('default', 10);
283281
* ```
284282
*
285-
* @param string $queue Queue name
286-
* @param int $expected Number of messages expected
283+
* @param string $queue Queue name
284+
* @param int $expected Number of messages expected
287285
*/
288286
public function seeQueueHasTotalCount(string $queue, int $expected): void
289287
{
@@ -298,8 +296,8 @@ public function seeQueueHasTotalCount(string $queue, int $expected): void
298296
* $I->dontSeeQueueHasTotalCount('default', 10);
299297
* ```
300298
*
301-
* @param string $queue Queue name
302-
* @param int $expected Number of messages expected
299+
* @param string $queue Queue name
300+
* @param int $expected Number of messages expected
303301
*/
304302
public function dontSeeQueueHasTotalCount(string $queue, int $expected): void
305303
{
@@ -317,7 +315,7 @@ public function dontSeeQueueHasTotalCount(string $queue, int $expected): void
317315
* ```
318316
*
319317
* @param string $message Message Body
320-
* @param string $queue Queue name
318+
* @param string $queue Queue name
321319
*/
322320
public function addMessageToQueue(string $message, string $queue): void
323321
{
@@ -364,7 +362,7 @@ public function grabQueues(): array
364362
* $I->grabQueueCurrentCount('default');
365363
* ```
366364
*
367-
* @param string $queue Queue name
365+
* @param string $queue Queue name
368366
* @return int Count
369367
*/
370368
public function grabQueueCurrentCount(string $queue)
@@ -380,7 +378,7 @@ public function grabQueueCurrentCount(string $queue)
380378
* $I->grabQueueTotalCount('default');
381379
* ```
382380
*
383-
* @param string $queue Queue name
381+
* @param string $queue Queue name
384382
* @return int Count
385383
*/
386384
public function grabQueueTotalCount(string $queue)

‎tests/_support/UnitTester.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
/**
55
* Inherited Methods
6+
*
67
* @method void wantToTest($text)
78
* @method void wantTo($text)
89
* @method void execute($callable)
@@ -15,12 +16,12 @@
1516
* @method void pause()
1617
*
1718
* @SuppressWarnings(PHPMD)
18-
*/
19+
*/
1920
class UnitTester extends \Codeception\Actor
2021
{
2122
use _generated\UnitTesterActions;
2223

23-
/**
24-
* Define custom actions here
25-
*/
24+
/**
25+
* Define custom actions here
26+
*/
2627
}

‎tests/unit/Codeception/Module/QueueTest.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ abstract public function configProvider();
1717
*/
1818
public function testFlow($config): void
1919
{
20-
/** @var ModuleContainer $container */
20+
/**
21+
* @var ModuleContainer $container
22+
*/
2123
$container = Stub::make(ModuleContainer::class);
2224
$module = new Queue($container);
2325
$module->_setConfig($config);

0 commit comments

Comments
 (0)