linuxserver/Heimdall
1
0
Fork 0
mirror of https://github.com/linuxserver/Heimdall.git synced 2025-11-02 05:57:48 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Shift core files

Browse Source
This commit is contained in:
Shift
2024-02-16 21:13:07 +00:00
parent b943674881
commit ef25ec4f69
7 changed files with 115 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Exceptions/Handler.php
View File

@@ -8,25 +8,7 @@ use Throwable;
class Handler extends ExceptionHandler class Handler extends ExceptionHandler
{ {
/** /**
* A list of exception types with their corresponding custom log levels. * The list of the inputs that are never flashed to the session on validation exceptions.
*
* @var array<class-string<\Throwable>, \Psr\Log\LogLevel::*>
*/
protected $levels = [
//
];
/**
* A list of the exception types that are not reported.
*
* @var array<int, class-string<\Throwable>>
*/
protected $dontReport = [
//
];
/**
* A list of the inputs that are never flashed to the session on validation exceptions.
* *
* @var array<int, string> * @var array<int, string>
*/ */
@@ -38,10 +20,8 @@ class Handler extends ExceptionHandler
/** /**
* Register the exception handling callbacks for the application. * Register the exception handling callbacks for the application.
*
* @return void
*/ */
public function register() public function register(): void
{ {
$this->reportable(function (Throwable $e) { $this->reportable(function (Throwable $e) {
// //

3
app/Http/Controllers/Controller.php
View File

@@ -4,13 +4,12 @@ namespace App\Http\Controllers;
use App\User; use App\User;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController; use Illuminate\Routing\Controller as BaseController;
class Controller extends BaseController class Controller extends BaseController
{ {
use AuthorizesRequests, DispatchesJobs, ValidatesRequests; use AuthorizesRequests, ValidatesRequests;
protected $user; protected $user;

8
app/Http/Kernel.php
View File

@@ -37,19 +37,19 @@ class Kernel extends HttpKernel
], ],
'api' => [ 'api' => [
'throttle:60,1', \Illuminate\Routing\Middleware\ThrottleRequests::class.':60,1',
'bindings', 'bindings',
], ],
]; ];
/** /**
* The application's route middleware. * The application's middleware aliases.
* *
* These middleware may be assigned to groups or used individually. * Aliases may be used to conveniently assign middleware to routes and groups.
* *
* @var array * @var array
*/ */
protected $routeMiddleware = [ protected $middlewareAliases = [
'allowed' => \App\Http\Middleware\CheckAllowed::class, 'allowed' => \App\Http\Middleware\CheckAllowed::class,
'auth' => \Illuminate\Auth\Middleware\Authenticate::class, 'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,

4
app/Providers/BroadcastServiceProvider.php
View File

@@ -9,10 +9,8 @@ class BroadcastServiceProvider extends ServiceProvider
{ {
/** /**
* Bootstrap any application services. * Bootstrap any application services.
*
* @return void
*/ */
public function boot() public function boot(): void
{ {
Broadcast::routes(); Broadcast::routes();

5
database/factories/UserFactory.php
View File

@@ -2,6 +2,7 @@
namespace Database\Factories; namespace Database\Factories;
use Illuminate\Support\Facades\Hash;
use App\User; use App\User;
use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Database\Eloquent\Factories\Factory;
use Illuminate\Support\Str; use Illuminate\Support\Str;
@@ -13,12 +14,14 @@ class UserFactory extends Factory
* *
* @return array * @return array
*/ */
protected static ?string $password;
public function definition() public function definition()
{ {
return [ return [
'username' => $this->faker->name(), 'username' => $this->faker->name(),
'email' => $this->faker->unique()->safeEmail(), 'email' => $this->faker->unique()->safeEmail(),
'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password 'password' => static::$password ??= Hash::make('password'),
'public_front' => 1, 'public_front' => 1,
'remember_token' => Str::random(10), 'remember_token' => Str::random(10),
]; ];

190
lang/en/validation.php
View File

@@ -13,113 +13,125 @@ return [
| |
*/ */
'accepted' => 'The :attribute must be accepted.', 'accepted' => 'The :attribute field must be accepted.',
'accepted_if' => 'The :attribute must be accepted when :other is :value.', 'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
'active_url' => 'The :attribute is not a valid URL.', 'active_url' => 'The :attribute field must be a valid URL.',
'after' => 'The :attribute must be a date after :date.', 'after' => 'The :attribute field must be a date after :date.',
'after_or_equal' => 'The :attribute must be a date after or equal to :date.', 'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
'alpha' => 'The :attribute must only contain letters.', 'alpha' => 'The :attribute field must only contain letters.',
'alpha_dash' => 'The :attribute must only contain letters, numbers, dashes and underscores.', 'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
'alpha_num' => 'The :attribute must only contain letters and numbers.', 'alpha_num' => 'The :attribute field must only contain letters and numbers.',
'array' => 'The :attribute must be an array.', 'array' => 'The :attribute field must be an array.',
'ascii' => 'The :attribute must only contain single-byte alphanumeric characters and symbols.', 'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
'before' => 'The :attribute must be a date before :date.', 'before' => 'The :attribute field must be a date before :date.',
'before_or_equal' => 'The :attribute must be a date before or equal to :date.', 'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
'between' => [ 'between' => [
'array' => 'The :attribute must have between :min and :max items.', 'array' => 'The :attribute field must have between :min and :max items.',
'file' => 'The :attribute must be between :min and :max kilobytes.', 'file' => 'The :attribute field must be between :min and :max kilobytes.',
'numeric' => 'The :attribute must be between :min and :max.', 'numeric' => 'The :attribute field must be between :min and :max.',
'string' => 'The :attribute must be between :min and :max characters.', 'string' => 'The :attribute field must be between :min and :max characters.',
], ],
'boolean' => 'The :attribute field must be true or false.', 'boolean' => 'The :attribute field must be true or false.',
'confirmed' => 'The :attribute confirmation does not match.', 'can' => 'The :attribute field contains an unauthorized value.',
'confirmed' => 'The :attribute field confirmation does not match.',
'current_password' => 'The password is incorrect.', 'current_password' => 'The password is incorrect.',
'date' => 'The :attribute is not a valid date.', 'date' => 'The :attribute field must be a valid date.',
'date_equals' => 'The :attribute must be a date equal to :date.', 'date_equals' => 'The :attribute field must be a date equal to :date.',
'date_format' => 'The :attribute does not match the format :format.', 'date_format' => 'The :attribute field must match the format :format.',
'decimal' => 'The :attribute must have :decimal decimal places.', 'decimal' => 'The :attribute field must have :decimal decimal places.',
'declined' => 'The :attribute must be declined.', 'declined' => 'The :attribute field must be declined.',
'declined_if' => 'The :attribute must be declined when :other is :value.', 'declined_if' => 'The :attribute field must be declined when :other is :value.',
'different' => 'The :attribute and :other must be different.', 'different' => 'The :attribute field and :other must be different.',
'digits' => 'The :attribute must be :digits digits.', 'digits' => 'The :attribute field must be :digits digits.',
'digits_between' => 'The :attribute must be between :min and :max digits.', 'digits_between' => 'The :attribute field must be between :min and :max digits.',
'dimensions' => 'The :attribute has invalid image dimensions.', 'dimensions' => 'The :attribute field has invalid image dimensions.',
'distinct' => 'The :attribute field has a duplicate value.', 'distinct' => 'The :attribute field has a duplicate value.',
'doesnt_end_with' => 'The :attribute may not end with one of the following: :values.', 'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
'doesnt_start_with' => 'The :attribute may not start with one of the following: :values.', 'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
'email' => 'The :attribute must be a valid email address.', 'email' => 'The :attribute field must be a valid email address.',
'ends_with' => 'The :attribute must end with one of the following: :values.', 'ends_with' => 'The :attribute field must end with one of the following: :values.',
'enum' => 'The selected :attribute is invalid.', 'enum' => 'The selected :attribute is invalid.',
'exists' => 'The selected :attribute is invalid.', 'exists' => 'The selected :attribute is invalid.',
'file' => 'The :attribute must be a file.', 'extensions' => 'The :attribute field must have one of the following extensions: :values.',
'file' => 'The :attribute field must be a file.',
'filled' => 'The :attribute field must have a value.', 'filled' => 'The :attribute field must have a value.',
'gt' => [ 'gt' => [
'array' => 'The :attribute must have more than :value items.', 'array' => 'The :attribute field must have more than :value items.',
'file' => 'The :attribute must be greater than :value kilobytes.', 'file' => 'The :attribute field must be greater than :value kilobytes.',
'numeric' => 'The :attribute must be greater than :value.', 'numeric' => 'The :attribute field must be greater than :value.',
'string' => 'The :attribute must be greater than :value characters.', 'string' => 'The :attribute field must be greater than :value characters.',
], ],
'gte' => [ 'gte' => [
'array' => 'The :attribute must have :value items or more.', 'array' => 'The :attribute field must have :value items or more.',
'file' => 'The :attribute must be greater than or equal to :value kilobytes.', 'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
'numeric' => 'The :attribute must be greater than or equal to :value.', 'numeric' => 'The :attribute field must be greater than or equal to :value.',
'string' => 'The :attribute must be greater than or equal to :value characters.', 'string' => 'The :attribute field must be greater than or equal to :value characters.',
], ],
'image' => 'The :attribute must be an image.', 'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
'image' => 'The :attribute field must be an image.',
'in' => 'The selected :attribute is invalid.', 'in' => 'The selected :attribute is invalid.',
'in_array' => 'The :attribute field does not exist in :other.', 'in_array' => 'The :attribute field must exist in :other.',
'integer' => 'The :attribute must be an integer.', 'integer' => 'The :attribute field must be an integer.',
'ip' => 'The :attribute must be a valid IP address.', 'ip' => 'The :attribute field must be a valid IP address.',
'ipv4' => 'The :attribute must be a valid IPv4 address.', 'ipv4' => 'The :attribute field must be a valid IPv4 address.',
'ipv6' => 'The :attribute must be a valid IPv6 address.', 'ipv6' => 'The :attribute field must be a valid IPv6 address.',
'json' => 'The :attribute must be a valid JSON string.', 'json' => 'The :attribute field must be a valid JSON string.',
'lowercase' => 'The :attribute must be lowercase.', 'lowercase' => 'The :attribute field must be lowercase.',
'lt' => [ 'lt' => [
'array' => 'The :attribute must have less than :value items.', 'array' => 'The :attribute field must have less than :value items.',
'file' => 'The :attribute must be less than :value kilobytes.', 'file' => 'The :attribute field must be less than :value kilobytes.',
'numeric' => 'The :attribute must be less than :value.', 'numeric' => 'The :attribute field must be less than :value.',
'string' => 'The :attribute must be less than :value characters.', 'string' => 'The :attribute field must be less than :value characters.',
], ],
'lte' => [ 'lte' => [
'array' => 'The :attribute must not have more than :value items.', 'array' => 'The :attribute field must not have more than :value items.',
'file' => 'The :attribute must be less than or equal to :value kilobytes.', 'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
'numeric' => 'The :attribute must be less than or equal to :value.', 'numeric' => 'The :attribute field must be less than or equal to :value.',
'string' => 'The :attribute must be less than or equal to :value characters.', 'string' => 'The :attribute field must be less than or equal to :value characters.',
], ],
'mac_address' => 'The :attribute must be a valid MAC address.', 'mac_address' => 'The :attribute field must be a valid MAC address.',
'max' => [ 'max' => [
'array' => 'The :attribute must not have more than :max items.', 'array' => 'The :attribute field must not have more than :max items.',
'file' => 'The :attribute must not be greater than :max kilobytes.', 'file' => 'The :attribute field must not be greater than :max kilobytes.',
'numeric' => 'The :attribute must not be greater than :max.', 'numeric' => 'The :attribute field must not be greater than :max.',
'string' => 'The :attribute must not be greater than :max characters.', 'string' => 'The :attribute field must not be greater than :max characters.',
], ],
'max_digits' => 'The :attribute must not have more than :max digits.', 'max_digits' => 'The :attribute field must not have more than :max digits.',
'mimes' => 'The :attribute must be a file of type: :values.', 'mimes' => 'The :attribute field must be a file of type: :values.',
'mimetypes' => 'The :attribute must be a file of type: :values.', 'mimetypes' => 'The :attribute field must be a file of type: :values.',
'min' => [ 'min' => [
'array' => 'The :attribute must have at least :min items.', 'array' => 'The :attribute field must have at least :min items.',
'file' => 'The :attribute must be at least :min kilobytes.', 'file' => 'The :attribute field must be at least :min kilobytes.',
'numeric' => 'The :attribute must be at least :min.', 'numeric' => 'The :attribute field must be at least :min.',
'string' => 'The :attribute must be at least :min characters.', 'string' => 'The :attribute field must be at least :min characters.',
], ],
'min_digits' => 'The :attribute must have at least :min digits.', 'min_digits' => 'The :attribute field must have at least :min digits.',
'multiple_of' => 'The :attribute must be a multiple of :value.', 'missing' => 'The :attribute field must be missing.',
'missing_if' => 'The :attribute field must be missing when :other is :value.',
'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
'missing_with' => 'The :attribute field must be missing when :values is present.',
'missing_with_all' => 'The :attribute field must be missing when :values are present.',
'multiple_of' => 'The :attribute field must be a multiple of :value.',
'not_in' => 'The selected :attribute is invalid.', 'not_in' => 'The selected :attribute is invalid.',
'not_regex' => 'The :attribute format is invalid.', 'not_regex' => 'The :attribute field format is invalid.',
'numeric' => 'The :attribute must be a number.', 'numeric' => 'The :attribute field must be a number.',
'password' => [ 'password' => [
'letters' => 'The :attribute must contain at least one letter.', 'letters' => 'The :attribute field must contain at least one letter.',
'mixed' => 'The :attribute must contain at least one uppercase and one lowercase letter.', 'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
'numbers' => 'The :attribute must contain at least one number.', 'numbers' => 'The :attribute field must contain at least one number.',
'symbols' => 'The :attribute must contain at least one symbol.', 'symbols' => 'The :attribute field must contain at least one symbol.',
'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.', 'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
], ],
'present' => 'The :attribute field must be present.', 'present' => 'The :attribute field must be present.',
'present_if' => 'The :attribute field must be present when :other is :value.',
'present_unless' => 'The :attribute field must be present unless :other is :value.',
'present_with' => 'The :attribute field must be present when :values is present.',
'present_with_all' => 'The :attribute field must be present when :values are present.',
'prohibited' => 'The :attribute field is prohibited.', 'prohibited' => 'The :attribute field is prohibited.',
'prohibited_if' => 'The :attribute field is prohibited when :other is :value.', 'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.', 'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
'prohibits' => 'The :attribute field prohibits :other from being present.', 'prohibits' => 'The :attribute field prohibits :other from being present.',
'regex' => 'The :attribute format is invalid.', 'regex' => 'The :attribute field format is invalid.',
'required' => 'The :attribute field is required.', 'required' => 'The :attribute field is required.',
'required_array_keys' => 'The :attribute field must contain entries for: :values.', 'required_array_keys' => 'The :attribute field must contain entries for: :values.',
'required_if' => 'The :attribute field is required when :other is :value.', 'required_if' => 'The :attribute field is required when :other is :value.',
@@ -129,22 +141,22 @@ return [
'required_with_all' => 'The :attribute field is required when :values are present.', 'required_with_all' => 'The :attribute field is required when :values are present.',
'required_without' => 'The :attribute field is required when :values is not present.', 'required_without' => 'The :attribute field is required when :values is not present.',
'required_without_all' => 'The :attribute field is required when none of :values are present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.',
'same' => 'The :attribute and :other must match.', 'same' => 'The :attribute field must match :other.',
'size' => [ 'size' => [
'array' => 'The :attribute must contain :size items.', 'array' => 'The :attribute field must contain :size items.',
'file' => 'The :attribute must be :size kilobytes.', 'file' => 'The :attribute field must be :size kilobytes.',
'numeric' => 'The :attribute must be :size.', 'numeric' => 'The :attribute field must be :size.',
'string' => 'The :attribute must be :size characters.', 'string' => 'The :attribute field must be :size characters.',
], ],
'starts_with' => 'The :attribute must start with one of the following: :values.', 'starts_with' => 'The :attribute field must start with one of the following: :values.',
'string' => 'The :attribute must be a string.', 'string' => 'The :attribute field must be a string.',
'timezone' => 'The :attribute must be a valid timezone.', 'timezone' => 'The :attribute field must be a valid timezone.',
'unique' => 'The :attribute has already been taken.', 'unique' => 'The :attribute has already been taken.',
'uploaded' => 'The :attribute failed to upload.', 'uploaded' => 'The :attribute failed to upload.',
'uppercase' => 'The :attribute must be uppercase.', 'uppercase' => 'The :attribute field must be uppercase.',
'url' => 'The :attribute must be a valid URL.', 'url' => 'The :attribute field must be a valid URL.',
'ulid' => 'The :attribute must be a valid ULID.', 'ulid' => 'The :attribute field must be a valid ULID.',
'uuid' => 'The :attribute must be a valid UUID.', 'uuid' => 'The :attribute field must be a valid UUID.',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

3
phpunit.xml
View File

@@ -20,7 +20,8 @@
<!-- <env name="DB_CONNECTION" value="sqlite"/> --> <!-- <env name="DB_CONNECTION" value="sqlite"/> -->
<!-- <env name="DB_DATABASE" value=":memory:"/> --> <!-- <env name="DB_DATABASE" value=":memory:"/> -->
<env name="MAIL_MAILER" value="array"/> <env name="MAIL_MAILER" value="array"/>
<env name="QUEUE_CONNECTION" value="sync"/> <env name="PULSE_ENABLED" value="false"/>
<env name="QUEUE_CONNECTION" value="sync"/>
<env name="SESSION_DRIVER" value="array"/> <env name="SESSION_DRIVER" value="array"/>
<env name="TELESCOPE_ENABLED" value="false"/> <env name="TELESCOPE_ENABLED" value="false"/>
</php> </php>