Skip to content

Commit b24ba3f

Browse files
Merge branch '3.4' into 4.3
* 3.4: Fix inconsistent return points. [Security/Core] UserInterface::getPassword() can return null [Router] Fix TraceableUrlMatcher behaviour with trailing slash
2 parents b3d9457 + 09ca9e4 commit b24ba3f

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

Compiler/CheckArgumentsValidityPass.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,7 @@ protected function processValue($value, $isRoot = false)
8181
}
8282
}
8383
}
84+
85+
return null;
8486
}
8587
}

EnvVarProcessor.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
120120

121121
if (false !== $i || 'string' !== $prefix) {
122122
if (null === $env = $getEnv($name)) {
123-
return;
123+
return null;
124124
}
125125
} elseif (isset($_ENV[$name])) {
126126
$env = $_ENV[$name];
@@ -132,7 +132,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
132132
}
133133

134134
if (null === $env = $this->container->getParameter("env($name)")) {
135-
return;
135+
return null;
136136
}
137137
}
138138

LazyProxy/ProxyHelper.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionPa
5050
if ('self' === $lcName) {
5151
return $prefix.$r->getDeclaringClass()->name;
5252
}
53-
if ($parent = $r->getDeclaringClass()->getParentClass()) {
54-
return $prefix.$parent->name;
55-
}
53+
54+
return ($parent = $r->getDeclaringClass()->getParentClass()) ? $prefix.$parent->name : null;
5655
}
5756
}

0 commit comments

Comments
 (0)