Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump async from 2.6.3 to 2.6.4 #77

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Events/User/BanRepealed.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class BanRepealed extends BaseUserEvent
/**
* Create a new event instance.
*
* @param Ban $ban
* @param Ban $ban
*/
public function __construct(Ban $ban)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Events/User/Banned.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Banned extends BaseUserEvent
/**
* Create a new event instance.
*
* @param Ban $ban
* @param Ban $ban
*/
public function __construct(Ban $ban)
{
Expand Down
2 changes: 1 addition & 1 deletion app/Events/User/BaseUserEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ abstract class BaseUserEvent
/**
* Create a new event instance.
*
* @param User $user
* @param User $user
*/
public function __construct(User $user)
{
Expand Down
6 changes: 3 additions & 3 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Handler extends ExceptionHandler
/**
* Report or log an exception.
*
* @param Throwable $exception
* @param Throwable $exception
* @return void
*
* @throws Exception
Expand All @@ -46,8 +46,8 @@ public function report(Throwable $exception)
/**
* Render an exception into an HTTP response.
*
* @param Request $request
* @param Throwable $exception
* @param Request $request
* @param Throwable $exception
* @return Response
*
* @throws Throwable
Expand Down
11 changes: 6 additions & 5 deletions app/GraphQL/Directives/HasPermissionDirective.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ class HasPermissionDirective extends BaseDirective implements FieldMiddleware

/**
* CanDirective constructor.
* @param Gate $gate
*
* @param Gate $gate
* @return void
*/
public function __construct(Gate $gate)
Expand All @@ -31,8 +32,8 @@ public function __construct(Gate $gate)
/**
* Ensure the user is authorized to access this field.
*
* @param FieldValue $fieldValue
* @param Closure $next
* @param FieldValue $fieldValue
* @param Closure $next
* @return FieldValue
*/
public function handleField(FieldValue $fieldValue, Closure $next): FieldValue
Expand All @@ -54,8 +55,8 @@ function ($root, array $args, GraphQLContext $context, ResolveInfo $resolveInfo)
}

/**
* @param Gate $gate
* @param string|string[] $ability
* @param Gate $gate
* @param string|string[] $ability
* @return void
*
* @throws AuthorizationException
Expand Down
9 changes: 5 additions & 4 deletions app/GraphQL/Queries/AuthorizeUser.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ class AuthorizeUser
/**
* Checks if the authenticated user is able to perform a permission or not.
*
* @param null $rootValue Usually contains the result returned from the parent field. In this case, it is always `null`.
* @param mixed[] $args The arguments that were passed into the field.
* @param \Nuwave\Lighthouse\Support\Contracts\GraphQLContext $context Arbitrary data that is shared between all fields of a single query.
* @param \GraphQL\Type\Definition\ResolveInfo $resolveInfo Information about the query itself, such as the execution state, the field name, path to the field from the root, and more.
* @param null $rootValue Usually contains the result returned from the parent field. In this case, it is always `null`.
* @param mixed[] $args The arguments that were passed into the field.
* @param \Nuwave\Lighthouse\Support\Contracts\GraphQLContext $context Arbitrary data that is shared between all fields of a single query.
* @param \GraphQL\Type\Definition\ResolveInfo $resolveInfo Information about the query itself, such as the execution state, the field name, path to the field from the root, and more.
* @return mixed
*
* @throws AuthorizationException
*/
public function __invoke($rootValue, array $args, GraphQLContext $context, ResolveInfo $resolveInfo)
Expand Down
8 changes: 4 additions & 4 deletions app/GraphQL/Queries/UserRoles.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ class UserRoles
/**
* Return a value for the field.
*
* @param null $rootValue Usually contains the result returned from the parent field. In this case, it is always `null`.
* @param mixed[] $args The arguments that were passed into the field.
* @param \Nuwave\Lighthouse\Support\Contracts\GraphQLContext $context Arbitrary data that is shared between all fields of a single query.
* @param \GraphQL\Type\Definition\ResolveInfo $resolveInfo Information about the query itself, such as the execution state, the field name, path to the field from the root, and more.
* @param null $rootValue Usually contains the result returned from the parent field. In this case, it is always `null`.
* @param mixed[] $args The arguments that were passed into the field.
* @param \Nuwave\Lighthouse\Support\Contracts\GraphQLContext $context Arbitrary data that is shared between all fields of a single query.
* @param \GraphQL\Type\Definition\ResolveInfo $resolveInfo Information about the query itself, such as the execution state, the field name, path to the field from the root, and more.
* @return mixed
*/
public function __invoke($rootValue, array $args, GraphQLContext $context, ResolveInfo $resolveInfo)
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Auth/LoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function logout()
/**
* This function acts as an internal router for all login-related actions.
*
* @param Request $request
* @param Request $request
* @return mixed
*/
public function handleLogin(Request $request)
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Auth/ResetPasswordController.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ protected function guard()
/**
* Reset the given user's password.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
*/
public function reset(Request $request)
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Middleware/Authenticate.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Authenticate extends Middleware
/**
* Get the path the user should be redirected to when they are not authenticated.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Http\Request $request
* @return string
*/
protected function redirectTo($request)
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Middleware/CheckForExpiredPasswords.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ class CheckForExpiredPasswords
/**
* Handle an incoming request.
*
* @param Request $request
* @param Closure $next
* @param Request $request
* @param Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Middleware/MustHavePassword.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ class MustHavePassword
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
Expand Down
5 changes: 3 additions & 2 deletions app/Http/Middleware/PasswordConfirmation.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ class PasswordConfirmation extends RequirePassword
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*
* @throws \Throwable UnauthorizedException
*/
public function handle($request, Closure $next, $redirectToRoute = null)
Expand Down
1 change: 1 addition & 0 deletions app/Libraries/SSO/RsaSha1.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public function fetch_private_cert(&$request)
* Fetch the public RSA certificate (we do not use this functionality).
*
* @param $request
*
* @throws OAuthServerException
*/
public function fetch_public_cert(&$request)
Expand Down
32 changes: 16 additions & 16 deletions app/Libraries/SSO/VATSIMSSO.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static function isEnabled()
*
* @param $returnUrl
* @param $success
* @param null $error
* @param null $error
* @return bool|mixed
*/
public function login($returnUrl, $success, $error = null)
Expand All @@ -133,7 +133,7 @@ public function login($returnUrl, $success, $error = null)
* @param $secret
* @param $verifier
* @param $success
* @param null $error
* @param null $error
* @return bool|mixed
*/
public function validate($key, $secret, $verifier, $success, $error = null)
Expand All @@ -155,9 +155,9 @@ public function validate($key, $secret, $verifier, $success, $error = null)
/**
* Request a login token from VATSIM (required to send someone for an SSO login).
*
* @param string $return_url URL for VATSIM to return memers to after login
* @param bool $allow_sus true to allow suspended VATSIM accounts to log in
* @param bool $allow_ina true to allow inactive VATSIM accounts to log in
* @param string $return_url URL for VATSIM to return memers to after login
* @param bool $allow_sus true to allow suspended VATSIM accounts to log in
* @param bool $allow_ina true to allow inactive VATSIM accounts to log in
* @return object|bool
*/
public function requestToken($return_url = false, $allow_sus = false, $allow_ina = false)
Expand Down Expand Up @@ -223,9 +223,9 @@ public function requestToken($return_url = false, $allow_sus = false, $allow_ina
/**
* Obtains a user's login details from a token key and secret.
*
* @param string $tokenKey The token key provided by VATSIM
* @param secret $tokenSecret The secret associated with the token
* @return object|false false if error, otherwise returns user details
* @param string $tokenKey The token key provided by VATSIM
* @param secret $tokenSecret The secret associated with the token
* @return object|false false if error, otherwise returns user details
*/
public function checkLogin($tokenKey, $tokenSecret, $tokenVerifier)
{
Expand Down Expand Up @@ -282,9 +282,9 @@ public function checkLogin($tokenKey, $tokenSecret, $tokenVerifier)
/**
* Perform a (post) cURL request.
*
* @param type $url Destination of request
* @param type $bodu Query string of data to be posted
* @return bool true if able to make request
* @param type $url Destination of request
* @param type $bodu Query string of data to be posted
* @return bool true if able to make request
*/
private function curlRequest($url, $body)
{
Expand Down Expand Up @@ -325,7 +325,7 @@ private function responseFormat($response)
/**
* Redirect the user to VATSIM to log in/confirm login.
*
* @return bool false if failed
* @return bool false if failed
*/
public function sendToVatsim()
{
Expand All @@ -341,9 +341,9 @@ public function sendToVatsim()
/**
* Set the signing method to be used to encrypt request signature.
*
* @param string $signature Signature encryption method: RSA|HMAC
* @param string $private_key openssl RSA private key (only needed if using RSA)
* @return bool true if able to use this signing type
* @param string $signature Signature encryption method: RSA|HMAC
* @param string $private_key openssl RSA private key (only needed if using RSA)
* @return bool true if able to use this signing type
*/
public function signature($signature, $private_key = false)
{
Expand Down Expand Up @@ -389,7 +389,7 @@ protected function callClassBasedResponse($callback, $parameters)
/**
* Obtain the last generated error from this class.
*
* @return array Array of the latest error
* @return array Array of the latest error
*/
public function getError()
{
Expand Down
17 changes: 10 additions & 7 deletions app/Models/Concerns/HasBans.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@ public function getBannedAttribute(): bool
* Ban the user locally.
*
* @param $body
* @param Ban\Reason $reason
* @param User|int $banner
* @param Carbon $end
* @param Ban\Reason $reason
* @param User|int $banner
* @param Carbon $end
* @return Ban
*
* @throws BanEndsBeforeStartException
*/
public function banLocally($body, Ban\Reason $reason = null, $banner = null, Carbon $end = null): Ban
Expand All @@ -78,8 +79,9 @@ public function banLocally($body, Ban\Reason $reason = null, $banner = null, Car
/**
* Adds a network ban for the user (only affects status on local system).
*
* @param null $body
* @param null $body
* @return Ban
*
* @throws AlreadyNetworkBannedException
* @throws BanEndsBeforeStartException
*/
Expand Down Expand Up @@ -112,10 +114,11 @@ public function endNetworkBanIfHas(): ?Ban
*
* @param $type int A BanConstant type
* @param $body string
* @param Ban\Reason $reason
* @param User|int $banner
* @param Carbon|null $end
* @param Ban\Reason $reason
* @param User|int $banner
* @param Carbon|null $end
* @return Ban
*
* @throws BanEndsBeforeStartException
*/
private function ban($type, $body, Ban\Reason $reason = null, $banner = null, Carbon $end = null): Ban
Expand Down
2 changes: 1 addition & 1 deletion app/Models/Concerns/HasMemberships.php
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public function removeAllSecondaryMemberships(): void
}

/**
* @param Membership|int|string $membership
* @param Membership|int|string $membership
* @return bool
*/
public function hasMembership($membership): bool
Expand Down
4 changes: 2 additions & 2 deletions app/Models/Concerns/HasPassword.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function verifyPassword(string $password): bool
*
* Will hash the password, or set it as null if required.
*
* @param null|string $password The password value to set.
* @param null|string $password The password value to set.
*/
public function setPasswordAttribute($password): void
{
Expand Down Expand Up @@ -109,7 +109,7 @@ public function hasPassword(): bool
/**
* Set the user's password.
*
* @param string $password The password string.
* @param string $password The password string.
* @return bool
*/
public function setPassword(string $password): bool
Expand Down
Loading