Running php-cs-fixer

JimTools · JimTools · commit 8b16dbcb355c · 2025-01-17T21:33:18.000Z
Running php-cs-fixer to fix CS drift
diff --git a/PheanstalkMessage.php b/PheanstalkMessage.php
@@ -103,7 +103,7 @@ public function setRedelivered(bool $redelivered): void
         $this->redelivered = $redelivered;
     }
 
-    public function setCorrelationId(string $correlationId = null): void
+    public function setCorrelationId(?string $correlationId = null): void
     {
         $this->setHeader('correlation_id', (string) $correlationId);
     }
@@ -113,7 +113,7 @@ public function getCorrelationId(): ?string
         return $this->getHeader('correlation_id');
     }
 
-    public function setMessageId(string $messageId = null): void
+    public function setMessageId(?string $messageId = null): void
     {
         $this->setHeader('message_id', (string) $messageId);
     }
@@ -130,12 +130,12 @@ public function getTimestamp(): ?int
         return null === $value ? null : (int) $value;
     }
 
-    public function setTimestamp(int $timestamp = null): void
+    public function setTimestamp(?int $timestamp = null): void
     {
         $this->setHeader('timestamp', $timestamp);
     }
 
-    public function setReplyTo(string $replyTo = null): void
+    public function setReplyTo(?string $replyTo = null): void
     {
         $this->setHeader('reply_to', $replyTo);
     }
