Skip to content

Commit 86c70b4

Browse files
Merge branch '2.3' into 2.6
* 2.3: [2.3][Debug] Fix fatal-errors handling on HHVM Standardize the name of the exception variables [2.3] Static Code Analysis for Components Remove duplicated paths Conflicts: src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php src/Symfony/Component/Security/Acl/Dbal/AclProvider.php src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
2 parents 801a917 + a6b7a4b commit 86c70b4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Compiler/ResolveInvalidReferencesPass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function process(ContainerBuilder $container)
4747
foreach ($definition->getMethodCalls() as $call) {
4848
try {
4949
$calls[] = array($call[0], $this->processArguments($call[1], true));
50-
} catch (RuntimeException $ignore) {
50+
} catch (RuntimeException $e) {
5151
// this call is simply removed
5252
}
5353
}
@@ -58,7 +58,7 @@ public function process(ContainerBuilder $container)
5858
try {
5959
$value = $this->processArguments(array($value), true);
6060
$properties[$name] = reset($value);
61-
} catch (RuntimeException $ignore) {
61+
} catch (RuntimeException $e) {
6262
// ignore property
6363
}
6464
}

Dumper/GraphvizDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ private function addOptions($options)
278278
*/
279279
private function dotize($id)
280280
{
281-
return strtolower(preg_replace('/[^\w]/i', '_', $id));
281+
return strtolower(preg_replace('/\W/i', '_', $id));
282282
}
283283

284284
/**

0 commit comments

Comments
 (0)