projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added the Search API Synonym module to deal specifically with licence and license...
[yaffs-website]
/
vendor
/
symfony
/
dependency-injection
/
Compiler
/
ResolveEnvPlaceholdersPass.php
diff --git
a/vendor/symfony/dependency-injection/Compiler/ResolveEnvPlaceholdersPass.php
b/vendor/symfony/dependency-injection/Compiler/ResolveEnvPlaceholdersPass.php
index f42107c6f7fd297007ea9f751cdfc982d7426583..9e1edd4d3156885de631a460d12f512a5ba20635 100644
(file)
--- a/
vendor/symfony/dependency-injection/Compiler/ResolveEnvPlaceholdersPass.php
+++ b/
vendor/symfony/dependency-injection/Compiler/ResolveEnvPlaceholdersPass.php
@@
-20,7
+20,7
@@
class ResolveEnvPlaceholdersPass extends AbstractRecursivePass
{
protected function processValue($value, $isRoot = false)
{
{
protected function processValue($value, $isRoot = false)
{
- if (is_string($value)) {
+ if (
\
is_string($value)) {
return $this->container->resolveEnvPlaceholders($value, true);
}
if ($value instanceof Definition) {
return $this->container->resolveEnvPlaceholders($value, true);
}
if ($value instanceof Definition) {
@@
-35,7
+35,7
@@
class ResolveEnvPlaceholdersPass extends AbstractRecursivePass
$value = parent::processValue($value, $isRoot);
$value = parent::processValue($value, $isRoot);
- if ($value && is_array($value) && !$isRoot) {
+ if ($value &&
\
is_array($value) && !$isRoot) {
$value = array_combine($this->container->resolveEnvPlaceholders(array_keys($value), true), $value);
}
$value = array_combine($this->container->resolveEnvPlaceholders(array_keys($value), true), $value);
}