Skip to content

Php7 #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 1, 2016
Merged

Php7 #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dc5b22a
Cleaning up driver for php7. WIP
mkoppanen Jan 29, 2016
c15d792
Clean up session code, start on the whole i_obj/m_obj confusion
mkoppanen Jan 30, 2016
bdd0911
Update to a simpler object structure, make session config match old s…
mkoppanen Jan 31, 2016
ecc7d81
Add tests, fix compilation error for non-sasl
mkoppanen Jan 31, 2016
9ce59ef
Add to package.xml
mkoppanen Jan 31, 2016
782077c
Fix json serializer
mkoppanen Jan 31, 2016
27ad33b
Fix serializers
mkoppanen Feb 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .travis/travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading