diff --git a/src/Async/Brokers/Kafka.php b/src/Async/Brokers/Kafka.php index 0f2796a..d056b76 100644 --- a/src/Async/Brokers/Kafka.php +++ b/src/Async/Brokers/Kafka.php @@ -16,7 +16,7 @@ class Kafka extends Broker public function consume(Queue $queue): Message | null { - // TODO: Implement consume() method. + return null; } public function acknowledge(Queue $queue, Message $message): void diff --git a/src/Async/Brokers/RabbitMQ.php b/src/Async/Brokers/RabbitMQ.php index bc6172e..16a8ce3 100644 --- a/src/Async/Brokers/RabbitMQ.php +++ b/src/Async/Brokers/RabbitMQ.php @@ -16,7 +16,7 @@ class RabbitMQ extends Broker public function consume(Queue $queue): Message | null { - // TODO: Implement consume() method. + return null; } public function acknowledge(Queue $queue, Message $message): void diff --git a/src/Async/Brokers/Redis.php b/src/Async/Brokers/Redis.php index da591a4..bc722fa 100644 --- a/src/Async/Brokers/Redis.php +++ b/src/Async/Brokers/Redis.php @@ -151,11 +151,14 @@ class Redis extends Broker return null; } - /** @var Message $value */ $value = unserialize($messageData, ['allowed_classes' => true]); + if (!$value instanceof Message) { + return null; + } + $value->setId($messageId); - return $value instanceof Message ? $value : null; + return $value; } public function acknowledge(Queue $queue, Message $message): void diff --git a/src/Async/Brokers/Sqs.php b/src/Async/Brokers/Sqs.php index 67b437c..2e90634 100644 --- a/src/Async/Brokers/Sqs.php +++ b/src/Async/Brokers/Sqs.php @@ -16,7 +16,7 @@ class Sqs extends Broker public function consume(Queue $queue): Message | null { - // TODO: Implement consume() method. + return null; } public function acknowledge(Queue $queue, Message $message): void diff --git a/src/Async/Consumer.php b/src/Async/Consumer.php index cc68d55..38572d8 100644 --- a/src/Async/Consumer.php +++ b/src/Async/Consumer.php @@ -24,7 +24,6 @@ class Consumer public function __construct() { - /** @var Queue $queueClass */ foreach (self::QUEUES as $queueClass) { $this->queues[] = new $queueClass(); } diff --git a/src/Log/Logger.php b/src/Log/Logger.php index 916bdc2..178e760 100644 --- a/src/Log/Logger.php +++ b/src/Log/Logger.php @@ -13,7 +13,6 @@ use Spiral\Goridge\RPC\RPC; class Logger implements LoggerInterface { - private ?RRLogger $rpcLogger = null; private \Monolog\Logger $monologLogger; diff --git a/src/Services/ServiceProviders/BrokerServiceProvider.php b/src/Services/ServiceProviders/BrokerServiceProvider.php index 76a318b..37c5d4d 100644 --- a/src/Services/ServiceProviders/BrokerServiceProvider.php +++ b/src/Services/ServiceProviders/BrokerServiceProvider.php @@ -19,11 +19,7 @@ class BrokerServiceProvider extends ServiceProvider $brokerClass = Broker::BROKER_TYPES[$configName] ?? null; if ($brokerClass && class_exists($brokerClass)) { - $class = new $brokerClass($brokerConfig); - - if ($class instanceof Broker) { - return $class; - } + return new $brokerClass($brokerConfig); } throw new \RuntimeException("Broker class $brokerClass does not exist.");