fixes merge conflict

config/php.ini

@@ -869,7 +869,7 @@ default_socket_timeout = 60
 zend_extension=opcache.so
 extension=redis.so
 extension=phalcon.so
-;extension=yaf.so
+extension=yaf.so
 extension=mongodb.so
 ;extension=php_bz2.dll
 ;extension=php_curl.dll

frameworks/PHP/yaf/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx
+fw_depends php yaf nginx
 
 sed -i 's|host=localhost|host='"${DBHOST}"'|g' app/conf/application.ini
 sed -i 's|root .*/FrameworkBenchmarks/php-yaf|root '"${TROOT}"'|g' deploy/nginx.conf 

toolset/setup/linux/frameworks/yaf.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+fw_depends php
+
+RETCODE=$(fw_exists ${IROOT}/yaf.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $IROOT/yaf.installed
+  return 0; }
+
+printf "\n" | $PHP_HOME/bin/pecl -q install -f yaf-2.2.9
+
+echo "" > $IROOT/yaf.installed
+
+source $IROOT/yaf.installed

toolset/setup/linux/languages/php.sh

@@ -46,9 +46,6 @@ $PHP_HOME/bin/pecl channel-update pecl.php.net
 $PHP_HOME/bin/pecl config-set php_ini $PHP_HOME/lib/php.ini
 printf "\n" | $PHP_HOME/bin/pecl -q install -f redis
 
-# yaf.so
-# printf "\n" | $PHP_HOME/bin/pecl -q install -f yaf
-
 # mongodb.so
 printf "\n" | $PHP_HOME/bin/pecl -q install -f mongodb