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

Replacing hardcoded protocol in mix helper #18943

Merged
merged 4 commits into from
Apr 26, 2017
Merged

Replacing hardcoded protocol in mix helper #18943

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0d8cd3
Replacing hardcoded protocol in mix helper
OwenMelbz Apr 26, 2017
143b70d
Code styling changes
OwenMelbz Apr 26, 2017
b60e3e6
simplified :)
OwenMelbz Apr 26, 2017
a93576a
Update helpers.php
taylorotwell Apr 26, 2017
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
4 changes: 3 additions & 1 deletion src/Illuminate/Foundation/helpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,9 @@ function mix($path, $manifestDirectory = '')
}

if (file_exists(public_path($manifestDirectory.'/hot'))) {
return new HtmlString("http://localhost:8080{$path}");
$hotProtocol = request()->secure() ? 'https' : 'http';

return new HtmlString("{$hotProtocol}://localhost:8080{$path}");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can simply use a protocol-relative URL:

return new HtmlString("//localhost:8080{$path}");

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ha sure, that also works, guess I definitely over engineered that :D

}

if (! $manifest) {
Expand Down