Running php-cs-fixer

JimTools · JimTools · commit 1660cc1817cf · 2025-01-17T21:33:18.000Z
Running php-cs-fixer to fix CS drift
diff --git a/AmqpConnectionFactory.php b/AmqpConnectionFactory.php
@@ -32,7 +32,7 @@ class AmqpConnectionFactory implements InteropAmqpConnectionFactory, DelayStrate
     private $connection;
 
     /**
-     * @see \Enqueue\AmqpTools\ConnectionConfig for possible config formats and values.
+     * @see ConnectionConfig for possible config formats and values.
      *
      * @param array|string|null $config
      */
diff --git a/AmqpConsumer.php b/AmqpConsumer.php
@@ -47,7 +47,7 @@ public function __construct(AmqpContext $context, InteropAmqpQueue $queue)
         $this->flags = self::FLAG_NOPARAM;
     }
 
-    public function setConsumerTag(string $consumerTag = null): void
+    public function setConsumerTag(?string $consumerTag = null): void
     {
         $this->consumerTag = $consumerTag;
     }
@@ -97,7 +97,7 @@ public function receive(int $timeout = 0): ?Message
                 return $message;
             }
 
-            usleep(100000); //100ms
+            usleep(100000); // 100ms
         }
 
         return null;
@@ -127,7 +127,6 @@ public function acknowledge(Message $message): void
 
     /**
      * @param InteropAmqpMessage $message
-     * @param bool               $requeue
      */
     public function reject(Message $message, bool $requeue = false): void
     {
diff --git a/AmqpProducer.php b/AmqpProducer.php
@@ -81,7 +81,7 @@ public function send(Destination $destination, Message $message): void
     /**
      * @return self
      */
-    public function setDeliveryDelay(int $deliveryDelay = null): Producer
+    public function setDeliveryDelay(?int $deliveryDelay = null): Producer
     {
         if (null === $this->delayStrategy) {
             throw DeliveryDelayNotSupportedException::providerDoestNotSupportIt();
@@ -100,7 +100,7 @@ public function getDeliveryDelay(): ?int
     /**
      * @return self
      */
-    public function setPriority(int $priority = null): Producer
+    public function setPriority(?int $priority = null): Producer
     {
         $this->priority = $priority;
 
@@ -115,7 +115,7 @@ public function getPriority(): ?int
     /**
      * @return self
      */
-    public function setTimeToLive(int $timeToLive = null): Producer
+    public function setTimeToLive(?int $timeToLive = null): Producer
     {
         $this->timeToLive = $timeToLive;
 
diff --git a/AmqpSubscriptionConsumer.php b/AmqpSubscriptionConsumer.php
@@ -93,7 +93,7 @@ public function consume(int $timeout = 0): void
     public function subscribe(Consumer $consumer, callable $callback): void
     {
         if (false == $consumer instanceof AmqpConsumer) {
-            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', AmqpConsumer::class, get_class($consumer)));
+            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', AmqpConsumer::class, $consumer::class));
         }
 
         if ($consumer->getConsumerTag() && array_key_exists($consumer->getConsumerTag(), $this->subscribers)) {
@@ -140,7 +140,7 @@ public function subscribe(Consumer $consumer, callable $callback): void
     public function unsubscribe(Consumer $consumer): void
     {
         if (false == $consumer instanceof AmqpConsumer) {
-            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', AmqpConsumer::class, get_class($consumer)));
+            throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', AmqpConsumer::class, $consumer::class));
         }
 
         if (false == $consumer->getConsumerTag()) {
diff --git a/Tests/Spec/AmqpProducerTest.php b/Tests/Spec/AmqpProducerTest.php
@@ -10,9 +10,6 @@
  */
 class AmqpProducerTest extends ProducerSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createProducer()
     {
         $factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));
diff --git a/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php b/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest.php
@@ -13,9 +13,6 @@
  */
 class AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest extends SendAndReceiveDelayedMessageFromQueueSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));
@@ -26,8 +23,6 @@ protected function createContext()
 
     /**
      * @param AmqpContext $context
-     *
-     * {@inheritdoc}
      */
     protected function createQueue(Context $context, $queueName)
     {
diff --git a/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php b/Tests/Spec/AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest.php
@@ -13,9 +13,6 @@
  */
 class AmqpSendAndReceiveDelayedMessageWithDlxStrategyTest extends SendAndReceiveDelayedMessageFromQueueSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));
@@ -26,8 +23,6 @@ protected function createContext()
 
     /**
      * @param AmqpContext $context
-     *
-     * {@inheritdoc}
      */
     protected function createQueue(Context $context, $queueName)
     {
diff --git a/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php b/Tests/Spec/AmqpSendAndReceivePriorityMessagesFromQueueTest.php
@@ -12,9 +12,6 @@
  */
 class AmqpSendAndReceivePriorityMessagesFromQueueTest extends SendAndReceivePriorityMessagesFromQueueSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));
@@ -23,8 +20,6 @@ protected function createContext()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param AmqpContext $context
      */
     protected function createQueue(Context $context, $queueName)
diff --git a/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php b/Tests/Spec/AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest.php
@@ -12,9 +12,6 @@
  */
 class AmqpSendAndReceiveTimeToLiveMessagesFromQueueTest extends SendAndReceiveTimeToLiveMessagesFromQueueSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));
@@ -23,8 +20,6 @@ protected function createContext()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param AmqpContext $context
      */
     protected function createQueue(Context $context, $queueName)
diff --git a/Tests/Spec/AmqpSendAndReceiveTimestampAsIntengerTest.php b/Tests/Spec/AmqpSendAndReceiveTimestampAsIntengerTest.php
@@ -10,9 +10,6 @@
  */
 class AmqpSendAndReceiveTimestampAsIntengerTest extends SendAndReceiveTimestampAsIntegerSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));
