From 3121b1761e50a3d7d60e50ca419fc4d25dea9455 Mon Sep 17 00:00:00 2001 From: Daniele Alessandri Date: Sun, 18 Apr 2010 14:33:22 +0200 Subject: [PATCH] Changed the way arguments of SORT are prepared before serialization to be compatible with an eventual switch to multi-bulk requests. --- lib/Predis.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/Predis.php b/lib/Predis.php index df4f3565..10002141 100644 --- a/lib/Predis.php +++ b/lib/Predis.php @@ -2188,21 +2188,26 @@ class Sort extends \Predis\InlineCommand { $sortParams = $arguments[1]; if (isset($sortParams['by'])) { - $query[] = 'BY ' . $sortParams['by']; + $query[] = 'BY'; + $query[] = $sortParams['by']; } if (isset($sortParams['get'])) { $getargs = $sortParams['get']; if (is_array($getargs)) { foreach ($getargs as $getarg) { - $query[] = 'GET ' . $getarg; + $query[] = 'GET'; + $query[] = $getarg; } } else { - $query[] = 'GET ' . $getargs; + $query[] = 'GET'; + $query[] = $getargs; } } if (isset($sortParams['limit']) && is_array($sortParams['limit'])) { - $query[] = 'LIMIT ' . $sortParams['limit'][0] . ' ' . $sortParams['limit'][1]; + $query[] = 'LIMIT'; + $query[] = $sortParams['limit'][0]; + $query[] = $sortParams['limit'][1]; } if (isset($sortParams['sort'])) { $query[] = strtoupper($sortParams['sort']); @@ -2211,7 +2216,8 @@ class Sort extends \Predis\InlineCommand { $query[] = 'ALPHA'; } if (isset($sortParams['store']) && $sortParams['store'] == true) { - $query[] = 'STORE ' . $sortParams['store']; + $query[] = 'STORE'; + $query[] = $sortParams['store']; } return $query;