This commit is contained in:
Dane Everitt 2020-06-28 15:43:44 -07:00
parent 6143b656a3
commit 2ed3763d21
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
17 changed files with 18 additions and 19 deletions

View file

@ -4,6 +4,7 @@ on:
pull_request: pull_request:
jobs: jobs:
integration_tests: integration_tests:
if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
runs-on: ubuntu-latest runs-on: ubuntu-latest
services: services:
mysql: mysql:

View file

@ -38,7 +38,7 @@ class CleanOrphanedApiKeysCommand extends Command
/** /**
* Delete all orphaned API keys from the database when upgrading from 0.6 to 0.7. * Delete all orphaned API keys from the database when upgrading from 0.6 to 0.7.
* *
* @return null|void * @return void|null
*/ */
public function handle() public function handle()
{ {

View file

@ -19,7 +19,7 @@ interface SessionRepositoryInterface extends RepositoryInterface
* *
* @param int $user * @param int $user
* @param string $session * @param string $session
* @return null|int * @return int|null
*/ */
public function deleteUserSession(int $user, string $session); public function deleteUserSession(int $user, string $session);
} }

View file

@ -21,7 +21,7 @@ interface TaskRepositoryInterface extends RepositoryInterface
* *
* @param int $schedule * @param int $schedule
* @param int $index * @param int $index
* @return null|\Pterodactyl\Models\Task * @return \Pterodactyl\Models\Task|null
*/ */
public function getNextTask(int $schedule, int $index); public function getNextTask(int $schedule, int $index);
} }

View file

@ -21,7 +21,7 @@ class StoreNodeRequest extends ApplicationApiRequest
/** /**
* Validation rules to apply to this request. * Validation rules to apply to this request.
* *
* @param null|array $rules * @param array|null $rules
* @return array * @return array
*/ */
public function rules(array $rules = null): array public function rules(array $rules = null): array

View file

@ -7,7 +7,7 @@ trait Searchable
/** /**
* The search term to use when filtering results. * The search term to use when filtering results.
* *
* @var null|string * @var string|null
*/ */
protected $searchTerm; protected $searchTerm;

View file

@ -34,7 +34,7 @@ class SessionRepository extends EloquentRepository implements SessionRepositoryI
* *
* @param int $user * @param int $user
* @param string $session * @param string $session
* @return null|int * @return int|null
*/ */
public function deleteUserSession(int $user, string $session) public function deleteUserSession(int $user, string $session)
{ {

View file

@ -41,7 +41,7 @@ class TaskRepository extends EloquentRepository implements TaskRepositoryInterfa
* *
* @param int $schedule * @param int $schedule
* @param int $index * @param int $index
* @return null|\Pterodactyl\Models\Task * @return \Pterodactyl\Models\Task|null
*/ */
public function getNextTask(int $schedule, int $index) public function getNextTask(int $schedule, int $index)
{ {

View file

@ -24,7 +24,7 @@ class AssetHashService
private $application; private $application;
/** /**
* @var null|array * @var array|null
*/ */
protected static $manifest; protected static $manifest;

View file

@ -3,7 +3,6 @@
use Monolog\Handler\StreamHandler; use Monolog\Handler\StreamHandler;
return [ return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Default Log Channel | Default Log Channel
@ -77,5 +76,4 @@ return [
'level' => 'debug', 'level' => 'debug',
], ],
], ],
]; ];

View file

@ -23,6 +23,5 @@ class DeleteTaskWhenParentServerIsDeleted extends Migration
*/ */
public function down() public function down()
{ {
//
} }
} }

View file

@ -1,8 +1,8 @@
<?php <?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AllowNullableDescriptions extends Migration class AllowNullableDescriptions extends Migration
{ {

View file

@ -1,8 +1,8 @@
<?php <?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddMaxConnectionsColumn extends Migration class AddMaxConnectionsColumn extends Migration
{ {

View file

@ -1,8 +1,8 @@
<?php <?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddBackupLimitToServers extends Migration class AddBackupLimitToServers extends Migration
{ {

View file

@ -117,6 +117,7 @@ class EggSeeder extends Seeder
$decoded = json_decode($file->getContents()); $decoded = json_decode($file->getContents());
if (json_last_error() !== JSON_ERROR_NONE) { if (json_last_error() !== JSON_ERROR_NONE) {
$this->command->error('JSON decode exception for ' . $file->getFilename() . ': ' . json_last_error_msg()); $this->command->error('JSON decode exception for ' . $file->getFilename() . ': ' . json_last_error_msg());
return; return;
} }