peter-gribanov / sphinx-php-client

src/SphinxClient.php

Spacing +228 added lines, -228 removed lines

@@ -33,82 +33,82 @@ 
 /////////////////////////////////////////////////////////////////////////////
 
 /// known searchd commands
-define('SEARCHD_COMMAND_SEARCH',     0);
-define('SEARCHD_COMMAND_EXCERPT',    1);
-define('SEARCHD_COMMAND_UPDATE',     2);
-define('SEARCHD_COMMAND_KEYWORDS',   3);
-define('SEARCHD_COMMAND_PERSIST',    4);
-define('SEARCHD_COMMAND_STATUS',     5);
+define('SEARCHD_COMMAND_SEARCH', 0);
+define('SEARCHD_COMMAND_EXCERPT', 1);
+define('SEARCHD_COMMAND_UPDATE', 2);
+define('SEARCHD_COMMAND_KEYWORDS', 3);
+define('SEARCHD_COMMAND_PERSIST', 4);
+define('SEARCHD_COMMAND_STATUS', 5);
 define('SEARCHD_COMMAND_FLUSHATTRS', 7);
 
 /// current client-side command implementation versions
-define('VER_COMMAND_SEARCH',     0x11E);
-define('VER_COMMAND_EXCERPT',    0x104);
-define('VER_COMMAND_UPDATE',     0x103);
-define('VER_COMMAND_KEYWORDS',   0x100);
-define('VER_COMMAND_STATUS',     0x101);
-define('VER_COMMAND_QUERY',      0x100);
+define('VER_COMMAND_SEARCH', 0x11E);
+define('VER_COMMAND_EXCERPT', 0x104);
+define('VER_COMMAND_UPDATE', 0x103);
+define('VER_COMMAND_KEYWORDS', 0x100);
+define('VER_COMMAND_STATUS', 0x101);
+define('VER_COMMAND_QUERY', 0x100);
 define('VER_COMMAND_FLUSHATTRS', 0x100);
 
 /// known searchd status codes
-define('SEARCHD_OK',      0);
-define('SEARCHD_ERROR',   1);
-define('SEARCHD_RETRY',   2);
+define('SEARCHD_OK', 0);
+define('SEARCHD_ERROR', 1);
+define('SEARCHD_RETRY', 2);
 define('SEARCHD_WARNING', 3);
 
 /// known match modes
-define('SPH_MATCH_ALL',       0);
-define('SPH_MATCH_ANY',       1);
-define('SPH_MATCH_PHRASE',    2);
-define('SPH_MATCH_BOOLEAN',   3);
-define('SPH_MATCH_EXTENDED',  4);
-define('SPH_MATCH_FULLSCAN',  5);
+define('SPH_MATCH_ALL', 0);
+define('SPH_MATCH_ANY', 1);
+define('SPH_MATCH_PHRASE', 2);
+define('SPH_MATCH_BOOLEAN', 3);
+define('SPH_MATCH_EXTENDED', 4);
+define('SPH_MATCH_FULLSCAN', 5);
 define('SPH_MATCH_EXTENDED2', 6); // extended engine V2 (TEMPORARY, WILL BE REMOVED)
 
 /// known ranking modes (ext2 only)
 define('SPH_RANK_PROXIMITY_BM25', 0); ///< default mode, phrase proximity major factor and BM25 minor one
-define('SPH_RANK_BM25',           1); ///< statistical mode, BM25 ranking only (faster but worse quality)
-define('SPH_RANK_NONE',           2); ///< no ranking, all matches get a weight of 1
-define('SPH_RANK_WORDCOUNT',      3); ///< simple word-count weighting, rank is a weighted sum of per-field keyword occurence counts
-define('SPH_RANK_PROXIMITY',      4);
-define('SPH_RANK_MATCHANY',       5);
-define('SPH_RANK_FIELDMASK',      6);
-define('SPH_RANK_SPH04',          7);
-define('SPH_RANK_EXPR',           8);
-define('SPH_RANK_TOTAL',          9);
+define('SPH_RANK_BM25', 1); ///< statistical mode, BM25 ranking only (faster but worse quality)
+define('SPH_RANK_NONE', 2); ///< no ranking, all matches get a weight of 1
+define('SPH_RANK_WORDCOUNT', 3); ///< simple word-count weighting, rank is a weighted sum of per-field keyword occurence counts
+define('SPH_RANK_PROXIMITY', 4);
+define('SPH_RANK_MATCHANY', 5);
+define('SPH_RANK_FIELDMASK', 6);
+define('SPH_RANK_SPH04', 7);
+define('SPH_RANK_EXPR', 8);
+define('SPH_RANK_TOTAL', 9);
 
 /// known sort modes
-define('SPH_SORT_RELEVANCE',     0);
-define('SPH_SORT_ATTR_DESC',     1);
-define('SPH_SORT_ATTR_ASC',      2);
+define('SPH_SORT_RELEVANCE', 0);
+define('SPH_SORT_ATTR_DESC', 1);
+define('SPH_SORT_ATTR_ASC', 2);
 define('SPH_SORT_TIME_SEGMENTS', 3);
-define('SPH_SORT_EXTENDED',      4);
-define('SPH_SORT_EXPR',          5);
+define('SPH_SORT_EXTENDED', 4);
+define('SPH_SORT_EXPR', 5);
 
 /// known filter types
-define('SPH_FILTER_VALUES',     0);
-define('SPH_FILTER_RANGE',      1);
+define('SPH_FILTER_VALUES', 0);
+define('SPH_FILTER_RANGE', 1);
 define('SPH_FILTER_FLOATRANGE', 2);
-define('SPH_FILTER_STRING',     3);
+define('SPH_FILTER_STRING', 3);
 
 /// known attribute types
-define('SPH_ATTR_INTEGER',   1);
+define('SPH_ATTR_INTEGER', 1);
 define('SPH_ATTR_TIMESTAMP', 2);
