Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupal-3485117
Manage
Activity
Members
Labels
Plan
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Issue forks
drupal-3485117
Commits
807947c9
Commit
807947c9
authored
12 years ago
by
Larry Garfield
Browse files
Options
Downloads
Patches
Plain Diff
Clean up and document private property overrides.
parent
9fdd40f8
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/lib/Drupal/Core/DrupalKernel.php
+0
-17
0 additions, 17 deletions
core/lib/Drupal/Core/DrupalKernel.php
core/lib/Drupal/Core/EventSubscriber/RouterListener.php
+16
-0
16 additions, 0 deletions
core/lib/Drupal/Core/EventSubscriber/RouterListener.php
with
16 additions
and
17 deletions
core/lib/Drupal/Core/DrupalKernel.php
+
0
−
17
View file @
807947c9
...
...
@@ -34,21 +34,6 @@
*/
class
DrupalKernel
extends
HttpKernel
{
/**
* The event dispatcher used by this kernel.
*
* @var Symfony\Component\EventDispatcher\EventDispatcherInterface
*/
protected
$dispatcher
;
/**
* The controller resolver that will extract the controller from a Request.
*
* @var Symfony\Component\HttpKernel\Controller\ControllerResolverInterface
*/
protected
$resolver
;
/**
* Constructor.
*
...
...
@@ -59,8 +44,6 @@ class DrupalKernel extends HttpKernel {
*/
public
function
__construct
(
EventDispatcherInterface
$dispatcher
,
ControllerResolverInterface
$resolver
)
{
parent
::
__construct
(
$dispatcher
,
$resolver
);
$this
->
dispatcher
=
$dispatcher
;
$this
->
resolver
=
$resolver
;
$this
->
matcher
=
new
UrlMatcher
();
$this
->
dispatcher
->
addSubscriber
(
new
RouterListener
(
$this
->
matcher
));
...
...
This diff is collapsed.
Click to expand it.
core/lib/Drupal/Core/EventSubscriber/RouterListener.php
+
16
−
0
View file @
807947c9
...
...
@@ -12,6 +12,7 @@
use
Symfony\Component\HttpKernel\Event\GetResponseEvent
;
use
Symfony\Component\HttpKernel\Exception\NotFoundHttpException
;
use
Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException
;
use
Symfony\Component\HttpKernel\Log\LoggerInterface
;
use
Symfony\Component\Routing\Matcher\UrlMatcherInterface
;
use
Symfony\Component\Routing\Exception\ResourceNotFoundException
;
use
Symfony\Component\Routing\Exception\MethodNotFoundException
;
...
...
@@ -23,7 +24,22 @@
*/
class
RouterListener
extends
SymfonyRouterListener
{
/**
* The Matcher object for this listener.
*
* This property is private in the base class, so we have to hack around it.
*
* @var Symfony\Component\Router\Matcher\UrlMatcherInterface
*/
protected
$urlMatcher
;
/**
* The Logging object for this listener.
*
* This property is private in the base class, so we have to hack around it.
*
* @var Symfony\Component\HttpKernel\Log\LoggerInterface
*/
protected
$logger
;
public
function
__construct
(
UrlMatcherInterface
$urlMatcher
,
LoggerInterface
$logger
=
null
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment