summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-02-21 15:56:12 -0500
committerFrederic Guillot <fred@kanboard.net>2015-02-21 15:56:12 -0500
commit279ad3c17ea993d3a20c136b45223cc53a6ad0ca (patch)
tree0e9d49e9afa6f76c4b3b2f54b187a5ae8a106a92
parent48ef507b077e02cb9cf7327ad331cd1d2b0058a6 (diff)
Add Debian 6 in Vagrantfile to test with PHP 5.3.3
-rw-r--r--Vagrantfile6
-rw-r--r--app/Controller/Base.php2
2 files changed, 7 insertions, 1 deletions
diff --git a/Vagrantfile b/Vagrantfile
index 46312e3a..89d950ee 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -90,6 +90,12 @@ Vagrant.configure("2") do |config|
m.vm.synced_folder ".", "/var/www", owner: "www-data", group: "www-data"
end
+ config.vm.define "debian6" do |m|
+ m.vm.box = "chef/debian-6.0.10"
+ m.vm.provision "shell", inline: $script_sqlite
+ m.vm.synced_folder ".", "/var/www", owner: "www-data", group: "www-data"
+ end
+
config.vm.define "centos7" do |m|
m.vm.box = "chef/centos-7.0"
m.vm.synced_folder ".", "/var/www/html", owner: "apache", group: "apache"
diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index 548fdb40..d949048d 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -119,7 +119,7 @@ abstract class Base
}
$this->container['logger']->debug('SQL_QUERIES={nb}', array('nb' => $this->container['db']->nb_queries));
- $this->container['logger']->debug('RENDERING={time}', array('time' => microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']));
+ $this->container['logger']->debug('RENDERING={time}', array('time' => microtime(true) - @$_SERVER['REQUEST_TIME_FLOAT']));
}
}