-define('SPH_ATTR_ORDINAL',   3);
-define('SPH_ATTR_BOOL',      4);
-define('SPH_ATTR_FLOAT',     5);
-define('SPH_ATTR_BIGINT',    6);
-define('SPH_ATTR_STRING',    7);
-define('SPH_ATTR_FACTORS',   1001);
-define('SPH_ATTR_MULTI',     0x40000001);
-define('SPH_ATTR_MULTI64',   0x40000002);
+define('SPH_ATTR_ORDINAL', 3);
+define('SPH_ATTR_BOOL', 4);
+define('SPH_ATTR_FLOAT', 5);
+define('SPH_ATTR_BIGINT', 6);
+define('SPH_ATTR_STRING', 7);
+define('SPH_ATTR_FACTORS', 1001);
+define('SPH_ATTR_MULTI', 0x40000001);
+define('SPH_ATTR_MULTI64', 0x40000002);
 
 /// known grouping functions
-define('SPH_GROUPBY_DAY',      0);
-define('SPH_GROUPBY_WEEK',     1);
-define('SPH_GROUPBY_MONTH',    2);
-define('SPH_GROUPBY_YEAR',     3);
-define('SPH_GROUPBY_ATTR',     4);
+define('SPH_GROUPBY_DAY', 0);
+define('SPH_GROUPBY_WEEK', 1);
+define('SPH_GROUPBY_MONTH', 2);
+define('SPH_GROUPBY_YEAR', 3);
+define('SPH_GROUPBY_ATTR', 4);
 define('SPH_GROUPBY_ATTRPAIR', 5);
 
 // important properties of PHP's integers:
@@ -143,19 +143,19 @@ 
     assert(is_numeric($v));
 
     // x64
