diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:51:29 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:51:29 +0200 |
| commit | 1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6 (patch) | |
| tree | 891277758f0876cb4661392b88a2e2be5523598c /phpBB/phpbb/event/kernel_request_subscriber.php | |
| parent | 71379c3a0f32b57d9d7c73dda7a98edea0ce6736 (diff) | |
| parent | 346c6f39980fe060b57549a8364f2e5dece1eb83 (diff) | |
| download | forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.tar forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.tar.gz forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.tar.bz2 forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.tar.xz forums-1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6.zip | |
Merge pull request #2397 from Nicofuma/ticket/11497
[ticket/11497] Remove 'ext.finder' from services' list
* Nicofuma/ticket/11497:
[ticket/11497] Rename set_ext_finder in find_routing_files
[ticket/11497] Change the date in the package declaration
[ticket/11497] Fix pagination tests
[ticket/11497] Use a mock object to define the root folder for the finder
[ticket/11497] Generate the list of the routes in controller_helper
[ticket/11497] Fix the path for the finder in controller_provider
[ticket/11497] Fix tests
[ticket/11497] Update pagination test
[ticket/11497] Remove 'ext.finder' from services' list
Diffstat (limited to 'phpBB/phpbb/event/kernel_request_subscriber.php')
| -rw-r--r-- | phpBB/phpbb/event/kernel_request_subscriber.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/phpBB/phpbb/event/kernel_request_subscriber.php b/phpBB/phpbb/event/kernel_request_subscriber.php index 7d5418498b..a39d622273 100644 --- a/phpBB/phpbb/event/kernel_request_subscriber.php +++ b/phpBB/phpbb/event/kernel_request_subscriber.php @@ -18,10 +18,10 @@ use Symfony\Component\Routing\RequestContext; class kernel_request_subscriber implements EventSubscriberInterface { /** - * Extension finder object - * @var \phpbb\extension\finder + * Extension manager object + * @var \phpbb\extension\manager */ - protected $finder; + protected $manager; /** * PHP extension @@ -38,15 +38,15 @@ class kernel_request_subscriber implements EventSubscriberInterface /** * Construct method * - * @param \phpbb\extension\finder $finder Extension finder object + * @param \phpbb\extension\manager $manager Extension manager object * @param string $root_path Root path * @param string $php_ext PHP extension */ - public function __construct(\phpbb\extension\finder $finder, $root_path, $php_ext) + public function __construct(\phpbb\extension\manager $manager, $root_path, $php_ext) { - $this->finder = $finder; $this->root_path = $root_path; $this->php_ext = $php_ext; + $this->manager = $manager; } /** @@ -55,6 +55,7 @@ class kernel_request_subscriber implements EventSubscriberInterface * This is responsible for setting up the routing information * * @param GetResponseEvent $event + * @throws \BadMethodCallException * @return null */ public function on_kernel_request(GetResponseEvent $event) @@ -63,7 +64,7 @@ class kernel_request_subscriber implements EventSubscriberInterface $context = new RequestContext(); $context->fromRequest($request); - $matcher = phpbb_get_url_matcher($this->finder, $context, $this->root_path, $this->php_ext); + $matcher = phpbb_get_url_matcher($this->manager, $context, $this->root_path, $this->php_ext); $router_listener = new RouterListener($matcher, $context); $router_listener->onKernelRequest($event); } |