1
0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-30 07:32:39 +01:00

Ran phpcbf and updated helpers typehinting

This commit is contained in:
Dan Brown 2019-09-15 18:29:51 +01:00
parent b1566099a3
commit be08dc1588
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
23 changed files with 46 additions and 50 deletions

View File

@ -20,5 +20,4 @@ class Application extends \Illuminate\Foundation\Application
. 'Config' . 'Config'
. ($path ? DIRECTORY_SEPARATOR.$path : $path); . ($path ? DIRECTORY_SEPARATOR.$path : $path);
} }
}
}

View File

@ -36,5 +36,4 @@ class EmailConfirmationService extends UserTokenService
return setting('registration-confirmation') return setting('registration-confirmation')
|| setting('registration-restrict'); || setting('registration-restrict');
} }
} }

View File

@ -19,5 +19,4 @@ class UserInviteService extends UserTokenService
$token = $this->createTokenForUser($user); $token = $this->createTokenForUser($user);
$user->notify(new UserInvite($token)); $user->notify(new UserInvite($token));
} }
} }

View File

@ -131,5 +131,4 @@ class UserTokenService
return Carbon::now()->subHours($this->expiryTime) return Carbon::now()->subHours($this->expiryTime)
->gt(new Carbon($tokenEntry->created_at)); ->gt(new Carbon($tokenEntry->created_at));
} }
}
}

View File

@ -70,4 +70,4 @@ return [
], ],
], ],
]; ];

View File

@ -14,8 +14,12 @@ if (env('CACHE_DRIVER') === 'memcached') {
$memcachedServers = explode(',', trim(env('MEMCACHED_SERVERS', '127.0.0.1:11211:100'), ',')); $memcachedServers = explode(',', trim(env('MEMCACHED_SERVERS', '127.0.0.1:11211:100'), ','));
foreach ($memcachedServers as $index => $memcachedServer) { foreach ($memcachedServers as $index => $memcachedServer) {
$memcachedServerDetails = explode(':', $memcachedServer); $memcachedServerDetails = explode(':', $memcachedServer);
if (count($memcachedServerDetails) < 2) $memcachedServerDetails[] = '11211'; if (count($memcachedServerDetails) < 2) {
if (count($memcachedServerDetails) < 3) $memcachedServerDetails[] = '100'; $memcachedServerDetails[] = '11211';
}
if (count($memcachedServerDetails) < 3) {
$memcachedServerDetails[] = '100';
}
$memcachedServers[$index] = array_combine($memcachedServerKeys, $memcachedServerDetails); $memcachedServers[$index] = array_combine($memcachedServerKeys, $memcachedServerDetails);
} }
} }

View File

@ -11,7 +11,6 @@
// REDIS // REDIS
// Split out configuration into an array // Split out configuration into an array
if (env('REDIS_SERVERS', false)) { if (env('REDIS_SERVERS', false)) {
$redisDefaults = ['host' => '127.0.0.1', 'port' => '6379', 'database' => '0', 'password' => null]; $redisDefaults = ['host' => '127.0.0.1', 'port' => '6379', 'database' => '0', 'password' => null];
$redisServers = explode(',', trim(env('REDIS_SERVERS', '127.0.0.1:6379:0'), ',')); $redisServers = explode(',', trim(env('REDIS_SERVERS', '127.0.0.1:6379:0'), ','));
$redisConfig = ['client' => 'predis']; $redisConfig = ['client' => 'predis'];

View File

@ -69,7 +69,7 @@ return [
* should be an absolute path. * should be an absolute path.
* This is only checked on command line call by dompdf.php, but not by * This is only checked on command line call by dompdf.php, but not by
* direct class use like: * direct class use like:
* $dompdf = new DOMPDF(); $dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output(); * $dompdf = new DOMPDF(); $dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output();
*/ */
"DOMPDF_CHROOT" => realpath(base_path()), "DOMPDF_CHROOT" => realpath(base_path()),

View File

@ -34,4 +34,4 @@ return [
'time' => 2, 'time' => 2,
], ],
]; ];

