Running php-cs-fixer

JimTools · JimTools · commit 4a84b80526f0 · 2025-01-17T21:33:18.000Z
Running php-cs-fixer to fix CS drift
diff --git a/BufferedStompClient.php b/BufferedStompClient.php
@@ -103,9 +103,6 @@ public function readMessageFrame(string $subscriptionId, int $timeout): ?Frame
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function disconnect($sync = false)
     {
         parent::disconnect($sync);
diff --git a/ExtensionType.php b/ExtensionType.php
@@ -6,7 +6,7 @@
 
 class ExtensionType
 {
-    const ACTIVEMQ = 'activemq';
-    const RABBITMQ = 'rabbitmq';
-    const ARTEMIS = 'artemis';
+    public const ACTIVEMQ = 'activemq';
+    public const RABBITMQ = 'rabbitmq';
+    public const ARTEMIS = 'artemis';
 }
diff --git a/StompConnectionFactory.php b/StompConnectionFactory.php
@@ -13,7 +13,7 @@
 
 class StompConnectionFactory implements ConnectionFactory
 {
-    const SUPPORTED_SCHEMES = [
+    public const SUPPORTED_SCHEMES = [
         ExtensionType::ACTIVEMQ,
         ExtensionType::RABBITMQ,
         ExtensionType::ARTEMIS,
@@ -120,7 +120,7 @@ private function parseDsn(string $dsn): array
         $dsn = Dsn::parseFirst($dsn);
 
         if ('stomp' !== $dsn->getSchemeProtocol()) {
-            throw new \LogicException(sprintf('The given DSN is not supported. Must start with "stomp:".'));
+            throw new \LogicException('The given DSN is not supported. Must start with "stomp:".');
         }
 
         $schemeExtension = current($dsn->getSchemeExtensions());
diff --git a/StompConsumer.php b/StompConsumer.php
@@ -15,9 +15,9 @@
 
 class StompConsumer implements Consumer
 {
-    const ACK_AUTO = 'auto';
-    const ACK_CLIENT = 'client';
-    const ACK_CLIENT_INDIVIDUAL = 'client-individual';
+    public const ACK_AUTO = 'auto';
+    public const ACK_CLIENT = 'client';
+    public const ACK_CLIENT_INDIVIDUAL = 'client-individual';
 
     /**
      * @var StompDestination
diff --git a/StompContext.php b/StompContext.php
@@ -74,7 +74,7 @@ public function createMessage(string $body = '', array $properties = [], array $
      */
     public function createQueue(string $name): Queue
     {
-        if (0 !== strpos($name, '/')) {
+        if (!str_starts_with($name, '/')) {
             $destination = new StompDestination($this->extensionType);
             $destination->setType(StompDestination::TYPE_QUEUE);
             $destination->setStompName($name);
@@ -101,7 +101,7 @@ public function createTemporaryQueue(): Queue
      */
     public function createTopic(string $name): Topic
     {
-        if (0 !== strpos($name, '/')) {
+        if (!str_starts_with($name, '/')) {
             $destination = new StompDestination($this->extensionType);
             $destination->setType($this->useExchangePrefix ? StompDestination::TYPE_EXCHANGE : StompDestination::TYPE_TOPIC);
             $destination->setStompName($name);
@@ -130,7 +130,7 @@ public function createDestination(string $destination): StompDestination
 
         foreach ($types as $_type) {
             $typePrefix = '/'.$_type.'/';
-            if (0 === strpos($dest, $typePrefix)) {
+            if (str_starts_with($dest, $typePrefix)) {
                 $type = $_type;
                 $dest = substr($dest, strlen($typePrefix));
 
@@ -225,7 +225,7 @@ private function createStomp(): BufferedStompClient
         $stomp = call_user_func($this->stompFactory);
 
         if (false == $stomp instanceof BufferedStompClient) {
-            throw new \LogicException(sprintf('The factory must return instance of BufferedStompClient. It returns %s', is_object($stomp) ? get_class($stomp) : gettype($stomp)));
+            throw new \LogicException(sprintf('The factory must return instance of BufferedStompClient. It returns %s', is_object($stomp) ? $stomp::class : gettype($stomp)));
         }
 
         return $stomp;
diff --git a/StompDestination.php b/StompDestination.php
@@ -9,16 +9,16 @@
 
 class StompDestination implements Topic, Queue
 {
-    const TYPE_TOPIC = 'topic';
-    const TYPE_EXCHANGE = 'exchange';
-    const TYPE_QUEUE = 'queue';
-    const TYPE_AMQ_QUEUE = 'amq/queue';
-    const TYPE_TEMP_QUEUE = 'temp-queue';
-    const TYPE_REPLY_QUEUE = 'reply-queue';
+    public const TYPE_TOPIC = 'topic';
+    public const TYPE_EXCHANGE = 'exchange';
+    public const TYPE_QUEUE = 'queue';
+    public const TYPE_AMQ_QUEUE = 'amq/queue';
+    public const TYPE_TEMP_QUEUE = 'temp-queue';
+    public const TYPE_REPLY_QUEUE = 'reply-queue';
 
-    const HEADER_DURABLE = 'durable';
-    const HEADER_AUTO_DELETE = 'auto-delete';
-    const HEADER_EXCLUSIVE = 'exclusive';
+    public const HEADER_DURABLE = 'durable';
+    public const HEADER_AUTO_DELETE = 'auto-delete';
+    public const HEADER_EXCLUSIVE = 'exclusive';
 
     /**
      * @var string
@@ -122,7 +122,7 @@ public function getRoutingKey(): ?string
         return $this->routingKey;
     }
 
-    public function setRoutingKey(string $routingKey = null): void
+    public function setRoutingKey(?string $routingKey = null): void
     {
         $this->routingKey = $routingKey;
     }
diff --git a/StompHeadersEncoder.php b/StompHeadersEncoder.php
@@ -6,13 +6,13 @@
 
 class StompHeadersEncoder
 {
-    const PROPERTY_PREFIX = '_property_';
-    const TYPE_PREFIX = '_type_';
-    const TYPE_STRING = 's';
-    const TYPE_INT = 'i';
-    const TYPE_FLOAT = 'f';
-    const TYPE_BOOL = 'b';
-    const TYPE_NULL = 'n';
+    public const PROPERTY_PREFIX = '_property_';
+    public const TYPE_PREFIX = '_type_';
+    public const TYPE_STRING = 's';
+    public const TYPE_INT = 'i';
+    public const TYPE_FLOAT = 'f';
+    public const TYPE_BOOL = 'b';
+    public const TYPE_NULL = 'n';
 
     public static function encode(array $headers = [], array $properties = []): array
     {
@@ -36,7 +36,7 @@ public static function decode(array $headers = []): array
 
         // separate headers/properties
         foreach ($headers as $key => $value) {
-            if (0 === strpos($key, self::PROPERTY_PREFIX)) {
+            if (str_starts_with($key, self::PROPERTY_PREFIX)) {
                 $encodedProperties[substr($key, $prefixLength)] = $value;
             } else {
                 $encodedHeaders[$key] = $value;
@@ -94,7 +94,7 @@ private static function doDecode(array $headers = []): array
 
         foreach ($headers as $key => $value) {
             // skip type header
-            if (0 === strpos($key, self::TYPE_PREFIX)) {
+            if (str_starts_with($key, self::TYPE_PREFIX)) {
                 continue;
             }
 
diff --git a/StompMessage.php b/StompMessage.php
@@ -120,7 +120,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);
     }
@@ -130,7 +130,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);
     }
@@ -147,7 +147,7 @@ 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);
     }
@@ -157,12 +157,12 @@ public function getFrame(): ?Frame
         return $this->frame;
     }
 
-    public function setFrame(Frame $frame = null): void
+    public function setFrame(?Frame $frame = null): void
     {
         $this->frame = $frame;
     }
 
-    public function setReplyTo(string $replyTo = null): void
+    public function setReplyTo(?string $replyTo = null): void
     {
         $this->setHeader('reply-to', $replyTo);
     }
diff --git a/StompProducer.php b/StompProducer.php
@@ -45,7 +45,7 @@ public function send(Destination $destination, Message $message): void
     /**
      * @return $this|Producer
      */
-    public function setDeliveryDelay(int $deliveryDelay = null): Producer
+    public function setDeliveryDelay(?int $deliveryDelay = null): Producer
     {
         if (empty($deliveryDelay)) {
             return $this;
@@ -64,7 +64,7 @@ public function getDeliveryDelay(): ?int
      *
      * @return $this|Producer
      */
-    public function setPriority(int $priority = null): Producer
+    public function setPriority(?int $priority = null): Producer
     {
         if (empty($priority)) {
             return $this;
@@ -81,7 +81,7 @@ public function getPriority(): ?int
     /**
      * @return $this|Producer
      */
-    public function setTimeToLive(int $timeToLive = null): Producer
+    public function setTimeToLive(?int $timeToLive = null): Producer
     {
         if (empty($timeToLive)) {
             return $this;
diff --git a/Tests/Spec/StompMessageTest.php b/Tests/Spec/StompMessageTest.php
@@ -7,9 +7,6 @@
 
 class StompMessageTest extends MessageSpec
 {
-    /**
-     * {@inheritdoc}
-     */
     protected function createMessage()
     {
         return new StompMessage();
diff --git a/Tests/StompConnectionFactoryConfigTest.php b/Tests/StompConnectionFactoryConfigTest.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/StompHeadersEncoderTest.php b/Tests/StompHeadersEncoderTest.php
@@ -32,9 +32,6 @@ public function propertyValuesDataProvider()
 
     /**
      * @dataProvider headerValuesDataProvider
-     *
-     * @param mixed $originalValue
-     * @param mixed $encodedValue
      */
     public function testShouldEncodeHeaders($originalValue, $encodedValue)
     {
@@ -43,9 +40,6 @@ public function testShouldEncodeHeaders($originalValue, $encodedValue)
 
     /**
      * @dataProvider propertyValuesDataProvider
-     *
-     * @param mixed $originalValue
-     * @param mixed $encodedValue
      */
     public function testShouldEncodeProperties($originalValue, $encodedValue)
     {
@@ -54,9 +48,6 @@ public function testShouldEncodeProperties($originalValue, $encodedValue)
 
     /**
      * @dataProvider headerValuesDataProvider
-     *
-     * @param mixed $originalValue
-     * @param mixed $encodedValue
      */
     public function testShouldDecodeHeaders($originalValue, $encodedValue)
     {
@@ -65,9 +56,6 @@ public function testShouldDecodeHeaders($originalValue, $encodedValue)
 
     /**
      * @dataProvider propertyValuesDataProvider
-     *
-     * @param mixed $originalValue
-     * @param mixed $encodedValue
      */
     public function testShouldDecodeProperties($originalValue, $encodedValue)
     {
diff --git a/Tests/StompMessageTest.php b/Tests/StompMessageTest.php
@@ -93,7 +93,7 @@ public function testShouldUnsetHeaderIfNullPassed()
 
         $message->setHeader('aHeader', 'aVal');
 
-        //guard
+        // guard
         $this->assertSame('aVal', $message->getHeader('aHeader'));
 
         $message->setHeader('aHeader', null);
@@ -108,7 +108,7 @@ public function testShouldUnsetPropertyIfNullPassed()
 
         $message->setProperty('aProperty', 'aVal');
 
-        //guard
+        // guard
         $this->assertSame('aVal', $message->getProperty('aProperty'));
 
         $message->setProperty('aProperty', null);

Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,6 @@ public function readMessageFrame(string $subscriptionId, int $timeout): ?Frame`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`		`- /**`
`107`		`- * {@inheritdoc}`
`108`		`- */`
`109`	`106`	`public function disconnect($sync = false)`
`110`	`107`	`{`
`111`	`108`	`parent::disconnect($sync);`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class ExtensionType`
`8`	`8`	`{`
`9`		`- const ACTIVEMQ = 'activemq';`
`10`		`- const RABBITMQ = 'rabbitmq';`
`11`		`- const ARTEMIS = 'artemis';`
	`9`	`+ public const ACTIVEMQ = 'activemq';`
	`10`	`+ public const RABBITMQ = 'rabbitmq';`
	`11`	`+ public const ARTEMIS = 'artemis';`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`class StompConnectionFactory implements ConnectionFactory`
`15`	`15`	`{`
`16`		`- const SUPPORTED_SCHEMES = [`
	`16`	`+ public const SUPPORTED_SCHEMES = [`
`17`	`17`	`ExtensionType::ACTIVEMQ,`
`18`	`18`	`ExtensionType::RABBITMQ,`
`19`	`19`	`ExtensionType::ARTEMIS,`
`@@ -120,7 +120,7 @@ private function parseDsn(string $dsn): array`
`120`	`120`	`$dsn = Dsn::parseFirst($dsn);`
`121`	`121`
`122`	`122`	`if ('stomp' !== $dsn->getSchemeProtocol()) {`
`123`		`- throw new \LogicException(sprintf('The given DSN is not supported. Must start with "stomp:".'));`
	`123`	`+ throw new \LogicException('The given DSN is not supported. Must start with "stomp:".');`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`$schemeExtension = current($dsn->getSchemeExtensions());`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public function setRedelivered(bool $redelivered): void`
`120`	`120`	`$this->redelivered = $redelivered;`
`121`	`121`	`}`
`122`	`122`
`123`		`- public function setCorrelationId(string $correlationId = null): void`
	`123`	`+ public function setCorrelationId(?string $correlationId = null): void`
`124`	`124`	`{`
`125`	`125`	`$this->setHeader('correlation_id', (string) $correlationId);`
`126`	`126`	`}`
`@@ -130,7 +130,7 @@ public function getCorrelationId(): ?string`
`130`	`130`	`return $this->getHeader('correlation_id');`
`131`	`131`	`}`
`132`	`132`
`133`		`- public function setMessageId(string $messageId = null): void`
	`133`	`+ public function setMessageId(?string $messageId = null): void`
`134`	`134`	`{`
`135`	`135`	`$this->setHeader('message_id', (string) $messageId);`
`136`	`136`	`}`
`@@ -147,7 +147,7 @@ public function getTimestamp(): ?int`
`147`	`147`	`return null === $value ? null : (int) $value;`
`148`	`148`	`}`
`149`	`149`
`150`		`- public function setTimestamp(int $timestamp = null): void`
	`150`	`+ public function setTimestamp(?int $timestamp = null): void`
`151`	`151`	`{`
`152`	`152`	`$this->setHeader('timestamp', $timestamp);`
`153`	`153`	`}`
`@@ -157,12 +157,12 @@ public function getFrame(): ?Frame`
`157`	`157`	`return $this->frame;`
`158`	`158`	`}`
`159`	`159`
`160`		`- public function setFrame(Frame $frame = null): void`
	`160`	`+ public function setFrame(?Frame $frame = null): void`
`161`	`161`	`{`
`162`	`162`	`$this->frame = $frame;`
`163`	`163`	`}`
`164`	`164`
`165`		`- public function setReplyTo(string $replyTo = null): void`
	`165`	`+ public function setReplyTo(?string $replyTo = null): void`
`166`	`166`	`{`
`167`	`167`	`$this->setHeader('reply-to', $replyTo);`
`168`	`168`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,6 @@`
`7`	`7`
`8`	`8`	`class StompMessageTest extends MessageSpec`
`9`	`9`	`{`
`10`		`- /**`
`11`		`- * {@inheritdoc}`
`12`		`- */`
`13`	`10`	`protected function createMessage()`
`14`	`11`	`{`
`15`	`12`	`return new StompMessage();`