diff --git a/app/Http/Controllers/Admin/Servers/ServerTransferController.php b/app/Http/Controllers/Admin/Servers/ServerTransferController.php index b0b9740a0..9518092f1 100644 --- a/app/Http/Controllers/Admin/Servers/ServerTransferController.php +++ b/app/Http/Controllers/Admin/Servers/ServerTransferController.php @@ -91,7 +91,7 @@ class ServerTransferController extends Controller $transfer->new_node = $node_id; $transfer->old_allocation = $server->allocation_id; $transfer->new_allocation = $allocation_id; - $transfer->old_additional_allocations = $server->allocations->where('id', '!=', $server->allocation_id)->pluck('id'); + $transfer->old_additional_allocations = $server->allocations->where('id', '!=', $server->allocation_id)->pluck('id')->all(); $transfer->new_additional_allocations = $additional_allocations; $transfer->save(); diff --git a/app/Models/Model.php b/app/Models/Model.php index a512ccc12..ea20103ab 100644 --- a/app/Models/Model.php +++ b/app/Models/Model.php @@ -12,7 +12,7 @@ use Illuminate\Validation\ValidationException; use Illuminate\Database\Eloquent\Factories\HasFactory; use App\Exceptions\Model\DataValidationException; use Illuminate\Database\Eloquent\Model as IlluminateModel; -use Illuminate\Contracts\Validation\Factory as ValidationFactory; +use Illuminate\Validation\Factory as ValidationFactory; use Illuminate\Validation\Validator; abstract class Model extends IlluminateModel diff --git a/app/Services/Allocations/AllocationDeletionService.php b/app/Services/Allocations/AllocationDeletionService.php index 642f77edb..a42f36b56 100644 --- a/app/Services/Allocations/AllocationDeletionService.php +++ b/app/Services/Allocations/AllocationDeletionService.php @@ -19,6 +19,6 @@ class AllocationDeletionService throw new ServerUsingAllocationException(trans('exceptions.allocations.server_using')); } - return $allocation->delete(); + return (int) $allocation->delete(); } } diff --git a/app/Services/Databases/Hosts/HostDeletionService.php b/app/Services/Databases/Hosts/HostDeletionService.php index 16b688b8f..c1caabac9 100644 --- a/app/Services/Databases/Hosts/HostDeletionService.php +++ b/app/Services/Databases/Hosts/HostDeletionService.php @@ -21,6 +21,6 @@ class HostDeletionService throw new HasActiveServersException(trans('exceptions.databases.delete_has_databases')); } - return $host->delete(); + return (int) $host->delete(); } } diff --git a/app/Services/Eggs/EggDeletionService.php b/app/Services/Eggs/EggDeletionService.php index 8f01b5218..623a87bcc 100644 --- a/app/Services/Eggs/EggDeletionService.php +++ b/app/Services/Eggs/EggDeletionService.php @@ -28,6 +28,6 @@ class EggDeletionService $egg = Egg::query()->findOrFail($egg); - return $egg->delete(); + return (int) $egg->delete(); } } diff --git a/app/Services/Nodes/NodeDeletionService.php b/app/Services/Nodes/NodeDeletionService.php index 9217f6467..5aee63c3b 100644 --- a/app/Services/Nodes/NodeDeletionService.php +++ b/app/Services/Nodes/NodeDeletionService.php @@ -31,6 +31,6 @@ class NodeDeletionService throw new HasActiveServersException($this->translator->get('exceptions.node.servers_attached')); } - return $node->delete(); + return (int) $node->delete(); } } diff --git a/app/Transformers/Api/Application/BaseTransformer.php b/app/Transformers/Api/Application/BaseTransformer.php index 2c987b37c..8052c20ae 100644 --- a/app/Transformers/Api/Application/BaseTransformer.php +++ b/app/Transformers/Api/Application/BaseTransformer.php @@ -50,7 +50,7 @@ abstract class BaseTransformer extends TransformerAbstract /** * Returns a new transformer instance with the request set on the instance. */ - public static function fromRequest(Request $request): BaseTransformer + public static function fromRequest(Request $request): static { return app(static::class)->setRequest($request); } diff --git a/phpstan.neon b/phpstan.neon index 027d25359..d56f916ea 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -7,7 +7,7 @@ parameters: - app/ # Level 9 is the highest level - level: 2 + level: 3 ignoreErrors: # Prologue\Alerts defines its methods from its configuration file dynamically