View File

@ -79,4 +79,4 @@ return [
], ],
], ],
]; ];

View File

@ -23,7 +23,7 @@ return [
// Global "From" address & name // Global "From" address & name
'from' => [ 'from' => [
'address' => env('MAIL_FROM', 'mail@bookstackapp.com'), 'address' => env('MAIL_FROM', 'mail@bookstackapp.com'),
'name' => env('MAIL_FROM_NAME','BookStack') 'name' => env('MAIL_FROM_NAME', 'BookStack')
], ],
// Email encryption protocol // Email encryption protocol

View File

@ -81,8 +81,8 @@ return [
'okta' => [ 'okta' => [
'client_id' => env('OKTA_APP_ID'), 'client_id' => env('OKTA_APP_ID'),
'client_secret' => env('OKTA_APP_SECRET'), 'client_secret' => env('OKTA_APP_SECRET'),
'redirect' => env('APP_URL') . '/login/service/okta/callback', 'redirect' => env('APP_URL') . '/login/service/okta/callback',
'base_url' => env('OKTA_BASE_URL'), 'base_url' => env('OKTA_BASE_URL'),
'name' => 'Okta', 'name' => 'Okta',
'auto_register' => env('OKTA_AUTO_REGISTER', false), 'auto_register' => env('OKTA_AUTO_REGISTER', false),
'auto_confirm' => env('OKTA_AUTO_CONFIRM_EMAIL', false), 'auto_confirm' => env('OKTA_AUTO_CONFIRM_EMAIL', false),
@ -126,10 +126,10 @@ return [
'email_attribute' => env('LDAP_EMAIL_ATTRIBUTE', 'mail'), 'email_attribute' => env('LDAP_EMAIL_ATTRIBUTE', 'mail'),
'display_name_attribute' => env('LDAP_DISPLAY_NAME_ATTRIBUTE', 'cn'), 'display_name_attribute' => env('LDAP_DISPLAY_NAME_ATTRIBUTE', 'cn'),
'follow_referrals' => env('LDAP_FOLLOW_REFERRALS', false), 'follow_referrals' => env('LDAP_FOLLOW_REFERRALS', false),
'user_to_groups' => env('LDAP_USER_TO_GROUPS',false), 'user_to_groups' => env('LDAP_USER_TO_GROUPS', false),
'group_attribute' => env('LDAP_GROUP_ATTRIBUTE', 'memberOf'), 'group_attribute' => env('LDAP_GROUP_ATTRIBUTE', 'memberOf'),
'remove_from_groups' => env('LDAP_REMOVE_FROM_GROUPS',false), 'remove_from_groups' => env('LDAP_REMOVE_FROM_GROUPS', false),
'tls_insecure' => env('LDAP_TLS_INSECURE', false), 'tls_insecure' => env('LDAP_TLS_INSECURE', false),
] ]
]; ];

View File

@ -19,4 +19,4 @@ return [
'app-custom-head' => false, 'app-custom-head' => false,
'registration-enabled' => false, 'registration-enabled' => false,
]; ];

View File

