Merge pull request #206 from FoolCode/update-travis

Author: oohnoitz

.travis.yml

@@ -1,9 +1,7 @@
+dist: bionic
 language: php
 
 php:
-  - 7.1
-  - 7.2
-  - 7.3
   - 7.4
   - 8.0
   - 8.1.0

CHANGELOG.md

@@ -1,3 +1,6 @@
+#### 3.0.2
+* Dropped support for PHP 7.3 and lower
+
 #### 3.0.1
 * Fixed Exception Error for PDO Driver
 * Dropped support for PHP 7.0 and lower

src/SphinxQL.php

@@ -1368,6 +1368,10 @@ public function compileEscapeChars($array = array())
      */
     public function escapeMatch($string)
     {
+        if (is_null($string)) {
+            return '';
+        }
+
         if ($string instanceof Expression) {
             return $string->value();
         }

tests/install.sh

@@ -2,11 +2,11 @@
 
 case $SEARCH_BUILD in
   SPHINX2)
-    wget --quiet http://ppa.launchpad.net/builds/sphinxsearch-rel22/ubuntu/dists/`lsb_release -cs`/main/binary-amd64/Packages.gz
-    gzip -d Packages.gz
-    SPHINX_DEB=`grep -m1 Filename Packages | cut -f2 -d' '`
-    wget --quiet -O search.deb http://ppa.launchpad.net/builds/sphinxsearch-rel22/ubuntu/${SPHINX_DEB}
-    dpkg -x search.deb .
+    wget --quiet http://sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
+    tar zxvf sphinx-2.2.11-release.tar.gz
+    cd sphinx-2.2.11-release
+    ./configure --prefix=/usr/local/sphinx
+    sudo make && sudo make install
     ;;
   SPHINX3)
     wget --quiet http://sphinxsearch.com/files/sphinx-3.0.3-facc3fb-linux-amd64.tar.gz

tests/run.sh

@@ -4,7 +4,7 @@ case $SEARCH_BUILD in
   SPHINX2)
     WORK=$HOME/search
     gcc -shared -o data/test_udf.so test_udf.c
-    $WORK/usr/bin/searchd -c sphinx.conf
+    /usr/local/sphinx/bin/searchd -c sphinx.conf
     ;;
   SPHINX3)
     WORK=$HOME/search/sphinx-3.0.3