mirrors/Speedtest-Tracker
1
0
Fork 0
mirror of https://github.com/henrywhitaker3/Speedtest-Tracker.git synced 2025-12-21 13:23:04 +01:00
Code Issues Projects Releases Wiki Activity

Commands now use provider DI

Browse Source
This commit is contained in:
Henry Whitaker
2021-03-07 13:45:29 +00:00
parent 85d2d87e53
commit 2861196cff
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Console/Commands/SpeedtestCommand.php
View File

@@ -3,6 +3,7 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use App\Helpers\SpeedtestHelper; use App\Helpers\SpeedtestHelper;
use App\Interfaces\SpeedtestProvider;
use Illuminate\Console\Command; use Illuminate\Console\Command;
class SpeedtestCommand extends Command class SpeedtestCommand extends Command
@@ -21,13 +22,17 @@ class SpeedtestCommand extends Command
*/ */
protected $description = 'Performs a new speedtest'; protected $description = 'Performs a new speedtest';
private SpeedtestProvider $speedtestProvider;
/** /**
* Create a new command instance. * Create a new command instance.
* *
* @return void * @return void
*/ */
public function __construct() public function __construct(SpeedtestProvider $speedtestProvider)
{ {
$this->speedtestProvider = $speedtestProvider;
parent::__construct(); parent::__construct();
} }

7
app/Console/Commands/SpeedtestLatestCommand.php
View File

@@ -3,6 +3,7 @@
namespace App\Console\Commands; namespace App\Console\Commands;
use App\Helpers\SpeedtestHelper; use App\Helpers\SpeedtestHelper;
use App\Interfaces\SpeedtestProvider;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Artisan;
@@ -22,13 +23,17 @@ class SpeedtestLatestCommand extends Command
*/ */
protected $description = 'Returns the latest speedtest result'; protected $description = 'Returns the latest speedtest result';
private SpeedtestProvider $speedtestProvider;
/** /**
* Create a new command instance. * Create a new command instance.
* *
* @return void * @return void
*/ */
public function __construct() public function __construct(SpeedtestProvider $speedtestProvider)
{ {
$this->speedtestProvider = $speedtestProvider;
parent::__construct(); parent::__construct();
} }

9
app/Providers/SpeedtestServiceProvider.php
View File

@@ -18,20 +18,11 @@ class SpeedtestServiceProvider extends ServiceProvider
*/ */
public function boot() public function boot()
{ {
if (File::exists(env('DB_DATABASE'))) {
if (Schema::hasTable('settings')) {
switch (SettingsHelper::get('speedtest_provider')) {
case 'ookla':
default:
$this->app->singleton( $this->app->singleton(
SpeedtestProvider::class, SpeedtestProvider::class,
function () { function () {
return new OoklaTester(); return new OoklaTester();
} }
); );
break;
}
}
}
} }
} }