@ -432,7 +432,7 @@ class PageRepo extends EntityRepo
return []; return [];
} }
$tree = collect($headers)->map(function($header) { $tree = collect($headers)->map(function ($header) {
$text = trim(str_replace("\xc2\xa0", '', $header->nodeValue)); $text = trim(str_replace("\xc2\xa0", '', $header->nodeValue));
$text = mb_substr($text, 0, 100); $text = mb_substr($text, 0, 100);
@ -442,7 +442,7 @@ class PageRepo extends EntityRepo
'link' => '#' . $header->getAttribute('id'), 'link' => '#' . $header->getAttribute('id'),
'text' => $text, 'text' => $text,
]; ];
})->filter(function($header) { })->filter(function ($header) {
return mb_strlen($header['text']) > 0; return mb_strlen($header['text']) > 0;
}); });
@ -541,12 +541,12 @@ class PageRepo extends EntityRepo
* @param string $search * @param string $search
* @return \Illuminate\Contracts\Pagination\LengthAwarePaginator * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
*/ */
public function getPageTemplates(int $count = 10, int $page = 1, string $search = '') public function getPageTemplates(int $count = 10, int $page = 1, string $search = '')
{ {
$query = $this->entityQuery('page') $query = $this->entityQuery('page')
->where('template', '=', true) ->where('template', '=', true)
->orderBy('name', 'asc') ->orderBy('name', 'asc')
->skip( ($page - 1) * $count) ->skip(($page - 1) * $count)
->take($count); ->take($count);
if ($search) { if ($search) {

View File

@ -1,6 +1,7 @@
<?php namespace BookStack\Exceptions; <?php namespace BookStack\Exceptions;
class UserTokenExpiredException extends \Exception { class UserTokenExpiredException extends \Exception
{
public $userId; public $userId;
@ -14,6 +15,4 @@ class UserTokenExpiredException extends \Exception {
$this->userId = $userId; $this->userId = $userId;
parent::__construct($message); parent::__construct($message);
} }
}
}

View File

@ -1,3 +1,6 @@
<?php namespace BookStack\Exceptions; <?php namespace BookStack\Exceptions;
class UserTokenNotFoundException extends \Exception {} class UserTokenNotFoundException extends \Exception
{
}

View File

@ -64,7 +64,6 @@ class ConfirmEmailController extends Controller
try { try {
$userId = $this->emailConfirmationService->checkTokenAndGetUserId($token); $userId = $this->emailConfirmationService->checkTokenAndGetUserId($token);
} catch (Exception $exception) { } catch (Exception $exception) {
if ($exception instanceof UserTokenNotFoundException) { if ($exception instanceof UserTokenNotFoundException) {
session()->flash('error', trans('errors.email_confirmation_invalid')); session()->flash('error', trans('errors.email_confirmation_invalid'));
return redirect('/register'); return redirect('/register');
@ -114,5 +113,4 @@ class ConfirmEmailController extends Controller
session()->flash('success', trans('auth.email_confirm_resent')); session()->flash('success', trans('auth.email_confirm_resent'));
return redirect('/register/confirm'); return redirect('/register/confirm');
} }
} }

View File

@ -102,5 +102,4 @@ class UserInviteController extends Controller
throw $exception; throw $exception;
} }
} }

View File

@ -59,5 +59,4 @@ class PageTemplateController extends Controller
'markdown' => $page->markdown, 'markdown' => $page->markdown,
]); ]);
} }
} }

View File

@ -14,4 +14,4 @@ class CheckForMaintenanceMode extends Middleware
protected $except = [ protected $except = [
// //
]; ];
} }

View File

@ -22,5 +22,4 @@ class Request extends LaravelRequest
return $base; return $base;
} }
}
}

View File

