minor symfony#26907 [Messenger] Minor improvements and cleanup (yceruto)

sroze · sroze · commit 6bbb5bcc5294 · 2018-04-12T21:15:39.000+01:00
This PR was merged into the 4.1-dev branch. Discussion ---------- [Messenger] Minor improvements and cleanup | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - - enable some of opcode optimizations - add missing typehints - cleanup Commits ------- d8cc7a4 Minor improvements and cleanup
diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpReceiver.php b/src/Symfony/Component/Messenger/Adapter/AmqpExt/AmqpReceiver.php
@@ -43,7 +43,7 @@ public function receive(callable $handler): void
                 $handler(null);
 
                 usleep($this->connection->getConnectionCredentials()['loop_sleep'] ?? 200000);
-                if (function_exists('pcntl_signal_dispatch')) {
+                if (\function_exists('pcntl_signal_dispatch')) {
                     pcntl_signal_dispatch();
                 }
 
@@ -66,7 +66,7 @@ public function receive(callable $handler): void
 
                 throw $e;
             } finally {
-                if (function_exists('pcntl_signal_dispatch')) {
+                if (\function_exists('pcntl_signal_dispatch')) {
                     pcntl_signal_dispatch();
                 }
             }
diff --git a/src/Symfony/Component/Messenger/Adapter/AmqpExt/Connection.php b/src/Symfony/Component/Messenger/Adapter/AmqpExt/Connection.php
@@ -84,16 +84,15 @@ public static function fromDsn(string $dsn, array $options = array(), bool $debu
         $exchangeOptions = $amqpOptions['exchange'];
         $queueOptions = $amqpOptions['queue'];
 
-        unset($amqpOptions['queue']);
-        unset($amqpOptions['exchange']);
+        unset($amqpOptions['queue'], $amqpOptions['exchange']);
 
         return new self($amqpOptions, $exchangeOptions, $queueOptions, $debug, $amqpFactory);
     }
 
     /**
      * @throws \AMQPException
      */
-    public function publish(string $body, array $headers = array())
+    public function publish(string $body, array $headers = array()): void
     {
         if ($this->debug) {
             $this->setup();
@@ -123,30 +122,30 @@ public function get(): ?\AMQPEnvelope
                 $this->setup();
 
                 return $this->get();
-            } else {
-                throw $e;
             }
+
+            throw $e;
         }
 
         return null;
     }
 
-    public function ack(\AMQPEnvelope $message)
+    public function ack(\AMQPEnvelope $message): bool
     {
         return $this->queue()->ack($message->getDeliveryTag());
     }
 
-    public function reject(\AMQPEnvelope $message)
+    public function reject(\AMQPEnvelope $message): bool
     {
         return $this->queue()->reject($message->getDeliveryTag());
     }
 
-    public function nack(\AMQPEnvelope $message, int $flags = AMQP_NOPARAM)
+    public function nack(\AMQPEnvelope $message, int $flags = AMQP_NOPARAM): bool
     {
         return $this->queue()->nack($message->getDeliveryTag(), $flags);
     }
 