-    if (PHP_INT_SIZE >= 8) {
+    if (PHP_INT_SIZE>=8) {
         $v = (int)$v;
         return pack('NN', $v >> 32, $v & 0xFFFFFFFF);
     }
 
     // x32, int
     if (is_int($v)) {
-        return pack('NN', $v < 0 ? -1 : 0, $v);
+        return pack('NN', $v<0 ? -1 : 0, $v);
     }
 
     // x32, bcmath
     if (function_exists('bcmul')) {
-        if (bccomp($v, 0) == -1) {
+        if (bccomp($v, 0)==-1) {
             $v = bcadd('18446744073709551616', $v);
         }
         $h = bcdiv($v, '4294967296', 0);
@@ -173,8 +173,8 @@ 
     $l = $m - ($q * 4294967296.0);
     $h = $hi * 2328.0 + $q; // (10 ^ 13) / (1 << 32) = 2328
 
-    if ($v < 0) {
-        if ($l == 0) {
+    if ($v<0) {
+        if ($l==0) {
             $h = 4294967296.0 - $h;
         } else {
             $h = 4294967295.0 - $h;
@@ -190,8 +190,8 @@ 
     assert(is_numeric($v));
 
     // x64
-    if (PHP_INT_SIZE >= 8) {
-        assert($v >= 0);
+    if (PHP_INT_SIZE>=8) {
+        assert($v>=0);
 
         // x64, int
         if (is_int($v)) {
@@ -247,16 +247,16 @@ 
 {
     list($hi, $lo) = array_values(unpack('N*N*', $v));
 
-    if (PHP_INT_SIZE >= 8) {
-        if ($hi < 0) { // because php 5.2.2 to 5.2.5 is totally fucked up again
+    if (PHP_INT_SIZE>=8) {
+        if ($hi<0) { // because php 5.2.2 to 5.2.5 is totally fucked up again
             $hi += 1 << 32;
         }
-        if ($lo < 0) {
+        if ($lo<0) {
             $lo += 1 << 32;
         }
 
         // x64, int
-        if ($hi <= 2147483647) {
+        if ($hi<=2147483647) {
             return ($hi << 32) + $lo;
         }
 
@@ -269,20 +269,20 @@ 
         $C = 100000;
         $h = ((int)($hi / $C) << 32) + (int)($lo / $C);
         $l = (($hi % $C) << 32) + ($lo % $C);
-        if ($l > $C) {
+        if ($l>$C) {
             $h += (int)($l / $C);
             $l  = $l % $C;
         }
 
-        if ($h == 0) {
+        if ($h==0) {
             return $l;
         }
         return sprintf('%d%05d', $h, $l);
     }
 
     // x32, int
-    if ($hi == 0) {
-        if ($lo > 0) {
+    if ($hi==0) {
+        if ($lo>0) {
             return $lo;
         }
         return sprintf('%u', $lo);
@@ -309,10 +309,10 @@ 
 
     $h = sprintf('%.0f', $h);
     $l = sprintf('%07.0f', $l);
-    if ($h == '0') {
+    if ($h=='0') {
         return sprintf('%.0f', (float)$l);
     }
-    return $h . $l;
+    return $h.$l;
 }
 
 // unpack 64-bit signed
@@ -321,24 +321,24 @@ 
     list($hi, $lo) = array_values(unpack('N*N*', $v));
 
     // x64
-    if (PHP_INT_SIZE >= 8) {
-        if ($hi < 0) { // because php 5.2.2 to 5.2.5 is totally fucked up again
+    if (PHP_INT_SIZE>=8) {
+        if ($hi<0) { // because php 5.2.2 to 5.2.5 is totally fucked up again
             $hi += 1 << 32;
         }
-        if ($lo < 0) {
+        if ($lo<0) {
             $lo += 1 << 32;
         }
 
         return ($hi << 32) + $lo;
     }
 
-    if ($hi == 0) { // x32, int
-        if ($lo > 0) {
+    if ($hi==0) { // x32, int
+        if ($lo>0) {
             return $lo;
         }
         return sprintf('%u', $lo);
-    } elseif ($hi == -1) { // x32, int
-        if ($lo < 0) {
+    } elseif ($hi==-1) { // x32, int
+        if ($lo<0) {
             return $lo;
         }
         return sprintf('%.0f', $lo - 4294967296.0);
@@ -346,7 +346,7 @@ 
 
     $neg = '';
     $c = 0;
-    if ($hi < 0) {
+    if ($hi<0) {
         $hi = ~$hi;
         $lo = ~$lo;
         $c = 1;
@@ -358,7 +358,7 @@ 
 
     // x32, bcmath
     if (function_exists('bcmul')) {
-        return $neg . bcadd(bcadd($lo, bcmul($hi, '4294967296')), $c);
+        return $neg.bcadd(bcadd($lo, bcmul($hi, '4294967296')), $c);
     }
 
     // x32, no-bcmath
@@ -371,25 +371,25 @@ 
     $mq = floor($m / 10000000.0);
     $l = $m - $mq * 10000000.0 + $c;
     $h = $q * 4294967296.0 + $r * 429.0 + $mq;
-    if ($l == 10000000) {
+    if ($l==10000000) {
         $l = 0;
         $h += 1;
     }
 
     $h = sprintf('%.0f', $h);
     $l = sprintf('%07.0f', $l);
-    if ($h == '0') {
-        return $neg . sprintf('%.0f', (float)$l);
+    if ($h=='0') {
+        return $neg.sprintf('%.0f', (float)$l);
     }
-    return $neg . $h . $l;
+    return $neg.$h.$l;
 }
 
 
 function sphFixUint($value)
 {
-    if (PHP_INT_SIZE >= 8) {
+    if (PHP_INT_SIZE>=8) {
         // x64 route, workaround broken unpack() in 5.2.2+
-        if ($value < 0) {
+        if ($value<0) {
             $value += 1 << 32;
         }
         return $value;
@@ -507,7 +507,7 @@ 
         $this->warning = '';
         $this->connerror = false;
 
-        $this->reqs = array();// requests storage (for multi-query case)
+        $this->reqs = array(); // requests storage (for multi-query case)
         $this->mbenc = '';
         $this->arrayresult = false;
         $this->timeout = 0;
@@ -515,7 +515,7 @@ 
 
     public function __destruct()
     {
-        if ($this->_socket !== false) {
+        if ($this->_socket!==false) {
             fclose($this->_socket);
         }
     }
@@ -542,19 +542,19 @@ 
     public function setServer($host, $port = 0)
     {
         assert(is_string($host));
-        if ($host[0] == '/') {
-            $this->_path = 'unix://' . $host;
+        if ($host[0]=='/') {
+            $this->_path = 'unix://'.$host;
             return;
         }
-        if (substr($host, 0, 7) == 'unix://') {
+        if (substr($host, 0, 7)=='unix://') {
             $this->_path = $host;
             return;
         }
 
         $this->host = $host;
         $port = intval($port);
-        assert(0 <= $port && $port < 65536);
-        $this->port = $port == 0 ? 9312 : $port;
+        assert(0<=$port && $port<65536);
+        $this->port = $port==0 ? 9312 : $port;
         $this->_path = '';
     }
 
@@ -568,7 +568,7 @@ 
 
     protected function send($handle, $data, $length)
     {
-        if (feof($handle) || fwrite($handle, $data, $length) !== $length) {
+        if (feof($handle) || fwrite($handle, $data, $length)!==$length) {
             $this->error = 'connection unexpectedly closed (timed out?)';
             $this->connerror = true;
             return false;
@@ -599,7 +599,7 @@ 
     /// connect to searchd server
     protected function connect()
     {
-        if ($this->_socket !== false) {
+        if ($this->_socket!==false) {
             // we are in persistent connection mode, so we have a socket
             // however, need to check whether it's still alive
             if (!@feof($this->_socket)) {
@@ -622,7 +622,7 @@ 
             $port = $this->port;
         }
 
-        if ($this->timeout <= 0) {
+        if ($this->timeout<=0) {
             $fp = @fsockopen($host, $port, $errno, $errstr);
         } else {
             $fp = @fsockopen($host, $port, $errno, $errstr, $this->timeout);
@@ -654,7 +654,7 @@ 
         // check version
         list(, $v) = unpack('N*', fread($fp, 4));
         $v = (int)$v;
-        if ($v < 1) {
+        if ($v<1) {
             fclose($fp);
             $this->error = "expected searchd protocol version 1+, got version '$v'";
             return false;
@@ -670,10 +670,10 @@ 
         $len = 0;
 
         $header = fread($fp, 8);
-        if (strlen($header) == 8) {
+        if (strlen($header)==8) {
             list($status, $ver, $len) = array_values(unpack('n2a/Nb', $header));
             $left = $len;
-            while ($left > 0 && !feof($fp)) {
+            while ($left>0 && !feof($fp)) {
                 $chunk = fread($fp, min(8192, $left));
                 if ($chunk) {
                     $response .= $chunk;
@@ -681,13 +681,13 @@ 
                 }
             }
         }
-        if ($this->_socket === false) {
+        if ($this->_socket===false) {
             fclose($fp);
         }
 
         // check response
         $read = strlen($response);
-        if (!$response || $read != $len) {
+        if (!$response || $read!=$len) {
             $this->error = $len
                 ? "failed to read searchd response (status=$status, ver=$ver, len=$len, read=$read)"
                 : 'received zero-sized searchd response';
@@ -695,26 +695,26 @@ 
         }
 
         // check status
-        if ($status == SEARCHD_WARNING) {
+        if ($status==SEARCHD_WARNING) {
             list(, $wlen) = unpack('N*', substr($response, 0, 4));
             $this->warning = substr($response, 4, $wlen);
             return substr($response, 4 + $wlen);
         }
-        if ($status == SEARCHD_ERROR) {
-            $this->error = 'searchd error: ' . substr($response, 4);
+        if ($status==SEARCHD_ERROR) {
+            $this->error = 'searchd error: '.substr($response, 4);
             return false;
         }
-        if ($status == SEARCHD_RETRY) {
-            $this->error = 'temporary searchd error: ' . substr($response, 4);
+        if ($status==SEARCHD_RETRY) {
+            $this->error = 'temporary searchd error: '.substr($response, 4);
             return false;
         }
-        if ($status != SEARCHD_OK) {
+        if ($status!=SEARCHD_OK) {
             $this->error = "unknown status code '$status'";
             return false;
         }
 
         // check version
-        if ($ver < $client_ver) {
+        if ($ver<$client_ver) {
             $this->warning = sprintf(
                 'searchd command v.%d.%d older than client\'s v.%d.%d, some options might not work',
                 $ver >> 8,
@@ -737,15 +737,15 @@ 
     {
         assert(is_int($offset));
         assert(is_int($limit));
-        assert($offset >= 0);
-        assert($limit > 0);
-        assert($max >= 0);
+        assert($offset>=0);
+        assert($limit>0);
+        assert($max>=0);
         $this->offset = $offset;
         $this->limit = $limit;
-        if ($max > 0) {
+        if ($max>0) {
             $this->maxmatches = $max;
         }
-        if ($cutoff > 0) {
+        if ($cutoff>0) {
             $this->cutoff = $cutoff;
         }
     }
@@ -755,7 +755,7 @@ 
     public function setMaxQueryTime($max)
     {
         assert(is_int($max));
-        assert($max >= 0);
+        assert($max>=0);
         $this->maxquerytime = $max;
     }
 
@@ -767,21 +767,21 @@ 
             E_USER_DEPRECATED
         );
         assert(
-            $mode == SPH_MATCH_ALL ||
-            $mode == SPH_MATCH_ANY ||
-            $mode == SPH_MATCH_PHRASE ||
-            $mode == SPH_MATCH_BOOLEAN ||
-            $mode == SPH_MATCH_EXTENDED ||
-            $mode == SPH_MATCH_FULLSCAN ||
-            $mode == SPH_MATCH_EXTENDED2
+            $mode==SPH_MATCH_ALL ||
+            $mode==SPH_MATCH_ANY ||
+            $mode==SPH_MATCH_PHRASE ||
+            $mode==SPH_MATCH_BOOLEAN ||
+            $mode==SPH_MATCH_EXTENDED ||
+            $mode==SPH_MATCH_FULLSCAN ||
+            $mode==SPH_MATCH_EXTENDED2
         );
         $this->mode = $mode;
     }
 
     /// set ranking mode
-    public function setRankingMode($ranker, $rankexpr='')
+    public function setRankingMode($ranker, $rankexpr = '')
     {
-        assert($ranker === 0 || $ranker >= 1 && $ranker < SPH_RANK_TOTAL);
+        assert($ranker===0 || $ranker>=1 && $ranker<SPH_RANK_TOTAL);
         assert(is_string($rankexpr));
         $this->ranker = $ranker;
         $this->rankexpr = $rankexpr;
@@ -790,16 +790,16 @@ 
     /// set matches sorting mode
     public function setSortMode($mode, $sortby = '')
     {
-        assert (
-            $mode == SPH_SORT_RELEVANCE ||
-            $mode == SPH_SORT_ATTR_DESC ||
-            $mode == SPH_SORT_ATTR_ASC ||
-            $mode == SPH_SORT_TIME_SEGMENTS ||
-            $mode == SPH_SORT_EXTENDED ||
-            $mode == SPH_SORT_EXPR
+        assert(
+            $mode==SPH_SORT_RELEVANCE ||
+            $mode==SPH_SORT_ATTR_DESC ||
+            $mode==SPH_SORT_ATTR_ASC ||
+            $mode==SPH_SORT_TIME_SEGMENTS ||
+            $mode==SPH_SORT_EXTENDED ||
+            $mode==SPH_SORT_EXPR
         );
         assert(is_string($sortby));
-        assert($mode == SPH_SORT_RELEVANCE || strlen($sortby) > 0);
+        assert($mode==SPH_SORT_RELEVANCE || strlen($sortby)>0);
 
         $this->sort = $mode;
         $this->sortby = $sortby;
@@ -843,7 +843,7 @@ 
     {
         assert(is_numeric($min));
         assert(is_numeric($max));
-        assert($min <= $max);
+        assert($min<=$max);
         $this->min_id = $min;
         $this->max_id = $max;
     }
@@ -891,7 +891,7 @@ 
         assert(is_string($attribute));
         assert(is_numeric($min));
         assert(is_numeric($max));
-        assert($min <= $max);
+        assert($min<=$max);
 
         $this->filters[] = array(
             'type' => SPH_FILTER_RANGE,
@@ -909,7 +909,7 @@ 
         assert(is_string($attribute));
         assert(is_float($min));
         assert(is_float($max));
-        assert($min <= $max);
+        assert($min<=$max);
 
         $this->filters[] = array(
             'type' => SPH_FILTER_FLOATRANGE,
@@ -944,12 +944,12 @@ 
         assert(is_string($attribute));
         assert(is_string($groupsort));
         assert(
-            $func == SPH_GROUPBY_DAY ||
-            $func == SPH_GROUPBY_WEEK ||
-            $func == SPH_GROUPBY_MONTH ||
-            $func == SPH_GROUPBY_YEAR ||
-            $func == SPH_GROUPBY_ATTR ||
-            $func == SPH_GROUPBY_ATTRPAIR
+            $func==SPH_GROUPBY_DAY ||
+            $func==SPH_GROUPBY_WEEK ||
+            $func==SPH_GROUPBY_MONTH ||
+            $func==SPH_GROUPBY_YEAR ||
+            $func==SPH_GROUPBY_ATTR ||
+            $func==SPH_GROUPBY_ATTRPAIR
         );
 
         $this->groupby = $attribute;
@@ -967,8 +967,8 @@ 
     /// set distributed retries count and delay
     public function setRetries($count, $delay = 0)
     {
-        assert(is_int($count) && $count >= 0);
-        assert(is_int($delay) && $delay >= 0);
+        assert(is_int($count) && $count>=0);
+        assert(is_int($delay) && $delay>=0);
         $this->retrycount = $count;
         $this->retrydelay = $delay;
     }
@@ -1025,12 +1025,12 @@ 
             'global_idf',
             'low_priority'
         );
-        $flags = array (
+        $flags = array(
             'reverse_scan' => array(0, 1),
             'sort_method' => array('pq', 'kbuffer'),
             'max_predicted_time' => array(0),
             'boolean_simplify' => array(true, false),
-            'idf' => array ('normalized', 'plain', 'tfidf_normalized', 'tfidf_unnormalized'),
+            'idf' => array('normalized', 'plain', 'tfidf_normalized', 'tfidf_unnormalized'),
             'global_idf' => array(true, false),
             'low_priority' => array(true, false)
         );
@@ -1038,32 +1038,32 @@ 
         assert(isset($flag_name, $known_names));
         assert(
             in_array($flag_value, $flags[$flag_name], true) ||
-            ($flag_name == 'max_predicted_time' && is_int($flag_value) && $flag_value >= 0)
+            ($flag_name=='max_predicted_time' && is_int($flag_value) && $flag_value>=0)
         );
 
-        if ($flag_name == 'reverse_scan') {
-            $this->query_flags = sphSetBit($this->query_flags, 0, $flag_value == 1);
+        if ($flag_name=='reverse_scan') {
+            $this->query_flags = sphSetBit($this->query_flags, 0, $flag_value==1);
         }
-        if ($flag_name == 'sort_method') {
-            $this->query_flags = sphSetBit($this->query_flags, 1, $flag_value == 'kbuffer');
+        if ($flag_name=='sort_method') {
+            $this->query_flags = sphSetBit($this->query_flags, 1, $flag_value=='kbuffer');
         }
-        if ($flag_name == 'max_predicted_time') {
-            $this->query_flags = sphSetBit($this->query_flags, 2, $flag_value > 0);
+        if ($flag_name=='max_predicted_time') {
+            $this->query_flags = sphSetBit($this->query_flags, 2, $flag_value>0);
             $this->predictedtime = (int)$flag_value;
         }
-        if ($flag_name == 'boolean_simplify') {
+        if ($flag_name=='boolean_simplify') {
             $this->query_flags = sphSetBit($this->query_flags, 3, $flag_value);
         }
-        if ($flag_name == 'idf' && ($flag_value == 'normalized' || $flag_value == 'plain')) {
-            $this->query_flags = sphSetBit($this->query_flags, 4, $flag_value == 'plain');
+        if ($flag_name=='idf' && ($flag_value=='normalized' || $flag_value=='plain')) {
+            $this->query_flags = sphSetBit($this->query_flags, 4, $flag_value=='plain');
         }
-        if ($flag_name == 'global_idf') {
+        if ($flag_name=='global_idf') {
             $this->query_flags = sphSetBit($this->query_flags, 5, $flag_value);
         }
-        if ($flag_name == 'idf' && ($flag_value == 'tfidf_normalized' || $flag_value == 'tfidf_unnormalized')) {
-            $this->query_flags = sphSetBit($this->query_flags, 6, $flag_value == 'tfidf_normalized');
+        if ($flag_name=='idf' && ($flag_value=='tfidf_normalized' || $flag_value=='tfidf_unnormalized')) {
+            $this->query_flags = sphSetBit($this->query_flags, 6, $flag_value=='tfidf_normalized');
         }
-        if ($flag_name == 'low_priority') {
+        if ($flag_name=='low_priority') {
             $this->query_flags = sphSetBit($this->query_flags, 8, $flag_value);
         }
     }
@@ -1074,8 +1074,8 @@ 
         assert(is_string($orderby));
         assert(is_int($offset));
         assert(is_int($limit));
-        assert($offset >= 0);
-        assert($limit > 0);
+        assert($offset>=0);
+        assert($limit>0);
 
         $this->outerorderby = $orderby;
         $this->outeroffset = $offset;
@@ -1140,7 +1140,7 @@ 
 
         $this->error = $results[0]['error'];
         $this->warning = $results[0]['warning'];
-        if ($results[0]['status'] == SEARCHD_ERROR) {
+        if ($results[0]['status']==SEARCHD_ERROR) {
             return false;
         } else {
             return $results[0];
@@ -1164,24 +1164,24 @@ 
 
         // build request
         $req = pack('NNNNN', $this->query_flags, $this->offset, $this->limit, $this->mode, $this->ranker);
-        if ($this->ranker == SPH_RANK_EXPR) {
-            $req .= pack('N', strlen($this->rankexpr)) . $this->rankexpr;
+        if ($this->ranker==SPH_RANK_EXPR) {
+            $req .= pack('N', strlen($this->rankexpr)).$this->rankexpr;
         }
         $req .= pack('N', $this->sort); // (deprecated) sort mode
-        $req .= pack('N', strlen($this->sortby)) . $this->sortby;
-        $req .= pack('N', strlen($query)) . $query; // query itself
+        $req .= pack('N', strlen($this->sortby)).$this->sortby;
+        $req .= pack('N', strlen($query)).$query; // query itself
         $req .= pack('N', count($this->weights)); // weights
         foreach ($this->weights as $weight) {
             $req .= pack('N', (int)$weight);
         }
-        $req .= pack('N', strlen($index)) . $index; // indexes
+        $req .= pack('N', strlen($index)).$index; // indexes
         $req .= pack('N', 1); // id64 range marker
-        $req .= sphPackU64($this->min_id) . sphPackU64($this->max_id); // id64 range
+        $req .= sphPackU64($this->min_id).sphPackU64($this->max_id); // id64 range
 
         // filters
         $req .= pack('N', count($this->filters));
         foreach ($this->filters as $filter) {
-            $req .= pack('N', strlen($filter['attr'])) . $filter['attr'];
+            $req .= pack('N', strlen($filter['attr'])).$filter['attr'];
             $req .= pack('N', $filter['type']);
             switch ($filter['type']) {
                 case SPH_FILTER_VALUES:
@@ -1191,13 +1191,13 @@ 
                     }
                     break;
                 case SPH_FILTER_RANGE:
-                    $req .= sphPackI64($filter['min']) . sphPackI64($filter['max']);
+                    $req .= sphPackI64($filter['min']).sphPackI64($filter['max']);
                     break;
                 case SPH_FILTER_FLOATRANGE:
-                    $req .= $this->packFloat($filter['min']) . $this->packFloat($filter['max']);
+                    $req .= $this->packFloat($filter['min']).$this->packFloat($filter['max']);
                     break;
                 case SPH_FILTER_STRING:
-                    $req .= pack('N', strlen($filter['value'])) . $filter['value'];
+                    $req .= pack('N', strlen($filter['value'])).$filter['value'];
                     break;
                 default:
                     assert(0 && 'internal error: unhandled filter type');
@@ -1206,27 +1206,27 @@ 
         }
 
         // group-by clause, max-matches count, group-sort clause, cutoff count
-        $req .= pack('NN', $this->groupfunc, strlen($this->groupby)) . $this->groupby;
+        $req .= pack('NN', $this->groupfunc, strlen($this->groupby)).$this->groupby;
         $req .= pack('N', $this->maxmatches);
-        $req .= pack('N', strlen($this->groupsort)) . $this->groupsort;
+        $req .= pack('N', strlen($this->groupsort)).$this->groupsort;
         $req .= pack('NNN', $this->cutoff, $this->retrycount, $this->retrydelay);
-        $req .= pack('N', strlen($this->groupdistinct)) . $this->groupdistinct;
+        $req .= pack('N', strlen($this->groupdistinct)).$this->groupdistinct;
 
         // anchor point
         if (empty($this->anchor)) {
             $req .= pack('N', 0);
         } else {
-            $a =& $this->anchor;
+            $a = & $this->anchor;
             $req .= pack('N', 1);
-            $req .= pack('N', strlen($a['attrlat'])) . $a['attrlat'];
-            $req .= pack('N', strlen($a['attrlong'])) . $a['attrlong'];
-            $req .= $this->packFloat($a['lat']) . $this->packFloat($a['long']);
+            $req .= pack('N', strlen($a['attrlat'])).$a['attrlat'];
+            $req .= pack('N', strlen($a['attrlong'])).$a['attrlong'];
+            $req .= $this->packFloat($a['lat']).$this->packFloat($a['long']);
         }
 
         // per-index weights
         $req .= pack('N', count($this->indexweights));
         foreach ($this->indexweights as $idx => $weight) {
-            $req .= pack('N', strlen($idx)) . $idx . pack('N', $weight);
+            $req .= pack('N', strlen($idx)).$idx.pack('N', $weight);
         }
 
         // max query time
@@ -1235,16 +1235,16 @@ 
         // per-field weights
         $req .= pack('N', count($this->fieldweights));
         foreach ($this->fieldweights as $field => $weight) {
-            $req .= pack('N', strlen($field)) . $field . pack('N', $weight);
+            $req .= pack('N', strlen($field)).$field.pack('N', $weight);
         }
 
         // comment
-        $req .= pack('N', strlen($comment)) . $comment;
+        $req .= pack('N', strlen($comment)).$comment;
 
         // attribute overrides
         $req .= pack('N', count($this->overrides));
         foreach ($this->overrides as $key => $entry) {
-            $req .= pack('N', strlen($entry['attr'])) . $entry['attr'];
+            $req .= pack('N', strlen($entry['attr'])).$entry['attr'];
             $req .= pack('NN', $entry['type'], count($entry['values']));
             foreach ($entry['values'] as $id => $val) {
                 assert(is_numeric($id));
@@ -1266,14 +1266,14 @@ 
         }
 
         // select-list
-        $req .= pack('N', strlen($this->select)) . $this->select;
+        $req .= pack('N', strlen($this->select)).$this->select;
 
         // max_predicted_time
-        if ($this->predictedtime > 0) {
+        if ($this->predictedtime>0) {
             $req .= pack('N', (int)$this->predictedtime);
         }
 
-        $req .= pack('N', strlen($this->outerorderby)) . $this->outerorderby;
+        $req .= pack('N', strlen($this->outerorderby)).$this->outerorderby;
         $req .= pack('NN', $this->outeroffset, $this->outerlimit);
         if ($this->hasouter) {
             $req .= pack('N', 1);
@@ -1309,7 +1309,7 @@ 
         $nreqs = count($this->reqs);
         $req = join('', $this->reqs);
         $len = 8 + strlen($req);
-        $req = pack('nnNNN', SEARCHD_COMMAND_SEARCH, VER_COMMAND_SEARCH, $len, 0, $nreqs) . $req; // add header
+        $req = pack('nnNNN', SEARCHD_COMMAND_SEARCH, VER_COMMAND_SEARCH, $len, 0, $nreqs).$req; // add header
 
         if (!$this->send($fp, $req, $len + 8) || !($response = $this->getResponse($fp, VER_COMMAND_SEARCH))) {
             $this->mbPop();
@@ -1330,9 +1330,9 @@ 
         $max = strlen($response); // max position for checks, to protect against broken responses
 
         $results = array();
-        for ($ires = 0; $ires < $nreqs && $p < $max; $ires++) {
+        for ($ires = 0; $ires<$nreqs && $p<$max; $ires++) {
             $results[] = array();
-            $result =& $results[$ires];
+            $result = & $results[$ires];
 
             $result['error'] = '';
             $result['warning'] = '';
@@ -1341,13 +1341,13 @@ 
             list(, $status) = unpack('N*', substr($response, $p, 4));
             $p += 4;
             $result['status'] = $status;
-            if ($status != SEARCHD_OK) {
+            if ($status!=SEARCHD_OK) {
                 list(, $len) = unpack('N*', substr($response, $p, 4));
                 $p += 4;
                 $message = substr($response, $p, $len);
                 $p += $len;
 
-                if ($status == SEARCHD_WARNING) {
+                if ($status==SEARCHD_WARNING) {
                     $result['warning'] = $message;
                 } else {
                     $result['error'] = $message;
@@ -1361,7 +1361,7 @@ 
 
             list(, $nfields) = unpack('N*', substr($response, $p, 4));
             $p += 4;
-            while ($nfields --> 0 && $p < $max) {
+            while ($nfields-->0 && $p<$max) {
                 list(, $len) = unpack('N*', substr($response, $p, 4));
                 $p += 4;
                 $fields[] = substr($response, $p, $len);
@@ -1371,7 +1371,7 @@ 
 
             list(, $nattrs) = unpack('N*', substr($response, $p, 4));
             $p += 4;
-            while ($nattrs --> 0 && $p < $max) {
+            while ($nattrs-->0 && $p<$max) {
                 list(, $len) = unpack('N*', substr($response, $p, 4));
                 $p += 4;
                 $attr = substr($response, $p, $len);
@@ -1390,7 +1390,7 @@ 
 
             // read matches
             $idx = -1;
-            while ($count --> 0 && $p < $max) {
+            while ($count-->0 && $p<$max) {
                 // index into result array
                 $idx++;
 
@@ -1418,14 +1418,14 @@ 
                 $attrvals = array();
                 foreach ($attrs as $attr => $type) {
                     // handle 64bit ints
-                    if ($type == SPH_ATTR_BIGINT) {
+                    if ($type==SPH_ATTR_BIGINT) {
                         $attrvals[$attr] = sphUnpackI64(substr($response, $p, 8));
                         $p += 8;
                         continue;
                     }
 
                     // handle floats
-                    if ($type == SPH_ATTR_FLOAT) {
+                    if ($type==SPH_ATTR_FLOAT) {
                         list(, $uval) = unpack('N*', substr($response, $p, 4));
                         $p += 4;
                         list(, $fval) = unpack('f*', pack('L', $uval));
@@ -1436,28 +1436,28 @@ 
                     // handle everything else as unsigned ints
                     list(, $val) = unpack('N*', substr($response, $p, 4));
                     $p += 4;
-                    if ($type == SPH_ATTR_MULTI) {
+                    if ($type==SPH_ATTR_MULTI) {
                         $attrvals[$attr] = array();
                         $nvalues = $val;
-                        while ($nvalues --> 0 && $p < $max) {
+                        while ($nvalues-->0 && $p<$max) {
                             list(, $val) = unpack('N*', substr($response, $p, 4));
                             $p += 4;
                             $attrvals[$attr][] = sphFixUint($val);
                         }
-                    } elseif ($type == SPH_ATTR_MULTI64) {
+                    } elseif ($type==SPH_ATTR_MULTI64) {
                         $attrvals[$attr] = array();
                         $nvalues = $val;
-                        while ($nvalues > 0 && $p < $max) {
+                        while ($nvalues>0 && $p<$max) {
                             $attrvals[$attr][] = sphUnpackI64(substr($response, $p, 8));
                             $p += 8;
                             $nvalues -= 2;
                         }
-                    } elseif ($type == SPH_ATTR_STRING) {
+                    } elseif ($type==SPH_ATTR_STRING) {
                         $attrvals[$attr] = substr($response, $p, $val);
                         $p += $val;
-                    } elseif ($type == SPH_ATTR_FACTORS) {
+                    } elseif ($type==SPH_ATTR_FACTORS) {
                         $attrvals[$attr] = substr($response, $p, $val - 4);
-                        $p += $val-4;
+                        $p += $val - 4;
                     } else {
                         $attrvals[$attr] = sphFixUint($val);
                     }
@@ -1476,14 +1476,14 @@ 
             $result['time'] = sprintf('%.3f', $msecs / 1000);
             $p += 16;
 
-            while ($words --> 0 && $p < $max) {
+            while ($words-->0 && $p<$max) {
                 list(, $len) = unpack('N*', substr($response, $p, 4));
                 $p += 4;
                 $word = substr($response, $p, $len);
                 $p += $len;
                 list($docs, $hits) = array_values(unpack('N*N*', substr($response, $p, 8)));
                 $p += 8;
-                $result['words'][$word] = array (
+                $result['words'][$word] = array(
                     'docs' => sprintf('%u', $docs),
                     'hits' => sprintf('%u', $hits)
                 );
@@ -1618,23 +1618,23 @@ 
             $flags |= 1024;
         }
         $req = pack('NN', 0, $flags); // mode=0, flags=$flags
-        $req .= pack('N', strlen($index)) . $index; // req index
-        $req .= pack('N', strlen($words)) . $words; // req words
+        $req .= pack('N', strlen($index)).$index; // req index
+        $req .= pack('N', strlen($words)).$words; // req words
 
         // options
-        $req .= pack('N', strlen($opts['before_match'])) . $opts['before_match'];
-        $req .= pack('N', strlen($opts['after_match'])) . $opts['after_match'];
-        $req .= pack('N', strlen($opts['chunk_separator'])) . $opts['chunk_separator'];
+        $req .= pack('N', strlen($opts['before_match'])).$opts['before_match'];
+        $req .= pack('N', strlen($opts['after_match'])).$opts['after_match'];
+        $req .= pack('N', strlen($opts['chunk_separator'])).$opts['chunk_separator'];
         $req .= pack('NN', (int)$opts['limit'], (int)$opts['around']);
         $req .= pack('NNN', (int)$opts['limit_passages'], (int)$opts['limit_words'], (int)$opts['start_passage_id']); // v.1.2
-        $req .= pack('N', strlen($opts['html_strip_mode'])) . $opts['html_strip_mode'];
-        $req .= pack('N', strlen($opts['passage_boundary'])) . $opts['passage_boundary'];
+        $req .= pack('N', strlen($opts['html_strip_mode'])).$opts['html_strip_mode'];
+        $req .= pack('N', strlen($opts['passage_boundary'])).$opts['passage_boundary'];
 
         // documents
         $req .= pack('N', count($docs));
         foreach ($docs as $doc) {
             assert(is_string($doc));
-            $req .= pack('N', strlen($doc)) . $doc;
+            $req .= pack('N', strlen($doc)).$doc;
         }
 
         ////////////////////////////
@@ -1642,7 +1642,7 @@ 
         ////////////////////////////
 
         $len = strlen($req);
-        $req = pack('nnN', SEARCHD_COMMAND_EXCERPT, VER_COMMAND_EXCERPT, $len) . $req; // add header
+        $req = pack('nnN', SEARCHD_COMMAND_EXCERPT, VER_COMMAND_EXCERPT, $len).$req; // add header
         if (!$this->send($fp, $req, $len + 8) || !($response = $this->getResponse($fp, VER_COMMAND_EXCERPT))) {
             $this->mbPop();
             return false;
@@ -1660,7 +1660,7 @@ 
             list(, $len) = unpack('N*', substr($response, $pos, 4));
             $pos += 4;
 
-            if ($pos + $len > $rlen) {
+            if ($pos + $len>$rlen) {
                 $this->error = 'incomplete reply';
                 $this->mbPop();
                 return false;
@@ -1699,8 +1699,8 @@ 
         /////////////////
 
         // v.1.0 req
-        $req  = pack('N', strlen($query)) . $query; // req query
-        $req .= pack('N', strlen($index)) . $index; // req index
+        $req  = pack('N', strlen($query)).$query; // req query
+        $req .= pack('N', strlen($index)).$index; // req index
         $req .= pack('N', (int)$hits);
 
         ////////////////////////////
@@ -1708,7 +1708,7 @@ 
         ////////////////////////////
 
         $len = strlen($req);
-        $req = pack('nnN', SEARCHD_COMMAND_KEYWORDS, VER_COMMAND_KEYWORDS, $len) . $req; // add header
+        $req = pack('nnN', SEARCHD_COMMAND_KEYWORDS, VER_COMMAND_KEYWORDS, $len).$req; // add header
         if (!$this->send($fp, $req, $len + 8) || !($response = $this->getResponse($fp, VER_COMMAND_KEYWORDS))) {
             $this->mbPop();
             return false;
@@ -1723,7 +1723,7 @@ 
         $rlen = strlen($response);
         list(, $nwords) = unpack('N*', substr($response, $pos, 4));
         $pos += 4;
-        for ($i = 0; $i < $nwords; $i++) {
+        for ($i = 0; $i<$nwords; $i++) {
             list(, $len) = unpack('N*', substr($response, $pos, 4));
             $pos += 4;
             $tokenized = $len ? substr($response, $pos, $len) : '';
@@ -1746,7 +1746,7 @@ 
                 $res[$i]['hits'] = $nhits;
             }
 
-            if ($pos > $rlen) {
+            if ($pos>$rlen) {
                 $this->error = 'incomplete reply';
                 $this->mbPop();
                 return false;
@@ -1759,8 +1759,8 @@ 
 
     public function escapeString($string)
     {
-        $from = array('\\', '(',')','|','-','!','@','~','"','&', '/', '^', '$', '=', '<');
-        $to   = array('\\\\', '\(','\)','\|','\-','\!','\@','\~','\"', '\&', '\/', '\^', '\$', '\=', '\<');
+        $from = array('\\', '(', ')', '|', '-', '!', '@', '~', '"', '&', '/', '^', '$', '=', '<');
+        $to   = array('\\\\', '\(', '\)', '\|', '\-', '\!', '\@', '\~', '\"', '\&', '\/', '\^', '\$', '\=', '\<');
 
         return str_replace($from, $to, $string);
     }
@@ -1787,7 +1787,7 @@ 
         foreach ($values as $id => $entry) {
             assert(is_numeric($id));
             assert(is_array($entry));
-            assert(count($entry) == count($attrs));
+            assert(count($entry)==count($attrs));
             foreach ($entry as $v) {
                 if ($mva) {
                     assert(is_array($v));
@@ -1802,12 +1802,12 @@ 
 
         // build request
         $this->mbPush();
-        $req = pack('N', strlen($index)) . $index;
+        $req = pack('N', strlen($index)).$index;
 
         $req .= pack('N', count($attrs));
         $req .= pack('N', $ignorenonexistent ? 1 : 0);
         foreach ($attrs as $attr) {
-            $req .= pack('N', strlen($attr)) . $attr;
+            $req .= pack('N', strlen($attr)).$attr;
             $req .= pack('N', $mva ? 1 : 0);
         }
 
@@ -1831,7 +1831,7 @@ 
         }
 
         $len = strlen($req);
-        $req = pack('nnN', SEARCHD_COMMAND_UPDATE, VER_COMMAND_UPDATE, $len) . $req; // add header
+        $req = pack('nnN', SEARCHD_COMMAND_UPDATE, VER_COMMAND_UPDATE, $len).$req; // add header
         if (!$this->send($fp, $req, $len + 8)) {
             $this->mbPop();
             return -1;
@@ -1854,7 +1854,7 @@ 
 
     public function open()
     {
-        if ($this->_socket !== false) {
+        if ($this->_socket!==false) {
             $this->error = 'already connected';
             return false;
         }
@@ -1873,7 +1873,7 @@ 
 
     public function close()
     {
-        if ($this->_socket === false) {
+        if ($this->_socket===false) {
             $this->error = 'not connected';
             return false;
         }
@@ -1910,8 +1910,8 @@ 
         $p += 8;
 
         $res = array();
-        for ($i = 0; $i < $rows; $i++) {
-            for ($j = 0; $j < $cols; $j++) {
+        for ($i = 0; $i<$rows; $i++) {
+            for ($j = 0; $j<$cols; $j++) {
                 list(, $len) = unpack('N*', substr($response, $p, 4));
                 $p += 4;
                 $res[$i][] = substr($response, $p, $len);
@@ -1942,7 +1942,7 @@ 
         }
 
         $tag = -1;
-        if (strlen($response) == 4) {
+        if (strlen($response)==4) {
             list(, $tag) = unpack('N*', $response);
         } else {
             $this->error = 'unexpected response length';

src/test.php

Spacing +11 added lines, -11 removed lines

@@ -74,7 +74,7 @@ 
     $select = '';
     $count = count($args);
 
-    for ($i = 0; $i < $count; $i++) {
+    for ($i = 0; $i<$count; $i++) {
         switch ($args[$i]) {
             case '-h':
             case '--host':
@@ -168,7 +168,7 @@ 
                 }
                 break;
             default:
-                $q .= $args[$i] . ' ';
+                $q .= $args[$i].' ';
         }
     }
 
@@ -199,7 +199,7 @@ 
         $cl->setSelect($select);
     }
     if ($limit) {
-        $cl->setLimits(0, $limit, ($limit > 1000) ? $limit : 1000);
+        $cl->setLimits(0, $limit, ($limit>1000) ? $limit : 1000);
     }
     $cl->setRankingMode($ranker);
     $res = $cl->query($q, $index);
@@ -208,16 +208,16 @@ 
     // print me out
     ////////////////
 
-    if ($res === false) {
-        printf('Query failed: %s.' . PHP_EOL, $cl->getLastError());
+    if ($res===false) {
+        printf('Query failed: %s.'.PHP_EOL, $cl->getLastError());
 
     } else {
         if ($cl->getLastWarning()) {
-            printf('WARNING: %s' . PHP_EOL . PHP_EOL, $cl->getLastWarning());
+            printf('WARNING: %s'.PHP_EOL.PHP_EOL, $cl->getLastWarning());
         }
 
         print "Query '$q' retrieved {$res['total']} of {$res['total_found']} matches in {$res['time']} sec.\n";
-        print 'Query stats:' . PHP_EOL;
+        print 'Query stats:'.PHP_EOL;
         if (is_array($res['words'])) {
             foreach ($res['words'] as $word => $info) {
                 print "    '$word' found {$info['hits']} times in {$info['docs']} documents\n";
@@ -227,14 +227,14 @@ 
 
         if (is_array($res['matches'])) {
             $n = 1;
-            print 'Matches:' . PHP_EOL;
+            print 'Matches:'.PHP_EOL;
             foreach ($res['matches'] as $docinfo) {
                 print "$n. doc_id={$docinfo['id']}, weight={$docinfo['weight']}";
                 foreach ($res['attrs'] as $attrname => $attrtype) {
                     $value = $docinfo['attrs'][$attrname];
-                    if ($attrtype == SPH_ATTR_MULTI || $attrtype == SPH_ATTR_MULTI64) {
-                        $value = '(' . join(',', $value) . ')';
-                    } elseif ($attrtype == SPH_ATTR_TIMESTAMP) {
+                    if ($attrtype==SPH_ATTR_MULTI || $attrtype==SPH_ATTR_MULTI64) {
+                        $value = '('.join(',', $value).')';
+                    } elseif ($attrtype==SPH_ATTR_TIMESTAMP) {
                         $value = date('Y-m-d H:i:s', $value);
                     }
                     print ", $attrname=$value";