Skip to content

Commit 98cd2b1

Browse files
committed
Fixed misconfiguration of Laravel 4
1 parent c422eff commit 98cd2b1

5 files changed

+17
-8
lines changed

src/Adapters/EventDispatcherLaravel4.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class EventDispatcherLaravel4 extends EventDispatcherAdapter
1919
{
2020
/**
2121
* Forward all methods to the Laravel Events Dispatcher
22-
* @param Symfony\Component\EventDispatcher\EventDispatcherInterface $symfonyDispatcher
23-
* @param Illuminate\Events\Dispatcher $laravelDispatcher
22+
* @param LaravelDispatcher $laravelDispatcher
23+
* @param SymfonyDispatcher $symfonyDispatcher
2424
*/
2525
public function __construct(LaravelDispatcher $laravelDispatcher, SymfonyDispatcher $symfonyDispatcher)
2626
{

src/Adapters/EventDispatcherLaravel5.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class EventDispatcherLaravel5 extends EventDispatcherAdapter
1919
{
2020
/**
2121
* Forward all methods to the Laravel Events Dispatcher
22-
* @param Symfony\Component\EventDispatcher\EventDispatcherInterface $symfonyDispatcher
23-
* @param Illuminate\Contracts\Events\Dispatcher $laravelDispatcher
22+
* @param LaravelDispatcher $laravelDispatcher
23+
* @param SymfonyDispatcher $symfonyDispatcher
2424
*/
2525
public function __construct(LaravelDispatcher $laravelDispatcher, SymfonyDispatcher $symfonyDispatcher)
2626
{

src/TmdbServiceProvider.php

-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
namespace Tmdb\Laravel;
88

99
use Illuminate\Support\ServiceProvider;
10-
1110
use Tmdb\Laravel\TmdbServiceProviderLaravel4;
1211
use Tmdb\Laravel\TmdbServiceProviderLaravel5;
13-
1412
use Tmdb\ApiToken;
1513
use Tmdb\Client;
1614

src/TmdbServiceProviderLaravel4.php

+7-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class TmdbServiceProviderLaravel4 extends ServiceProvider {
1717
*/
1818
public function boot()
1919
{
20-
$this->package('wtfzdotnet/tmdb-package', null, __DIR__);
20+
$this->package('php-tmdb/laravel', 'tmdb', __DIR__);
2121
}
2222

2323
/**
@@ -30,8 +30,13 @@ public function register()
3030
$this->app->bind('Tmdb\Laravel\Adapters\EventDispatcherAdapter', 'Tmdb\Laravel\Adapters\EventDispatcherLaravel4');
3131
}
3232

33+
/**
34+
* Get the TMDB configuration from the config repository
35+
*
36+
* @return array
37+
*/
3338
public function config()
3439
{
35-
return $this->app['config']->get('tmdb-package::tmdb');
40+
return $this->app['config']->get('tmdb::tmdb');
3641
}
3742
}

src/TmdbServiceProviderLaravel5.php

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ public function register()
3434
$this->app->bind('Tmdb\Laravel\Adapters\EventDispatcherAdapter', 'Tmdb\Laravel\Adapters\EventDispatcherLaravel5');
3535
}
3636

37+
/**
38+
* Get the TMDB configuration from the config repository
39+
*
40+
* @return array
41+
*/
3742
public function config()
3843
{
3944
return $this->app['config']->get('tmdb');
@@ -52,6 +57,7 @@ private function setupConfiguration()
5257

5358
/**
5459
* Returns the default configuration path
60+
*
5561
* @return string
5662
*/
5763
private function defaultConfig()

0 commit comments

Comments
 (0)