projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull merge.
[yaffs-website]
/
web
/
core
/
lib
/
Drupal
/
Core
/
Path
/
CurrentPathStack.php
diff --git
a/web/core/lib/Drupal/Core/Path/CurrentPathStack.php
b/web/core/lib/Drupal/Core/Path/CurrentPathStack.php
index cb7878650fcdbd96713ee471c85d48269faba90d..51b97cd71e1b59db25dd2650dcb66e88a3fe10bc 100644
(file)
--- a/
web/core/lib/Drupal/Core/Path/CurrentPathStack.php
+++ b/
web/core/lib/Drupal/Core/Path/CurrentPathStack.php
@@
-1,6
+1,8
@@
<?php
namespace Drupal\Core\Path;
<?php
namespace Drupal\Core\Path;
+
+use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
/**
use Symfony\Component\HttpFoundation\RequestStack;
/**
@@
-46,7
+48,7
@@
class CurrentPathStack {
* @return string
* Returns the path, without leading slashes.
*/
* @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();
}
if (!isset($request)) {
$request = $this->requestStack->getCurrentRequest();
}
@@
-67,7
+69,7
@@
class CurrentPathStack {
*
* @return $this
*/
*
* @return $this
*/
- public function setPath($path, $request = NULL) {
+ public function setPath($path,
Request
$request = NULL) {
if (!isset($request)) {
$request = $this->requestStack->getCurrentRequest();
}
if (!isset($request)) {
$request = $this->requestStack->getCurrentRequest();
}