From 1a3bf508552f6f70e6e1c96b9d77db21389c872c Mon Sep 17 00:00:00 2001 From: Dimitriy Remerov Date: Thu, 7 Apr 2016 13:07:48 +0200 Subject: [PATCH] empty-values: Added support of empty strings --- Processor.php | 2 +- Tests/fixtures/testcases/non_existent_with_environment/dist.yml | 1 + .../testcases/non_existent_with_environment/expected.yml | 1 + .../fixtures/testcases/non_existent_with_environment/setup.yml | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Processor.php b/Processor.php index 6dc208f..5ee25f1 100644 --- a/Processor.php +++ b/Processor.php @@ -112,7 +112,7 @@ private function getEnvValues(array $envMap) $params = array(); foreach ($envMap as $param => $env) { $value = getenv($env); - if ($value) { + if ($value !== false) { $params[$param] = Inline::parse($value); } } diff --git a/Tests/fixtures/testcases/non_existent_with_environment/dist.yml b/Tests/fixtures/testcases/non_existent_with_environment/dist.yml index 45f3fdd..e6e84d7 100644 --- a/Tests/fixtures/testcases/non_existent_with_environment/dist.yml +++ b/Tests/fixtures/testcases/non_existent_with_environment/dist.yml @@ -2,6 +2,7 @@ parameters: foo: bar boolean: false another: ~ + empty: nonempty nested: foo: bar bar: baz diff --git a/Tests/fixtures/testcases/non_existent_with_environment/expected.yml b/Tests/fixtures/testcases/non_existent_with_environment/expected.yml index 45b12e2..7abe179 100644 --- a/Tests/fixtures/testcases/non_existent_with_environment/expected.yml +++ b/Tests/fixtures/testcases/non_existent_with_environment/expected.yml @@ -3,6 +3,7 @@ parameters: foo: foobar boolean: true another: null + empty: '' nested: foo: env_foo bar: diff --git a/Tests/fixtures/testcases/non_existent_with_environment/setup.yml b/Tests/fixtures/testcases/non_existent_with_environment/setup.yml index 684e4de..d6d7aba 100644 --- a/Tests/fixtures/testcases/non_existent_with_environment/setup.yml +++ b/Tests/fixtures/testcases/non_existent_with_environment/setup.yml @@ -6,8 +6,10 @@ config: foo: IC_TEST_FOO nested: IC_TEST_NESTED another: IC_TEST_NOT_SET + empty: IC_TEST_EMPTY environment: IC_TEST_BOOL: 'true' IC_TEST_FOO: 'foobar' IC_TEST_NESTED: '{foo: env_foo, bar: [env, test, null]}' + IC_TEST_EMPTY: ''