Skip to content

Commit 2d2a5f8

Browse files
committed
Added php module zip xml. Fix #680
1 parent b3f6856 commit 2d2a5f8

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

ee/core/variables.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ class EEVariables():
122122
ee_php_repo = "ppa:ondrej/php"
123123
ee_php5_6 = ["php5.6-fpm", "php5.6-curl", "php5.6-gd", "php5.6-imap",
124124
"php5.6-mcrypt", "php5.6-readline", "php5.6-common",
125-
"php5.6-mysql", "php5.6-cli"]
125+
"php5.6-mysql", "php5.6-cli", "php5.6-zip", "php5.6-xml"]
126126
ee_php7_0 = ["php7.0-fpm", "php7.0-curl", "php7.0-gd", "php7.0-imap",
127127
"php7.0-mcrypt", "php7.0-readline", "php7.0-common",
128-
"php7.0-mysql", "php7.0-cli"]
128+
"php7.0-mysql", "php7.0-cli", "php7.0-zip", "php7.0-xml"]
129129
ee_php_extra = ["php-memcached", "php-imagick", "memcached",
130130
"graphviz", "php-pear", "php-xdebug", "php-msgpack"]
131131
elif ee_platform_distro == 'debian':

install

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ function ee_upgrade_php(){
304304
add-apt-repository -y 'ppa:ondrej/php'
305305
ee_lib_echo "Upgrading required packages, please wait..."
306306
apt-get update &>> /dev/null
307-
apt-get -y install php5.6-fpm php5.6-curl php5.6-gd php5.6-imap php5.6-mcrypt php5.6-readline php5.6-mysql php5.6-cli php5.6-common php-memcached php-imagick memcached graphviz php-pear php-xdebug php-msgpack || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
307+
apt-get -y install php5.6-fpm php5.6-curl php5.6-gd php5.6-imap php5.6-mcrypt php5.6-readline php5.6-mysql php5.6-cli php5.6-common php-memcached php-imagick memcached graphviz php-pear php-xdebug php-msgpack php5.6-zip php5.6-xml || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
308308
if [ -e /etc/php5/fpm/pool.d/www.conf -a -e /etc/php5/fpm/pool.d/debug.conf -a -e /etc/php5/fpm/php.ini -a -e /etc/php5/fpm/php-fpm.conf ]; then
309309
cp -f /etc/php5/fpm/pool.d/www.conf /etc/php/5.6/fpm/pool.d/www.conf &>> /dev/null
310310
cp -f /etc/php5/fpm/pool.d/debug.conf /etc/php/5.6/fpm/pool.d/debug.conf &>> /dev/null
@@ -324,6 +324,9 @@ function ee_upgrade_php(){
324324
service php5.6-fpm restart &>> /dev/null
325325
rm -f /etc/apt/sources.list.d/ondrej-php5-5_6-trusty.list &>> /dev/null
326326
apt-get remove -y php5-fpm php5-curl php5-gd php5-imap php5-mcrypt php5-common php5-readline php5-mysql php5-cli php5-memcache php5-imagick memcached graphviz php-pear
327+
328+
elif [ -f /etc/apt/sources.list.d/ondrej-php-trusty.list ]; then
329+
apt-get -y install php5.6-zip php5.6-xml || ee_lib_error "Unable to install PHP 5.6 packages, exit status " 1
327330
fi
328331
fi
329332

0 commit comments

Comments
 (0)