Fixed misconfiguration of Laravel 4

php-tmdb · Apr 16, 2015 · 98cd2b1 · 98cd2b1
1 parent c422eff
commit 98cd2b1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/src/Adapters/EventDispatcherLaravel4.php b/src/Adapters/EventDispatcherLaravel4.php
@@ -19,8 +19,8 @@ class EventDispatcherLaravel4 extends EventDispatcherAdapter
 {
     /**
      * Forward all methods to the Laravel Events Dispatcher
-     * @param Symfony\Component\EventDispatcher\EventDispatcherInterface $symfonyDispatcher
-     * @param Illuminate\Events\Dispatcher $laravelDispatcher
+     * @param LaravelDispatcher $laravelDispatcher
+     * @param SymfonyDispatcher $symfonyDispatcher
      */
     public function __construct(LaravelDispatcher $laravelDispatcher, SymfonyDispatcher $symfonyDispatcher)
     {

diff --git a/src/Adapters/EventDispatcherLaravel5.php b/src/Adapters/EventDispatcherLaravel5.php
@@ -19,8 +19,8 @@ class EventDispatcherLaravel5 extends EventDispatcherAdapter
 {
     /**
      * Forward all methods to the Laravel Events Dispatcher
-     * @param Symfony\Component\EventDispatcher\EventDispatcherInterface $symfonyDispatcher
-     * @param Illuminate\Contracts\Events\Dispatcher $laravelDispatcher
+     * @param LaravelDispatcher $laravelDispatcher
+     * @param SymfonyDispatcher $symfonyDispatcher
      */
     public function __construct(LaravelDispatcher $laravelDispatcher, SymfonyDispatcher $symfonyDispatcher)
     {

diff --git a/src/TmdbServiceProvider.php b/src/TmdbServiceProvider.php
@@ -7,10 +7,8 @@
 namespace Tmdb\Laravel;
 
 use Illuminate\Support\ServiceProvider;
-
 use Tmdb\Laravel\TmdbServiceProviderLaravel4;
 use Tmdb\Laravel\TmdbServiceProviderLaravel5;
-
 use Tmdb\ApiToken;
 use Tmdb\Client;
 

diff --git a/src/TmdbServiceProviderLaravel4.php b/src/TmdbServiceProviderLaravel4.php
@@ -17,7 +17,7 @@ class TmdbServiceProviderLaravel4 extends ServiceProvider {
      */
     public function boot()
     {
-        $this->package('wtfzdotnet/tmdb-package', null, __DIR__);
+        $this->package('php-tmdb/laravel', 'tmdb', __DIR__);
     }
 
     /**
@@ -30,8 +30,13 @@ public function register()
         $this->app->bind('Tmdb\Laravel\Adapters\EventDispatcherAdapter', 'Tmdb\Laravel\Adapters\EventDispatcherLaravel4');
     }
 
+    /**
+     * Get the TMDB configuration from the config repository
+     *
+     * @return array
+     */
     public function config()
     {
-        return $this->app['config']->get('tmdb-package::tmdb');
+        return $this->app['config']->get('tmdb::tmdb');
     }
 }
diff --git a/src/TmdbServiceProviderLaravel5.php b/src/TmdbServiceProviderLaravel5.php
@@ -34,6 +34,11 @@ public function register()
         $this->app->bind('Tmdb\Laravel\Adapters\EventDispatcherAdapter', 'Tmdb\Laravel\Adapters\EventDispatcherLaravel5');
     }
 
+    /**
+     * Get the TMDB configuration from the config repository
+     *
+     * @return array
+     */
     public function config()
     {
         return $this->app['config']->get('tmdb');
@@ -52,6 +57,7 @@ private function setupConfiguration()
 
     /**
      * Returns the default configuration path
+     *
      * @return string
      */
     private function defaultConfig()