8 files changed, 24 insertions, 28 deletions
diff --git a/travis/compile.sh b/travis/compile.sh
index 683e7012a4..3669643f9d 100755
--- a/travis/compile.sh
+++ b/travis/compile.sh
@@ -6,7 +6,7 @@ else
 	TS="";
 fi
 if [[ "$ENABLE_DEBUG" == 1 ]]; then
-	DEBUG="--enable-debug --without-pcre-valgrind";
+	DEBUG="--enable-debug";
 else
 	DEBUG="";
 fi
@@ -24,10 +24,11 @@ else
 	MAKE_QUIET=""
 fi
 
-MAKE_JOBS=${MAKE_JOBS:-2}
+MAKE_JOBS=${MAKE_JOBS:-$(nproc)}
 
 ./buildconf --force
 ./configure \
+--enable-option-checking=fatal \
 --prefix="$HOME"/php-install \
 $CONFIG_QUIET \
 $DEBUG \
@@ -41,18 +42,18 @@ $TS \
 --with-pdo-sqlite \
 --enable-intl \
 --without-pear \
---with-gd \
---with-jpeg-dir=/usr \
---with-png-dir=/usr \
+--enable-gd \
+--with-jpeg \
+--with-webp \
+--with-freetype \
+--with-xpm \
 --enable-exif \
---enable-zip \
---without-libzip \
+--with-zip \
 --with-zlib \
 --with-zlib-dir=/usr \
 --enable-soap \
 --enable-xmlreader \
 --with-xsl \
---with-curl=/usr \
 --with-tidy \
 --with-xmlrpc \
 --enable-sysvsem \
@@ -72,13 +73,13 @@ $TS \
 --enable-ftp \
 --with-pspell=/usr \
 --with-enchant=/usr \
---enable-wddx \
---with-freetype-dir=/usr \
---with-xpm-dir=/usr \
 --with-kerberos \
 --enable-sysvmsg \
+--with-ffi \
+--with-sodium \
 --enable-zend-test=shared \
-> "$CONFIG_LOG_FILE"
+--enable-werror \
+--with-pear
 
-make "-j${MAKE_JOBS}" $MAKE_QUIET > "$MAKE_LOG_FILE"
-make install >> "$MAKE_LOG_FILE"
+make "-j${MAKE_JOBS}" $MAKE_QUIET
+make install
diff --git a/travis/ext/curl/setup.sh b/travis/ext/curl/setup.sh
deleted file mode 100755
index 02e8ce5bb8..0000000000
--- a/travis/ext/curl/setup.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-export PHP_CURL_HTTP_REMOTE_SERVER="http://localhost:8080"
-cd ./ext/curl/tests/responder
-php -S localhost:8080 &
-cd -
diff --git a/travis/ext/mysql/setup.sh b/travis/ext/mysql/setup.sh
deleted file mode 100755
index a3ba75cb2d..0000000000
--- a/travis/ext/mysql/setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-mysql -e "CREATE DATABASE IF NOT EXISTS test"
diff --git a/travis/ext/mysqli/setup.sh b/travis/ext/mysqli/setup.sh
deleted file mode 100755
index a3ba75cb2d..0000000000
--- a/travis/ext/mysqli/setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-mysql -e "CREATE DATABASE IF NOT EXISTS test"
diff --git a/travis/ext/pdo_mysql/setup.sh b/travis/ext/pdo_mysql/setup.sh
deleted file mode 100755
index a3ba75cb2d..0000000000
--- a/travis/ext/pdo_mysql/setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-mysql -e "CREATE DATABASE IF NOT EXISTS test"
diff --git a/travis/ext/pdo_pgsql/setup.sh b/travis/ext/pdo_pgsql/setup.sh
deleted file mode 100755
index 5f3cf67f92..0000000000
--- a/travis/ext/pdo_pgsql/setup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-export PDO_PGSQL_TEST_DSN='pgsql:host=localhost port=5432 dbname=test user=postgres password='
diff --git a/travis/setup-mysql.sh b/travis/setup-mysql.sh
new file mode 100755
index 0000000000..4866f24442
--- /dev/null
+++ b/travis/setup-mysql.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+if [ -n "$ARM64" ]; then
+  sudo mysql -e 'CREATE USER "travis"@"localhost" IDENTIFIED BY ""'
+  sudo mysql -e 'GRANT ALL PRIVILEGES ON *.* TO "travis"@"localhost"'
+fi
+mysql -e "CREATE DATABASE IF NOT EXISTS test"
diff --git a/travis/ext/pgsql/setup.sh b/travis/setup-pgsql.sh
index 108f47db25..9172356265 100755
--- a/travis/ext/pgsql/setup.sh
+++ b/travis/setup-pgsql.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 echo '
 <?php $conn_str .= " user=postgres"; ?>' >> "./ext/pgsql/tests/config.inc"
-psql -c 'create database test;' -U postgres
+if [ -z "$ARM64" ]; then
+  psql -c 'create database test;' -U postgres
+fi