diff --git a/src/Config.php b/src/Config.php index 35ce774..0d3f226 100644 --- a/src/Config.php +++ b/src/Config.php @@ -139,7 +139,7 @@ class Config extends \ArrayObject $config['environment'] = $environment; // Defaults expected Pickles variables to false - foreach (['cache', 'profiler'] as $variable) + foreach (['auth', 'cache', 'profiler'] as $variable) { if (!isset($config['pickles'][$variable])) { diff --git a/tests/ResourceTest.php b/tests/ResourceTest.php index d9704b9..eeb7d24 100644 --- a/tests/ResourceTest.php +++ b/tests/ResourceTest.php @@ -67,6 +67,32 @@ namespace { class ResourceTest extends PHPUnit_Framework_TestCase { + public function setUp() + { + $_SERVER['REQUEST_METHOD'] = 'GET'; + $_SERVER['SERVER_NAME'] = '127.0.0.1'; + + file_put_contents('/tmp/pickles.php', ' [ + "local" => "127.0.0.1", + "production" => "123.456.789.0", + ], + "pickles" => [ + "namespace" => "", + "datasource" => "mysql", + ], + "datasources" => [ + "mysql" => [ + "driver" => "pdo_mysql", + ], + ], + ]; + '); + + Pickles\Config::getInstance('/tmp/pickles.php'); + } + public function testFilterAndValidate() { $response = json_encode([ @@ -211,6 +237,37 @@ namespace new Pickles\Router(); } + + public function testProfiler() + { + $this->expectOutputRegex('/"profiler":{/'); + + file_put_contents('/tmp/pickles.php', ' [ + "local" => "127.0.0.1", + "production" => "123.456.789.0", + ], + "pickles" => [ + "namespace" => "", + "datasource" => "mysql", + "profiler" => true, + ], + "datasources" => [ + "mysql" => [ + "driver" => "pdo_mysql", + ], + ], + ]; + '); + + Pickles\Config::getInstance('/tmp/pickles.php'); + + $_SERVER['REQUEST_METHOD'] = 'PUT'; + $_REQUEST['request'] = 'v1/resource/1'; + + new Pickles\Router(); + } } }