Merge pull request #24 from REBELinBLUE/fix_laravel_5.4_bug

Fixed the dependency resolution in Laravel 5.4

Author: Florian Wartner

src/TwilioProvider.php

@@ -2,8 +2,8 @@
 
 namespace NotificationChannels\Twilio;
 
-use Illuminate\Support\ServiceProvider;
 use Services_Twilio as TwilioService;
+use Illuminate\Support\ServiceProvider;
 
 class TwilioProvider extends ServiceProvider
 {
@@ -18,13 +18,16 @@ public function boot()
                 $config = $this->app['config']['services.twilio'];
 
                 return new Twilio(
-                    $this->app->make(TwilioService::class, [
-                        $config['account_sid'],
-                        $config['auth_token'],
-                    ]),
+                    $this->app->make(TwilioService::class),
                     $config['from']
                 );
             });
+
+        $this->app->bind(TwilioService::class, function () {
+            $config = $this->app['config']['services.twilio'];
+
+            return new TwilioService($config['account_sid'], $config['auth_token']);
+        });
     }
 
     /**

tests/TwilioProviderTest.php

@@ -2,14 +2,14 @@
 
 namespace NotificationChannels\Twilio\Test;
 
-use Illuminate\Contracts\Foundation\Application;
 use Mockery;
-use NotificationChannels\Twilio\TwilioChannel;
-use NotificationChannels\Twilio\TwilioProvider;
+use ArrayAccess;
 use PHPUnit_Framework_TestCase;
 use Services_Twilio as TwilioService;
 use NotificationChannels\Twilio\Twilio;
-use ArrayAccess;
+use NotificationChannels\Twilio\TwilioChannel;
+use NotificationChannels\Twilio\TwilioProvider;
+use Illuminate\Contracts\Foundation\Application;
 
 class TwilioProviderTest extends PHPUnit_Framework_TestCase
 {
@@ -49,6 +49,10 @@ public function it_gives_an_instantiated_twilio_object_when_the_channel_asks_for
             return  $twilio() instanceof Twilio;
         }))->once();
 
+        $this->app->shouldReceive('bind')->with(TwilioService::class, Mockery::on(function ($twilio) {
+            return  $twilio() instanceof TwilioService;
+        }))->once()->andReturn($this->app);
+
         $this->provider->boot();
     }
 }