support old config

Author: concentriccircles

src/GetStream/StreamLaravel/StreamLaravelManager.php

@@ -5,17 +5,19 @@
 class StreamLaravelManager {
 
     public $client;
+    private $config;
 
     public function __construct($api_key, $api_secret, $config)
     {
+        $this->config = $config;
         if (getenv('STREAM_URL') !== false) {
             $this->client = Client::herokuConnect(getenv('STREAM_URL'));
         } else {
-            $this->client = new Client($api_key, $api_secret, 'v1.0', '', 10);
-            $location = config("stream-laravel.location");
+            $this->client = new Client($api_key, $api_secret);
+            $location = $this->config->get("stream-laravel::location");
             $this->client->setLocation($location);
         }
-        $this->userFeed = config("stream-laravel.user_feed");
+        $this->userFeed = $this->config->get("stream-laravel::user_feed");
     }
 
     public function getUserFeed($user_id)
@@ -25,14 +27,14 @@ public function getUserFeed($user_id)
 
     public function getNotificationFeed($user_id)
     {
-        $user_feed = config("stream-laravel.notification_feed");
+        $user_feed = $this->config->get("stream-laravel::notification_feed");
         return $this->client->feed($user_feed, $user_id);
     }
 
     public function getNewsFeeds($user_id)
     {
         $feeds = array();
-        $news_feeds = config("stream-laravel.news_feeds");
+        $news_feeds = $this->config->get("stream-laravel::news_feeds");
         foreach ($news_feeds as $feed) {
             $feeds[$feed] = $this->client->feed($feed, $user_id);
         }
@@ -76,4 +78,4 @@ public function activityDeleted($instance)
         $feed->removeActivity($foreignId, true);
     }
 
-}
+}

src/GetStream/StreamLaravel/StreamLaravelServiceProvider.php

@@ -23,7 +23,7 @@ public function boot()
 		$this->loadViewsFrom(__DIR__.'/../../views', 'stream-laravel');
 
 		$this->publishes([
-		    __DIR__.'/../../config/config.php' => config_path('getstream.php'),
+		    __DIR__.'/../../config/config.php' => config_path('stream-laravel.php'),
 		    __DIR__.'/../../views' => base_path('resources/views/vendor/stream-laravel'),
 		]);
 	}
@@ -35,21 +35,43 @@ public function boot()
 	 */
 	public function register()
 	{
-		$this->mergeConfigFrom(
-			__DIR__.'/../../config/config.php', 'stream-laravel'
-		);
+
+		$this->registerResources();
 
 		$this->app['feed_manager'] = $this->app->share(function($app)
         {
 
-        	$manager_class = config('stream-laravel.feed_manager_class');
-        	$api_key = config('stream-laravel.api_key');
-        	$api_secret = config('stream-laravel.api_secret');
+        	$manager_class = $app['config']->get('stream-laravel::feed_manager_class');
+        	$api_key = $app['config']->get('stream-laravel::api_key');
+        	$api_secret = $app['config']->get('stream-laravel::api_secret');
 
-            return new $manager_class($api_key, $api_secret, $app['config']);
+            return new $manager_class($api_key, $api_secret, $this->app['config']);
         });
 	}
 
+	/**
+	 * Register the package resources.
+	 *
+	 * @return void
+	 */
+	protected function registerResources()
+	{
+	    $userConfigFile    = app()->configPath().'/stream-laravel.php';
+	    $packageConfigFile = __DIR__.'/../../config/config.php';
+	    $config            = $this->app['files']->getRequire($packageConfigFile);
+
+	    if (file_exists($userConfigFile)) {
+	        $userConfig = $this->app['files']->getRequire($userConfigFile);
+	        $config     = array_replace_recursive($config, $userConfig);
+	    }
+
+	    $namespace = 'stream-laravel::';
+
+	    foreach($config as $key => $value) {
+	    	$this->app['config']->set($namespace . $key , $value);
+	    }
+	}
+
 	/**
 	 * Get the services provided by the provider.
 	 *