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
/
ResolveParameterPlaceHoldersPass.php
diff --git
a/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php
b/vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php
index 9733e5d0943336db78da17762ca8f86386852d5a..9a59a73ec5e12f9d9702c0f061313ed40d00a828 100644
(file)
--- a/
vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php
+++ b/
vendor/symfony/dependency-injection/Compiler/ResolveParameterPlaceHoldersPass.php
@@
-60,10
+60,10
@@
class ResolveParameterPlaceHoldersPass extends AbstractRecursivePass
protected function processValue($value, $isRoot = false)
{
protected function processValue($value, $isRoot = false)
{
- if (is_string($value)) {
+ if (
\
is_string($value)) {
$v = $this->bag->resolveValue($value);
$v = $this->bag->resolveValue($value);
- return $this->resolveArrays || !$v || !is_array($v) ? $v : $value;
+ return $this->resolveArrays || !$v || !
\
is_array($v) ? $v : $value;
}
if ($value instanceof Definition) {
$value->setBindings($this->processValue($value->getBindings()));
}
if ($value instanceof Definition) {
$value->setBindings($this->processValue($value->getBindings()));
@@
-78,7
+78,7
@@
class ResolveParameterPlaceHoldersPass extends AbstractRecursivePass
$value = parent::processValue($value, $isRoot);
$value = parent::processValue($value, $isRoot);
- if ($value && is_array($value)) {
+ if ($value &&
\
is_array($value)) {
$value = array_combine($this->bag->resolveValue(array_keys($value)), $value);
}
$value = array_combine($this->bag->resolveValue(array_keys($value)), $value);
}