Code review fixes.

atrauzzi · atrauzzi · commit f3f9273f2cef · 2020-09-23T09:38:44.000-05:00
diff --git a/pkg/stomp/StompConnectionFactory.php b/pkg/stomp/StompConnectionFactory.php
@@ -76,7 +76,7 @@ public function createContext(): Context
     {
         if ($this->config['lazy']) {
             return new StompContext(
-                fn () => $this->establishConnection(),
+                function () { return $this->establishConnection(); },
                 $this->config['target']
             );
         }
@@ -128,7 +128,7 @@ private function parseDsn(string $dsn): array
             $schemeExtension = ExtensionType::RABBITMQ;
         }
 
-        if (false === in_array($schemeExtension, self::SUPPORTED_SCHEMES)) {
+        if (false === in_array($schemeExtension, self::SUPPORTED_SCHEMES, true)) {
             throw new \LogicException(sprintf('The given DSN is not supported. The scheme extension "%s" provided is not supported. It must be one of %s.', $schemeExtension, implode(', ', self::SUPPORTED_SCHEMES)));
         }
 
diff --git a/pkg/stomp/StompConsumer.php b/pkg/stomp/StompConsumer.php
@@ -5,6 +5,7 @@
 namespace Enqueue\Stomp;
 
 use Interop\Queue\Consumer;
+use Interop\Queue\Exception\Exception;
 use Interop\Queue\Exception\InvalidMessageException;
 use Interop\Queue\Message;
 use Interop\Queue\Queue;
@@ -104,15 +105,13 @@ public function receive(int $timeout = 0): ?Message
                         return $this->convertMessage($message);
                     }
                 }
-            }
-            else {
+            } else {
                 if ($message = $this->stomp->readMessageFrame($this->subscriptionId, $timeout)) {
                     return $this->convertMessage($message);
                 }
             }
-        }
-        catch (ErrorFrameException $e) {
-            throw new \Exception($e->getMessage() . "\n" . $e->getFrame()->getBody());
+        } catch (ErrorFrameException $e) {
+            throw new Exception($e->getMessage()."\n".$e->getFrame()->getBody(), null, $e);
         }
 
         return null;
@@ -150,7 +149,7 @@ public function reject(Message $message, bool $requeue = false): void
 
         $nackFrame = $this->stomp->getProtocol()->getNackFrame($message->getFrame());
 
-        if ($this->queue->getExtensionType() === ExtensionType::RABBITMQ) {
+        if (ExtensionType::RABBITMQ === $this->queue->getExtensionType()) {
             $nackFrame->addHeaders([
                 'requeue' => $requeue ? 'true' : 'false',
             ]);
@@ -178,19 +177,15 @@ private function subscribe(): void
 
             $headers = $this->queue->getHeaders();
 
-            if ($this->queue->getExtensionType() === ExtensionType::RABBITMQ) {
-
+            if (ExtensionType::RABBITMQ === $this->queue->getExtensionType()) {
                 $headers['prefetch-count'] = $this->prefetchCount;
                 $headers = StompHeadersEncoder::encode($headers);
 
                 foreach ($headers as $key => $value) {
                     $frame[$key] = $value;
                 }
-            }
-
-            if ($this->queue->getExtensionType() === ExtensionType::ARTEMIS) {
-
-                $subscriptionName = "{$this->subscriptionId}-{$this->queue->getStompName()}";
+            } elseif (ExtensionType::ARTEMIS === $this->queue->getExtensionType()) {
+                $subscriptionName = $this->subscriptionId.'-'.$this->queue->getStompName();
 
                 $artemisHeaders = [];
 
@@ -214,7 +209,7 @@ private function convertMessage(Frame $frame): StompMessage
             throw new \LogicException(sprintf('Frame is not MESSAGE frame but: "%s"', $frame->getCommand()));
         }
 
-        [$headers, $properties] = StompHeadersEncoder::decode($frame->getHeaders());
+        list($headers, $properties) = StompHeadersEncoder::decode($frame->getHeaders());
 
         $redelivered = isset($headers['redelivered']) && 'true' === $headers['redelivered'];
 
diff --git a/pkg/stomp/StompDestination.php b/pkg/stomp/StompDestination.php
@@ -42,7 +42,7 @@ class StompDestination implements Topic, Queue
     /**
      * @var string
      */
-    private string $extensionType;
+    private $extensionType;
 
     public function __construct(string $extensionType)
     {
@@ -76,7 +76,7 @@ public function getQueueName(): string
             throw new \LogicException('Destination name is not set');
         }
 
-        if ($this->extensionType === ExtensionType::ARTEMIS) {
+        if (ExtensionType::ARTEMIS === $this->extensionType) {
             return $this->getStompName();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function createContext(): Context`
`76`	`76`	`{`
`77`	`77`	`if ($this->config['lazy']) {`
`78`	`78`	`return new StompContext(`
`79`		`- fn () => $this->establishConnection(),`
	`79`	`+ function () { return $this->establishConnection(); },`
`80`	`80`	`$this->config['target']`
`81`	`81`	`);`
`82`	`82`	`}`
`@@ -128,7 +128,7 @@ private function parseDsn(string $dsn): array`
`128`	`128`	`$schemeExtension = ExtensionType::RABBITMQ;`
`129`	`129`	`}`
`130`	`130`
`131`		`- if (false === in_array($schemeExtension, self::SUPPORTED_SCHEMES)) {`
	`131`	`+ if (false === in_array($schemeExtension, self::SUPPORTED_SCHEMES, true)) {`
`132`	`132`	`throw new \LogicException(sprintf('The given DSN is not supported. The scheme extension "%s" provided is not supported. It must be one of %s.', $schemeExtension, implode(', ', self::SUPPORTED_SCHEMES)));`
`133`	`133`	`}`
`134`	`134`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class StompDestination implements Topic, Queue`
`42`	`42`	`/**`
`43`	`43`	`* @var string`
`44`	`44`	`*/`
`45`		`- private string $extensionType;`
	`45`	`+ private $extensionType;`
`46`	`46`
`47`	`47`	`public function __construct(string $extensionType)`
`48`	`48`	`{`
`@@ -76,7 +76,7 @@ public function getQueueName(): string`
`76`	`76`	`throw new \LogicException('Destination name is not set');`
`77`	`77`	`}`
`78`	`78`
`79`		`- if ($this->extensionType === ExtensionType::ARTEMIS) {`
	`79`	`+ if (ExtensionType::ARTEMIS === $this->extensionType) {`
`80`	`80`	`return $this->getStompName();`
`81`	`81`	`}`
`82`	`82`