Added php7 to toolset and updated nginx

config/php.ini

@@ -871,6 +871,7 @@ extension=redis.so
 extension=phalcon.so
 extension=yaf.so
 extension=mongo.so
+extension=mongodb.so
 ;extension=php_bz2.dll
 ;extension=php_curl.dll
 ;extension=php_fileinfo.dll

frameworks/PHP/php/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer
+fw_depends php7 nginx composer
 
 sed -i "s|localhost|${DBHOST}|g" dborm.php
 sed -i "s|localhost|${DBHOST}|g" dbraw.php

toolset/setup/linux/languages/php7.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+RETCODE=$(fw_exists ${IROOT}/php.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  echo "Moving PHP config files into place";
+  sudo cp $FWROOT/config/php.ini /usr/local/lib/php.ini
+  sudo cp $FWROOT/config/php-fpm.conf /usr/local/lib/php-fpm.conf
+  source $IROOT/php.installed
+  return 0; }
+
+VERSION="7.0.1"
+PHP_HOME=$IROOT/php-$VERSION
+
+# Precaution, unlikely to happen.
+rm -rf $IROOT/php PHP_HOME cphalcon
+
+fw_get -o php-${VERSION}.tar.gz http://php.net/distributions/php-${VERSION}.tar.gz
+fw_untar php-${VERSION}.tar.gz
+mv php-${VERSION} php
+cd php
+
+echo "Configuring PHP quietly..."
+./configure --prefix=$PHP_HOME --with-pdo-mysql \
+  --with-mcrypt --enable-intl --enable-mbstring \
+  --enable-fpm --with-fpm-user=testrunner --with-fpm-group=testrunner \
+  --with-openssl --with-mysqli --with-zlib --enable-opcache --quiet
+echo "Making PHP quietly..."
+make --quiet
+echo "Installing PHP quietly"
+make --quiet install
+cd ..
+
+cp $FWROOT/config/php.ini $PHP_HOME/lib/php.ini
+cp $FWROOT/config/php-fpm.conf $PHP_HOME/lib/php-fpm.conf
+
+# =======================
+#
+# Install the PHP extensions that our tests need
+#    Install all of them here becuase our config file references
+#    all of these *.so
+# ========================
+echo PHP compilation finished, installing extensions
+
+$PHP_HOME/bin/pecl channel-update pecl.php.net
+# Apc.so
+$PHP_HOME/bin/pecl config-set php_ini $PHP_HOME/lib/php.ini
+
+#redis not available in pecl for php7 - find alternative install
+#printf "\n" | $PHP_HOME/bin/pecl -q install -f redis
+
+#removed phalcon install - separate to toolset/setup/linux/frameworks
+
+# yaf.so - get working for php7 - also separate
+#printf "\n" | $PHP_HOME/bin/pecl -q install -f yaf
+
+# mongodb.so - mongo.so deprecated in php7 use mongodb.so
+printf "\n" | $PHP_HOME/bin/pecl -q install -f mongodb
+
+# Clean up a bit
+rm -rf $IROOT/php
+
+echo "export PHP_HOME=${PHP_HOME}" > $IROOT/php.installed
+echo -e "export PATH=\$PHP_HOME/bin:\$PHP_HOME/sbin:\$PATH" >> $IROOT/php.installed
+
+source $IROOT/php.installed

toolset/setup/linux/webservers/nginx.sh

@@ -7,9 +7,9 @@ RETCODE=$(fw_exists ${IROOT}/nginx.installed)
 
 NGINX_HOME=$IROOT/nginx
 
-fw_get -O http://nginx.org/download/nginx-1.4.1.tar.gz
-fw_untar nginx-1.4.1.tar.gz
-cd nginx-1.4.1
+fw_get -O http://nginx.org/download/nginx-1.9.9.tar.gz
+fw_untar nginx-1.9.9.tar.gz
+cd nginx-1.9.9
 
 # There is no --quiet flag that I could find...
 echo "Configuring nginx..."