Bladeren bron

update framework, adjust error level

ikkez 9 jaren geleden
bovenliggende
commit
273afe50e7
3 gewijzigde bestanden met toevoegingen van 11 en 5 verwijderingen
  1. 4 0
      frameworks/PHP/fat-free/index.php
  2. 4 3
      frameworks/PHP/fat-free/setup.sh
  3. 3 2
      frameworks/PHP/fat-free/setup_php5.sh

+ 4 - 0
frameworks/PHP/fat-free/index.php

@@ -2,10 +2,14 @@
 // drop startup errors
 if (function_exists('error_clear_last'))
     error_clear_last();
+   
+error_reporting(0);
 
 /** @var Base $f3 */
 $f3=require('src/base.php');
 
+error_reporting(-1);
+
 $f3->set('DEBUG',2);
 $f3->set('HIGHLIGHT',false);
 $f3->set('CACHE','folder=tmp/cache/');

+ 4 - 3
frameworks/PHP/fat-free/setup.sh

@@ -6,14 +6,15 @@ sed -i 's|localhost|'"${DBHOST}"'|g' index.php
 sed -i 's|root .*/FrameworkBenchmarks/fat-free|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
+
 F3DIR="$TROOT/src"
 
 [[ ! -e "$F3DIR" ]] || rm -r "$F3DIR"
 
 git clone "https://github.com/bcosca/fatfree-core.git" "$F3DIR"
 pushd "$F3DIR" > /dev/null
-git checkout -q "b284f0c482e858f0162cab529925e7de14d90746" # v3.5.0
+git checkout -q "069ccd84afd2461c7ebb67f660c142f97577e661" # v3.5.2-dev
 popd > /dev/null
 
-php-fpm --fpm-config "$FWROOT/config/php-fpm.conf" -g "$TROOT/deploy/php-fpm.pid"
-nginx -c "$TROOT/deploy/nginx.conf"
+php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
+nginx -c $TROOT/deploy/nginx.conf

+ 3 - 2
frameworks/PHP/fat-free/setup_php5.sh

@@ -3,16 +3,17 @@
 fw_depends php nginx
 
 sed -i 's|localhost|'"${DBHOST}"'|g' index.php
-sed -i 's|root .*/FrameworkBenchmarks/frameworks/PHP/fat-free|root '"${TROOT}"'|g' deploy/nginx.conf
+sed -i 's|root .*/FrameworkBenchmarks/fat-free|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
+
 F3DIR="$TROOT/src"
 
 [[ ! -e "$F3DIR" ]] || rm -r "$F3DIR"
 
 git clone "https://github.com/bcosca/fatfree-core.git" "$F3DIR"
 pushd "$F3DIR" > /dev/null
-git checkout -q "b284f0c482e858f0162cab529925e7de14d90746" # v3.5.0
+git checkout -q "069ccd84afd2461c7ebb67f660c142f97577e661" # v3.5.2-dev
 popd > /dev/null
 
 php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid