Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.8] Rename $cachedSchema property to $cachedScheme in Routing\UrlGenerator #26728

Merged
merged 1 commit into from
Dec 4, 2018
Merged

[5.8] Rename $cachedSchema property to $cachedScheme in Routing\UrlGenerator #26728

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/Illuminate/Routing/UrlGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,9 @@ class UrlGenerator implements UrlGeneratorContract
/**
* A cached copy of the URL scheme for the current request.
*
* @deprecated In 5.8, this will change to $cachedScheme
* @var string|null
*/
protected $cachedSchema;
protected $cachedScheme;

/**
* The root namespace being applied to controller actions.
Expand Down Expand Up @@ -300,11 +299,11 @@ public function formatScheme($secure = null)
return $secure ? 'https://' : 'http://';
}

if (is_null($this->cachedSchema)) {
$this->cachedSchema = $this->forceScheme ?: $this->request->getScheme().'://';
if (is_null($this->cachedScheme)) {
$this->cachedScheme = $this->forceScheme ?: $this->request->getScheme().'://';
}

return $this->cachedSchema;
return $this->cachedScheme;
}

/**
Expand Down Expand Up @@ -584,7 +583,7 @@ public function getDefaultParameters()
*/
public function forceScheme($scheme)
{
$this->cachedSchema = null;
$this->cachedScheme = null;

$this->forceScheme = $scheme.'://';
}
Expand Down Expand Up @@ -661,7 +660,7 @@ public function setRequest(Request $request)
$this->request = $request;

$this->cachedRoot = null;
$this->cachedSchema = null;
$this->cachedScheme = null;
$this->routeGenerator = null;
}

Expand Down