Merge branch 'master' into pipelines

# Conflicts:
#	src/StackExchange.Redis/Interfaces/IDatabase.cs
#	src/StackExchange.Redis/Interfaces/IDatabaseAsync.cs
#	src/StackExchange.Redis/RedisDatabase.cs

src/StackExchange.Redis/Interfaces/IDatabase.cs

@@ -989,7 +989,7 @@ public interface IDatabase : IRedis, IDatabaseAsync
         /// <param name="key">The key of the set.</param>
         /// <param name="count">The number of elements to return.</param>
         /// <param name="flags">The flags to use for this operation.</param>
-        /// <returns>The removed elements, or nil when key does not exist.</returns>
+        /// <returns>An array of elements, or an empty array when key does not exist.</returns>
         /// <remarks>https://redis.io/commands/spop</remarks>
         RedisValue[] SetPop(RedisKey key, long count, CommandFlags flags = CommandFlags.None);
 

src/StackExchange.Redis/Interfaces/IDatabaseAsync.cs

@@ -953,7 +953,7 @@ public interface IDatabaseAsync : IRedisAsync
         /// <param name="key">The key of the set.</param>
         /// <param name="count">The number of elements to return.</param>
         /// <param name="flags">The flags to use for this operation.</param>
-        /// <returns>The removed elements, or nil when key does not exist.</returns>
+        /// <returns>An array of elements, or an empty array when key does not exist.</returns>
         /// <remarks>https://redis.io/commands/spop</remarks>
         Task<RedisValue[]> SetPopAsync(RedisKey key, long count, CommandFlags flags = CommandFlags.None);
 

tests/StackExchange.Redis.Tests/DatabaseWrapperTests.cs

@@ -563,7 +563,7 @@ public void SetMove()
         }
 
         [Fact]
-        public void SetPop()
+        public void SetPop_1()
         {
             wrapper.SetPop("key", CommandFlags.HighPriority);
             mock.Verify(_ => _.SetPop("prefix:key", CommandFlags.HighPriority));
@@ -572,6 +572,13 @@ public void SetPop()
             mock.Verify(_ => _.SetPop("prefix:key", 5, CommandFlags.HighPriority));
         }
 
+        [Fact]
+        public void SetPop_2()
+        {
+            wrapper.SetPop("key", 5, CommandFlags.HighPriority);
+            mock.Verify(_ => _.SetPop("prefix:key", 5, CommandFlags.HighPriority));
+        }
+
         [Fact]
         public void SetRandomMember()
         {

tests/StackExchange.Redis.Tests/WrapperBaseTests.cs

@@ -535,7 +535,7 @@ public void SetMoveAsync()
         }
 
         [Fact]
-        public void SetPopAsync()
+        public void SetPopAsync_1()
         {
             wrapper.SetPopAsync("key", CommandFlags.HighPriority);
             mock.Verify(_ => _.SetPopAsync("prefix:key", CommandFlags.HighPriority));
@@ -544,6 +544,13 @@ public void SetPopAsync()
             mock.Verify(_ => _.SetPopAsync("prefix:key", 5, CommandFlags.HighPriority));
         }
 
+        [Fact]
+        public void SetPopAsync_2()
+        {
+            wrapper.SetPopAsync("key", 5, CommandFlags.HighPriority);
+            mock.Verify(_ => _.SetPopAsync("prefix:key", 5, CommandFlags.HighPriority));
+        }
+
         [Fact]
         public void SetRandomMemberAsync()
         {