Skip to content

[5.4] Why do service providers depend on helper functions? #18506

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

Merged
merged 3 commits into from
Mar 27, 2017
Merged

[5.4] Why do service providers depend on helper functions? #18506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60052ba
Update MailServiceProvider.php
collegeman Mar 27, 2017
dfda0af
Update helpers.php
collegeman Mar 27, 2017
faf059c
Update Application.php
collegeman Mar 27, 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
5 changes: 3 additions & 2 deletions src/Illuminate/Foundation/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,11 +404,12 @@ public function useStoragePath($path)
/**
* Get the path to the resources directory.
*
* @param string $path
* @return string
*/
public function resourcePath()
public function resourcePath($path = '')
{
return $this->basePath.DIRECTORY_SEPARATOR.'resources';
return $this->basePath.DIRECTORY_SEPARATOR.'resources'.($path ? DIRECTORY_SEPARATOR.$path : $path);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/helpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,7 @@ function resolve($name)
*/
function resource_path($path = '')
{
return app()->resourcePath().($path ? DIRECTORY_SEPARATOR.$path : $path);
return app()->resourcePath($path);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/MailServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ protected function registerMarkdownRenderer()
{
if ($this->app->runningInConsole()) {
$this->publishes([
__DIR__.'/resources/views' => resource_path('views/vendor/mail'),
__DIR__.'/resources/views' => $this->app->resourcePath('views/vendor/mail'),
], 'laravel-mail');
}

Expand Down