@@ -187,12 +187,8 @@ public function jsonSerialize(): array
     public static function jsonUnserialize(string $json): self
     {
         $data = json_decode($json, true);
-        if (JSON_ERROR_NONE !== json_last_error()) {
-            throw new \InvalidArgumentException(sprintf(
-                'The malformed json given. Error %s and message %s',
-                json_last_error(),
-                json_last_error_msg()
-            ));
+        if (\JSON_ERROR_NONE !== json_last_error()) {
+            throw new \InvalidArgumentException(sprintf('The malformed json given. Error %s and message %s', json_last_error(), json_last_error_msg()));
         }
 
         return new self($data['body'], $data['properties'], $data['headers']);
@@ -203,7 +199,7 @@ public function getJob(): ?Job
         return $this->job;
     }
 
-    public function setJob(Job $job = null): void
+    public function setJob(?Job $job = null): void
     {
         $this->job = $job;
     }
diff --git a/PheanstalkProducer.php b/PheanstalkProducer.php
@@ -48,7 +48,7 @@ public function send(Destination $destination, Message $message): void
         InvalidMessageException::assertMessageInstanceOf($message, PheanstalkMessage::class);
 
         $rawMessage = json_encode($message);
-        if (JSON_ERROR_NONE !== json_last_error()) {
+        if (\JSON_ERROR_NONE !== json_last_error()) {
             throw new \InvalidArgumentException(sprintf('Could not encode value into json. Error %s and message %s', json_last_error(), json_last_error_msg()));
         }
 
@@ -73,7 +73,7 @@ public function send(Destination $destination, Message $message): void
     /**
      * @return PheanstalkProducer
      */
-    public function setDeliveryDelay(int $deliveryDelay = null): Producer
+    public function setDeliveryDelay(?int $deliveryDelay = null): Producer
     {
         $this->deliveryDelay = $deliveryDelay;
 
@@ -88,7 +88,7 @@ public function getDeliveryDelay(): ?int
     /**
      * @return PheanstalkProducer
      */
-    public function setPriority(int $priority = null): Producer
+    public function setPriority(?int $priority = null): Producer
     {
         $this->priority = $priority;
 
@@ -103,7 +103,7 @@ public function getPriority(): ?int
     /**
      * @return PheanstalkProducer
      */
-    public function setTimeToLive(int $timeToLive = null): Producer
+    public function setTimeToLive(?int $timeToLive = null): Producer
     {
         $this->timeToLive = $timeToLive;
 
diff --git a/Tests/PheanstalkConnectionFactoryConfigTest.php b/Tests/PheanstalkConnectionFactoryConfigTest.php
@@ -41,9 +41,6 @@ public function testThrowIfDsnCouldNotBeParsed()
 
     /**
      * @dataProvider provideConfigs
-     *
-     * @param mixed $config
-     * @param mixed $expectedConfig
      */
     public function testShouldParseConfigurationAsExpected($config, $expectedConfig)
     {
diff --git a/Tests/PheanstalkConsumerTest.php b/Tests/PheanstalkConsumerTest.php
@@ -46,7 +46,7 @@ public function testShouldReceiveFromQueueAndReturnNullIfNoMessageInQueue()
     public function testShouldReceiveFromQueueAndReturnMessageIfMessageInQueue()
     {
         $destination = new PheanstalkDestination('theQueueName');
-        $message = new  PheanstalkMessage('theBody', ['foo' => 'fooVal'], ['bar' => 'barVal']);
+        $message = new PheanstalkMessage('theBody', ['foo' => 'fooVal'], ['bar' => 'barVal']);
 
         $job = new Job('theJobId', json_encode($message));
 
diff --git a/Tests/Spec/PheanstalkConnectionFactoryTest.php b/Tests/Spec/PheanstalkConnectionFactoryTest.php
@@ -7,9 +7,6 @@
 
 class PheanstalkConnectionFactoryTest extends ConnectionFactorySpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createConnectionFactory()
     {
         return new PheanstalkConnectionFactory();
diff --git a/Tests/Spec/PheanstalkContextTest.php b/Tests/Spec/PheanstalkContextTest.php
@@ -8,9 +8,6 @@
 
 class PheanstalkContextTest extends ContextSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         return new PheanstalkContext($this->createMock(Pheanstalk::class));
diff --git a/Tests/Spec/PheanstalkMessageTest.php b/Tests/Spec/PheanstalkMessageTest.php
@@ -7,9 +7,6 @@
 
 class PheanstalkMessageTest extends MessageSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createMessage()
     {
         return new PheanstalkMessage();
diff --git a/Tests/Spec/PheanstalkQueueTest.php b/Tests/Spec/PheanstalkQueueTest.php
@@ -7,9 +7,6 @@
 
 class PheanstalkQueueTest extends QueueSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createQueue()
     {
         return new PheanstalkDestination(self::EXPECTED_QUEUE_NAME);
diff --git a/Tests/Spec/PheanstalkSendToAndReceiveFromQueueTest.php b/Tests/Spec/PheanstalkSendToAndReceiveFromQueueTest.php
@@ -12,9 +12,6 @@
  */
 class PheanstalkSendToAndReceiveFromQueueTest extends SendToAndReceiveFromQueueSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new PheanstalkConnectionFactory(getenv('BEANSTALKD_DSN'));
@@ -23,8 +20,7 @@ protected function createContext()
     }
 
     /**
-     * @param Context $context
-     * @param string  $queueName
+     * @param string $queueName
      *
      * @return Queue
      */
diff --git a/Tests/Spec/PheanstalkSendToAndReceiveNoWaitFromQueueTest.php b/Tests/Spec/PheanstalkSendToAndReceiveNoWaitFromQueueTest.php
@@ -11,19 +11,13 @@
  */
 class PheanstalkSendToAndReceiveNoWaitFromQueueTest extends SendToAndReceiveNoWaitFromQueueSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new PheanstalkConnectionFactory(getenv('BEANSTALKD_DSN'));
 
         return $factory->createContext();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function createQueue(Context $context, $queueName)
     {
         return $context->createQueue($queueName.time());
diff --git a/Tests/Spec/PheanstalkSendToTopicAndReceiveFromQueueTest.php b/Tests/Spec/PheanstalkSendToTopicAndReceiveFromQueueTest.php
@@ -18,27 +18,18 @@ protected function setUp(): void
         $this->time = time();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new PheanstalkConnectionFactory(getenv('BEANSTALKD_DSN'));
 
         return $factory->createContext();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function createQueue(Context $context, $queueName)
     {
         return $context->createQueue($queueName.$this->time);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function createTopic(Context $context, $topicName)
     {
         return $context->createTopic($topicName.$this->time);
diff --git a/Tests/Spec/PheanstalkSendToTopicAndReceiveNoWaitFromQueueTest.php b/Tests/Spec/PheanstalkSendToTopicAndReceiveNoWaitFromQueueTest.php
@@ -18,27 +18,18 @@ protected function setUp(): void
         $this->time = time();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function createContext()
     {
         $factory = new PheanstalkConnectionFactory(getenv('BEANSTALKD_DSN'));
 
         return $factory->createContext();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function createQueue(Context $context, $queueName)
     {
         return $context->createQueue($queueName.$this->time);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function createTopic(Context $context, $topicName)
     {
         return $context->createTopic($topicName.$this->time);
diff --git a/Tests/Spec/PheanstalkTopicTest.php b/Tests/Spec/PheanstalkTopicTest.php
@@ -7,9 +7,6 @@
 
 class PheanstalkTopicTest extends TopicSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createTopic()
     {
         return new PheanstalkDestination(self::EXPECTED_TOPIC_NAME);

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function setRedelivered(bool $redelivered): void`
`103`	`103`	`$this->redelivered = $redelivered;`
`104`	`104`	`}`
`105`	`105`
`106`		`- public function setCorrelationId(string $correlationId = null): void`
	`106`	`+ public function setCorrelationId(?string $correlationId = null): void`
`107`	`107`	`{`
`108`	`108`	`$this->setHeader('correlation_id', (string) $correlationId);`
`109`	`109`	`}`
`@@ -113,7 +113,7 @@ public function getCorrelationId(): ?string`
`113`	`113`	`return $this->getHeader('correlation_id');`
`114`	`114`	`}`
`115`	`115`
`116`		`- public function setMessageId(string $messageId = null): void`
	`116`	`+ public function setMessageId(?string $messageId = null): void`
`117`	`117`	`{`
`118`	`118`	`$this->setHeader('message_id', (string) $messageId);`
`119`	`119`	`}`
`@@ -130,12 +130,12 @@ public function getTimestamp(): ?int`
`130`	`130`	`return null === $value ? null : (int) $value;`
`131`	`131`	`}`
`132`	`132`
`133`		`- public function setTimestamp(int $timestamp = null): void`
	`133`	`+ public function setTimestamp(?int $timestamp = null): void`
`134`	`134`	`{`
`135`	`135`	`$this->setHeader('timestamp', $timestamp);`
`136`	`136`	`}`
`137`	`137`
`138`		`- public function setReplyTo(string $replyTo = null): void`
	`138`	`+ public function setReplyTo(?string $replyTo = null): void`
`139`	`139`	`{`
`140`	`140`	`$this->setHeader('reply_to', $replyTo);`
`141`	`141`	`}`
`@@ -187,12 +187,8 @@ public function jsonSerialize(): array`
`187`	`187`	`public static function jsonUnserialize(string $json): self`
`188`	`188`	`{`
`189`	`189`	`$data = json_decode($json, true);`
`190`		`- if (JSON_ERROR_NONE !== json_last_error()) {`
`191`		`- throw new \InvalidArgumentException(sprintf(`
`192`		`- 'The malformed json given. Error %s and message %s',`
`193`		`- json_last_error(),`
`194`		`- json_last_error_msg()`
`195`		`- ));`
	`190`	`+ if (\JSON_ERROR_NONE !== json_last_error()) {`
	`191`	`+ throw new \InvalidArgumentException(sprintf('The malformed json given. Error %s and message %s', json_last_error(), json_last_error_msg()));`
`196`	`192`	`}`
`197`	`193`
`198`	`194`	`return new self($data['body'], $data['properties'], $data['headers']);`
`@@ -203,7 +199,7 @@ public function getJob(): ?Job`
`203`	`199`	`return $this->job;`
`204`	`200`	`}`
`205`	`201`
`206`		`- public function setJob(Job $job = null): void`
	`202`	`+ public function setJob(?Job $job = null): void`
`207`	`203`	`{`
`208`	`204`	`$this->job = $job;`
`209`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,6 @@ public function testThrowIfDsnCouldNotBeParsed()`
`41`	`41`
`42`	`42`	`/**`
`43`	`43`	`* @dataProvider provideConfigs`
`44`		`- *`
`45`		`- * @param mixed $config`
`46`		`- * @param mixed $expectedConfig`
`47`	`44`	`*/`
`48`	`45`	`public function testShouldParseConfigurationAsExpected($config, $expectedConfig)`
`49`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function testShouldReceiveFromQueueAndReturnNullIfNoMessageInQueue()`
`46`	`46`	`public function testShouldReceiveFromQueueAndReturnMessageIfMessageInQueue()`
`47`	`47`	`{`
`48`	`48`	`$destination = new PheanstalkDestination('theQueueName');`
`49`		`- $message = new PheanstalkMessage('theBody', ['foo' => 'fooVal'], ['bar' => 'barVal']);`
	`49`	`+ $message = new PheanstalkMessage('theBody', ['foo' => 'fooVal'], ['bar' => 'barVal']);`
`50`	`50`
`51`	`51`	`$job = new Job('theJobId', json_encode($message));`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,6 @@`
`7`	`7`
`8`	`8`	`class PheanstalkConnectionFactoryTest extends ConnectionFactorySpec`
`9`	`9`	`{`
`10`		`- /**`
`11`		`- * {@inheritdoc}`
`12`		`- */`
`13`	`10`	`protected function createConnectionFactory()`
`14`	`11`	`{`
`15`	`12`	`return new PheanstalkConnectionFactory();`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,6 @@`
`8`	`8`
`9`	`9`	`class PheanstalkContextTest extends ContextSpec`
`10`	`10`	`{`
`11`		`- /**`
`12`		`- * {@inheritdoc}`
`13`		`- */`
`14`	`11`	`protected function createContext()`
`15`	`12`	`{`
`16`	`13`	`return new PheanstalkContext($this->createMock(Pheanstalk::class));`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,6 @@`
`7`	`7`
`8`	`8`	`class PheanstalkMessageTest extends MessageSpec`
`9`	`9`	`{`
`10`		`- /**`
`11`		`- * {@inheritdoc}`
`12`		`- */`
`13`	`10`	`protected function createMessage()`
`14`	`11`	`{`
`15`	`12`	`return new PheanstalkMessage();`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,6 @@`
`7`	`7`
`8`	`8`	`class PheanstalkQueueTest extends QueueSpec`
`9`	`9`	`{`
`10`		`- /**`
`11`		`- * {@inheritdoc}`
`12`		`- */`
`13`	`10`	`protected function createQueue()`
`14`	`11`	`{`
`15`	`12`	`return new PheanstalkDestination(self::EXPECTED_QUEUE_NAME);`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,6 @@`
`12`	`12`	`*/`
`13`	`13`	`class PheanstalkSendToAndReceiveFromQueueTest extends SendToAndReceiveFromQueueSpec`
`14`	`14`	`{`
`15`		`- /**`
`16`		`- * {@inheritdoc}`
`17`		`- */`
`18`	`15`	`protected function createContext()`
`19`	`16`	`{`
`20`	`17`	`$factory = new PheanstalkConnectionFactory(getenv('BEANSTALKD_DSN'));`
`@@ -23,8 +20,7 @@ protected function createContext()`
`23`	`20`	`}`
`24`	`21`
`25`	`22`	`/**`
`26`		`- * @param Context $context`
`27`		`- * @param string $queueName`
	`23`	`+ * @param string $queueName`
`28`	`24`	`*`
`29`	`25`	`* @return Queue`
`30`	`26`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -11,19 +11,13 @@`
`11`	`11`	`*/`
`12`	`12`	`class PheanstalkSendToAndReceiveNoWaitFromQueueTest extends SendToAndReceiveNoWaitFromQueueSpec`
`13`	`13`	`{`
`14`		`- /**`
`15`		`- * {@inheritdoc}`
`16`		`- */`
`17`	`14`	`protected function createContext()`
`18`	`15`	`{`
`19`	`16`	`$factory = new PheanstalkConnectionFactory(getenv('BEANSTALKD_DSN'));`
`20`	`17`
`21`	`18`	`return $factory->createContext();`
`22`	`19`	`}`
`23`	`20`
`24`		`- /**`
`25`		`- * {@inheritdoc}`
`26`		`- */`
`27`	`21`	`protected function createQueue(Context $context, $queueName)`
`28`	`22`	`{`
`29`	`23`	`return $context->createQueue($queueName.time());`
Original file line number	Diff line number	Diff line change
`@@ -18,27 +18,18 @@ protected function setUp(): void`
`18`	`18`	`$this->time = time();`
`19`	`19`	`}`
`20`	`20`
`21`		`- /**`
`22`		`- * {@inheritdoc}`
`23`		`- */`
`24`	`21`	`protected function createContext()`
`25`	`22`	`{`
`26`	`23`	`$factory = new PheanstalkConnectionFactory(getenv('BEANSTALKD_DSN'));`
`27`	`24`
`28`	`25`	`return $factory->createContext();`
`29`	`26`	`}`
`30`	`27`
`31`		`- /**`
`32`		`- * {@inheritdoc}`
`33`		`- */`
`34`	`28`	`protected function createQueue(Context $context, $queueName)`
`35`	`29`	`{`
`36`	`30`	`return $context->createQueue($queueName.$this->time);`
`37`	`31`	`}`
`38`	`32`
`39`		`- /**`
`40`		`- * {@inheritdoc}`
`41`		`- */`
`42`	`33`	`protected function createTopic(Context $context, $topicName)`
`43`	`34`	`{`
`44`	`35`	`return $context->createTopic($topicName.$this->time);`