Merge pull request #2144 from knewmanTE/revert-phalcon-to-use-php5

Revert phalcon to use php5

frameworks/PHP/phalcon-micro/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php7 phalcon nginx
+fw_depends php5 phalcon nginx
 
 sed -i 's|localhost|'"${DBHOST}"'|g' public/index.php
 sed -i 's|root .*/FrameworkBenchmarks/php-phalcon-micro|root '"${TROOT}"'|g' deploy/nginx.conf

frameworks/PHP/phalcon/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php7 phalcon nginx
+fw_depends php5 phalcon nginx
 
 sed -i 's|mongodb://localhost|mongodb://'"${DBHOST}"'|g' app/config/config.php
 sed -i 's|localhost|'"${DBHOST}"'|g' app/config/config.php

toolset/setup/linux/languages/php7.sh

@@ -25,6 +25,11 @@ echo "Installing PHP quietly"
 make --quiet install
 cd ..
 
+# Disable yaf and phalcon, for most PHP frameworks
+# (there is a similar line to enable the frameworks in their respective setup files)
+sed -i 's|^extension=yaf.so|;extension=yaf.so|g' $FWROOT/config/php.ini
+sed -i 's|^extension=phalcon.so|;extension=phalcon.so|g' $FWROOT/config/php.ini
+
 # Enable the correct Mongo DB plugin for PHP 7
 sed -i 's|^extension=mongo.so|;extension=mongo.so|g' $FWROOT/config/php.ini
 sed -i 's|;extension=mongodb.so|extension=mongodb.so|g' $FWROOT/config/php.ini
@@ -44,8 +49,7 @@ $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
+printf "\n" | $PHP_HOME/bin/pecl -q install -f redis-3.0.0
 
 #removed phalcon install - separate to toolset/setup/linux/frameworks