Merge branch 'php7'

Author: sodabrew

.travis.yml

@@ -1,27 +1,36 @@
+sudo: required
+dist: trusty
+
 language: php
 php:
-    - 5.5
-    #- 5.4
-    #- 5.3
+    - 7.0
+    - 7.1
+
+matrix:
+    fast_finish: true
+    allow_failures:
+        - php: 7.1
+
 env:
-    - LIBMEMCACHED_VERSION=1.0.17
-    - LIBMEMCACHED_VERSION=1.0.16
-    - LIBMEMCACHED_VERSION=1.0.15
-    - LIBMEMCACHED_VERSION=1.0.14
-    - LIBMEMCACHED_VERSION=1.0.10
-    - LIBMEMCACHED_VERSION=1.0.8
-    - LIBMEMCACHED_VERSION=1.0.7
-    - LIBMEMCACHED_VERSION=1.0.6
-    - LIBMEMCACHED_VERSION=1.0.2
-    - LIBMEMCACHED_VERSION=0.53
-    - LIBMEMCACHED_VERSION=0.49
-    - LIBMEMCACHED_VERSION=0.44
-
-services:
-  - memcached # will start memcached
+    - LIBMEMCACHED_VERSION=1.0.18 # Debian Jessie / Ubuntu Xenial
+    - LIBMEMCACHED_VERSION=1.0.16 # RHEL / CentOS 7
+    - LIBMEMCACHED_VERSION=1.0.8  # Debian Wheezy / Ubuntu Trusty
+
+addons:
+    apt:
+        packages:
+            - sasl2-bin
+            - libsasl2-dev
+            - libevent-dev
 
 before_script:
     - ./.travis/travis.sh before_script $LIBMEMCACHED_VERSION
 
 script:
     - ./.travis/travis.sh script $LIBMEMCACHED_VERSION
+
+cache:
+    directories: 
+    - $HOME/cache
+
+    

.travis/travis.sh

