384 Laravel 6 changes (#385)
* 384 Laravel 6 changes * Library versions * Update package versions * Add keyType to models * Remove unused dependencies * StyleCI fixes * Fix models for test * Fix tests output and update test runner * Unused imports * Update exceptions handler * Fix login page
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace App\Console;
|
||||
|
||||
use Log;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Symfony\Component\Process\Process;
|
||||
|
||||
/**
|
||||
@@ -10,6 +10,16 @@ use Symfony\Component\Process\Process;
|
||||
*/
|
||||
abstract class Command extends \Illuminate\Console\Command
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
// Running in the console but not in the tests
|
||||
if (app()->runningInConsole() && env('APP_ENV') !== 'testing') {
|
||||
$this->redirectLoggingToFile('stdout');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
*/
|
||||
|
||||
@@ -7,9 +7,6 @@ use App\Facades\Utils;
|
||||
use GuzzleHttp\Client;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
|
||||
/**
|
||||
* Class AcarsReplay
|
||||
*/
|
||||
class AcarsReplay extends Command
|
||||
{
|
||||
protected $signature = 'phpvms:replay {files} {--manual} {--write-all} {--no-submit}';
|
||||
@@ -47,8 +44,6 @@ class AcarsReplay extends Command
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->redirectLoggingToFile('stdout');
|
||||
|
||||
$this->httpClient = new Client([
|
||||
'base_uri' => config('app.url'),
|
||||
'headers' => [
|
||||
|
||||
@@ -3,23 +3,13 @@
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Console\Command;
|
||||
use Artisan;
|
||||
use Illuminate\Support\Facades\Artisan;
|
||||
|
||||
/**
|
||||
* Class ComposerCommand
|
||||
*/
|
||||
class ComposerCommand extends Command
|
||||
{
|
||||
protected $signature = 'phpvms:composer {cmd}';
|
||||
protected $description = 'Composer related tasks';
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->redirectLoggingToFile('stdout');
|
||||
}
|
||||
|
||||
/**
|
||||
* Run composer update related commands
|
||||
*/
|
||||
|
||||
@@ -3,12 +3,9 @@
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Console\Command;
|
||||
use Log;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Tivie\OS\Detector;
|
||||
|
||||
/**
|
||||
* Class CreateDatabase
|
||||
*/
|
||||
class CreateDatabase extends Command
|
||||
{
|
||||
protected $signature = 'database:create {--reset} {--conn=?}';
|
||||
@@ -21,8 +18,6 @@ class CreateDatabase extends Command
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->redirectLoggingToFile('stdout');
|
||||
$this->os = new Detector();
|
||||
}
|
||||
|
||||
|
||||
@@ -19,9 +19,6 @@ use Illuminate\Support\Facades\Schema;
|
||||
use PDO;
|
||||
use Symfony\Component\Yaml\Yaml;
|
||||
|
||||
/**
|
||||
* Class DevCommands
|
||||
*/
|
||||
class DevCommands extends Command
|
||||
{
|
||||
protected $signature = 'phpvms {cmd} {param?}';
|
||||
@@ -37,7 +34,6 @@ class DevCommands extends Command
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->redirectLoggingToFile('stdout');
|
||||
$this->dbSvc = $dbSvc;
|
||||
}
|
||||
|
||||
|
||||
@@ -27,7 +27,6 @@ class DevInstall extends Command
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->redirectLoggingToFile('stdout');
|
||||
$this->databaseSeeder = $databaseSeeder;
|
||||
}
|
||||
|
||||
|
||||
@@ -5,9 +5,6 @@ namespace App\Console\Commands;
|
||||
use App\Console\Command;
|
||||
use App\Services\ImportService;
|
||||
|
||||
/**
|
||||
* Class ImportCsv
|
||||
*/
|
||||
class ImportCsv extends Command
|
||||
{
|
||||
protected $signature = 'phpvms:csv-import {type} {file}';
|
||||
@@ -24,7 +21,6 @@ class ImportCsv extends Command
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->redirectLoggingToFile('stdout');
|
||||
$this->importer = $importer;
|
||||
}
|
||||
|
||||
|
||||
@@ -6,21 +6,11 @@ use App\Console\Command;
|
||||
use App\Models\Enums\NavaidType;
|
||||
use App\Models\Navdata;
|
||||
|
||||
/**
|
||||
* Class NavdataImport
|
||||
*/
|
||||
class NavdataImport extends Command
|
||||
{
|
||||
protected $signature = 'phpvms:navdata';
|
||||
protected $description = '';
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->redirectLoggingToFile('stdout');
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws \League\Geotools\Exception\InvalidArgumentException
|
||||
*
|
||||
|
||||
@@ -5,20 +5,11 @@ namespace App\Console\Commands;
|
||||
use App\Console\Command;
|
||||
use GuzzleHttp\Client;
|
||||
|
||||
/**
|
||||
* Class TestApi
|
||||
*/
|
||||
class TestApi extends Command
|
||||
{
|
||||
protected $signature = 'phpvms:test-api {apikey} {url}';
|
||||
protected $httpClient;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
$this->redirectLoggingToFile('stdout');
|
||||
}
|
||||
|
||||
/**
|
||||
* Run dev related commands
|
||||
*/
|
||||
|
||||
@@ -6,9 +6,6 @@ use App\Console\Command;
|
||||
use App\Services\VersionService;
|
||||
use Symfony\Component\Yaml\Yaml;
|
||||
|
||||
/**
|
||||
* Class Version
|
||||
*/
|
||||
class Version extends Command
|
||||
{
|
||||
protected $signature = 'phpvms:version {--write} {--base-only}';
|
||||
@@ -19,7 +16,6 @@ class Version extends Command
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->redirectLoggingToFile('stdout');
|
||||
$this->versionSvc = $versionSvc;
|
||||
}
|
||||
|
||||
|
||||
@@ -14,13 +14,6 @@ class YamlExport extends Command
|
||||
protected $signature = 'phpvms:yaml-export {tables*}';
|
||||
protected $description = 'YAML table export';
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->redirectLoggingToFile('stdout');
|
||||
}
|
||||
|
||||
/**
|
||||
* Run dev related commands
|
||||
*/
|
||||
|
||||
@@ -24,7 +24,6 @@ class YamlImport extends Command
|
||||
parent::__construct();
|
||||
|
||||
$this->dbSvc = $dbSvc;
|
||||
$this->redirectLoggingToFile('stdout');
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -9,9 +9,6 @@ use App\Console\Cron\Weekly;
|
||||
use Illuminate\Console\Scheduling\Schedule;
|
||||
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
|
||||
|
||||
/**
|
||||
* Class Kernel
|
||||
*/
|
||||
class Kernel extends ConsoleKernel
|
||||
{
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user