Use amqp @remicollet version

rgomezcasas · rgomezcasas · commit 306d594c4d86 · 2020-11-10T18:49:39.000+01:00
php-amqp/php-amqp#383
diff --git a/etc/infrastructure/php/extensions/amqp.sh b/etc/infrastructure/php/extensions/amqp.sh
@@ -1,6 +1,5 @@
-git clone -n https://github.com/php-amqp/php-amqp.git
+git clone --branch issue-php8 https://github.com/remicollet/php-amqp.git
 cd php-amqp
-git checkout 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438
 phpize
 ./configure
 make
diff --git a/src/Shared/Infrastructure/Bus/CallableFirstParameterExtractor.php b/src/Shared/Infrastructure/Bus/CallableFirstParameterExtractor.php
@@ -60,7 +60,7 @@ public function extract($class): ?string
 
     private function firstParameterClassFrom(ReflectionMethod $method): string
     {
-        return  $method->getParameters()[0]->getType()->getName();
+        return $method->getParameters()[0]->getType()->getName();
     }
 
     private function hasOnlyOneParameter(ReflectionMethod $method): bool
diff --git a/src/Shared/Infrastructure/Bus/Event/RabbitMq/RabbitMqConnection.php b/src/Shared/Infrastructure/Bus/Event/RabbitMq/RabbitMqConnection.php
@@ -50,14 +50,18 @@ public function exchange(string $name): AMQPExchange
 
     private function channel(): AMQPChannel
     {
-        return self::$channel = self::$channel && self::$channel->isConnected()
-            ? self::$channel
-            : new AMQPChannel($this->connection());
+        if (!self::$channel?->isConnected()) {
+            self::$channel = new AMQPChannel($this->connection());
+        }
+
+        return self::$channel;
     }
 
     private function connection(): AMQPConnection
     {
-        self::$connection = self::$connection ?: new AMQPConnection($this->configuration);
+        if (null === self::$connection) {
+            self::$connection = new AMQPConnection($this->configuration);
+        }
 
         if (!self::$connection->isConnected()) {
             self::$connection->pconnect();

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function extract($class): ?string`
`60`	`60`
`61`	`61`	`private function firstParameterClassFrom(ReflectionMethod $method): string`
`62`	`62`	`{`
`63`		`- return $method->getParameters()[0]->getType()->getName();`
	`63`	`+ return $method->getParameters()[0]->getType()->getName();`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`private function hasOnlyOneParameter(ReflectionMethod $method): bool`