Merge pull request #6 from imknight/master

make it Laravel 5 compatible and load the vendor config nicely

Author: Artistan

README.md

@@ -1,4 +1,4 @@
-Nexmo for Laravel 4
+Nexmo for Laravel 5
 ==============
 
 Implements a service for Nexmo messaging based on
@@ -21,6 +21,10 @@ Add a ServiceProvider to your providers array in `app/config/app.php`:
 
 	)
 
+### Publish the Vendor Config
+
+php artisan vendor:publish --provider="Artistan\Nexmo\NexmoServiceProvider"
+
 ### Usage - work in progress
 
 Sending SMS via the Nexmo SMS gateway.

composer.json

@@ -19,7 +19,7 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "illuminate/support": "4.*"
+        "illuminate/support": "5.*"
     },
     "require-dev":{
         "phpunit/phpunit": "3.7.*",

src/Artistan/Nexmo/NexmoServiceProvider.php

@@ -21,7 +21,7 @@ class NexmoServiceProvider extends ServiceProvider {
      */
     public function boot()
     {
-        $this->package('artistan/nexmo');
+        $this->publishes([__DIR__.'/../../config/nexmo.php' => config_path('nexmo.php')]);       
     }
 
 	/**

src/Artistan/Nexmo/Service/Account.php

@@ -34,8 +34,8 @@ public function __construct ($api_key='', $api_secret='') {
             $this->nx_key = $api_key;
             $this->nx_secret = $api_secret;
         } else {
-            $this->nx_key = \Config::get('nexmo::auth.api_key');
-            $this->nx_secret = \Config::get('nexmo::auth.api_secret');
+            $this->nx_key = \Config::get('nexmo.api_key');
+            $this->nx_secret = \Config::get('nexmo.api_secret');
         }
 
         if(empty($this->nx_key) || empty($this->nx_secret)){
@@ -243,4 +243,4 @@ private function apiCall($command, $data=array()) {
         );
 
     }
-}
+}

src/Artistan/Nexmo/Service/Message/Sms.php

@@ -49,8 +49,8 @@ public function __construct ($api_key='', $api_secret='') {
             $this->nx_key = $api_key;
             $this->nx_secret = $api_secret;
         } else {
-            $this->nx_key = \Config::get('nexmo::auth.api_key');
-            $this->nx_secret = \Config::get('nexmo::auth.api_secret');
+            $this->nx_key = \Config::get('nexmo.api_key');
+            $this->nx_secret = \Config::get('nexmo.api_secret');
         }
 
         if(empty($this->nx_key) || empty($this->nx_secret)){
@@ -398,4 +398,4 @@ public function reply ($message) {
 
         return $this->sendText($this->from, $this->to, $message);
     }
-} 
+} 

src/config/auth.php renamed to src/config/nexmo.php

@@ -1,7 +1,5 @@
 <?php
-/**
- * User: Charles Peterson
- */
+
 return array(
     'api_key' => 'api_key',
     'api_secret' => 'api_secret'