Skip to content

Commit b679059

Browse files
author
Corey McCormick
committed
Resolve name collisions within service provider and facade
1 parent 187762c commit b679059

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

src/Facade.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
namespace SimpleSoftwareIO\QrCode\Facades;
44

5-
use Illuminate\Support\Facades\Facade;
5+
use Illuminate\Support\Facades\Facade as IlluminateFacade;
6+
use SimpleSoftwareIO\QrCode\Generator;
67

7-
class Facade extends Facade
8+
class Facade extends IlluminateFacade
89
{
910
/**
1011
* Get the registered name of the component.
@@ -13,8 +14,8 @@ class Facade extends Facade
1314
*/
1415
protected static function getFacadeAccessor()
1516
{
16-
self::clearResolvedInstance('qrcode');
17+
self::clearResolvedInstance(Generator::class);
1718

18-
return 'qrcode';
19+
return Generator::class;
1920
}
2021
}

src/ServiceProvider.php

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,18 @@
22

33
namespace SimpleSoftwareIO\QrCode;
44

5-
use Illuminate\Support\ServiceProvider;
5+
use Illuminate\Contracts\Support\DeferrableProvider;
6+
use Illuminate\Support\ServiceProvider as IlluminateServiceProvider;
67

7-
class ServiceProvider extends ServiceProvider
8+
class ServiceProvider extends IlluminateServiceProvider implements DeferrableProvider
89
{
9-
/**
10-
* Indicates if loading of the provider is deferred.
11-
*
12-
* @var bool
13-
*/
14-
protected $defer = true;
15-
1610
/**
1711
* Register the service provider.
1812
*/
1913
public function register()
2014
{
2115
$this->app->bind('qrcode', function () {
22-
return new BaconQrCodeGenerator();
16+
return new Generator();
2317
});
2418
}
2519

@@ -30,6 +24,6 @@ public function register()
3024
*/
3125
public function provides()
3226
{
33-
return ['qrcode'];
27+
return [Generator::class];
3428
}
3529
}

0 commit comments

Comments
 (0)