@@ -44,6 +44,12 @@ function validate_package_xml() {
 
 function install_libmemcached() {
 
+    if test -d "${LIBMEMCACHED_PREFIX}"
+    then
+        echo "Using cached libmemcached: ${LIBMEMCACHED_PREFIX}"
+        return
+    fi
+
     wget "https://launchpad.net/libmemcached/1.0/${LIBMEMCACHED_VERSION}/+download/libmemcached-${LIBMEMCACHED_VERSION}.tar.gz" -O libmemcached-${LIBMEMCACHED_VERSION}.tar.gz
 
     tar xvfz libmemcached-${LIBMEMCACHED_VERSION}.tar.gz
@@ -73,43 +79,59 @@ function install_igbinary() {
 function install_msgpack() {
     git clone https://github.com/msgpack/msgpack-php.git
     pushd msgpack-php
-        git checkout php5
         phpize
         ./configure
         make
         make install
     popd
 }
 
-function install_sasl() {
+function install_memcached() {
+    local prefix="${HOME}/cache/memcached-sasl-${MEMCACHED_VERSION}"
+
+    if test -d "$prefix"
+    then
+        echo "Using cached memcached: ${prefix}"
+        return
+    fi
 
-    wget http://memcached.googlecode.com/files/memcached-1.4.15.tar.gz -O memcached-1.4.15.tar.gz
-    tar xfz memcached-1.4.15.tar.gz
+    wget http://www.memcached.org/files/memcached-${MEMCACHED_VERSION}.tar.gz -O memcached-${MEMCACHED_VERSION}.tar.gz
+    tar xfz memcached-${MEMCACHED_VERSION}.tar.gz
 
-    pushd memcached-1.4.15
-        ./configure --enable-sasl --prefix="${HOME}/memcached"
+    pushd memcached-${MEMCACHED_VERSION}
+        ./configure --enable-sasl --enable-sasl-pwdb --prefix="${prefix}"
         make
         make install
     popd
+}
+
+function run_memcached() {
+    local prefix="${HOME}/cache/memcached-sasl-${MEMCACHED_VERSION}"
 
-    sudo apt-get install sasl2-bin
-    export SASL_CONF_PATH="${HOME}/sasl2"
+    export SASL_CONF_PATH="/tmp/sasl2"
+
+    if test -d "${SASL_CONF_PATH}"
+    then
+        rm -rf "${SASL_CONF_PATH}"
+    fi
 
-    # Create config path
     mkdir "${SASL_CONF_PATH}"
+    export MEMCACHED_SASL_PWDB="${SASL_CONF_PATH}/sasldb2"
 
     # Create configuration
     cat<<EOF > "${SASL_CONF_PATH}/memcached.conf"
 mech_list: PLAIN
 plainlog_level: 5
-sasldb_path: ${SASL_CONF_PATH}/sasldb2
+sasldb_path: ${MEMCACHED_SASL_PWDB}
 EOF
 
-    # Create password
-    echo "test" | /usr/sbin/saslpasswd2 -c memcached -a memcached -f "${SASL_CONF_PATH}/sasldb2"
+    echo "test" | /usr/sbin/saslpasswd2 -c memcached -a memcached -f "${MEMCACHED_SASL_PWDB}"
+
+    # Run normal memcached
+    "${prefix}/bin/memcached" -d -p 11211
 
     # Run memcached on port 11212 with SASL support
-    "${HOME}/memcached/bin/memcached" -S -d -p 11212
+    "${prefix}/bin/memcached" -S -d -p 11212
 }
 
 function build_php_memcached() {
@@ -129,7 +151,8 @@ function build_php_memcached() {
             sasl_flag="--enable-memcached-sasl"
         fi
 
-        ./configure --with-libmemcached-dir="$LIBMEMCACHED_PREFIX" $protocol_flag $sasl_flag --enable-memcached-json --enable-memcached-igbinary --enable-memcached-msgpack
+        # ./configure --with-libmemcached-dir="$LIBMEMCACHED_PREFIX" $protocol_flag $sasl_flag 
+        ./configure --with-libmemcached-dir="$LIBMEMCACHED_PREFIX" $protocol_flag $sasl_flag --enable-memcached-json --enable-memcached-msgpack --enable-memcached-igbinary
         make
         make install
     popd
@@ -152,30 +175,24 @@ EOF
 function run_memcached_tests() {
     export NO_INTERACTION=1
     export REPORT_EXIT_STATUS=1
-    export TEST_PHP_EXECUTABLE=`which php`
+    export TEST_PHP_EXECUTABLE=$(which php)
 
     pushd "${PHP_MEMCACHED_BUILD_DIR}/memcached-${PHP_MEMCACHED_VERSION}"
         # We have one xfail test, we run it separately
-        php run-tests.php -d extension=msgpack.so -d extension=igbinary.so -d extension=memcached.so -n ./tests/expire.phpt
+        php run-tests.php -d extension=memcached.so -n ./tests/expire.phpt
         rm ./tests/expire.phpt
 
         # Run normal tests
-        php run-tests.php -d extension=msgpack.so -d extension=igbinary.so -d extension=memcached.so -n ./tests/*.phpt
+        php run-tests.php --show-diff -d extension=modules/memcached.so -d extension=msgpack.so -d extension=igbinary.so -n ./tests/*.phpt
         retval=$?
-        for i in `ls tests/*.out 2>/dev/null`; do
-            echo "-- START ${i}";
-            cat $i;
-            echo "";
-            echo "-- END";
-        done
     popd
-
     return $retval;
 }
 
 # Command line arguments
 ACTION=$1
 LIBMEMCACHED_VERSION=$2
+MEMCACHED_VERSION="1.4.25"
 
 if test "x$ACTION" = "x"; then
     echo "Usage: $0 <action> <libmemcached version>"
@@ -187,11 +204,15 @@ if test "x$LIBMEMCACHED_VERSION" = "x"; then
     exit 1
 fi
 
+if test "x$3" != "x"; then
+    MEMCACHED_VERSION=$3
+fi
+
 # the extension version
 PHP_MEMCACHED_VERSION=$(php -r '$sxe = simplexml_load_file ("package.xml"); echo (string) $sxe->version->release;')
 
 # Libmemcached install dir
-LIBMEMCACHED_PREFIX="${HOME}/libmemcached-${LIBMEMCACHED_VERSION}"
+LIBMEMCACHED_PREFIX="${HOME}/cache/libmemcached-${LIBMEMCACHED_VERSION}"
 
 # Where to do the build
 PHP_MEMCACHED_BUILD_DIR="/tmp/php-memcached-build"
@@ -216,13 +237,11 @@ case $ACTION in
         # Install igbinary extension
         install_igbinary
 
-        # install msgpack
+        # Install msgpack extension
         install_msgpack
-        
-        # install SASL
-        if test "x$ENABLE_SASL" = "xyes"; then
-            install_sasl
-        fi
+
+        install_memcached
+        run_memcached
     ;;
 
     script)

README.markdown

@@ -1,6 +1,6 @@
 Build Status
 ------------
-[![Build Status](https://travis-ci.org/php-memcached-dev/php-memcached.png?branch=master)](https://travis-ci.org/php-memcached-dev/php-memcached)
+[![Build Status](https://travis-ci.org/php-memcached-dev/php-memcached.png?branch=php7)](https://travis-ci.org/php-memcached-dev/php-memcached)
 
 Description
 -----------

config.m4

@@ -106,72 +106,29 @@ if test "$PHP_MEMCACHED" != "no"; then
       AC_MSG_RESULT([$session_inc_path])
     fi
   fi
-  
+
   if test "$PHP_MEMCACHED_JSON" != "no"; then
     AC_MSG_CHECKING([for json includes])
     json_inc_path=""
-    
-    tmp_version=$PHP_VERSION
-    if test -z "$tmp_version"; then
-      if test -z "$PHP_CONFIG"; then
-        AC_MSG_ERROR([php-config not found])
-      fi
-      PHP_MEMCACHED_VERSION_ORIG=`$PHP_CONFIG --version`;
-    else
-      PHP_MEMCACHED_VERSION_ORIG=$tmp_version
-    fi
 
-    if test -z $PHP_MEMCACHED_VERSION_ORIG; then
-      AC_MSG_ERROR([failed to detect PHP version, please report])
+    if test -f "$abs_srcdir/include/php/ext/json/php_json.h"; then
+      json_inc_path="$abs_srcdir/include/php"
+    elif test -f "$abs_srcdir/ext/json/php_json.h"; then
+      json_inc_path="$abs_srcdir"
+    elif test -f "$phpincludedir/ext/json/php_json.h"; then
+      json_inc_path="$phpincludedir"
+    else
+      for i in php php4 php5 php6; do
+        if test -f "$prefix/include/$i/ext/json/php_json.h"; then
+          json_inc_path="$prefix/include/$i"
+        fi
+      done
     fi
-
-    PHP_MEMCACHED_VERSION_MASK=`echo ${PHP_MEMCACHED_VERSION_ORIG} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-    
-    if test $PHP_MEMCACHED_VERSION_MASK -ge 5003000; then
-      if test -f "$abs_srcdir/include/php/ext/json/php_json.h"; then
-        json_inc_path="$abs_srcdir/include/php"
-      elif test -f "$abs_srcdir/ext/json/php_json.h"; then
-        json_inc_path="$abs_srcdir"
-      elif test -f "$phpincludedir/ext/json/php_json.h"; then
-        json_inc_path="$phpincludedir"
-      else
-        for i in php php4 php5 php6; do
-          if test -f "$prefix/include/$i/ext/json/php_json.h"; then
-            json_inc_path="$prefix/include/$i"
-          fi
-        done
-      fi
-      if test "$json_inc_path" = ""; then
-        AC_MSG_ERROR([Cannot find php_json.h])
-      else
-        AC_DEFINE(HAVE_JSON_API,1,[Whether JSON API is available])
-        AC_DEFINE(HAVE_JSON_API_5_3,1,[Whether JSON API for PHP 5.3 is available])
-        AC_MSG_RESULT([$json_inc_path])
-      fi
-    elif test $PHP_MEMCACHED_VERSION_MASK -ge 5002009; then
-      dnl Check JSON for PHP 5.2.9+
-      if test -f "$abs_srcdir/include/php/ext/json/php_json.h"; then
-        json_inc_path="$abs_srcdir/include/php"
-      elif test -f "$abs_srcdir/ext/json/php_json.h"; then
-        json_inc_path="$abs_srcdir"
-      elif test -f "$phpincludedir/ext/json/php_json.h"; then
-        json_inc_path="$phpincludedir"
-      else
-        for i in php php4 php5 php6; do
-          if test -f "$prefix/include/$i/ext/json/php_json.h"; then
-            json_inc_path="$prefix/include/$i"
-          fi
-        done
-      fi
-      if test "$json_inc_path" = ""; then
-        AC_MSG_ERROR([Cannot find php_json.h])
-      else
-        AC_DEFINE(HAVE_JSON_API,1,[Whether JSON API is available])
-        AC_DEFINE(HAVE_JSON_API_5_2,1,[Whether JSON API for PHP 5.2 is available])
-        AC_MSG_RESULT([$json_inc_path])
-      fi
-    else 
-      AC_MSG_RESULT([the PHP version does not support JSON serialization API])
+    if test "$json_inc_path" = ""; then
+      AC_MSG_ERROR([Cannot find php_json.h])
+    else
+      AC_DEFINE(HAVE_JSON_API,1,[Whether JSON API is available])
+      AC_MSG_RESULT([$json_inc_path])
     fi
   fi
 
@@ -339,6 +296,28 @@ if test "$PHP_MEMCACHED" != "no"; then
       AC_MSG_RESULT([no])
     fi
 
+    ORIG_CFLAGS="$CFLAGS"
+    ORIG_LIBS="$LIBS"
+  
+    CFLAGS="$CFLAGS $PHP_LIBMEMCACHED_INCLUDES"
+    LIBS="$LIBS $PHP_LIBMEMCACHED_LIBS"
+
+    AC_CACHE_CHECK([whether memcached_exist is defined], ac_cv_have_memcached_exist, [
+      AC_TRY_LINK(
+        [ #include <libmemcached/memcached.h> ],
+        [ memcached_exist (NULL, NULL, 0); ],
+        [ ac_cv_have_memcached_exist="yes" ],
+        [ ac_cv_have_memcached_exist="no" ]
+      )
+    ])
+
+    CFLAGS="$ORIG_CFLAGS"
+    LIBS="$ORIG_LIBS"
+
+    if test "$ac_cv_have_memcached_exist" = "yes"; then
+      AC_DEFINE(HAVE_MEMCACHED_EXIST, [1], [Whether memcached_exist is defined])
+    fi
+
     PHP_MEMCACHED_FILES="php_memcached.c php_libmemcached_compat.c  g_fmt.c"
 
     if test "$PHP_SYSTEM_FASTLZ" != "no"; then