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

Less strict type; closes #2681

Browse source
This commit is contained in:
Dane Everitt 2020-12-06 14:17:54 -08:00
parent d22456d9ca
commit f9ea96f45d
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Transformers/Api/Application/ServerDatabaseTransformer.php
View file

@ -4,7 +4,6 @@ namespace Pterodactyl\Transformers\Api\Application;
use Cake\Chronos\Chronos; use Cake\Chronos\Chronos;
use Pterodactyl\Models\Database; use Pterodactyl\Models\Database;
use League\Fractal\Resource\Item;
use Pterodactyl\Models\DatabaseHost; use Pterodactyl\Models\DatabaseHost;
use Pterodactyl\Services\Acl\Api\AdminAcl; use Pterodactyl\Services\Acl\Api\AdminAcl;
use Illuminate\Contracts\Encryption\Encrypter; use Illuminate\Contracts\Encryption\Encrypter;
@ -72,7 +71,7 @@ class ServerDatabaseTransformer extends BaseTransformer
* @param \Pterodactyl\Models\Database $model * @param \Pterodactyl\Models\Database $model
* @return \League\Fractal\Resource\Item * @return \League\Fractal\Resource\Item
*/ */
public function includePassword(Database $model): Item public function includePassword(Database $model)
{ {
return $this->item($model, function (Database $model) { return $this->item($model, function (Database $model) {
return [ return [

5
app/Transformers/Api/Client/DatabaseTransformer.php
View file

@ -3,7 +3,6 @@
namespace Pterodactyl\Transformers\Api\Client; namespace Pterodactyl\Transformers\Api\Client;
use Pterodactyl\Models\Database; use Pterodactyl\Models\Database;
use League\Fractal\Resource\Item;
use Pterodactyl\Models\Permission; use Pterodactyl\Models\Permission;
use Illuminate\Contracts\Encryption\Encrypter; use Illuminate\Contracts\Encryption\Encrypter;
use Pterodactyl\Contracts\Extensions\HashidsInterface; use Pterodactyl\Contracts\Extensions\HashidsInterface;
@ -69,9 +68,9 @@ class DatabaseTransformer extends BaseClientTransformer
* @param \Pterodactyl\Models\Database $database * @param \Pterodactyl\Models\Database $database
* @return \League\Fractal\Resource\Item|\League\Fractal\Resource\NullResource * @return \League\Fractal\Resource\Item|\League\Fractal\Resource\NullResource
*/ */
public function includePassword(Database $database): Item public function includePassword(Database $database)
{ {
if (!$this->getUser()->can(Permission::ACTION_DATABASE_VIEW_PASSWORD, $database->server)) { if (! $this->getUser()->can(Permission::ACTION_DATABASE_VIEW_PASSWORD, $database->server)) {
return $this->null(); return $this->null();
} }