Skip to content

Commit 1a37576

Browse files
committed
Only use class names for service IDs
1 parent fe6258e commit 1a37576

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

src/Facades/TwilioClient.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ final class TwilioClient extends Facade
2727
*/
2828
protected static function getFacadeAccessor()
2929
{
30-
return 'babdev.twilio.manager';
30+
return ConnectionManager::class;
3131
}
3232
}

src/Providers/TwilioProvider.php

+3-8
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ final class TwilioProvider extends ServiceProvider implements DeferrableProvider
2424
public function provides()
2525
{
2626
return [
27-
'babdev.twilio.manager',
2827
ConnectionManager::class,
2928
TwilioClient::class,
3029

31-
'babdev.twilio.http_client',
3230
TwilioHttpClient::class,
3331
];
3432
}
@@ -69,14 +67,13 @@ public function register(): void
6967
private function registerConnectionManager(): void
7068
{
7169
$this->app->singleton(
72-
'babdev.twilio.manager',
70+
ConnectionManager::class,
7371
static function (Application $app): ConnectionManager {
7472
return new ConnectionManager($app);
7573
}
7674
);
7775

78-
$this->app->alias('babdev.twilio.manager', ConnectionManager::class);
79-
$this->app->alias('babdev.twilio.manager', TwilioClient::class);
76+
$this->app->alias(ConnectionManager::class, TwilioClient::class);
8077
}
8178

8279
/**
@@ -87,7 +84,7 @@ static function (Application $app): ConnectionManager {
8784
private function registerHttpClient(): void
8885
{
8986
$this->app->bind(
90-
'babdev.twilio.http_client',
87+
TwilioHttpClient::class,
9188
static function (Application $app): TwilioHttpClient {
9289
// If Guzzle is installed, then we will either use Laravel's native client or Guzzle directly
9390
if (\class_exists(Guzzle::class)) {
@@ -103,7 +100,5 @@ static function (Application $app): TwilioHttpClient {
103100
return new CurlClient();
104101
}
105102
);
106-
107-
$this->app->alias('babdev.twilio.http_client', TwilioHttpClient::class);
108103
}
109104
}

tests/Providers/TwilioProviderTest.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace BabDev\Twilio\Tests\Providers;
44

55
use BabDev\Twilio\ConnectionManager;
6+
use BabDev\Twilio\Contracts\TwilioClient;
67
use BabDev\Twilio\Providers\TwilioProvider;
78
use Illuminate\Support\ServiceProvider;
89
use Orchestra\Testbench\TestCase;
@@ -20,8 +21,8 @@ public function testServiceProviderPublishesConfiguration(): void
2021

2122
public function testServicesAreRegistered(): void
2223
{
23-
$this->assertTrue($this->app->bound('babdev.twilio.manager'));
24-
$this->assertSame('babdev.twilio.manager', $this->app->getAlias(ConnectionManager::class));
24+
$this->assertTrue($this->app->bound(ConnectionManager::class));
25+
$this->assertSame(ConnectionManager::class, $this->app->getAlias(TwilioClient::class));
2526
}
2627

2728
protected function getPackageProviders($app)

0 commit comments

Comments
 (0)