-    public function setup()
+    public function setup(): void
     {
         if (!$this->channel()->isConnected()) {
             $this->clear();
@@ -210,7 +209,7 @@ public function getConnectionCredentials(): array
         return $this->connectionCredentials;
     }
 
-    private function clear()
+    private function clear(): void
     {
         $this->amqpChannel = null;
         $this->amqpQueue = null;
diff --git a/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Asynchronous/Middleware/SendMessageMiddleware.php
@@ -45,7 +45,7 @@ public function handle($message, callable $next)
                 $sender->send($message);
             }
 
-            if (!in_array(null, $senders, true)) {
+            if (!\in_array(null, $senders, true)) {
                 return;
             }
         }
diff --git a/src/Symfony/Component/Messenger/Asynchronous/Routing/SenderLocator.php b/src/Symfony/Component/Messenger/Asynchronous/Routing/SenderLocator.php
@@ -32,7 +32,7 @@ public function __construct(ContainerInterface $senderServiceLocator, array $mes
      */
     public function getSendersForMessage($message): array
     {
-        $senderIds = $this->messageToSenderIdsMapping[get_class($message)] ?? $this->messageToSenderIdsMapping['*'] ?? array();
+        $senderIds = $this->messageToSenderIdsMapping[\get_class($message)] ?? $this->messageToSenderIdsMapping['*'] ?? array();
 
         $senders = array();
         foreach ($senderIds as $senderId) {
diff --git a/src/Symfony/Component/Messenger/ContainerHandlerLocator.php b/src/Symfony/Component/Messenger/ContainerHandlerLocator.php
@@ -29,7 +29,7 @@ public function __construct(ContainerInterface $container)
 
     public function resolve($message): callable
     {
-        $messageClass = get_class($message);
+        $messageClass = \get_class($message);
         $handlerKey = 'handler.'.$messageClass;
 
         if (!$this->container->has($handlerKey)) {
diff --git a/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php b/src/Symfony/Component/Messenger/DataCollector/MessengerDataCollector.php
@@ -54,7 +54,7 @@ public function handle($message, callable $next)
     {
         $debugRepresentation = array(
             'message' => array(
-                'type' => get_class($message),
+                'type' => \get_class($message),
                 'object' => $this->cloneVar($message),
             ),
         );
diff --git a/src/Symfony/Component/Messenger/Debug/LoggingMiddleware.php b/src/Symfony/Component/Messenger/Debug/LoggingMiddleware.php
@@ -37,7 +37,7 @@ public function handle($message, callable $next)
 
         $this->logger->debug('Starting handling message {class}', array(
             'message' => $message,
-            'class' => get_class($message),
+            'class' => \get_class($message),
         ));
 
         try {
@@ -46,15 +46,15 @@ public function handle($message, callable $next)
             $this->logger->warning('An exception occurred while handling message {class}', array(
                 'message' => $message,
                 'exception' => $e,
-                'class' => get_class($message),
+                'class' => \get_class($message),
             ));
 
             throw $e;
         }
 
         $this->logger->debug('Finished handling message {class}', array(
             'message' => $message,
-            'class' => get_class($message),
+            'class' => \get_class($message),
         ));
 
         return $result;
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -73,7 +73,7 @@ private function registerHandlers(ContainerBuilder $container)
                 $priority = $tag['priority'] ?? 0;
 
                 foreach ($handles as $messageClass) {
-                    if (is_array($messageClass)) {
+                    if (\is_array($messageClass)) {
                         $messagePriority = $messageClass[1];
                         $messageClass = $messageClass[0];
                     } else {
@@ -93,12 +93,12 @@ private function registerHandlers(ContainerBuilder $container)
 
         foreach ($handlersByMessage as $message => $handlers) {
             krsort($handlersByMessage[$message]);
-            $handlersByMessage[$message] = call_user_func_array('array_merge', $handlersByMessage[$message]);
+            $handlersByMessage[$message] = \call_user_func_array('array_merge', $handlersByMessage[$message]);
         }
 
         $definitions = array();
         foreach ($handlersByMessage as $message => $handlers) {
-            if (1 === count($handlers)) {
+            if (1 === \count($handlers)) {
                 $handlersByMessage[$message] = current($handlers);
             } else {
                 $d = new Definition(ChainHandler::class, array($handlers));
@@ -136,7 +136,7 @@ private function guessHandledClasses(\ReflectionClass $handlerClass, string $ser
         }
 
         $parameters = $method->getParameters();
-        if (1 !== count($parameters)) {
+        if (1 !== \count($parameters)) {
             throw new RuntimeException(sprintf('Invalid handler service "%s": method "%s::__invoke()" must have exactly one argument corresponding to the message it handles.', $serviceId, $handlerClass->getName()));
         }
 
diff --git a/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php b/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php
@@ -29,7 +29,7 @@ public function __construct($violatingMessage, ConstraintViolationListInterface
         $this->violatingMessage = $violatingMessage;
         $this->violations = $violations;
 
-        parent::__construct(sprintf('Message of type "%s" failed validation.', get_class($this->violatingMessage)));
+        parent::__construct(sprintf('Message of type "%s" failed validation.', \get_class($this->violatingMessage)));
     }
 
     public function getViolatingMessage()
diff --git a/src/Symfony/Component/Messenger/HandlerLocator.php b/src/Symfony/Component/Messenger/HandlerLocator.php
@@ -30,7 +30,7 @@ public function __construct(array $messageToHandlerMapping = array())
 
     public function resolve($message): callable
     {
-        $messageKey = get_class($message);
+        $messageKey = \get_class($message);
 
         if (!isset($this->messageToHandlerMapping[$messageKey])) {
             throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $messageKey));
diff --git a/src/Symfony/Component/Messenger/MessageBus.php b/src/Symfony/Component/Messenger/MessageBus.php
@@ -37,13 +37,13 @@ public function __construct(iterable $middlewares = array())
      */
     public function dispatch($message)
     {
-        return call_user_func($this->callableForNextMiddleware(0), $message);
+        return \call_user_func($this->callableForNextMiddleware(0), $message);
     }
 
     private function callableForNextMiddleware(int $index): callable
     {
         if (null === $this->indexedMiddlewares) {
-            $this->indexedMiddlewares = is_array($this->middlewares) ? array_values($this->middlewares) : iterator_to_array($this->middlewares, false);
+            $this->indexedMiddlewares = \is_array($this->middlewares) ? array_values($this->middlewares) : iterator_to_array($this->middlewares, false);
         }
 
         if (!isset($this->indexedMiddlewares[$index])) {
diff --git a/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php b/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php
@@ -30,7 +30,7 @@ public function __construct(ValidatorInterface $validator)
     public function handle($message, callable $next)
     {
         $violations = $this->validator->validate($message);
-        if (count($violations)) {
+        if (\count($violations)) {
             throw new ValidationFailedException($message, $violations);
         }
 
diff --git a/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpExtIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Adapter/AmqpExt/AmqpExtIntegrationTest.php
@@ -55,7 +55,7 @@ public function testItSendsAndReceivesMessages()
         $sender->send($secondMessage = new DummyMessage('Second'));
 
         $receivedMessages = 0;
-        $generator = $receiver->receive(function ($message) use ($receiver, &$receivedMessages, $firstMessage, $secondMessage) {
+        $receiver->receive(function ($message) use ($receiver, &$receivedMessages, $firstMessage, $secondMessage) {
             $this->assertEquals(0 == $receivedMessages ? $firstMessage : $secondMessage, $message);
 
             if (2 == ++$receivedMessages) {
diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php
@@ -34,7 +34,9 @@ public function decode(array $encodedMessage)
     {
         if (empty($encodedMessage['body']) || empty($encodedMessage['headers'])) {
             throw new \InvalidArgumentException('Encoded message should have at least a `body` and some `headers`.');
-        } elseif (empty($encodedMessage['headers']['type'])) {
+        }
+
+        if (empty($encodedMessage['headers']['type'])) {
             throw new \InvalidArgumentException('Encoded message does not have a `type` header.');
         }
 
@@ -48,7 +50,7 @@ public function encode($message): array
     {
         return array(
             'body' => $this->serializer->serialize($message, $this->format),
-            'headers' => array('type' => get_class($message)),
+            'headers' => array('type' => \get_class($message)),
         );
     }
 }
diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php
@@ -35,13 +35,13 @@ public function __construct(ReceiverInterface $receiver, MessageBusInterface $bu
      */
     public function run()
     {
-        if (function_exists('pcntl_signal')) {
+        if (\function_exists('pcntl_signal')) {
             pcntl_signal(SIGTERM, function () {
                 $this->receiver->stop();
             });
         }
 
-        $this->receiver->receive(function($message) {
+        $this->receiver->receive(function ($message) {
             if (null === $message) {
                 return;
             }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function receive(callable $handler): void`
`43`	`43`	`$handler(null);`
`44`	`44`
`45`	`45`	`usleep($this->connection->getConnectionCredentials()['loop_sleep'] ?? 200000);`
`46`		`- if (function_exists('pcntl_signal_dispatch')) {`
	`46`	`+ if (\function_exists('pcntl_signal_dispatch')) {`
`47`	`47`	`pcntl_signal_dispatch();`
`48`	`48`	`}`
`49`	`49`
`@@ -66,7 +66,7 @@ public function receive(callable $handler): void`
`66`	`66`
`67`	`67`	`throw $e;`
`68`	`68`	`} finally {`
`69`		`- if (function_exists('pcntl_signal_dispatch')) {`
	`69`	`+ if (\function_exists('pcntl_signal_dispatch')) {`
`70`	`70`	`pcntl_signal_dispatch();`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,16 +84,15 @@ public static function fromDsn(string $dsn, array $options = array(), bool $debu`
`84`	`84`	`$exchangeOptions = $amqpOptions['exchange'];`
`85`	`85`	`$queueOptions = $amqpOptions['queue'];`
`86`	`86`
`87`		`- unset($amqpOptions['queue']);`
`88`		`- unset($amqpOptions['exchange']);`
	`87`	`+ unset($amqpOptions['queue'], $amqpOptions['exchange']);`
`89`	`88`
`90`	`89`	`return new self($amqpOptions, $exchangeOptions, $queueOptions, $debug, $amqpFactory);`
`91`	`90`	`}`
`92`	`91`
`93`	`92`	`/**`
`94`	`93`	`* @throws \AMQPException`
`95`	`94`	`*/`
`96`		`- public function publish(string $body, array $headers = array())`
	`95`	`+ public function publish(string $body, array $headers = array()): void`
`97`	`96`	`{`
`98`	`97`	`if ($this->debug) {`
`99`	`98`	`$this->setup();`
`@@ -123,30 +122,30 @@ public function get(): ?\AMQPEnvelope`
`123`	`122`	`$this->setup();`
`124`	`123`
`125`	`124`	`return $this->get();`
`126`		`- } else {`
`127`		`- throw $e;`
`128`	`125`	`}`
	`126`	`+`
	`127`	`+ throw $e;`
`129`	`128`	`}`
`130`	`129`
`131`	`130`	`return null;`
`132`	`131`	`}`
`133`	`132`
`134`		`- public function ack(\AMQPEnvelope $message)`
	`133`	`+ public function ack(\AMQPEnvelope $message): bool`
`135`	`134`	`{`
`136`	`135`	`return $this->queue()->ack($message->getDeliveryTag());`
`137`	`136`	`}`
`138`	`137`
`139`		`- public function reject(\AMQPEnvelope $message)`
	`138`	`+ public function reject(\AMQPEnvelope $message): bool`
`140`	`139`	`{`
`141`	`140`	`return $this->queue()->reject($message->getDeliveryTag());`
`142`	`141`	`}`
`143`	`142`
`144`		`- public function nack(\AMQPEnvelope $message, int $flags = AMQP_NOPARAM)`
	`143`	`+ public function nack(\AMQPEnvelope $message, int $flags = AMQP_NOPARAM): bool`
`145`	`144`	`{`
`146`	`145`	`return $this->queue()->nack($message->getDeliveryTag(), $flags);`
`147`	`146`	`}`
`148`	`147`
`149`		`- public function setup()`
	`148`	`+ public function setup(): void`
`150`	`149`	`{`
`151`	`150`	`if (!$this->channel()->isConnected()) {`
`152`	`151`	`$this->clear();`
`@@ -210,7 +209,7 @@ public function getConnectionCredentials(): array`
`210`	`209`	`return $this->connectionCredentials;`
`211`	`210`	`}`
`212`	`211`
`213`		`- private function clear()`
	`212`	`+ private function clear(): void`
`214`	`213`	`{`
`215`	`214`	`$this->amqpChannel = null;`
`216`	`215`	`$this->amqpQueue = null;`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function handle($message, callable $next)`
`45`	`45`	`$sender->send($message);`
`46`	`46`	`}`
`47`	`47`
`48`		`- if (!in_array(null, $senders, true)) {`
	`48`	`+ if (!\in_array(null, $senders, true)) {`
`49`	`49`	`return;`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(ContainerInterface $senderServiceLocator, array $mes`
`32`	`32`	`*/`
`33`	`33`	`public function getSendersForMessage($message): array`
`34`	`34`	`{`
`35`		`- $senderIds = $this->messageToSenderIdsMapping[get_class($message)] ?? $this->messageToSenderIdsMapping['*'] ?? array();`
	`35`	`+ $senderIds = $this->messageToSenderIdsMapping[\get_class($message)] ?? $this->messageToSenderIdsMapping['*'] ?? array();`
`36`	`36`
`37`	`37`	`$senders = array();`
`38`	`38`	`foreach ($senderIds as $senderId) {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct(ContainerInterface $container)`
`29`	`29`
`30`	`30`	`public function resolve($message): callable`
`31`	`31`	`{`
`32`		`- $messageClass = get_class($message);`
	`32`	`+ $messageClass = \get_class($message);`
`33`	`33`	`$handlerKey = 'handler.'.$messageClass;`
`34`	`34`
`35`	`35`	`if (!$this->container->has($handlerKey)) {`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function handle($message, callable $next)`
`54`	`54`	`{`
`55`	`55`	`$debugRepresentation = array(`
`56`	`56`	`'message' => array(`
`57`		`- 'type' => get_class($message),`
	`57`	`+ 'type' => \get_class($message),`
`58`	`58`	`'object' => $this->cloneVar($message),`
`59`	`59`	`),`
`60`	`60`	`);`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function __construct(array $messageToHandlerMapping = array())`
`30`	`30`
`31`	`31`	`public function resolve($message): callable`
`32`	`32`	`{`
`33`		`- $messageKey = get_class($message);`
	`33`	`+ $messageKey = \get_class($message);`
`34`	`34`
`35`	`35`	`if (!isset($this->messageToHandlerMapping[$messageKey])) {`
`36`	`36`	`throw new NoHandlerForMessageException(sprintf('No handler for message "%s".', $messageKey));`