Merge pull request #83 from p0lemic/allow-arguments-with-variables-in…

…-services-definition Allow arguments with variables in services definition
sifophp · Aug 5, 2019 · e8244ea · e8244ea
2 parents 42aac85 + 49df52e
commit e8244ea
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Sifo/DependencyInjector.php b/src/Sifo/DependencyInjector.php
@@ -455,7 +455,7 @@ private function getSetterInjectionsCalls($declaration, $compiled_services)
 
     private function isAVariableArgument($argument): bool
     {
-        return !is_array($argument) && strpos($argument, '%') !== 0;
+        return !is_array($argument) && preg_match('/%([^%\s]+)%/', $argument);
     }
 
     private function isALiteralArgument($argument): bool
@@ -470,9 +470,9 @@ private function isAnArray($dependency)
 
     private function getVariableArgumentCompilation($argument): string
     {
-        $variable_name = trim('%', $argument);
+        $variable_name = trim($argument, '%');
 
-        return $_ENV[$variable_name] ?? '';
+        return $_ENV[$variable_name] ? "\x20\x20\x20\x20\x20\x20\x20\x20'" . $_ENV[$variable_name] . "'" : '';
     }
 
     private function getLiteralArgumentCompilation($argument)