Merge pull request #11 from ipunkt/laravel5

Laravel 5 support

Author: Robert Kummer

README.md

@@ -1,4 +1,4 @@
-# Analytics tracking package for Laravel 4.x
+# Analytics tracking package for Laravel
 
 [![Latest Stable Version](https://poser.pugx.org/ipunkt/laravel-analytics/v/stable.svg)](https://packagist.org/packages/ipunkt/laravel-analytics) [![Latest Unstable Version](https://poser.pugx.org/ipunkt/laravel-analytics/v/unstable.svg)](https://packagist.org/packages/ipunkt/laravel-analytics) [![License](https://poser.pugx.org/ipunkt/laravel-analytics/license.svg)](https://packagist.org/packages/ipunkt/laravel-analytics) [![Total Downloads](https://poser.pugx.org/ipunkt/laravel-analytics/downloads.svg)](https://packagist.org/packages/ipunkt/laravel-analytics)
 
@@ -10,14 +10,26 @@ Add to your composer.json following lines
 		"ipunkt/laravel-analytics": "~1.0"
 	}
 
+### With Laravel 5
+
+Add `'Ipunkt\LaravelAnalytics\AnalyticsServiceProvider',` to `providers` in `app/config/app.php`.
+
+Optional: Add `'Analytics' => 'Ipunkt\LaravelAnalytics\AnalyticsFacade',` to `aliases` in `app/config/app.php`.
+
+Run `php artisan vendor:publish`
+
+Then edit `analytics.php` in `config` to your needs. We do config merge in the service provider, so your local settings 
+ will stay the same.
+
+### With Laravel 4
+
 Run `php artisan config:publish ipunkt/laravel-analytics`
 
 Then edit `analytics.php` in `app/config/packages/ipunkt/laravel-analytics` to your needs.
 
 Add `'Ipunkt\LaravelAnalytics\AnalyticsServiceProvider',` to `providers` in `app/config/app.php`.
 
-Add `'Analytics' => 'Ipunkt\LaravelAnalytics\AnalyticsFacade',` to `aliases` in `app/config/app.php`.
-
+Optional: Add `'Analytics' => 'Ipunkt\LaravelAnalytics\AnalyticsFacade',` to `aliases` in `app/config/app.php`.
 
 ## Configuration
 

composer.json

@@ -12,8 +12,12 @@
 	],
 	"require": {
 		"php": ">=5.4.0",
-		"illuminate/support": "~4.0",
-		"illuminate/session": "~4.0"
+		"illuminate/support": "~4.0|~5.0",
+		"illuminate/session": "~4.0|~5.0",
+		"illuminate/config": "~4.0|~5.0"
+	},
+	"require-dev": {
+		"laravel/framework": "~4.0|~5.0"
 	},
 	"autoload": {
 		"psr-0": {

src/Ipunkt/LaravelAnalytics/AnalyticsServiceProvider.php

@@ -19,7 +19,19 @@ class AnalyticsServiceProvider extends ServiceProvider
 	 */
 	public function boot()
 	{
-		$this->package('ipunkt/laravel-analytics');
+		if ($this->isLaravel4()) {
+			$this->package('ipunkt/laravel-analytics');
+
+			return;
+		}
+
+		$config = realpath(__DIR__ . '/../../config/analytics.php');
+
+		$this->mergeConfigFrom($config, 'analytics');
+
+		$this->publishes([
+			$config => config_path('analytics.php'),
+		]);
 	}
 
 	/**
@@ -29,18 +41,20 @@ public function boot()
 	 */
 	public function register()
 	{
-		$this->app->bind('analytics', function () {
+		$packageNamespace = $this->isLaravel4() ? 'laravel-analytics::' : '';
+
+		$this->app->bind('analytics', function () use ($packageNamespace) {
 
 			//	get analytics provider name
-			$provider = Config::get('laravel-analytics::analytics.provider');
+			$provider = Config::get($packageNamespace . 'analytics.provider');
 
 			//	make it a class
 			$providerClass = 'Ipunkt\LaravelAnalytics\Providers\\' . $provider;
 
 			//	getting the config
 			$providerConfig = [];
-			if (Config::has('laravel-analytics::analytics.configurations.' . $provider)) {
-				$providerConfig = Config::get('laravel-analytics::analytics.configurations.' . $provider);
+			if (Config::has($packageNamespace . 'analytics.configurations.' . $provider)) {
+				$providerConfig = Config::get($packageNamespace . 'analytics.configurations.' . $provider);
 			}
 
 			//	return an instance
@@ -57,4 +71,14 @@ public function provides()
 	{
 		return array();
 	}
+
+	/**
+	 * are we on laravel 4
+	 *
+	 * @return bool
+	 */
+	private function isLaravel4()
+	{
+		return version_compare(\Illuminate\Foundation\Application::VERSION, '5', '<');
+	}
 }