Merge branch 'event-loop-v0.4' into uv

.travis.yml

@@ -6,13 +6,37 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - nightly
 
 install:
-  - php -r 'exit((int) (PHP_MAJOR_VERSION < 7));' || (yes "" | pecl install "channel://pecl.php.net/libevent-0.1.0")
+  - if [ "$TRAVIS_PHP_VERSION" != "5.5" ] && [ "$TRAVIS_PHP_VERSION" != "5.6" ] ; then
-  - php -r 'exit((int) (PHP_MAJOR_VERSION < 7));' || (yes "" | pecl install ev)
+    git clone https://github.com/libuv/libuv;
-  - php -r 'exit((int) (PHP_MAJOR_VERSION >= 7));' || (mkdir libuv && (curl -L https://github.com/libuv/libuv/archive/v1.6.1.tar.gz | tar xzf -) && cd libuv-1.6.1 && ./autogen.sh && ./configure --prefix=$(readlink -f `pwd`/../libuv) && make && make install && cd ..)
+    pushd libuv;
-  - php -r 'exit((int) (PHP_MAJOR_VERSION >= 7));' || (git clone https://github.com/bwoebi/php-uv && cd php-uv && phpize && ./configure --with-uv=$(readlink -f `pwd`/../libuv) && make install && (echo "extension = uv.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini) && cd ..)
+    version=$(git describe --tags);
+    git checkout ${version};
+    ./autogen.sh;
+    ./configure --prefix=$(dirname `pwd`)/libuv-install;
+    make;
+    make install;
+    popd;
+    git clone https://github.com/bwoebi/php-uv.git;
+    pushd php-uv;
+    phpize;
+    ./configure --with-uv=$(dirname `pwd`)/libuv-install;
+    make;
+    make install;
+    popd;
+    echo "extension=uv.so" >> "$(php -r 'echo php_ini_loaded_file();')";
+    fi;
+  - curl -LS https://pecl.php.net/get/ev | tar -xz;
+    pushd ev-*;
+    phpize;
+    ./configure;
+    make;
+    make install;
+    popd;
+    echo "extension=ev.so" >> "$(php -r 'echo php_ini_loaded_file();')";
   - composer self-update
   - composer install --no-interaction --prefer-source
 
@@ -22,8 +46,8 @@ script:
 
 after_script:
   - composer require satooshi/php-coveralls dev-master
-  - php vendor/bin/coveralls -v
+  - php vendor/bin/coveralls -v --exclude-no-stmt
-  
+
 cache:
   directories:
     - $HOME/.composer/cache

lib/Loop.php

@@ -426,6 +426,6 @@ abstract class Loop extends Driver {
      * @return array
      */
     public function __debugInfo() {
-        return $this->info();
+        return $this->getInfo();
     }
 }