@@ -66,7 +66,7 @@ |
||
66 | 66 | // The system files are always in this location. |
67 | 67 | // It is also the default location of user data, such as media and GEDCOM files. |
68 | 68 | // The user files could be anywhere supported by Flysystem. |
69 | - public const DATA_DIR = self::ROOT_DIR . 'data/'; |
|
69 | + public const DATA_DIR = self::ROOT_DIR . 'data/'; |
|
70 | 70 | |
71 | 71 | // Location of the file containing the database connection details. |
72 | 72 | public const CONFIG_FILE = self::DATA_DIR . 'config.ini.php'; |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | $data_filesystem = $request->getAttribute('filesystem.data'); |
150 | 150 | assert($data_filesystem instanceof FilesystemInterface); |
151 | 151 | |
152 | - $files = $request->getQueryParams()['files']; // local|external|unused |
|
152 | + $files = $request->getQueryParams()['files']; // local|external|unused |
|
153 | 153 | |
154 | 154 | // Files within this folder |
155 | 155 | $media_folder = $request->getQueryParams()['media_folder']; |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | $create_form = ''; |
265 | 265 | foreach ($media_trees as $media_tree => $media_directory) { |
266 | 266 | if (Str::startsWith($row[0], $media_directory)) { |
267 | - $tmp = substr($row[0], strlen($media_directory)); |
|
267 | + $tmp = substr($row[0], strlen($media_directory)); |
|
268 | 268 | $create_form .= |
269 | 269 | '<p><a href="#" data-toggle="modal" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-url="' . e(route('create-media-from-file', ['tree' => $media_tree])) . '" onclick="document.getElementById(\'modal-create-media-from-file-form\').action=this.dataset.url; document.getElementById(\'file\').value=this.dataset.file;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>'; |
270 | 270 | } |
@@ -355,8 +355,8 @@ discard block |
||
355 | 355 | try { |
356 | 356 | // This will work for local filesystems. For remote filesystems, we will |
357 | 357 | // need to copy the file locally to work out the image size. |
358 | - $imgsize = getimagesize(Webtrees::DATA_DIR . $file); |
|
359 | - $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
358 | + $imgsize = getimagesize(Webtrees::DATA_DIR . $file); |
|
359 | + $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
360 | 360 | /* I18N: image dimensions, width × height */ |
361 | 361 | $html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>'; |
362 | 362 | } catch (Throwable $ex) { |
@@ -52,7 +52,7 @@ |
||
52 | 52 | */ |
53 | 53 | public function find($user_id): ?User |
54 | 54 | { |
55 | - return app('cache.array')->remember('user-' . $user_id, static function () use ($user_id): ?User { |
|
55 | + return app('cache.array')->remember('user-' . $user_id, static function () use ($user_id) : ?User { |
|
56 | 56 | return DB::table('user') |
57 | 57 | ->where('user_id', '=', $user_id) |
58 | 58 | ->get() |
@@ -283,7 +283,7 @@ |
||
283 | 283 | } |
284 | 284 | |
285 | 285 | // Stay on the same tree page |
286 | - $url = route(LoginPage::class, ['tree' => $tree instanceof Tree ? $tree->name() : null, 'url' => $redirect]); |
|
286 | + $url = route(LoginPage::class, ['tree' => $tree instanceof Tree ? $tree->name() : null, 'url' => $redirect]); |
|
287 | 287 | |
288 | 288 | return new Menu(I18N::translate('Sign in'), $url, 'menu-login', ['rel' => 'nofollow']); |
289 | 289 | } |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | return array ( |
4 | - '%H:%i:%s' => '%g:%i:%s %a', |
|
5 | - '%j %F %Y' => '%F %j, %Y', |
|
4 | + '%H:%i:%s' => '%g:%i:%s %a', |
|
5 | + '%j %F %Y' => '%F %j, %Y', |
|
6 | 6 | ); |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return array ( |
|
3 | +return array( |
|
4 | 4 | '%H:%i:%s' => '%g:%i:%s %a', |
5 | 5 | '%j %F %Y' => '%F %j, %Y', |
6 | 6 | ); |
@@ -88,7 +88,7 @@ |
||
88 | 88 | $repository = Auth::checkRepositoryAccess($repository, false); |
89 | 89 | |
90 | 90 | // Redirect to correct xref/slug |
91 | - if ($repository->xref() !== $xref || $request->getAttribute('slug') !== $repository->slug()) { |
|
91 | + if ($repository->xref() !== $xref || $request->getAttribute('slug') !== $repository->slug()) { |
|
92 | 92 | return redirect($repository->url(), StatusCodeInterface::STATUS_MOVED_PERMANENTLY); |
93 | 93 | } |
94 | 94 |
@@ -907,7 +907,7 @@ |
||
907 | 907 | private function filterActiveBlocks(Collection $blocks, Collection $active_blocks): Collection |
908 | 908 | { |
909 | 909 | return $blocks->map(static function (string $block_name) use ($active_blocks): ?ModuleBlockInterface { |
910 | - return $active_blocks->filter(static function (ModuleInterface $block) use ($block_name): bool { |
|
910 | + return $active_blocks->filter(static function (ModuleInterface $block) use ($block_name) : bool { |
|
911 | 911 | return $block->name() === $block_name; |
912 | 912 | })->first(); |
913 | 913 | })->filter(); |
@@ -87,7 +87,7 @@ |
||
87 | 87 | "\n", |
88 | 88 | ' ', |
89 | 89 | ], $t); |
90 | - $t = strip_tags($t); |
|
90 | + $t = strip_tags($t); |
|
91 | 91 | $this->text .= $t; |
92 | 92 | } |
93 | 93 |
@@ -383,7 +383,7 @@ |
||
383 | 383 | $this->upgrade_service->cleanFiles($root_filesystem, $folders_to_clean, $files_to_keep); |
384 | 384 | |
385 | 385 | $url = route(ControlPanel::class); |
386 | - $alert = I18N::translate('The upgrade is complete.'); |
|
386 | + $alert = I18N::translate('The upgrade is complete.'); |
|
387 | 387 | $button = '<a href="' . e($url) . '" class="btn btn-primary">' . I18N::translate('continue') . '</a>'; |
388 | 388 | |
389 | 389 | return response(view('components/alert-success', [ |