Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
asbiin committed Nov 1, 2023
1 parent 57b3d39 commit 7e1c596
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 13 deletions.
1 change: 0 additions & 1 deletion app/Http/Controllers/Settings/MultiFAController.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ public function validateTwoFactor(Request $request)
*/
public function disableTwoFactor(Request $request)
{
// @phpstan-ignore-next-line
return view('settings.security.2fa-disable');
}

Expand Down
6 changes: 3 additions & 3 deletions app/Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Kernel extends HttpKernel
*
* These middleware are run during every request to your application.
*
* @var array
* @var array<int,string>
*/
protected $middleware = [
\App\Http\Middleware\TrustProxies::class,
Expand All @@ -24,7 +24,7 @@ class Kernel extends HttpKernel
/**
* The application's route middleware groups.
*
* @var array
* @var array<string,array<int,string>>
*/
protected $middlewareGroups = [
'web' => [
Expand Down Expand Up @@ -68,7 +68,7 @@ class Kernel extends HttpKernel
*
* These middleware may be assigned to groups or used individually.
*
* @var array
* @var array<string,string>
*/
protected $routeMiddleware = [
'2fa' => \PragmaRX\Google2FALaravel\Middleware::class,
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Middleware/EncryptCookies.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class EncryptCookies extends Middleware
/**
* The names of the cookies that should not be encrypted.
*
* @var array
* @var array<int,string>
*/
protected $except = [
//
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Middleware/PreventRequestsDuringMaintenance.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class PreventRequestsDuringMaintenance extends Middleware
/**
* The URIs that should be reachable while maintenance mode is enabled.
*
* @var array
* @var array<int,string>
*/
protected $except = [
//
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Middleware/TrimStrings.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class TrimStrings extends Middleware
/**
* The names of the attributes that should not be trimmed.
*
* @var array
* @var array<int,string>
*/
protected $except = [
'password',
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Middleware/VerifyCsrfToken.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class VerifyCsrfToken extends Middleware
/**
* The URIs that should be excluded from CSRF verification.
*
* @var array
* @var array<int,string>
*/
protected $except = [
'stripe/*',
Expand Down
2 changes: 1 addition & 1 deletion app/Providers/EventServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class EventServiceProvider extends ServiceProvider
/**
* The event listener mappings for the application.
*
* @var array
* @var array<string,array<int,string>>
*/
protected $listen = [
\Illuminate\Auth\Events\Registered::class => [
Expand Down
2 changes: 1 addition & 1 deletion app/Services/Contact/Avatar/GetGravatarURL.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private function exists(array $data)
{
try {
return Gravatar::exists($data['email']);
} catch (\Creativeorange\Gravatar\Exceptions\InvalidEmailException $e) {
} catch (\Exception $e) {
// catch invalid email
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion app/Services/VCard/ImportVCard.php
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ private function importNames(array $contactData, VCard $entry): array
* @psalm-suppress InvalidReturnType
*
* @param VCard $entry
* @return array|string|null|\Illuminate\Contracts\Translation\Translator
* @return array|string
*/
private function name($entry)
{
Expand Down
2 changes: 0 additions & 2 deletions phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ parameters:
path: */Services/Contact/Contact/UpdateDeceasedInformation.php
- message: '#Parameter \#1 \$principalUri of method Sabre\\CardDAV\\Backend\\BackendInterface::getAddressBooksForUser\(\) expects string, array given\.#'
path: */Http/Controllers/DAV/Backend/CardDAV/AddressBookHome.php
- message: '#Access to an undefined property object::\$action\.#'
path: */Helpers/AuditLogHelper.php
- message: '#Property App\\Models\\Contact\\Contact::\$avatar_photo_id \(int\) does not accept null\.#'
path: */Services/Contact/Avatar/UpdateAvatar.php
- message: '#Call to an undefined method Illuminate\\Database\\Eloquent\\Builder::addressBook\(\)\.#'
Expand Down

0 comments on commit 7e1c596

Please sign in to comment.