Merge branch 'laravel5'

# Conflicts:
#	src/Davibennun/LaravelPushNotification/PushNotification.php

Author: daim2k5

README.md

@@ -45,7 +45,7 @@ php artisan vendor:publish --provider="Davibennun\LaravelPushNotification\Larave
 
 Laravel 4.*
 ```
-php artisan config:publish davibennun/laravel-push-notification
+php artisan vendor:publish --provider="Vendor/Davibennun/LaravelPushNotification/LaravelPushNotificationServiceProvider" --tag="config"
 ```
 
 This will generate a config file like this

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "davibennun/laravel-push-notification",
     "description": "Laravel package to send push notifications to mobile devices (apns, gcm)",
-     "keywords": ["apns","gcm","push","notification", "laravel"],
+    "keywords": ["apns","gcm","push","notification", "laravel"],
     "authors": [
         {
             "name": "DaviBenNun",
@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "illuminate/support": "4.*",
+        "illuminate/support": "5.*",
         "sly/notification-pusher": "2.*"
     },
     "autoload": {

src/Davibennun/LaravelPushNotification/LaravelPushNotificationServiceProvider.php

@@ -19,7 +19,10 @@ class LaravelPushNotificationServiceProvider extends ServiceProvider {
      */
     public function boot()
     {
-        $this->package('davibennun/laravel-push-notification');
+        $config_path = function_exists('config_path') ? config_path('push-notification.php') : 'push-notification.php';
+        $this->publishes([
+             __DIR__.'/../../config/config.php' => $config_path
+         ], 'config');
     }
 
     /**
@@ -29,8 +32,7 @@ public function boot()
      */
     public function register()
     {
-        $this->app['pushNotification'] = $this->app->share(function($app)
-        {
+        $this->app->singleton('pushNotification', function ($app) {
             return new PushNotification();
         });
     }
@@ -45,4 +47,4 @@ public function provides()
         return array();
     }
 
-}
+}