StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplify transformer logic

Browse source
This commit is contained in:
DaneEveritt 2022-05-22 16:23:22 -04:00
parent f7fc67344e
commit 33bafe9277
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
6 changed files with 32 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/Api/Client/ClientApiController.php
View file

@ -3,7 +3,6 @@
namespace Pterodactyl\Http\Controllers\Api\Client;
use Webmozart\Assert\Assert;
use Pterodactyl\Transformers\Daemon\BaseDaemonTransformer;
use Pterodactyl\Transformers\Api\Client\BaseClientTransformer;
use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
@ -55,13 +54,8 @@ abstract class ClientApiController extends ApplicationApiController
*/
public function getTransformer(string $abstract)
{
Assert::methodExists($abstract, 'fromRequest');
Assert::subclassOf($abstract, BaseClientTransformer::class);
/** @var T $transformer */
$transformer = $abstract::fromRequest($this->request);
Assert::isInstanceOfAny($transformer, [BaseClientTransformer::class, BaseDaemonTransformer::class]);
return $transformer;
return $abstract::fromRequest($this->request);
}
}

2
app/Http/Controllers/Api/Client/Servers/FileController.php
View file

@ -10,7 +10,7 @@ use Illuminate\Http\JsonResponse;
use Pterodactyl\Services\Nodes\NodeJWTService;
use Illuminate\Contracts\Routing\ResponseFactory;
use Pterodactyl\Repositories\Wings\DaemonFileRepository;
use Pterodactyl\Transformers\Daemon\FileObjectTransformer;
use Pterodactyl\Transformers\Api\Client\FileObjectTransformer;
use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\CopyFileRequest;
use Pterodactyl\Http\Requests\Api\Client\Servers\Files\PullFileRequest;