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.1] Deal with cases when the manifest is empty #14030

Merged
merged 2 commits into from
Jun 17, 2016
Merged
Changes from 1 commit
Commits
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
Next Next commit
Deal with cases when the manifest is empty
GrahamCampbell authored Jun 17, 2016
commit 191b3781dc5c92dfd08e6783a0ae982cda9faa86
2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/ProviderRepository.php
Original file line number Diff line number Diff line change
@@ -171,7 +171,7 @@ public function loadManifest()
if ($this->files->exists($this->manifestPath)) {
$manifest = json_decode($this->files->get($this->manifestPath), true);

return array_merge(['when' => []], $manifest);
return array_merge(['when' => []], $manifest ?: []);
}
}