Php7

.travis.yml

@@ -3,6 +3,7 @@ php:
     - 7.0
 
 env:
+    - LIBMEMCACHED_VERSION=1.0.18
     - LIBMEMCACHED_VERSION=1.0.17
     - LIBMEMCACHED_VERSION=1.0.16
     - LIBMEMCACHED_VERSION=1.0.15
@@ -12,15 +13,25 @@ env:
     - 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=0.53
+    #- LIBMEMCACHED_VERSION=0.49
+    #- LIBMEMCACHED_VERSION=0.44
+addons:
+    apt:
+        packages:
+            - sasl2-bin
+            - libsasl2-dev
 
 before_script:
     - ./.travis/travis.sh before_script $LIBMEMCACHED_VERSION
 
 script:
     - ./.travis/travis.sh script $LIBMEMCACHED_VERSION
+
+sudo: false
+
+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
@@ -81,35 +87,52 @@ function install_msgpack() {
     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() {
@@ -153,30 +176,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=memcached.so -n ./tests/expire.phpt
         rm ./tests/expire.phpt
 
         # Run normal tests
-        php run-tests.php -d extension=memcached.so -n ./tests/*.phpt
+        php run-tests.php --show-diff -d extension=memcached.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>"
@@ -188,11 +205,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"
@@ -219,11 +240,9 @@ case $ACTION in
 
         # install msgpack
         # install_msgpack
-
-        # install SASL
-        if test "x$ENABLE_SASL" = "xyes"; then
-        	install_sasl
-        fi
+
+        install_memcached
+        run_memcached
     ;;
 
     script)

tests/keys.phpt

@@ -13,7 +13,7 @@ $binary = memc_get_instance (array (
 $ascii = memc_get_instance ();
 
 var_dump ($binary->set ('binary key with spaces', 'this is a test'));
-var_dump ($binary->getResultCode () == Memcached::RES_BAD_KEY_PROVIDED);
+var_dump ($binary->getResultCode () == Memcached::RES_SUCCESS);
 
 var_dump ($ascii->set ('ascii key with spaces', 'this is a test'));
 var_dump ($ascii->getResultCode () == Memcached::RES_BAD_KEY_PROVIDED);
@@ -24,7 +24,7 @@ var_dump ($ascii->getResultCode () == Memcached::RES_BAD_KEY_PROVIDED);
 echo "OK" . PHP_EOL;
 
 --EXPECT--
-bool(false)
+bool(true)
 bool(true)
 bool(false)
 bool(true)

tests/user-flags.phpt

@@ -22,46 +22,78 @@ define ('FLAG_4', 4);
 define ('FLAG_32', 32);
 define ('FLAG_64', 64);
 define ('FLAG_TOO_LARGE', pow(2, 16));
-$x = 0;
 
 include dirname (__FILE__) . '/config.inc';
 $m = memc_get_instance (array (Memcached::OPT_BINARY_PROTOCOL => true));
 
 $key = uniqid ('udf_test_');
 
-echo "stored with flags" . PHP_EOL;
+// Set with flags off
+$m->set ($key, '1', 10);
+$m->get($key);
+var_dump($m->getLastUserFlags());
 
-$m->set ($key, '1', 10, FLAG_1 | FLAG_4 | FLAG_64);
-$udf_flags = 0;
-$value = $m->get ($key, null, $x, $udf_flags);
+// Set flags on
+$m->setOption(Memcached::OPT_USER_FLAGS, FLAG_1);
+$m->set ($key, '1', 10);
+$m->get($key);
+check_flags($m->getLastUserFlags()[$key], array(FLAG_1));
 
-check_flags ($udf_flags, array (FLAG_1, FLAG_4, FLAG_64));
+// Multiple flags
+$m->setOption(Memcached::OPT_USER_FLAGS, FLAG_1 | FLAG_2 | FLAG_4);
+$m->set ($key, '1', 10);
+$m->get($key);
+check_flags($m->getLastUserFlags()[$key], array(FLAG_1, FLAG_2, FLAG_4));
 
-echo "stored without flags" . PHP_EOL;
-$m->set ($key, '1');
-$value = $m->get ($key, null, $x, $udf_flags);
+// Even more flags
+$m->setOption(Memcached::OPT_USER_FLAGS, FLAG_1 | FLAG_2 | FLAG_4 | FLAG_32 | FLAG_64);
+$m->set ($key, '1', 10);
+$m->get($key);
+check_flags($m->getLastUserFlags()[$key], array(FLAG_1, FLAG_2, FLAG_4, FLAG_32, FLAG_64));
 
-var_dump ($udf_flags == 0);
-$m->set ($key, '1', 10, FLAG_TOO_LARGE);
+// User flags with get multi
+$values = array(
+	uniqid ('udf_test_multi_') => "first",
+	uniqid ('udf_test_multi_') => "second",
+	uniqid ('udf_test_multi_') => "third",
+);
 
+$m->setOption(Memcached::OPT_USER_FLAGS, FLAG_2 | FLAG_4);
+$m->setMulti($values);
+$m->getMulti(array_keys($values));
+$flags = $m->getLastUserFlags();
+
+foreach (array_keys($values) as $key) {
+	check_flags($flags[$key], array(FLAG_2, FLAG_4));
+}
+
+// User flags with compression on
+$m->setOption(Memcached::OPT_USER_FLAGS, FLAG_1 | FLAG_2 | FLAG_4);
 $m->setOption(Memcached::OPT_COMPRESSION, true);
 $m->setOption(Memcached::OPT_COMPRESSION_TYPE, Memcached::COMPRESSION_FASTLZ);
 
-$m->set ($key, str_repeat ("abcdef1234567890", 200), 10, FLAG_1 | FLAG_4 | FLAG_64);
+$m->set ($key, '1', 10);
+$m->get($key);
+check_flags($m->getLastUserFlags()[$key], array(FLAG_1, FLAG_2, FLAG_4));
 
-$udf_flags = 0;
-$value_back = $m->get($key, null, null, $udf_flags);
 
-check_flags ($udf_flags, array (FLAG_1, FLAG_4, FLAG_64));
+// Too large flags
+$m->setOption(Memcached::OPT_USER_FLAGS, FLAG_TOO_LARGE);
 
 echo "DONE TEST\n";
 ?>
 --EXPECTF--
-stored with flags
+array(1) {
+  ["udf_test_%s"]=>
+  int(0)
+}
+Flags OK
 Flags OK
-stored without flags
-bool(true)
-
-Warning: Memcached::set(): udf_flags will be limited to 65535 in %s on line %d
 Flags OK
+Flags OK
+Flags OK
+Flags OK
+Flags OK
+
+Warning: Memcached::setOption(): MEMC_OPT_USER_FLAGS must be < 65535 in %s on line %d
 DONE TEST