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

[6.x] Fix FilesystemManager unwanted changes #30369

Merged
merged 2 commits into from Oct 21, 2019

Conversation

@netpok
Copy link
Contributor

netpok commented Oct 21, 2019

#30331 Introduced the following changes:

When a disk named local have no driver it thrown an exception in the previous version (through multiple levels of non-existing array keys). With this merge it will resolve to local driver.

Also it will try to create drivers for non existing disks: if filesystems.php has no disk named local the Storage::disk('local') will still try to create a local disk (actually it will fail because it tries to pass a null to a method which has an array typehint, but that's an other story).

This pull request

  • restores the original working principle
  • handles the root problem that made #30331 necessary
  • Updates the test to use local disk, so a similar problem wont happen again
netpok added 2 commits Oct 21, 2019
@netpok netpok changed the title Fix FilesystemManager unwanted changes [6.x] Fix FilesystemManager unwanted changes Oct 21, 2019
@taylorotwell taylorotwell merged commit 0087f11 into laravel:6.x Oct 21, 2019
2 checks passed
2 checks passed
continuous-integration/styleci/pr The analysis has passed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@netpok netpok deleted the netpok:bugfix/filesystem-resolver branch Oct 22, 2019
ginnerpeace added a commit to ginnerpeace/framework that referenced this pull request Oct 28, 2019
* Update expected exception and target disk in test

* Fix filesystem disk resolving
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.