Merge branch '2.0' into 3.0

.travis.yml

@@ -19,13 +19,7 @@ matrix:
     - php: nightly
 
 install:
-  - wget http://ftp.gnu.org/gnu/parallel/parallel-20170822.tar.bz2
-  - tar -xvjf parallel*
-  - cd parallel-20170822
-  - ./configure
-  - make
-  - sudo make install
-  - cd ..
+  - phpenv config-rm xdebug.ini
   - eval `ssh-agent -s`
   - travis/setup-secure-shell.sh
   - sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' -a `php -r "echo (int) version_compare(PHP_VERSION, '7.0', '<');"` = "1" ]; then travis/install-php-extensions.sh; fi"

travis/run-phpunit.sh

@@ -38,15 +38,8 @@ then
     find tests -type f -name "*.php" -print0 | xargs -0 sed -i 's/^class Functional_Net_/class /g'
 fi
 
-if [ "$TRAVIS_PHP_VERSION" = 'hhvm' -o `php -r "echo (int) version_compare(PHP_VERSION, '7.0', '>=');"` = "1" ]
-then
-  find tests -type f -name "*Test.php" | \
-    parallel --gnu --keep-order \
-      "echo '== {} =='; \"$PHPUNIT\" $PHPUNIT_ARGS {};"
-else
-  "$PHPUNIT" \
-    $PHPUNIT_ARGS \
-    --coverage-text \
-    --coverage-clover code_coverage/clover.xml \
-    --coverage-html code_coverage/
-fi
+"$PHPUNIT" \
+  $PHPUNIT_ARGS \
+  --coverage-text \
+  --coverage-clover code_coverage/clover.xml \
+  --coverage-html code_coverage/