[Messenger] Resolved reviews.

* Fixed too much indent. * Removed `PlatformUtil` internal class. * Used method `extension_loaded(sysvmsg)` instead `PlatformUtil::isWindows()`.
symfony · Nov 19, 2019 · 9456873 · 9456873
1 parent 1498b18
commit 9456873
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 47 deletions.
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Semaphore/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Semaphore/ConnectionTest.php
@@ -13,16 +13,15 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Transport\Semaphore\Connection;
-use Symfony\Component\Messenger\Transport\Semaphore\Util\PlatformUtil;
 
 class ConnectionTest extends TestCase
 {
     protected function setUp(): void
     {
         parent::setUp();
 
-        if (true === PlatformUtil::isWindows()) {
-            $this->markTestSkipped('Semaphore extension is not available on Windows platforms.');
+        if (false === \extension_loaded('sysvmsg')) {
+            $this->markTestSkipped('Semaphore extension (sysvmsg) is required.');
         }
     }
 

diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Semaphore/SemaphoreIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Semaphore/SemaphoreIntegrationTest.php
@@ -18,7 +18,6 @@
 use Symfony\Component\Messenger\Transport\Semaphore\SemaphoreReceiver;
 use Symfony\Component\Messenger\Transport\Semaphore\SemaphoreSender;
 use Symfony\Component\Messenger\Transport\Semaphore\SemaphoreStamp;
-use Symfony\Component\Messenger\Transport\Semaphore\Util\PlatformUtil;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Serializer as SerializerComponent;
@@ -40,8 +39,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if (true === PlatformUtil::isWindows()) {
-            $this->markTestSkipped('Semaphore extension is not available on Windows platforms.');
+        if (false === \extension_loaded('sysvmsg')) {
+            $this->markTestSkipped('Semaphore extension (sysvmsg) is required.');
 
             return;
         }

diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Semaphore/SemaphoreReceiverTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Semaphore/SemaphoreReceiverTest.php
@@ -16,7 +16,6 @@
 use Symfony\Component\Messenger\Transport\Semaphore\Connection;
 use Symfony\Component\Messenger\Transport\Semaphore\SemaphoreEnvelope;
 use Symfony\Component\Messenger\Transport\Semaphore\SemaphoreReceiver;
-use Symfony\Component\Messenger\Transport\Semaphore\Util\PlatformUtil;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Serializer as SerializerComponent;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
@@ -28,8 +27,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if (true === PlatformUtil::isWindows()) {
-            $this->markTestSkipped('Semaphore extension is not available on Windows platforms.');
+        if (false === \extension_loaded('sysvmsg')) {
+            $this->markTestSkipped('Semaphore extension (sysvmsg) is required.');
         }
     }
 

diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Semaphore/SemaphoreSenderTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Semaphore/SemaphoreSenderTest.php
@@ -18,7 +18,6 @@
 use Symfony\Component\Messenger\Transport\Semaphore\Exception\SemaphoreException;
 use Symfony\Component\Messenger\Transport\Semaphore\SemaphoreSender;
 use Symfony\Component\Messenger\Transport\Semaphore\SemaphoreStamp;
-use Symfony\Component\Messenger\Transport\Semaphore\Util\PlatformUtil;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 
 class SemaphoreSenderTest extends TestCase
@@ -27,8 +26,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if (true === PlatformUtil::isWindows()) {
-            $this->markTestSkipped('Semaphore extension is not available on Windows platforms.');
+        if (false === \extension_loaded('sysvmsg')) {
+            $this->markTestSkipped('Semaphore extension (sysvmsg) is required.');
         }
     }
 

diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Semaphore/SemaphoreTransportFactoryTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Semaphore/SemaphoreTransportFactoryTest.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Messenger\Transport\Semaphore\Connection;
 use Symfony\Component\Messenger\Transport\Semaphore\SemaphoreTransport;
 use Symfony\Component\Messenger\Transport\Semaphore\SemaphoreTransportFactory;
-use Symfony\Component\Messenger\Transport\Semaphore\Util\PlatformUtil;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 
 class SemaphoreTransportFactoryTest extends TestCase
@@ -24,8 +23,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if (true === PlatformUtil::isWindows()) {
-            $this->markTestSkipped('Semaphore extension is not available on Windows platforms.');
+        if (false === \extension_loaded('sysvmsg')) {
+            $this->markTestSkipped('Semaphore extension (sysvmsg) is required.');
         }
     }
 

diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Semaphore/SemaphoreTransportTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Semaphore/SemaphoreTransportTest.php
@@ -17,7 +17,6 @@
 use Symfony\Component\Messenger\Transport\Semaphore\Connection;
 use Symfony\Component\Messenger\Transport\Semaphore\SemaphoreEnvelope;
 use Symfony\Component\Messenger\Transport\Semaphore\SemaphoreTransport;
-use Symfony\Component\Messenger\Transport\Semaphore\Util\PlatformUtil;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportInterface;
 
@@ -30,8 +29,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if (true === PlatformUtil::isWindows()) {
-            $this->markTestSkipped('Semaphore extension is not available on Windows platforms.');
+        if (false === \extension_loaded('sysvmsg')) {
+            $this->markTestSkipped('Semaphore extension (sysvmsg) is required.');
         }
     }
 

diff --git a/src/Symfony/Component/Messenger/Transport/Semaphore/Connection.php b/src/Symfony/Component/Messenger/Transport/Semaphore/Connection.php
@@ -14,7 +14,6 @@
 use Symfony\Component\Messenger\Exception\InvalidArgumentException;
 use Symfony\Component\Messenger\Exception\TransportException;
 use Symfony\Component\Messenger\Transport\Semaphore\Exception\SemaphoreException;
-use Symfony\Component\Messenger\Transport\Semaphore\Util\PlatformUtil;
 
 /**
  * A Semaphore connection.
@@ -47,8 +46,8 @@ class Connection
 
     public function __construct(array $configuration)
     {
-        if (true === PlatformUtil::isWindows()) {
-            throw new TransportException('Semaphore extension is not available on Windows platforms');
+        if (false === \extension_loaded('sysvmsg')) {
+            throw new TransportException('Semaphore extension (sysvmsg) is required.');
         }
 
         $this->configuration = array_replace_recursive(self::DEFAULT_OPTIONS, $configuration);
@@ -109,7 +108,7 @@ public function send(string $body, array $headers = [], int $delay = 0, Semaphor
         $message = json_encode(['body' => $body, 'headers' => $headers]);
 
         if ($this->configuration['message_max_size'] < \strlen($message)) {
-            throw new SemaphoreException(sprintf('The semaphore message is too long to be sent, the maximum size accepted is 10 bytes.', $this->configuration['message_max_size']));
+            throw new SemaphoreException(sprintf('The semaphore message is too long to be sent, the maximum size accepted is %s bytes.', $this->configuration['message_max_size']));
         }
 
         if (false === msg_send($this->getQueue(), $messageType, $message, false, false, $errorCode)) {

diff --git a/src/Symfony/Component/Messenger/Transport/Semaphore/SemaphoreReceiver.php b/src/Symfony/Component/Messenger/Transport/Semaphore/SemaphoreReceiver.php
@@ -61,8 +61,8 @@ public function get(): iterable
 
         try {
             $envelope = $this->serializer->decode([
-                    'body' => $semaphoreEnvelope->getBody(),
-                    'headers' => $semaphoreEnvelope->getHeaders(),
+                'body' => $semaphoreEnvelope->getBody(),
+                'headers' => $semaphoreEnvelope->getHeaders(),
             ]);
         } catch (MessageDecodingFailedException $exception) {
             // TODO: [Researh] Implements nack strategy for semaphore

diff --git a/src/Symfony/Component/Messenger/Transport/Semaphore/Util/PlatformUtil.php b/src/Symfony/Component/Messenger/Transport/Semaphore/Util/PlatformUtil.php