Add constants, convert if to match and some tests

glengemann · glengemann · commit 9ac99343d3c4 · 2022-09-25T23:18:58.000-05:00
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Compressor/CompressorFactory.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Compressor/CompressorFactory.php
@@ -17,12 +17,10 @@ class CompressorFactory
 {
     public static function createCompressor(string $mimeContentEncoding)
     {
-        if ('gzip' === $mimeContentEncoding) {
-            return new Gzip();
-        } elseif ('deflate') {
-            return new Deflate();
-        }
-
-        throw new InvalidArgumentException(sprintf('The MIME content encoding of the message cannot be decompressed "%s".', $mimeContentEncoding));
+        return match ($mimeContentEncoding) {
+            Gzip::CONTENT_ENCODING => new Gzip(),
+            Deflate::CONTENT_ENCODING => new Deflate(),
+            default => throw new InvalidArgumentException(sprintf('The MIME content encoding of the message cannot be decompressed "%s".', $mimeContentEncoding)),
+        };
     }
 }
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Compressor/Deflate.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Compressor/Deflate.php
@@ -13,18 +13,19 @@
 
 class Deflate implements CompressorInterface
 {
+    public const CONTENT_ENCODING = 'deflate';
+
     public function compress(mixed $data): string
     {
         return gzdeflate($data);
     }
 
     public function decompress(mixed $data): mixed
     {
-        $decompressData = gzinflate($data);
-        if (false === $decompressData) {
-            return $data;
+        if (\function_exists('gzinflate')) {
+            return @gzinflate($data) ?: $data;
         }
 
-        return $decompressData;
+        return $data;
     }
 }
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Compressor/Gzip.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Compressor/Gzip.php
@@ -13,18 +13,19 @@
 
 class Gzip implements CompressorInterface
 {
+    public const CONTENT_ENCODING = 'gzip';
+
     public function compress(mixed $data): string
     {
         return gzencode($data);
     }
 
     public function decompress(mixed $data): mixed
     {
-        $decompressData = gzdecode($data);
-        if (false === $decompressData) {
-            return $data;
+        if (\function_exists('gzdecode')) {
+            return @gzdecode($data) ?: $data;
         }
 
-        return $decompressData;
+        return $data;
     }
 }
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Compressor/DeflateTest.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Compressor/DeflateTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Compressor;
+
+use Symfony\Component\Messenger\Bridge\Amqp\Compressor\Deflate;
+use PHPUnit\Framework\TestCase;
+
+class DeflateTest extends TestCase
+{
+    public function testDecompress()
+    {
+        $compressor = new Deflate();
+
+        $actual = $compressor->decompress('string no compressed');
+        $this->assertEquals('string no compressed', $actual);
+
+        $actual = $compressor->decompress(gzdeflate('string compressed'));
+        $this->assertEquals('string compressed', $actual);
+    }
+}
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Compressor/GzipTest.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Compressor/GzipTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Compressor;
+
+use Symfony\Component\Messenger\Bridge\Amqp\Compressor\Gzip;
+use PHPUnit\Framework\TestCase;
+
+class GzipTest extends TestCase
+{
+    public function testDecompress()
+    {
+        $compressor = new Gzip();
+
+        $actual = $compressor->decompress('string no compressed');
+        $this->assertEquals('string no compressed', $actual);
+
+        $actual = $compressor->decompress(gzencode('string compressed'));
+        $this->assertEquals('string compressed', $actual);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,10 @@ class CompressorFactory`
`17`	`17`	`{`
`18`	`18`	`public static function createCompressor(string $mimeContentEncoding)`
`19`	`19`	`{`
`20`		`- if ('gzip' === $mimeContentEncoding) {`
`21`		`- return new Gzip();`
`22`		`- } elseif ('deflate') {`
`23`		`- return new Deflate();`
`24`		`- }`
`25`		`-`
`26`		`- throw new InvalidArgumentException(sprintf('The MIME content encoding of the message cannot be decompressed "%s".', $mimeContentEncoding));`
	`20`	`+ return match ($mimeContentEncoding) {`
	`21`	`+ Gzip::CONTENT_ENCODING => new Gzip(),`
	`22`	`+ Deflate::CONTENT_ENCODING => new Deflate(),`
	`23`	`+ default => throw new InvalidArgumentException(sprintf('The MIME content encoding of the message cannot be decompressed "%s".', $mimeContentEncoding)),`
	`24`	`+ };`
`27`	`25`	`}`
`28`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,18 +13,19 @@`
`13`	`13`
`14`	`14`	`class Deflate implements CompressorInterface`
`15`	`15`	`{`
	`16`	`+ public const CONTENT_ENCODING = 'deflate';`
	`17`	`+`
`16`	`18`	`public function compress(mixed $data): string`
`17`	`19`	`{`
`18`	`20`	`return gzdeflate($data);`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`public function decompress(mixed $data): mixed`
`22`	`24`	`{`
`23`		`- $decompressData = gzinflate($data);`
`24`		`- if (false === $decompressData) {`
`25`		`- return $data;`
	`25`	`+ if (\function_exists('gzinflate')) {`
	`26`	`+ return @gzinflate($data) ?: $data;`
`26`	`27`	`}`
`27`	`28`
`28`		`- return $decompressData;`
	`29`	`+ return $data;`
`29`	`30`	`}`
`30`	`31`	`}`