Skip to content

update for laravel 5 #3

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

Open
craigjmidwinter wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update for laravel 5 #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 20 additions & 19 deletions src/Dcarrith/LxMPD/LxMPDServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ class LxMPDServiceProvider extends ServiceProvider {
*/
protected $defer = false;

/**
* Bootstrap the application events.
*
* @return void
*/
public function boot()
{
//$this->package('dcarrith/lxmpd');
$this->publishes(array(
__DIR__.'/../../config/config.php' => config_path('lxmpd.php')
));
}
/**
* Bootstrap the application events.
*
* @return void
*/
public function boot()
{
//$this->package('dcarrith/lxmpd');
$this->publishes(array(
__DIR__.'/../../config/config.php' => config_path('lxmpd.php')
));
}

/**
* Register the service provider.
Expand All @@ -39,18 +39,19 @@ public function register()
{
//$this->app['lxmpd'] = $this->app->share(function($app)
//{
$this->app->singleton('lxmpd', function()

$this->app->bind('lxmpd', function()
{
// These three calls to Log::info show the three different ways to access configs
Log::info( 'LxMPDServiceProvider', array('host' => Config::get('lxmpd::host')));
Log::info( 'LxMPDServiceProvider', array('host' => config('lxmpd.host')));
//Log::info( 'LxMPDServiceProvider', array('port' => $app['config']->get('lxmpd::port')));
//Log::info( 'LxMPDServiceProvider', array('password' => $app['config']['lxmpd::password']));
Log::info( 'LxMPDServiceProvider', array('port' => Config::get('lxmpd::port')));
Log::info( 'LxMPDServiceProvider', array('password' => Config::get('lxmpd::password')));
Log::info( 'LxMPDServiceProvider', array('port' => config('lxmpd.port')));
Log::info( 'LxMPDServiceProvider', array('password' => config('lxmpd.password')));

try {
// Instantiate a new MPDCOnnection object using the host, port and password set in configs
$connection = new MPDConnection( Config::get('lxmpd::host'), Config::get('lxmpd::port'), Config::get('lxmpd::password') );
$connection = new MPDConnection( config('lxmpd.host'), config('lxmpd.port'), config('lxmpd.password') );

// Determine if the connection to MPD is local to the Web Server
$connection->determineIfLocal();
Expand All @@ -75,7 +76,7 @@ public function register()
Log::info( 'LxMPDServiceProvider caught MPDConnectionException', array($e));

// Get the default path to the mpd binary from the project configuration
$binary = Config::get('defaults.default_path_to_mpd_binary');
$binary = config('defaults.default_path_to_mpd_binary');

Log::info( 'LxMPDServiceProvider default_path_to_mpd_binary', array($binary));

Expand All @@ -102,7 +103,7 @@ public function register()
while($starting = !($lxmpd->start($binary, $conf))) {}

// Instantiate a new MPDCOnnection object using the host, port and password set in configs
$connection = new MPDConnection( Config::get('lxmpd::host'), Config::get('lxmpd::port'), Config::get('lxmpd::password') );
$connection = new MPDConnection( config('lxmpd.host'), config('lxmpd.port'), config('lxmpd.password') );

// Determine if the connection to MPD is local to the Web Server
$connection->determineIfLocal();
Expand Down