joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Worked through some bugs, updated dependencies

Browse source 
The vendor directory is now just composer stuff. Planning to rearrange some
files soon but wanted to commit these changes. AYAH is now installed via
composer from a package I am maintaining and I dropped the test helpers as it
is a dev-only requirement (and that's assuming you even want to test).
This commit is contained in:
Joshua Sherman 2014-01-20 22:06:59 -05:00
parent c9f39e2e18
commit 293f618bef
43 changed files with 160 additions and 3148 deletions
Download patch file Download diff file Expand all files Collapse all files

15
classes/Config.php
View file

@ -140,19 +140,10 @@ class Config extends Object
// Defaults profiler to true if it doesn't match an option exactly
if (isset($this->data['pickles']['profiler']))
{
if ($this->data['pickles']['profiler'] !== true)
// If we have an array convert to a string
if (is_array($this->data['pickles']['profiler']))
{
// If we have an array convert to a string
if (is_array($this->data['pickles']['profiler']))
{
$this->data['pickles']['profiler'] = implode(',', $this->data['pickles']['profiler']);
}
// Checks that one of our known values exists, if not, force true
if (preg_match('/(objects|timers|queries|explains)/', $this->data['pickles']['profiler']) == false)
{
$this->data['pickles']['profiler'] = true;
}
$this->data['pickles']['profiler'] = implode(',', $this->data['pickles']['profiler']);
}
}
else