diff --git a/core/lib/Drupal/Core/Access/CsrfAccessCheck.php b/core/lib/Drupal/Core/Access/CsrfAccessCheck.php index 8812384..277cb21 100644 --- a/core/lib/Drupal/Core/Access/CsrfAccessCheck.php +++ b/core/lib/Drupal/Core/Access/CsrfAccessCheck.php @@ -4,7 +4,6 @@ use Drupal\Core\Routing\Access\AccessInterface as RoutingAccessInterface; use Drupal\Core\Routing\RouteMatchInterface; -use Drupal\Core\Session\AccountInterface; use Drupal\Core\Session\SessionConfigurationInterface; use Symfony\Component\Routing\Route; use Symfony\Component\HttpFoundation\Request; @@ -26,6 +25,8 @@ class CsrfAccessCheck implements RoutingAccessInterface { protected $csrfToken; /** + * The Session configuration interface. + * * @var \Drupal\Core\Session\SessionConfigurationInterface */ protected $sessionConfiguration; diff --git a/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php b/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php index 748d7b8..69b4f90 100644 --- a/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php +++ b/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php @@ -22,11 +22,15 @@ class RouteProcessorCsrf implements OutboundRouteProcessorInterface { protected $csrfToken; /** + * The Session configuration interface. + * * @var \Drupal\Core\Session\SessionConfigurationInterface */ protected $sessionConfiguration; /** + * The Request stack. + * * @var \Symfony\Component\HttpFoundation\RequestStack */ protected $requestStack; @@ -37,7 +41,7 @@ class RouteProcessorCsrf implements OutboundRouteProcessorInterface { * @param \Drupal\Core\Access\CsrfTokenGenerator $csrf_token * The CSRF token generator. */ - function __construct(CsrfTokenGenerator $csrf_token, SessionConfigurationInterface $session_configuration, RequestStack $request_stack) { + public function __construct(CsrfTokenGenerator $csrf_token, SessionConfigurationInterface $session_configuration, RequestStack $request_stack) { $this->csrfToken = $csrf_token; $this->sessionConfiguration = $session_configuration; $this->requestStack = $request_stack; diff --git a/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php index b4761ce..a330314 100644 --- a/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php +++ b/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php @@ -33,9 +33,9 @@ class CsrfAccessCheckTest extends UnitTestCase { * * @var \Drupal\Core\Session\SessionConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject */ - protected $sessionConfiguration; + protected $sessionConfiguration; - protected function setUp() { + protected function setUp() { $this->csrfToken = $this->getMockBuilder('Drupal\Core\Access\CsrfTokenGenerator') ->disableOriginalConstructor() ->getMock(); diff --git a/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php b/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php index 72a2718..0a2acec 100644 --- a/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php +++ b/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php @@ -29,6 +29,8 @@ class RouteProcessorCsrfTest extends UnitTestCase { protected $processor; /** + * The Session configuration interface. + * * @var \Drupal\Core\Session\SessionConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $sessionConfiguration;