Skip to content

Commit 483ab40

Browse files
committed
Merge branch '3.4' into 4.0
* 3.4: Env var maps to undefined constant. [SecurityBundle] Backport test [Security] fix merge of 2.7 into 2.8 + add test case backport regression test from 3.4 do not mock the container builder or definitions fixed CS [TwigBundle] Register TwigBridge extensions first [WebProfilerBundle] Fix sub request link PhpDocExtractor::getTypes() throws fatal error when type omitted Fix misspelling variable use libsodium to run Argon2i related tests [DI] minor: use a strict comparision in setDecoratedService [HttpKernel] fix FC Follow-on to #25825: Fix edge case in getParameterOption. keep the context when validating forms
2 parents fe86a4c + 450789d commit 483ab40

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Definition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function getFactory()
128128
*/
129129
public function setDecoratedService($id, $renamedId = null, $priority = 0)
130130
{
131-
if ($renamedId && $id == $renamedId) {
131+
if ($renamedId && $id === $renamedId) {
132132
throw new InvalidArgumentException(sprintf('The decorated service inner name for "%s" must be different than the service name itself.', $id));
133133
}
134134

EnvVarProcessor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
114114
throw new RuntimeException(sprintf('Env var "%s" maps to undefined constant "%s".', $name, $env));
115115
}
116116

117-
return constant($name);
117+
return constant($env);
118118
}
119119

120120
if ('base64' === $prefix) {

0 commit comments

Comments
 (0)