Merge pull request #211 from mkoppanen/php7

Php7

Author: mkoppanen

.travis/travis.sh

@@ -67,8 +67,8 @@ function install_libmemcached() {
 }
 
 function install_igbinary() {
-    git clone https://github.com/igbinary/igbinary.git
-    pushd igbinary
+    git clone https://github.com/igbinary/igbinary7.git
+    pushd igbinary7
         phpize
         ./configure
         make
@@ -79,7 +79,7 @@ function install_igbinary() {
 function install_msgpack() {
     git clone https://github.com/msgpack/msgpack-php.git
     pushd msgpack-php
-		git checkout php7
+        git checkout php7
         phpize
         ./configure
         make
@@ -152,9 +152,9 @@ 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-msgpack --enable-memcached-igbinary
-		./configure --with-libmemcached-dir="$LIBMEMCACHED_PREFIX" $protocol_flag $sasl_flag
-		make
+        # ./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
 }
@@ -184,7 +184,7 @@ function run_memcached_tests() {
         rm ./tests/expire.phpt
 
         # Run normal tests
-        php run-tests.php --show-diff -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=$?
     popd
     return $retval;
@@ -236,10 +236,10 @@ case $ACTION in
         install_libmemcached
 
         # Install igbinary extension
-        # install_igbinary
+        install_igbinary
 
         # install msgpack
-        # install_msgpack
+        install_msgpack
 
         install_memcached
         run_memcached

package.xml

@@ -137,15 +137,17 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <file role='test' name='sasl_basic.phpt'/>
     <file role='test' name='getserverbykey.phpt'/>
     <file role='test' name='gh_155.phpt'/>
+    <file role='test' name='get_flags.phpt'/>
+    <file role='test' name='session_lock.phpt'/>
+    <file role='test' name='session_regenerate.phpt'/>
+    <file role='test' name='stats.phpt'/>
   </dir>
  </dir>
  </contents>
  <dependencies>
   <required>
    <php>
-    <min>5.2.0</min>
-    <max>6.0.0</max>
-    <exclude>6.0.0</exclude>
+    <min>7.0.0</min>
    </php>
    <pearinstaller>
     <min>1.4.0b1</min>