Skip to content

Commit 6e13536

Browse files
JimToolsJimTools
committed
Running php-cs-fixer
Running php-cs-fixer to fix CS drift
1 parent 3ef3206 commit 6e13536

File tree

85 files changed

+160
-360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+160
-360
lines changed

‎Client/ChainExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function __construct(array $extensions)
6767
}
6868

6969
if (false == $extensionValid) {
70-
throw new \LogicException(sprintf('Invalid extension given %s', get_class($extension)));
70+
throw new \LogicException(sprintf('Invalid extension given %s', $extension::class));
7171
}
7272
});
7373
}

‎Client/Config.php

+16-16
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
class Config
66
{
7-
const TOPIC = 'enqueue.topic';
8-
const COMMAND = 'enqueue.command';
9-
const PROCESSOR = 'enqueue.processor';
10-
const EXPIRE = 'enqueue.expire';
11-
const PRIORITY = 'enqueue.priority';
12-
const DELAY = 'enqueue.delay';
13-
const CONTENT_TYPE = 'enqueue.content_type';
7+
public const TOPIC = 'enqueue.topic';
8+
public const COMMAND = 'enqueue.command';
9+
public const PROCESSOR = 'enqueue.processor';
10+
public const EXPIRE = 'enqueue.expire';
11+
public const PRIORITY = 'enqueue.priority';
12+
public const DELAY = 'enqueue.delay';
13+
public const CONTENT_TYPE = 'enqueue.content_type';
1414

1515
/**
1616
* @var string
@@ -66,7 +66,7 @@ public function __construct(
6666
string $defaultQueue,
6767
string $routerProcessor,
6868
array $transportConfig,
69-
array $driverConfig
69+
array $driverConfig,
7070
) {
7171
$this->prefix = trim($prefix);
7272
$this->app = trim($app);
@@ -153,15 +153,15 @@ public function getDriverOptions(): array
153153
}
154154

155155
public static function create(
156-
string $prefix = null,
157-
string $separator = null,
158-
string $app = null,
159-
string $routerTopic = null,
160-
string $routerQueue = null,
161-
string $defaultQueue = null,
162-
string $routerProcessor = null,
156+
?string $prefix = null,
157+
?string $separator = null,
158+
?string $app = null,
159+
?string $routerTopic = null,
160+
?string $routerQueue = null,
161+
?string $defaultQueue = null,
162+
?string $routerProcessor = null,
163163
array $transportConfig = [],
164-
array $driverConfig = []
164+
array $driverConfig = [],
165165
): self {
166166
return new static(
167167
$prefix ?: '',

‎Client/ConsumptionExtension/DelayRedeliveredMessageExtension.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
class DelayRedeliveredMessageExtension implements MessageReceivedExtensionInterface
1111
{
12-
const PROPERTY_REDELIVER_COUNT = 'enqueue.redelivery_count';
12+
public const PROPERTY_REDELIVER_COUNT = 'enqueue.redelivery_count';
1313

1414
/**
1515
* @var DriverInterface
@@ -24,8 +24,7 @@ class DelayRedeliveredMessageExtension implements MessageReceivedExtensionInterf
2424
private $delay;
2525

2626
/**
27-
* @param DriverInterface $driver
28-
* @param int $delay The number of seconds the message should be delayed
27+
* @param int $delay The number of seconds the message should be delayed
2928
*/
3029
public function __construct(DriverInterface $driver, $delay)
3130
{

‎Client/ConsumptionExtension/SetRouterPropertiesExtension.php

-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ class SetRouterPropertiesExtension implements MessageReceivedExtensionInterface
1414
*/
1515
private $driver;
1616

17-
/**
18-
* @param DriverInterface $driver
19-
*/
2017
public function __construct(DriverInterface $driver)
2118
{
2219
$this->driver = $driver;

‎Client/ConsumptionExtension/SetupBrokerExtension.php

-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ class SetupBrokerExtension implements StartExtensionInterface
1818
*/
1919
private $isDone;
2020

21-
/**
22-
* @param DriverInterface $driver
23-
*/
2421
public function __construct(DriverInterface $driver)
2522
{
2623
$this->driver = $driver;

‎Client/DelegateProcessor.php

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ public function __construct(ProcessorRegistryInterface $registry)
2020
}
2121

2222
/**
23-
* {@inheritdoc}
24-
*
2523
* @return string|object
2624
*/
2725
public function process(InteropMessage $message, Context $context)

‎Client/Driver/AmqpDriver.php

+3-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Enqueue\Client\Driver;
5+
namespace Enqueue\Client\Driver;
66

77
use Enqueue\AmqpExt\AmqpProducer;
88
use Enqueue\Client\Message;
@@ -45,11 +45,7 @@ public function createTransportMessage(Message $clientMessage): InteropMessage
4545
$priorityMap = $this->getPriorityMap();
4646
if ($priority = $clientMessage->getPriority()) {
4747
if (false == array_key_exists($priority, $priorityMap)) {
48-
throw new \InvalidArgumentException(sprintf(
49-
'Cant convert client priority "%s" to transport one. Could be one of "%s"',
50-
$priority,
51-
implode('", "', array_keys($priorityMap))
52-
));
48+
throw new \InvalidArgumentException(sprintf('Cant convert client priority "%s" to transport one. Could be one of "%s"', $priority, implode('", "', array_keys($priorityMap))));
5349
}
5450

5551
$transportMessage->setPriority($priorityMap[$priority]);
@@ -58,7 +54,7 @@ public function createTransportMessage(Message $clientMessage): InteropMessage
5854
return $transportMessage;
5955
}
6056

61-
public function setupBroker(LoggerInterface $logger = null): void
57+
public function setupBroker(?LoggerInterface $logger = null): void
6258
{
6359
$logger = $logger ?: new NullLogger();
6460
$log = function ($text, ...$args) use ($logger) {

‎Client/Driver/DbalDriver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function __construct(DbalContext $context, ...$args)
1616
parent::__construct($context, ...$args);
1717
}
1818

19-
public function setupBroker(LoggerInterface $logger = null): void
19+
public function setupBroker(?LoggerInterface $logger = null): void
2020
{
2121
$logger = $logger ?: new NullLogger();
2222
$log = function ($text, ...$args) use ($logger) {

‎Client/Driver/FsDriver.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Enqueue\Client\Driver;
3+
namespace Enqueue\Client\Driver;
44

55
use Enqueue\Fs\FsContext;
66
use Enqueue\Fs\FsDestination;
@@ -18,7 +18,7 @@ public function __construct(FsContext $context, ...$args)
1818
parent::__construct($context, ...$args);
1919
}
2020

21-
public function setupBroker(LoggerInterface $logger = null): void
21+
public function setupBroker(?LoggerInterface $logger = null): void
2222
{
2323
$logger = $logger ?: new NullLogger();
2424
$log = function ($text, ...$args) use ($logger) {

‎Client/Driver/GenericDriver.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class GenericDriver implements DriverInterface
3939
public function __construct(
4040
Context $context,
4141
Config $config,
42-
RouteCollection $routeCollection
42+
RouteCollection $routeCollection,
4343
) {
4444
$this->context = $context;
4545
$this->config = $config;
@@ -120,7 +120,7 @@ public function sendToProcessor(Message $message): DriverSendResult
120120
return new DriverSendResult($queue, $transportMessage);
121121
}
122122

123-
public function setupBroker(LoggerInterface $logger = null): void
123+
public function setupBroker(?LoggerInterface $logger = null): void
124124
{
125125
}
126126

‎Client/Driver/GpsDriver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function __construct(GpsContext $context, ...$args)
2020
parent::__construct($context, ...$args);
2121
}
2222

23-
public function setupBroker(LoggerInterface $logger = null): void
23+
public function setupBroker(?LoggerInterface $logger = null): void
2424
{
2525
$logger = $logger ?: new NullLogger();
2626
$log = function ($text, ...$args) use ($logger) {

‎Client/Driver/MongodbDriver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function __construct(MongodbContext $context, ...$args)
1616
parent::__construct($context, ...$args);
1717
}
1818

19-
public function setupBroker(LoggerInterface $logger = null): void
19+
public function setupBroker(?LoggerInterface $logger = null): void
2020
{
2121
$logger = $logger ?: new NullLogger();
2222
$log = function ($text, ...$args) use ($logger) {

‎Client/Driver/RabbitMqDriver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Enqueue\Client\Driver;
3+
namespace Enqueue\Client\Driver;
44

55
use Interop\Amqp\AmqpQueue;
66
use Interop\Queue\Queue as InteropQueue;

‎Client/Driver/RabbitMqStompDriver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function createTransportMessage(Message $message): InteropMessage
6262
return $transportMessage;
6363
}
6464

65-
public function setupBroker(LoggerInterface $logger = null): void
65+
public function setupBroker(?LoggerInterface $logger = null): void
6666
{
6767
$logger = $logger ?: new NullLogger();
6868
$log = function ($text, ...$args) use ($logger) {

‎Client/Driver/RdKafkaDriver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function __construct(RdKafkaContext $context, ...$args)
1919
parent::__construct($context, ...$args);
2020
}
2121

22-
public function setupBroker(LoggerInterface $logger = null): void
22+
public function setupBroker(?LoggerInterface $logger = null): void
2323
{
2424
$logger = $logger ?: new NullLogger();
2525
$logger->debug('[RdKafkaDriver] setup broker');

‎Client/Driver/SnsQsDriver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function __construct(SnsQsContext $context, ...$args)
1919
parent::__construct($context, ...$args);
2020
}
2121

22-
public function setupBroker(LoggerInterface $logger = null): void
22+
public function setupBroker(?LoggerInterface $logger = null): void
2323
{
2424
$logger = $logger ?: new NullLogger();
2525
$log = function ($text, ...$args) use ($logger) {

‎Client/Driver/SqsDriver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function __construct(SqsContext $context, ...$args)
1818
parent::__construct($context, ...$args);
1919
}
2020

21-
public function setupBroker(LoggerInterface $logger = null): void
21+
public function setupBroker(?LoggerInterface $logger = null): void
2222
{
2323
$logger = $logger ?: new NullLogger();
2424
$log = function ($text, ...$args) use ($logger) {

‎Client/Driver/StompDriver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function __construct(StompContext $context, ...$args)
2222
parent::__construct($context, ...$args);
2323
}
2424

25-
public function setupBroker(LoggerInterface $logger = null): void
25+
public function setupBroker(?LoggerInterface $logger = null): void
2626
{
2727
$logger = $logger ?: new NullLogger();
2828
$logger->debug('[StompDriver] Stomp protocol does not support broker configuration');

‎Client/Driver/StompManagementClient.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function declareExchange(string $name, array $options)
3737
return $this->client->exchanges()->create($this->vhost, $name, $options);
3838
}
3939

40-
public function bind(string $exchange, string $queue, string $routingKey = null, $arguments = null)
40+
public function bind(string $exchange, string $queue, ?string $routingKey = null, $arguments = null)
4141
{
4242
return $this->client->bindings()->create($this->vhost, $exchange, $queue, $routingKey, $arguments);
4343
}

‎Client/DriverFactory.php

+2-10
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,10 @@ public function create(ConnectionFactory $factory, Config $config, RouteCollecti
3131

3232
$knownDrivers = Resources::getKnownDrivers();
3333
if ($driverInfo = $this->findDriverInfo($dsn, $knownDrivers)) {
34-
throw new \LogicException(sprintf(
35-
'To use given scheme "%s" a package has to be installed. Run "composer req %s" to add it.',
36-
$dsn->getScheme(),
37-
implode(' ', $driverInfo['packages'])
38-
));
34+
throw new \LogicException(sprintf('To use given scheme "%s" a package has to be installed. Run "composer req %s" to add it.', $dsn->getScheme(), implode(' ', $driverInfo['packages'])));
3935
}
4036

41-
throw new \LogicException(sprintf(
42-
'A given scheme "%s" is not supported. Maybe it is a custom driver, make sure you registered it with "%s::addDriver".',
43-
$dsn->getScheme(),
44-
Resources::class
45-
));
37+
throw new \LogicException(sprintf('A given scheme "%s" is not supported. Maybe it is a custom driver, make sure you registered it with "%s::addDriver".', $dsn->getScheme(), Resources::class));
4638
}
4739

4840
private function findDriverInfo(Dsn $dsn, array $factories): ?array

‎Client/DriverInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function createRouteQueue(Route $route): InteropQueue;
2727
* Prepare broker for work.
2828
* Creates all required queues, exchanges, topics, bindings etc.
2929
*/
30-
public function setupBroker(LoggerInterface $logger = null): void;
30+
public function setupBroker(?LoggerInterface $logger = null): void;
3131

3232
public function getConfig(): Config;
3333

‎Client/Extension/PrepareBodyExtension.php

+2-8
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ private function prepareBody(Message $message): void
3232
// only array of scalars is allowed.
3333
array_walk_recursive($body, function ($value) {
3434
if (!is_scalar($value) && null !== $value) {
35-
throw new \LogicException(sprintf(
36-
'The message\'s body must be an array of scalars. Found not scalar in the array: %s',
37-
is_object($value) ? get_class($value) : gettype($value)
38-
));
35+
throw new \LogicException(sprintf('The message\'s body must be an array of scalars. Found not scalar in the array: %s', is_object($value) ? $value::class : gettype($value)));
3936
}
4037
});
4138

@@ -45,10 +42,7 @@ private function prepareBody(Message $message): void
4542
$contentType = $contentType ?: 'application/json';
4643
$body = JSON::encode($body);
4744
} else {
48-
throw new \InvalidArgumentException(sprintf(
49-
'The message\'s body must be either null, scalar, array or object (implements \JsonSerializable). Got: %s',
50-
is_object($body) ? get_class($body) : gettype($body)
51-
));
45+
throw new \InvalidArgumentException(sprintf('The message\'s body must be either null, scalar, array or object (implements \JsonSerializable). Got: %s', is_object($body) ? $body::class : gettype($body)));
5246
}
5347

5448
$message->setContentType($contentType);

‎Client/Message.php

+6-18
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ class Message
77
/**
88
* @const string
99
*/
10-
const SCOPE_MESSAGE_BUS = 'enqueue.scope.message_bus';
10+
public const SCOPE_MESSAGE_BUS = 'enqueue.scope.message_bus';
1111

1212
/**
1313
* @const string
1414
*/
15-
const SCOPE_APP = 'enqueue.scope.app';
15+
public const SCOPE_APP = 'enqueue.scope.app';
1616

1717
/**
1818
* @var string|null
@@ -256,10 +256,8 @@ public function getHeaders()
256256
}
257257

258258
/**
259-
* @param string $name
260-
* @param mixed $default
261-
*
262-
* @return mixed
259+
* @param string $name
260+
* @param mixed|null $default
263261
*/
264262
public function getHeader($name, $default = null)
265263
{
@@ -268,16 +266,12 @@ public function getHeader($name, $default = null)
268266

269267
/**
270268
* @param string $name
271-
* @param mixed $value
272269
*/
273270
public function setHeader($name, $value)
274271
{
275272
$this->headers[$name] = $value;
276273
}
277274

278-
/**
279-
* @param array $headers
280-
*/
281275
public function setHeaders(array $headers)
282276
{
283277
$this->headers = $headers;
@@ -291,19 +285,14 @@ public function getProperties()
291285
return $this->properties;
292286
}
293287

294-
/**
295-
* @param array $properties
296-
*/
297288
public function setProperties(array $properties)
298289
{
299290
$this->properties = $properties;
300291
}
301292

302293
/**
303-
* @param string $name
304-
* @param mixed $default
305-
*
306-
* @return mixed
294+
* @param string $name
295+
* @param mixed|null $default
307296
*/
308297
public function getProperty($name, $default = null)
309298
{
@@ -312,7 +301,6 @@ public function getProperty($name, $default = null)
312301

313302
/**
314303
* @param string $name
315-
* @param mixed $value
316304
*/
317305
public function setProperty($name, $value)
318306
{

0 commit comments

Comments
 (0)