@ -48,7 +48,7 @@ class AppServiceProvider extends ServiceProvider
return "<?php echo icon($expression); ?>"; return "<?php echo icon($expression); ?>";
}); });
Blade::directive('exposeTranslations', function($expression) { Blade::directive('exposeTranslations', function ($expression) {
return "<?php \$__env->startPush('translations'); ?>" . return "<?php \$__env->startPush('translations'); ?>" .
"<?php foreach({$expression} as \$key): ?>" . "<?php foreach({$expression} as \$key): ?>" .
'<meta name="translation" key="<?php echo e($key); ?>" value="<?php echo e(trans($key)); ?>">' . "\n" . '<meta name="translation" key="<?php echo e($key); ?>" value="<?php echo e(trans($key)); ?>">' . "\n" .

View File

@ -12,7 +12,7 @@ use BookStack\Settings\SettingService;
* @return string * @return string
* @throws Exception * @throws Exception
*/ */
function versioned_asset($file = '') : string function versioned_asset(string $file = ''): string
{ {
static $version = null; static $version = null;
@ -35,7 +35,7 @@ function versioned_asset($file = '') : string
* Defaults to public 'Guest' user if not logged in. * Defaults to public 'Guest' user if not logged in.
* @return User * @return User
*/ */
function user() : User function user(): User
{ {
return auth()->user() ?: User::getDefault(); return auth()->user() ?: User::getDefault();
} }
@ -44,7 +44,7 @@ function user() : User
* Check if current user is a signed in user. * Check if current user is a signed in user.
* @return bool * @return bool
*/ */
function signedInUser() : bool function signedInUser(): bool
{ {
return auth()->user() && !auth()->user()->isDefault(); return auth()->user() && !auth()->user()->isDefault();
} }
@ -53,7 +53,7 @@ function signedInUser() : bool
* Check if the current user has general access. * Check if the current user has general access.
* @return bool * @return bool
*/ */
function hasAppAccess() : bool function hasAppAccess(): bool
{ {
return !auth()->guest() || setting('app-public'); return !auth()->guest() || setting('app-public');
} }
@ -66,7 +66,7 @@ function hasAppAccess() : bool
* @param Ownable $ownable * @param Ownable $ownable
* @return bool * @return bool
*/ */
function userCan(string $permission, Ownable $ownable = null) : bool function userCan(string $permission, Ownable $ownable = null): bool
{ {
if ($ownable === null) { if ($ownable === null) {
return user() && user()->can($permission); return user() && user()->can($permission);
@ -84,7 +84,7 @@ function userCan(string $permission, Ownable $ownable = null) : bool
* @param string|null $entityClass * @param string|null $entityClass
* @return bool * @return bool
*/ */
function userCanOnAny(string $permission, string $entityClass = null) : bool function userCanOnAny(string $permission, string $entityClass = null): bool
{ {
$permissionService = app(PermissionService::class); $permissionService = app(PermissionService::class);
return $permissionService->checkUserHasPermissionOnAnything($permission, $entityClass); return $permissionService->checkUserHasPermissionOnAnything($permission, $entityClass);
@ -96,7 +96,7 @@ function userCanOnAny(string $permission, string $entityClass = null) : bool
* @param bool $default * @param bool $default
* @return bool|string|SettingService * @return bool|string|SettingService
*/ */
function setting($key = null, $default = false) function setting(string $key = null, bool $default = false)
{ {
$settingService = resolve(SettingService::class); $settingService = resolve(SettingService::class);
if (is_null($key)) { if (is_null($key)) {
@ -110,7 +110,7 @@ function setting($key = null, $default = false)
* @param string $path * @param string $path
* @return string * @return string
*/ */
function theme_path($path = '') : string function theme_path(string $path = ''): string
{ {
$theme = config('view.theme'); $theme = config('view.theme');
if (!$theme) { if (!$theme) {
@ -130,7 +130,7 @@ function theme_path($path = '') : string
* @param array $attrs * @param array $attrs
* @return mixed * @return mixed
*/ */
function icon($name, $attrs = []) function icon(string $name, array $attrs = []): string
{ {
$attrs = array_merge([ $attrs = array_merge([
'class' => 'svg-icon', 'class' => 'svg-icon',
@ -158,12 +158,12 @@ function icon($name, $attrs = [])
* Generate a url with multiple parameters for sorting purposes. * Generate a url with multiple parameters for sorting purposes.
* Works out the logic to set the correct sorting direction * Works out the logic to set the correct sorting direction
* Discards empty parameters and allows overriding. * Discards empty parameters and allows overriding.
* @param $path * @param string $path
* @param array $data * @param array $data
* @param array $overrideData * @param array $overrideData
* @return string * @return string
*/ */
function sortUrl($path, $data, $overrideData = []) function sortUrl(string $path, array $data, array $overrideData = []): string
{ {
$queryStringSections = []; $queryStringSections = [];
$queryData = array_merge($data, $overrideData); $queryData = array_merge($data, $overrideData);