Upgrade to Laravel 9 + switch to Laragear/WebAuthn (#1469)

app/Actions/Album/Delete.php

@@ -20,7 +20,6 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
 use Safe\Exceptions\ArrayException;
-use function Safe\usort;
 
 /**
  * Deletes the albums with the designated IDs **efficiently**.
@@ -101,6 +100,8 @@ public function do(array $albumIDs): FileDeleter
 				$recursiveAlbumIDs = array_merge($recursiveAlbumIDs, $subAlbums->pluck('id')->all());
 				$recursiveAlbumTracks = $recursiveAlbumTracks->merge($subAlbums->pluck('track_short_path'));
 			}
+			// prune the null values
+			$recursiveAlbumTracks = $recursiveAlbumTracks->filter(fn ($val) => $val !== null);
 
 			// Delete the photos from DB and obtain the list of files which need
 			// to be deleted later

app/Actions/Albums/Tree.php

@@ -72,7 +72,7 @@ public function get(): AlbumTree
 			// (sub)-tree and then `toTree` will return garbage as it does
 			// not find connected paths within `$albums` or `$sharedAlbums`,
 			// resp.
-			list($albums, $sharedAlbums) = $albums->partition(fn ($album) => $album->owner_id === $userID);
+			list($albums, $sharedAlbums) = $albums->partition(fn (Album $album) => $album->owner_id === $userID);
 		}
 
 		// We must explicitly pass `null` as the ID of the root album

app/Actions/Diagnostics/Checks/BasicPermissionCheck.php

@@ -11,10 +11,14 @@
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Support\Facades\Storage;
-use League\Flysystem\Adapter\Local as LocalFlysystem;
+use League\Flysystem\Local\LocalFilesystemAdapter;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use function Safe\sprintf;
+use Safe\Exceptions\FilesystemException;
+use Safe\Exceptions\PosixException;
+use function Safe\fileperms;
+use function Safe\posix_getgrgid;
+use function Safe\posix_getgroups;
 
 class BasicPermissionCheck implements DiagnosticCheckInterface
 {
@@ -62,8 +66,9 @@ public function folders(array &$errors): void
 		$this->numOwnerIssues = 0;
 		$this->numPermissionIssues = 0;
 		$this->numAccessIssues = 0;
-		$groupIDsOrFalse = posix_getgroups();
-		if ($groupIDsOrFalse === false) {
+		try {
+			$groupIDsOrFalse = posix_getgroups();
+		} catch (PosixException) {
 			$errors[] = 'Error: Could not determine groups of process';
 
 			return;
@@ -74,9 +79,11 @@ public function folders(array &$errors): void
 		$this->groupIDs = array_unique($this->groupIDs);
 		$this->groupNames = implode(', ', array_map(
 			function (int $gid): string {
-				$groupNameOrFalse = posix_getgrgid($gid);
-
-				return $groupNameOrFalse === false ? '<unknown>' : $groupNameOrFalse['name'];
+				try {
+					return posix_getgrgid($gid)['name'];
+				} catch (PosixException) {
+					return '<unknown>';
+				}
 			},
 			$this->groupIDs
 		));
@@ -88,7 +95,7 @@ function (int $gid): string {
 		];
 
 		foreach ($disks as $disk) {
-			if ($disk->getDriver()->getAdapter() instanceof LocalFlysystem) {
+			if ($disk->getAdapter() instanceof LocalFilesystemAdapter) {
 				$this->checkDirectoryPermissionsRecursively($disk->path(''), $errors);
 			}
 		}
@@ -134,8 +141,9 @@ private function checkDirectoryPermissionsRecursively(string $path, array &$erro
 				return;
 			}
 
-			$actualPerm = fileperms($path);
-			if ($actualPerm === false) {
+			try {
+				$actualPerm = fileperms($path);
+			} catch (FilesystemException) {
 				$errors[] = sprintf('Warning: Unable to determine permissions for %s' . PHP_EOL, $path);
 
 				return;
@@ -146,7 +154,15 @@ private function checkDirectoryPermissionsRecursively(string $path, array &$erro
 			// interested in
 			$actualPerm &= 07777;
 			$owningGroupIdOrFalse = filegroup($path);
-			$owningGroupNameOrFalse = $owningGroupIdOrFalse === false ? false : posix_getgrgid($owningGroupIdOrFalse);
+			if ($owningGroupIdOrFalse !== false) {
+				try {
+					$owningGroupNameOrFalse = posix_getgrgid($owningGroupIdOrFalse);
+				} catch (PosixException) {
+					$owningGroupNameOrFalse = false;
+				}
+			} else {
+				$owningGroupNameOrFalse = false;
+			}
 			$owningGroupName = $owningGroupNameOrFalse === false ? '<unknown>' : $owningGroupNameOrFalse['name'];
 			$expectedPerm = self::getConfiguredDirectoryPerm();
 

app/Actions/Diagnostics/Checks/ImageOptCheck.php

@@ -5,7 +5,7 @@
 use App\Contracts\DiagnosticCheckInterface;
 use App\Facades\Helpers;
 use App\Models\Configs;
-use function Safe\substr;
+use function Safe\exec;
 use Spatie\ImageOptimizer\Optimizers\Cwebp;
 use Spatie\ImageOptimizer\Optimizers\Gifsicle;
 use Spatie\ImageOptimizer\Optimizers\Jpegoptim;

app/Actions/Diagnostics/Diagnostics.php

@@ -2,8 +2,6 @@
 
 namespace App\Actions\Diagnostics;
 
-use function Safe\sprintf;
-
 abstract class Diagnostics
 {
 	/**

app/Actions/Import/Exec.php

@@ -28,10 +28,10 @@
 use function Safe\file;
 use function Safe\glob;
 use function Safe\ini_get;
+use function Safe\ob_flush;
 use function Safe\preg_match;
 use function Safe\realpath;
 use function Safe\set_time_limit;
-use function Safe\substr;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class Exec

app/Actions/Import/FromUrl.php

@@ -49,6 +49,8 @@ public function do(array $urls, ?Album $album): Collection
 					// Silently do nothing, if `set_time_limit` is denied.
 				}
 
+				// If the component parameter is specified, this function returns a string (or int in case of PHP_URL_PORT)
+				/** @var string $path */
 				$path = parse_url($url, PHP_URL_PATH);
 				$extension = '.' . pathinfo($path, PATHINFO_EXTENSION);
 

app/Actions/Install/PermissionsChecker.php

@@ -3,7 +3,6 @@
 namespace App\Actions\Install;
 
 use function Safe\preg_match;
-use function Safe\substr;
 
 class PermissionsChecker
 {

app/Actions/Photo/Create.php

@@ -28,7 +28,6 @@
 use App\SmartAlbums\PublicAlbum;
 use App\SmartAlbums\StarredAlbum;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
-use function Safe\substr;
 
 class Create
 {

app/Actions/Photo/Strategies/AddVideoPartnerStrategy.php

@@ -14,7 +14,6 @@
 use App\Image\NativeLocalFile;
 use App\Image\StreamStat;
 use App\Models\Photo;
-use function Safe\substr;
 
 /**
  * Adds a video as partner to an existing photo.

app/Actions/RSS/Generate.php

@@ -65,6 +65,7 @@ public function do(): Collection
 			throw new FrameworkException('Date/Time component (Carbon)', $e);
 		}
 
+		/** @var Collection<int,Photo> $photos */
 		$photos = $this->photoQueryPolicy
 			->applySearchabilityFilter(
 				Photo::with(['album', 'owner', 'size_variants', 'size_variants.sym_links'])

app/Actions/Update/Apply.php

@@ -12,6 +12,7 @@
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Config;
 use function Safe\chdir;
+use function Safe\exec;
 use function Safe\preg_replace;
 use function Safe\putenv;
 

app/Actions/Update/Check.php

@@ -10,6 +10,7 @@
 use App\Metadata\GitRequest;
 use App\Metadata\LycheeVersion;
 use App\Models\Configs;
+use function Safe\exec;
 
 class Check
 {

app/Actions/User/Notify.php

@@ -2,27 +2,44 @@
 
 namespace App\Actions\User;
 
+use App\Exceptions\ConfigurationKeyMissingException;
+use App\Exceptions\Internal\QueryBuilderException;
 use App\Models\Configs;
 use App\Models\Photo;
 use App\Models\User;
 use App\Notifications\PhotoAdded;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Database\MultipleRecordsFoundException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Notification;
 
 class Notify
 {
+	/**
+	 * Notify users that a new photo has been uploaded.
+	 *
+	 * @param Photo $photo
+	 *
+	 * @return void
+	 *
+	 * @throws ConfigurationKeyMissingException
+	 * @throws QueryBuilderException
+	 * @throws ModelNotFoundException
+	 * @throws MultipleRecordsFoundException
+	 */
 	public function do(Photo $photo): void
 	{
 		if (!Configs::getValueAsBool('new_photos_notification')) {
 			return;
 		}
 
-		// The admin is always informed
-		$users = new Collection([User::query()->find(0)]);
+		// Admin user is always notified
+		$users = new Collection([User::find(0)]);
+
 		$album = $photo->album;
 		if ($album !== null) {
-			$users->push($album->shared_with);
+			$users = $users->concat($album->shared_with);
 			$users->push($album->owner);
 		}