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.

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.5] Fix custom URLs with prefix/root for AWS storage #22130

Merged
merged 1 commit into from
Nov 19, 2017

Conversation

tillkruss
Copy link
Contributor

This PR fixes a corner case of #22037 where the "path prefix" (or root) wasn't considered.

The "path prefix" is prepended to the path in all other cases, see path(), getAwsUrl() and getAwsTemporaryUrl().

Also, the temporary variable $config isn't necessary and was inlined.

@tillkruss tillkruss changed the title Fix custom URLs for AWS storage [5.5] Fix custom URLs for AWS storage Nov 18, 2017
@tillkruss tillkruss changed the title [5.5] Fix custom URLs for AWS storage [5.5] Fix custom URLs with prefix/root for AWS storage Nov 18, 2017
@GrahamCampbell
Copy link
Member

👍

@ntzm
Copy link
Contributor

ntzm commented Nov 18, 2017

Might be worth adding a test to prevent regression?

@sisve
Copy link
Contributor

sisve commented Nov 18, 2017

This will be a breaking change for everyone using the new url feature. I'm one of those. Do we expect them all to read the issues/pr list daily to figure out the ongoing changes in the framework?

This should be a 5.6 change. And this should clearly show that we need a proper qa setup instead of the current way of accept-quickly-and-later-fix-it approach.

@tillkruss
Copy link
Contributor Author

@sisve: I understand your concern. IMO this is a bug fix, because the root config parameter wasn't considered.

@paulofreitas
Copy link
Contributor

If I'm not wrong this would only affect the existing code if you have added a root config option to your s3 disk config in config/filesystems.php - it's not there by default and it's not even documented, so it seems to me that it wouldn't be affecting everyone. 👍

@tillkruss
Copy link
Contributor Author

Correct.

@sisve
Copy link
Contributor

sisve commented Nov 19, 2017

@paulofreitas It's not documented in the official docs, but it is not a secret. See it more as a problem on the qa department that we release new stuff but forget to update the documentation.

https://laravel-news.com/laravel-v5-5-21-released
https://medium.com/laravel-announcements/laravel-v5-5-21-released-aca3af740f79
https://twitter.com/LaravelLog/status/930500590400139266

@taylorotwell taylorotwell merged commit 41ea7cc into laravel:5.5 Nov 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants