Skip to content

Commit 277bac2

Browse files
committed
fix require() on modern laravel #1
1 parent 6da224d commit 277bac2

File tree

2 files changed

+25
-16
lines changed

2 files changed

+25
-16
lines changed

composer.json

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,26 @@
1414
}
1515
],
1616
"require": {
17-
"php": ">=7.2.0"
17+
"php": ">=5.6.0",
18+
"illuminate/support": ">=5.0"
19+
},
20+
"extra": {
21+
"laravel": {
22+
"providers": [
23+
"jessedp\\Timezones\\TimezonesServiceProvider"
24+
],
25+
"aliases": {
26+
"Timezones": "jessedp\\Timezones\\Facades\\Timezones"
27+
}
28+
}
1829
},
1930
"require-dev": {
2031
"phpunit/phpunit": "^8.0"
2132
},
2233
"autoload": {
2334
"psr-4": {
24-
"jessedp\\Timezones\\": "src/Timezones/"
35+
"jessedp\\Timezones\\": "src/Timezones"
2536
}
2637
},
2738
"minimum-stability": "stable"
28-
}
39+
}

src/Timezones/TimezonesServiceProvider.php

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace jessedp\Timezones;
33

4-
use Illuminate\Foundation\AliasLoader;
4+
55
use Illuminate\Support\ServiceProvider;
66

77
/**
@@ -12,13 +12,6 @@
1212
*/
1313
class TimezonesServiceProvider extends ServiceProvider
1414
{
15-
/**
16-
* Indicates if loading of the provider is deferred.
17-
*
18-
* @var bool
19-
*/
20-
protected $defer = false;
21-
2215
/**
2316
* Bootstrap the application events.
2417
*
@@ -36,14 +29,19 @@ public function boot()
3629
*/
3730
public function register()
3831
{
39-
$this->app->singleton('timezones', function ($app) {
32+
33+
// $this->app->singleton('timezones', function ($app) {
34+
// return new Timezones;
35+
// });
36+
37+
$this->app->bind(Timezones::class, function () {
4038
return new Timezones;
39+
// $loader = AliasLoader::getInstance();
40+
// $loader->alias('Timezones', 'jessedp\Timezones\Facades\Timezones');
4141
});
4242

43-
$this->app->booting(function () {
44-
$loader = AliasLoader::getInstance();
45-
$loader->alias('Timezones', 'jessedp\Timezones\Facades\Timezones');
46-
});
43+
$this->app->alias(Timezones::class, 'timezones');
44+
4745
}
4846

4947
/**

0 commit comments

Comments
 (0)