FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't allow cancels from certain states (#396)

Browse Source 
* Don't allow cancels from certain states

* Unused imports

* Don't reset the state doubly

* Move SetUserActive into listener; code cleanup

* Unused imports

* Add missing files into htaccess

* Move Command contract to correct folder
This commit is contained in:
Nabeel S
2019-09-16 13:08:26 -04:00
committed by GitHub
parent 41baefbf4a
commit aedb1f22b6
61 changed files with 231 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
app/Console/Command.php
View File

@@ -1,113 +0,0 @@
<?php
namespace App\Console;
use Illuminate\Support\Facades\Log;
use Symfony\Component\Process\Process;
/**
* Class BaseCommand
*/
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
*/
abstract public function handle();
/**
* Splice the logger and replace the active handlers with the handlers from the
* a stack in config/logging.php
*
* @param string $channel_name Channel name from config/logging.php
*/
public function redirectLoggingToFile($channel_name): void
{
$logger = app(\Illuminate\Log\Logger::class);
// Close the existing loggers
try {
$handlers = $logger->getHandlers();
foreach ($handlers as $handler) {
$handler->close();
}
} catch (\Exception $e) {
$this->error('Error closing handlers: '.$e->getMessage());
}
// Open the handlers for the channel name,
// and then set them to the main logger
try {
$logger->setHandlers(
Log::channel($channel_name)->getHandlers()
);
} catch (\Exception $e) {
$this->error('Couldn\'t splice the logger: '.$e->getMessage());
}
}
/**
* Streaming file reader
*
* @param $filename
*
* @return \Generator
*/
public function readFile($filename): ?\Generator
{
$fp = fopen($filename, 'rb');
while (($line = fgets($fp)) !== false) {
$line = rtrim($line, "\r\n");
if ($line[0] === ';') {
continue;
}
yield $line;
}
fclose($fp);
}
/**
* @param $cmd
* @param bool $return
* @param mixed $verbose
*
* @throws \Symfony\Component\Process\Exception\RuntimeException
* @throws \Symfony\Component\Process\Exception\LogicException
*
* @return string
*/
public function runCommand($cmd, $return = false, $verbose = true): string
{
if (\is_array($cmd)) {
$cmd = implode(' ', $cmd);
}
if ($verbose) {
$this->info('Running "'.$cmd.'"');
}
$val = '';
$process = new Process($cmd);
$process->run(function ($type, $buffer) use ($return, &$val) {
if ($return) {
$val .= $buffer;
} else {
echo $buffer;
}
});
return $val;
}
}

2
app/Console/Commands/AcarsReplay.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Commands;
use App\Console\Command;
use App\Contracts\Command;
use App\Facades\Utils;
use GuzzleHttp\Client;
use Illuminate\Database\Eloquent\Collection;

2
app/Console/Commands/ComposerCommand.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Commands;
use App\Console\Command;
use App\Contracts\Command;
use Illuminate\Support\Facades\Artisan;
class ComposerCommand extends Command

2
app/Console/Commands/CreateDatabase.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Commands;
use App\Console\Command;
use App\Contracts\Command;
use Illuminate\Support\Facades\Log;
use Tivie\OS\Detector;

2
app/Console/Commands/DevCommands.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Commands;
use App\Console\Command;
use App\Contracts\Command;
use App\Models\Acars;
use App\Models\Airline;
use App\Models\Pirep;

2
app/Console/Commands/DevInstall.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Commands;
use App\Console\Command;
use App\Contracts\Command;
use Modules\Installer\Services\ConfigService;
/**

2
app/Console/Commands/ImportCsv.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Commands;
use App\Console\Command;
use App\Contracts\Command;
use App\Services\ImportService;
class ImportCsv extends Command

2
app/Console/Commands/ImportFromClassic.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Commands;
use App\Console\Command;
use App\Contracts\Command;
class ImportFromClassic extends Command
{

2
app/Console/Commands/NavdataImport.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Commands;
use App\Console\Command;
use App\Contracts\Command;
use App\Models\Enums\NavaidType;
use App\Models\Navdata;

2
app/Console/Commands/TestApi.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Commands;
use App\Console\Command;
use App\Contracts\Command;
use GuzzleHttp\Client;
class TestApi extends Command

2
app/Console/Commands/Version.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Commands;
use App\Console\Command;
use App\Contracts\Command;
use App\Services\VersionService;
use Symfony\Component\Yaml\Yaml;

2
app/Console/Commands/YamlExport.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Commands;
use App\Console\Command;
use App\Contracts\Command;
use DB;
use Symfony\Component\Yaml\Yaml;

2
app/Console/Commands/YamlImport.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Commands;
use App\Console\Command;
use App\Contracts\Command;
use App\Services\DatabaseService;
/**

2
app/Console/Cron/Hourly.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Cron;
use App\Console\Command;
use App\Contracts\Command;
use App\Events\CronHourly;
/**

2
app/Console/Cron/Monthly.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Cron;
use App\Console\Command;
use App\Contracts\Command;
use App\Events\CronMonthly;
/**

2
app/Console/Cron/Nightly.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Cron;
use App\Console\Command;
use App\Contracts\Command;
use App\Events\CronNightly;
/**

2
app/Console/Cron/Weekly.php
View File

@@ -2,7 +2,7 @@
namespace App\Console\Cron;
use App\Console\Command;
use App\Contracts\Command;
use App\Events\CronWeekly;
/**