diff --git a/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php b/Tests/Spec/AmqpSendToAndReceiveFromQueueTest.php
@@ -12,9 +12,6 @@
  */
 class AmqpSendToAndReceiveFromQueueTest extends SendToAndReceiveFromQueueSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));
@@ -23,8 +20,6 @@ protected function createContext()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param AmqpContext $context
      */
     protected function createQueue(Context $context, $queueName)
diff --git a/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php b/Tests/Spec/AmqpSendToAndReceiveFromTopicTest.php
@@ -13,9 +13,6 @@
  */
 class AmqpSendToAndReceiveFromTopicTest extends SendToAndReceiveFromTopicSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));
@@ -24,8 +21,6 @@ protected function createContext()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param AmqpContext $context
      */
     protected function createTopic(Context $context, $topicName)
diff --git a/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php b/Tests/Spec/AmqpSendToAndReceiveNoWaitFromQueueTest.php
@@ -12,9 +12,6 @@
  */
 class AmqpSendToAndReceiveNoWaitFromQueueTest extends SendToAndReceiveNoWaitFromQueueSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));
@@ -23,8 +20,6 @@ protected function createContext()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param AmqpContext $context
      */
     protected function createQueue(Context $context, $queueName)
diff --git a/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php b/Tests/Spec/AmqpSendToAndReceiveNoWaitFromTopicTest.php
@@ -13,9 +13,6 @@
  */
 class AmqpSendToAndReceiveNoWaitFromTopicTest extends SendToAndReceiveNoWaitFromTopicSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));
@@ -24,8 +21,6 @@ protected function createContext()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param AmqpContext $context
      */
     protected function createTopic(Context $context, $topicName)
diff --git a/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php b/Tests/Spec/AmqpSendToTopicAndReceiveFromQueueTest.php
@@ -14,9 +14,6 @@
  */
 class AmqpSendToTopicAndReceiveFromQueueTest extends SendToTopicAndReceiveFromQueueSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));
@@ -25,8 +22,6 @@ protected function createContext()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param AmqpContext $context
      */
     protected function createQueue(Context $context, $queueName)
@@ -41,8 +36,6 @@ protected function createQueue(Context $context, $queueName)
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param AmqpContext $context
      */
     protected function createTopic(Context $context, $topicName)
