THRIFT-4794: finish php json cross test
diff --git a/build/docker/ubuntu-bionic/Dockerfile b/build/docker/ubuntu-bionic/Dockerfile
index 3566199..a0ed317 100644
--- a/build/docker/ubuntu-bionic/Dockerfile
+++ b/build/docker/ubuntu-bionic/Dockerfile
@@ -217,6 +217,7 @@
php \
php-cli \
php-dev \
+ php-json \
php-pear \
re2c \
composer
diff --git a/build/docker/ubuntu-xenial/Dockerfile b/build/docker/ubuntu-xenial/Dockerfile
index 88895a0..5693a2c 100644
--- a/build/docker/ubuntu-xenial/Dockerfile
+++ b/build/docker/ubuntu-xenial/Dockerfile
@@ -218,6 +218,7 @@
php7.0 \
php7.0-cli \
php7.0-dev \
+ php-json \
php-pear \
re2c \
composer
diff --git a/test/php/Makefile.am b/test/php/Makefile.am
index 5c42321..52765ee 100755
--- a/test/php/Makefile.am
+++ b/test/php/Makefile.am
@@ -26,6 +26,7 @@
php_ext_dir:
mkdir -p php_ext_dir
ln -s ../../../lib/php/src/ext/thrift_protocol/modules/thrift_protocol.so php_ext_dir/
+ ln -s "$$(php-config --extension-dir)/json.so" php_ext_dir/
ln -s "$$(php-config --extension-dir)/sockets.so" php_ext_dir/
precross: stubs php_ext_dir
diff --git a/test/php/test_php.ini b/test/php/test_php.ini
index 3f9bb21..aeb67cb 100644
--- a/test/php/test_php.ini
+++ b/test/php/test_php.ini
@@ -1,2 +1,3 @@
extension=thrift_protocol.so
+extension=json.so
extension=sockets.so
diff --git a/test/tests.json b/test/tests.json
index 02ae28a..acede24 100644
--- a/test/tests.json
+++ b/test/tests.json
@@ -545,8 +545,9 @@
],
"protocols": [
"binary",
+ "binary:accel",
"compact",
- "binary:accel"
+ "json"
],
"command": [
"php",