8000 Remove interface · symfony/symfony@fc0b374 · GitHub
[go: up one dir, main page]

Skip to content

Commit fc0b374

Browse files
committed
Remove interface
1 parent eb61d05 commit fc0b374

File tree

2 files changed

+16
-37
lines changed

2 files changed

+16
-37
lines changed

src/Symfony/Bundle/SecurityBundle/Security/ContextAwareFirewallMapInterface.php

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Component\HttpFoundation\Request;
1515
use Symfony\Component\DependencyInjection\ContainerInterface;
16+
use Symfony\Component\Security\Http\FirewallMapInterface;
1617

1718
/**
1819
* This is a lazy-loading firewall map implementation.
@@ -21,7 +22,7 @@
2122
*
2223
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
2324
*/
24-
class FirewallMap implements ContextAwareFirewallMapInterface
25+
class FirewallMap implements FirewallMapInterface
2526
{
2627
protected $container;
2728
protected $map;
@@ -39,7 +40,7 @@ public function __construct(ContainerInterface $container, array $map)
3940
*/
4041
public function getListeners(Request $request)
4142
{
42-
$context = $this->getContext($request);
43+
$context = $this->getFirewallContext($request);
4344

4445
if (null === $context) {
4546
return array(array(), null);
@@ -49,9 +50,20 @@ public function getListeners(Request $request)
4950
}
5051

5152
/**
52-
* {@inheritdoc}
53+
* @return FirewallConfig|null
5354
*/
54-
public function getContext(Request $request)
55+
public function getFirewallConfig(Request $request)
56+
{
57+
$context = $this->getFirewallContext($request);
58+
59+
if (null === $context) {
60+
return;
61+
}
62+
63+
return $context->getConfig();
64+
}
65+
66+
private function getFirewallContext(Request $request)
5567
{
5668
if ($this->contexts->contains($request)) {
5769
return $this->contexts[$request];

0 commit comments

Comments
 (0)
0