Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/react-admin

Browse source
This commit is contained in:
Matthew Penner 2021-01-23 14:39:23 -07:00
commit 8feb87de7c
532 changed files with 4262 additions and 5622 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/Repositories/Eloquent/NestRepository.php
View file

@ -38,10 +38,10 @@ class NestRepository extends EloquentRepository implements NestRepositoryInterfa
{
$instance = $this->getBuilder()->with('eggs', 'eggs.variables');
if (! is_null($id)) {
if (!is_null($id)) {
$instance = $instance->find($id, $this->getColumns());
if (! $instance) {
throw new RecordNotFoundException;
if (!$instance) {
throw new RecordNotFoundException();
}
return $instance;
@ -53,7 +53,6 @@ class NestRepository extends EloquentRepository implements NestRepositoryInterfa
/**
* Return a nest or all nests and the count of eggs and servers for that nest.
*
* @param int|null $id
* @return \Pterodactyl\Models\Nest|\Illuminate\Database\Eloquent\Collection
*
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
@ -62,10 +61,10 @@ class NestRepository extends EloquentRepository implements NestRepositoryInterfa
{
$instance = $this->getBuilder()->withCount(['eggs', 'servers']);
if (! is_null($id)) {
if (!is_null($id)) {
$instance = $instance->find($id, $this->getColumns());
if (! $instance) {
throw new RecordNotFoundException;
if (!$instance) {
throw new RecordNotFoundException();
}
return $instance;
@ -77,16 +76,13 @@ class NestRepository extends EloquentRepository implements NestRepositoryInterfa
/**
* Return a nest along with its associated eggs and the servers relation on those eggs.
*
* @param int $id
* @return \Pterodactyl\Models\Nest
*
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
*/
public function getWithEggServers(int $id): Nest
{
$instance = $this->getBuilder()->with('eggs.servers')->find($id, $this->getColumns());
if (! $instance) {
throw new RecordNotFoundException;
if (!$instance) {
throw new RecordNotFoundException();
}
/* @var Nest $instance */