diff --git a/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php b/Tests/Spec/AmqpSendToTopicAndReceiveNoWaitFromQueueTest.php
@@ -14,9 +14,6 @@
  */
 class AmqpSendToTopicAndReceiveNoWaitFromQueueTest extends SendToTopicAndReceiveNoWaitFromQueueSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));
@@ -25,8 +22,6 @@ protected function createContext()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param AmqpContext $context
      */
     protected function createQueue(Context $context, $queueName)
@@ -41,8 +36,6 @@ protected function createQueue(Context $context, $queueName)
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param AmqpContext $context
      */
     protected function createTopic(Context $context, $topicName)
diff --git a/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php b/Tests/Spec/AmqpSslSendToAndReceiveFromQueueTest.php
@@ -12,9 +12,6 @@
  */
 class AmqpSslSendToAndReceiveFromQueueTest extends SendToAndReceiveFromQueueSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $baseDir = realpath(__DIR__.'/../../../../');
@@ -37,8 +34,6 @@ protected function createContext()
     }
 
     /**
-     * {@inheritdoc}
-     *
      * @param AmqpContext $context
      */
     protected function createQueue(Context $context, $queueName)
diff --git a/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php b/Tests/Spec/AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest.php
@@ -15,8 +15,6 @@ class AmqpSubscriptionConsumerConsumeFromAllSubscribedQueuesTest extends Subscri
 {
     /**
      * @return AmqpContext
-     *
-     * {@inheritdoc}
      */
     protected function createContext()
     {
@@ -30,8 +28,6 @@ protected function createContext()
 
     /**
      * @param AmqpContext $context
-     *
-     * {@inheritdoc}
      */
     protected function createQueue(Context $context, $queueName)
     {
diff --git a/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php b/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php
@@ -24,8 +24,6 @@ protected function tearDown(): void
 
     /**
      * @return AmqpContext
-     *
-     * {@inheritdoc}
      */
     protected function createContext()
     {
@@ -39,8 +37,6 @@ protected function createContext()
 
     /**
      * @param AmqpContext $context
-     *
-     * {@inheritdoc}
      */
     protected function createQueue(Context $context, $queueName)
     {
diff --git a/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php b/Tests/Spec/AmqpSubscriptionConsumerStopOnFalseTest.php
@@ -15,8 +15,6 @@ class AmqpSubscriptionConsumerStopOnFalseTest extends SubscriptionConsumerStopOn
 {
     /**
      * @return AmqpContext
-     *
-     * {@inheritdoc}
      */
     protected function createContext()
     {
@@ -30,8 +28,6 @@ protected function createContext()
 
     /**
      * @param AmqpContext $context
-     *
-     * {@inheritdoc}
      */
     protected function createQueue(Context $context, $queueName)
     {
diff --git a/examples/consume.php b/examples/consume.php
@@ -12,7 +12,7 @@
 if ($autoload) {
     require_once $autoload;
 } else {
-    throw new \LogicException('Composer autoload was not found');
+    throw new LogicException('Composer autoload was not found');
 }
 
 use Enqueue\AmqpLib\AmqpConnectionFactory;
@@ -32,7 +32,7 @@
 
 while (true) {
     if ($m = $consumer->receive(100)) {
-        echo $m->getBody(), PHP_EOL;
+        echo $m->getBody(), \PHP_EOL;
         $consumer->acknowledge($m);
     }
 
diff --git a/examples/produce.php b/examples/produce.php
diff --git a/tutorial/rpc_client.php b/tutorial/rpc_client.php
diff --git a/tutorial/rpc_server.php b/tutorial/rpc_server.php

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class AmqpConnectionFactory implements InteropAmqpConnectionFactory, DelayStrate`
`32`	`32`	`private $connection;`
`33`	`33`
`34`	`34`	`/**`
`35`		`- * @see \Enqueue\AmqpTools\ConnectionConfig for possible config formats and values.`
	`35`	`+ * @see ConnectionConfig for possible config formats and values.`
`36`	`36`	`*`
`37`	`37`	`* @param array\|string\|null $config`
`38`	`38`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct(AmqpContext $context, InteropAmqpQueue $queue)`
`47`	`47`	`$this->flags = self::FLAG_NOPARAM;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public function setConsumerTag(string $consumerTag = null): void`
	`50`	`+ public function setConsumerTag(?string $consumerTag = null): void`
`51`	`51`	`{`
`52`	`52`	`$this->consumerTag = $consumerTag;`
`53`	`53`	`}`
`@@ -97,7 +97,7 @@ public function receive(int $timeout = 0): ?Message`
`97`	`97`	`return $message;`
`98`	`98`	`}`
`99`	`99`
`100`		`- usleep(100000); //100ms`
	`100`	`+ usleep(100000); // 100ms`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`return null;`
`@@ -127,7 +127,6 @@ public function acknowledge(Message $message): void`
`127`	`127`
`128`	`128`	`/**`
`129`	`129`	`* @param InteropAmqpMessage $message`
`130`		`- * @param bool $requeue`
`131`	`130`	`*/`
`132`	`131`	`public function reject(Message $message, bool $requeue = false): void`
`133`	`132`	`{`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function consume(int $timeout = 0): void`
`93`	`93`	`public function subscribe(Consumer $consumer, callable $callback): void`
`94`	`94`	`{`
`95`	`95`	`if (false == $consumer instanceof AmqpConsumer) {`
`96`		`- throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', AmqpConsumer::class, get_class($consumer)));`
	`96`	`+ throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', AmqpConsumer::class, $consumer::class));`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if ($consumer->getConsumerTag() && array_key_exists($consumer->getConsumerTag(), $this->subscribers)) {`
`@@ -140,7 +140,7 @@ public function subscribe(Consumer $consumer, callable $callback): void`
`140`	`140`	`public function unsubscribe(Consumer $consumer): void`
`141`	`141`	`{`
`142`	`142`	`if (false == $consumer instanceof AmqpConsumer) {`
`143`		`- throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', AmqpConsumer::class, get_class($consumer)));`
	`143`	`+ throw new \InvalidArgumentException(sprintf('The consumer must be instance of "%s" got "%s"', AmqpConsumer::class, $consumer::class));`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`if (false == $consumer->getConsumerTag()) {`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,6 @@`
`10`	`10`	`*/`
`11`	`11`	`class AmqpProducerTest extends ProducerSpec`
`12`	`12`	`{`
`13`		`- /**`
`14`		`- * {@inheritdoc}`
`15`		`- */`
`16`	`13`	`protected function createProducer()`
`17`	`14`	`{`
`18`	`15`	`$factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,6 @@`
`13`	`13`	`*/`
`14`	`14`	`class AmqpSendAndReceiveDelayedMessageWithDelayPluginStrategyTest extends SendAndReceiveDelayedMessageFromQueueSpec`
`15`	`15`	`{`
`16`		`- /**`
`17`		`- * {@inheritdoc}`
`18`		`- */`
`19`	`16`	`protected function createContext()`
`20`	`17`	`{`
`21`	`18`	`$factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));`
`@@ -26,8 +23,6 @@ protected function createContext()`
`26`	`23`
`27`	`24`	`/**`
`28`	`25`	`* @param AmqpContext $context`
`29`		`- *`
`30`		`- * {@inheritdoc}`
`31`	`26`	`*/`
`32`	`27`	`protected function createQueue(Context $context, $queueName)`
`33`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,6 @@`
`12`	`12`	`*/`
`13`	`13`	`class AmqpSendAndReceivePriorityMessagesFromQueueTest extends SendAndReceivePriorityMessagesFromQueueSpec`
`14`	`14`	`{`
`15`		`- /**`
`16`		`- * {@inheritdoc}`
`17`		`- */`
`18`	`15`	`protected function createContext()`
`19`	`16`	`{`
`20`	`17`	`$factory = new AmqpConnectionFactory(getenv('AMQP_DSN'));`
`@@ -23,8 +20,6 @@ protected function createContext()`
`23`	`20`	`}`
`24`	`21`
`25`	`22`	`/**`
`26`		`- * {@inheritdoc}`
`27`		`- *`
`28`	`23`	`* @param AmqpContext $context`
`29`	`24`	`*/`
`30`	`25`	`protected function createQueue(Context $context, $queueName)`