From 1239197d6af5b4db2cfa80284c369c8f928beccb Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Mon, 19 Jun 2017 09:48:36 -0400
Subject: [PATCH] Issue #2887179 by pasan.gamage, jibran, xjm, larowlan: Fix
 the typehinting in CurrentPathStack

---
 core/lib/Drupal/Core/Path/CurrentPathStack.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/lib/Drupal/Core/Path/CurrentPathStack.php b/core/lib/Drupal/Core/Path/CurrentPathStack.php
index cb7878650fc..51b97cd71e1 100644
--- a/core/lib/Drupal/Core/Path/CurrentPathStack.php
+++ b/core/lib/Drupal/Core/Path/CurrentPathStack.php
@@ -1,6 +1,8 @@
 <?php
 
 namespace Drupal\Core\Path;
+
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
@@ -46,7 +48,7 @@ class CurrentPathStack {
    * @return string
    *   Returns the path, without leading slashes.
    */
-  public function getPath($request = NULL) {
+  public function getPath(Request $request = NULL) {
     if (!isset($request)) {
       $request = $this->requestStack->getCurrentRequest();
     }
@@ -67,7 +69,7 @@ class CurrentPathStack {
    *
    * @return $this
    */
-  public function setPath($path, $request = NULL) {
+  public function setPath($path, Request $request = NULL) {
     if (!isset($request)) {
       $request = $this->requestStack->getCurrentRequest();
     }