Better naming

Toflar · Toflar · commit 9eb00e89ded0 · 2019-06-17T13:19:16.000+02:00
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php b/src/Symfony/Component/Messenger/Tests/Transport/RedisExt/ConnectionTest.php
@@ -143,15 +143,15 @@ public function testGetNonBlocking()
         $redis->del('messenger-getnonblocking');
     }
 
-    public function testxAddWithMaxLength()
+    public function testMaxEntries()
     {
         $redis = $this->getMockBuilder(\Redis::class)->disableOriginalConstructor()->getMock();
 
         $redis->expects($this->exactly(1))->method('xadd')
             ->with('queue', '*', ['message' => '{"body":"1","headers":[]}'], 20000, true)
             ->willReturn(1);
 
-        $connection = Connection::fromDsn('redis://localhost/queue?xadd_maxlength=20000', [], $redis); // 1 = always
+        $connection = Connection::fromDsn('redis://localhost/queue?stream_max_entries=20000', [], $redis); // 1 = always
         $connection->add('1', []);
     }
 }
diff --git a/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php b/src/Symfony/Component/Messenger/Transport/RedisExt/Connection.php
@@ -32,15 +32,15 @@ class Connection
         'group' => 'symfony',
         'consumer' => 'consumer',
         'auto_setup' => true,
-        'xadd_maxlength' => 0, // 0 disables trimming, any other value defines an approximate maximum length
+        'stream_max_entries' => 0, // any value higher than 0 defines an approximate maximum number of stream entries
     ];
 
     private $connection;
     private $stream;
     private $group;
     private $consumer;
     private $autoSetup;
-    private $xaddMaxLength;
+    private $maxEntries;
     private $couldHavePendingMessages = true;
 
     public function __construct(array $configuration, array $connectionCredentials = [], array $redisOptions = [], \Redis $redis = null)
@@ -52,7 +52,7 @@ public function __construct(array $configuration, array $connectionCredentials =
         $this->group = $configuration['group'] ?? self::DEFAULT_OPTIONS['group'];
         $this->consumer = $configuration['consumer'] ?? self::DEFAULT_OPTIONS['consumer'];
         $this->autoSetup = $configuration['auto_setup'] ?? self::DEFAULT_OPTIONS['auto_setup'];
-        $this->xaddMaxLength = $configuration['xadd_maxlength'] ?? self::DEFAULT_OPTIONS['xadd_maxlength'];
+        $this->maxEntries = $configuration['stream_max_entries'] ?? self::DEFAULT_OPTIONS['stream_max_entries'];
     }
 
     public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $redis = null): self
@@ -82,18 +82,18 @@ public static function fromDsn(string $dsn, array $redisOptions = [], \Redis $re
             unset($redisOptions['auto_setup']);
         }
 
-        $xaddMaxLength = null;
-        if (\array_key_exists('xadd_maxlength', $redisOptions)) {
-            $xaddMaxLength = filter_var($redisOptions['xadd_maxlength'], FILTER_VALIDATE_INT);
-            unset($redisOptions['xadd_maxlength']);
+        $maxEntries = null;
+        if (\array_key_exists('stream_max_entries', $redisOptions)) {
+            $maxEntries = filter_var($redisOptions['stream_max_entries'], FILTER_VALIDATE_INT);
+            unset($redisOptions['stream_max_entries']);
         }
 
         return new self([
             'stream' => $stream,
             'group' => $group,
             'consumer' => $consumer,
             'auto_setup' => $autoSetup,
-            'xadd_maxlength' => $xaddMaxLength,
+            'stream_max_entries' => $maxEntries,
         ], $connectionCredentials, $redisOptions, $redis);
     }
 
@@ -181,10 +181,10 @@ public function add(string $body, array $headers): void
 
         $e = null;
         try {
-            if ($this->xaddMaxLength) {
+            if ($this->maxEntries) {
                 $added = $this->connection->xadd($this->stream, '*', ['message' => json_encode(
                     ['body' => $body, 'headers' => $headers]
-                )], $this->xaddMaxLength, true);
+                )], $this->maxEntries, true);
             } else {
                 $added = $this->connection->xadd($this->stream, '*', ['message' => json_encode(
                     ['body' => $body, 'headers' => $headers]

Original file line number	Diff line number	Diff line change
`@@ -143,15 +143,15 @@ public function testGetNonBlocking()`
`143`	`143`	`$redis->del('messenger-getnonblocking');`
`144`	`144`	`}`
`145`	`145`
`146`		`- public function testxAddWithMaxLength()`
	`146`	`+ public function testMaxEntries()`
`147`	`147`	`{`
`148`	`148`	`$redis = $this->getMockBuilder(\Redis::class)->disableOriginalConstructor()->getMock();`
`149`	`149`
`150`	`150`	`$redis->expects($this->exactly(1))->method('xadd')`
`151`	`151`	`->with('queue', '*', ['message' => '{"body":"1","headers":[]}'], 20000, true)`
`152`	`152`	`->willReturn(1);`
`153`	`153`
`154`		`- $connection = Connection::fromDsn('redis://localhost/queue?xadd_maxlength=20000', [], $redis); // 1 = always`
	`154`	`+ $connection = Connection::fromDsn('redis://localhost/queue?stream_max_entries=20000', [], $redis); // 1 = always`
`155`	`155`	`$connection->add('1', []);`
`156`	`156`	`}`
`157`	`157`	`}`