formatting

app/Actions/Album/Archive.php

@@ -188,8 +188,8 @@ private function compressAlbum(AbstractAlbum $album, array &$usedDirNames, ?stri
 				// album_id === null shouldn't really be needed as all such photos
 				// in smart albums should be owned by the current user...
 				if (
-					($album instanceof BaseSmartAlbum || $album instanceof TagAlbum) &&
-					!Gate::check(PhotoPolicy::CAN_DOWNLOAD, $photo)
+					($album instanceof BaseSmartAlbum || $album instanceof TagAlbum)
+					&& !Gate::check(PhotoPolicy::CAN_DOWNLOAD, $photo)
 				) {
 					continue;
 				}

app/Actions/Album/Unlock.php

@@ -33,9 +33,9 @@ public function do(BaseAlbum $album, string $password): void
 	{
 		if ($album->is_public) {
 			if (
-				$album->password === null ||
-				$album->password === '' ||
-				$this->albumPolicy->isUnlocked($album)
+				$album->password === null
+				|| $album->password === ''
+				|| $this->albumPolicy->isUnlocked($album)
 			) {
 				return;
 			}

app/Actions/Diagnostics/Pipes/Checks/IniSettingsCheck.php

@@ -38,7 +38,7 @@ public function handle(array &$data, \Closure $next): array
 		if (!extension_loaded('imagick')) {
 			// @codeCoverageIgnoreStart
 			$data[] = 'Warning: Pictures that are rotated lose their metadata! Please install Imagick to avoid that.';
-		// @codeCoverageIgnoreEnd
+			// @codeCoverageIgnoreEnd
 		} else {
 			if (!isset($settings['imagick'])) {
 				// @codeCoverageIgnoreStart

app/Actions/Diagnostics/Pipes/Infos/ExtensionsInfo.php

@@ -26,7 +26,7 @@ public function handle(array &$data, \Closure $next): array
 		if (!isset($imagickVersion, $imagickVersion['versionNumber'])) {
 			// @codeCoverageIgnoreStart
 			$imagickVersion = '-';
-		// @codeCoverageIgnoreEnd
+			// @codeCoverageIgnoreEnd
 		} else {
 			$imagickVersion = $imagickVersion['versionNumber'];
 		}

app/Actions/Diagnostics/Pipes/Infos/VersionInfo.php

@@ -29,7 +29,7 @@ public function handle(array &$data, \Closure $next): array
 			$fileVersion->hydrate(false, false);
 
 			$lycheeInfoString = $fileVersion->getVersion()->toString();
-		// @codeCoverageIgnoreEnd
+			// @codeCoverageIgnoreEnd
 		} else {
 			$gitHubFunctions = resolve(GitHubVersion::class);
 			$gitHubFunctions->hydrate();

app/Actions/Import/Exec.php

@@ -159,15 +159,15 @@ private static function normalizePath(string $path): string
 			//
 			// This way we could simply check if the path is anything below `vault`
 			if (
-				$realPath === Storage::path('big') ||
-				$realPath === Storage::path('raw') ||
-				$realPath === Storage::path('original') ||
-				$realPath === Storage::path('medium2x') ||
-				$realPath === Storage::path('medium') ||
-				$realPath === Storage::path('small2x') ||
-				$realPath === Storage::path('small') ||
-				$realPath === Storage::path('thumb2x') ||
-				$realPath === Storage::path('thumb')
+				$realPath === Storage::path('big')
+				|| $realPath === Storage::path('raw')
+				|| $realPath === Storage::path('original')
+				|| $realPath === Storage::path('medium2x')
+				|| $realPath === Storage::path('medium')
+				|| $realPath === Storage::path('small2x')
+				|| $realPath === Storage::path('small')
+				|| $realPath === Storage::path('thumb2x')
+				|| $realPath === Storage::path('thumb')
 			) {
 				throw new ReservedDirectoryException('The given path is a reserved path of Lychee (' . $path . ')');
 			}

app/Actions/InstallUpdate/Pipes/ArtisanKeyGenerate.php

@@ -18,8 +18,8 @@ public function handle(array &$output, \Closure $next): array
 
 		// Always false on CICD
 		if (
-			!str_contains(end($output), 'Application key set successfully') ||
-			config('app.key') === null
+			!str_contains(end($output), 'Application key set successfully')
+			|| config('app.key') === null
 		) {
 			// @codeCoverageIgnoreStart
 			$output[] = 'We could not generate the encryption key.';

app/Actions/InstallUpdate/Pipes/ComposerCall.php

@@ -36,7 +36,7 @@ public function handle(array &$output, \Closure $next): array
 				chdir(base_path());
 				exec(sprintf('composer install %s--no-progress 2>&1', $noDev), $output);
 				chdir(base_path('public'));
-			// @codeCoverageIgnoreEnd
+				// @codeCoverageIgnoreEnd
 			} else {
 				$output[] = 'Composer update are always dangerous when automated.';
 				$output[] = 'So we did not execute it.';

app/Actions/InstallUpdate/RequirementsChecker.php

@@ -61,7 +61,7 @@ public function check(array $requirements): array
 	 *
 	 * @return array
 	 */
-	public function checkPHPVersion(?string $minPhpVersion = null): array
+	public function checkPHPVersion(string $minPhpVersion = null): array
 	{
 		$minVersionPhp = $minPhpVersion ?? self::MIN_PHP_VERSION;
 		$currentPhpVersion = self::getPhpVersionInfo();

app/Actions/Photo/Create.php

@@ -56,7 +56,7 @@ public function __construct(?ImportMode $importMode, int $intendedOwnerId)
 	 * @throws ModelNotFoundException
 	 * @throws LycheeException
 	 */
-	public function add(NativeLocalFile $sourceFile, ?AbstractAlbum $album = null): Photo
+	public function add(NativeLocalFile $sourceFile, AbstractAlbum $album = null): Photo
 	{
 		$sourceFile->assertIsSupportedMediaOrAcceptedRaw();
 
@@ -129,8 +129,8 @@ protected function loadFileMetadata(NativeLocalFile $sourceFile): void
 
 		// Use basename of file if IPTC title missing
 		if (
-			$this->strategyParameters->exifInfo->title === null ||
-			$this->strategyParameters->exifInfo->title === ''
+			$this->strategyParameters->exifInfo->title === null
+			|| $this->strategyParameters->exifInfo->title === ''
 		) {
 			$this->strategyParameters->exifInfo->title = substr($sourceFile->getOriginalBasename(), 0, 98);
 		}
@@ -173,8 +173,8 @@ protected function findLivePartner(
 			// different kind then the uploaded media.
 			if (
 				$livePartner !== null && !(
-					BaseMediaFile::isSupportedImageMimeType($mimeType) && $livePartner->isVideo() ||
-					BaseMediaFile::isSupportedVideoMimeType($mimeType) && $livePartner->isPhoto()
+					BaseMediaFile::isSupportedImageMimeType($mimeType) && $livePartner->isVideo()
+					|| BaseMediaFile::isSupportedVideoMimeType($mimeType) && $livePartner->isPhoto()
 				)
 			) {
 				$livePartner = null;
@@ -201,7 +201,7 @@ protected function findLivePartner(
 	 *
 	 * @throws InvalidPropertyException
 	 */
-	protected function initParentAlbum(?AbstractAlbum $album = null): void
+	protected function initParentAlbum(AbstractAlbum $album = null): void
 	{
 		if ($album === null) {
 			$this->strategyParameters->album = null;

app/Actions/Photo/Strategies/AddStandaloneStrategy.php

@@ -256,9 +256,9 @@ private function putSourceIntoFinalDestination(FlysystemFile $targetFile): Strea
 				\Safe\symlink($sourcePath, $targetPath);
 				$streamStat = StreamStat::createFromLocalFile($this->sourceFile);
 			} else {
-				$shallNormalize = Configs::getValueAsBool('auto_fix_orientation') &&
-					$this->sourceImage !== null &&
-					$this->parameters->exifInfo->orientation !== 1;
+				$shallNormalize = Configs::getValueAsBool('auto_fix_orientation')
+					&& $this->sourceImage !== null
+					&& $this->parameters->exifInfo->orientation !== 1;
 
 				if ($shallNormalize) {
 					// Saving the loaded image to the final target normalizes

app/Assets/ArrayToTextTable.php

@@ -78,7 +78,7 @@ public function __toString(): string
 	 * @throws PcreException
 	 * @throws MbstringException
 	 */
-	public function getTable(?array $rawData = null): string
+	public function getTable(array $rawData = null): string
 	{
 		if (!is_null($rawData)) {
 			$this->setData($rawData);

app/Assets/BaseSizeVariantNamingStrategy.php

@@ -25,9 +25,9 @@ abstract class BaseSizeVariantNamingStrategy extends AbstractSizeVariantNamingSt
 	 */
 	protected function generateExtension(SizeVariantType $sizeVariant): string
 	{
-		if ($sizeVariant === SizeVariantType::THUMB ||
-			$sizeVariant === SizeVariantType::THUMB2X ||
-			($sizeVariant !== SizeVariantType::ORIGINAL && !$this->photo->isPhoto())
+		if ($sizeVariant === SizeVariantType::THUMB
+			|| $sizeVariant === SizeVariantType::THUMB2X
+			|| ($sizeVariant !== SizeVariantType::ORIGINAL && !$this->photo->isPhoto())
 		) {
 			return self::THUMB_EXTENSION;
 		}

app/Assets/Helpers.php

@@ -105,9 +105,9 @@ public function hasPermissions(string $path): bool
 		// Check if the given path is readable and writable
 		// Both functions are also verifying that the path exists
 		return
-			file_exists($path) &&
-			is_readable($path) &&
-			is_writeable($path);
+			file_exists($path)
+			&& is_readable($path)
+			&& is_writeable($path);
 	}
 
 	/**

app/Casts/MustNotSetCast.php

@@ -27,7 +27,7 @@ class MustNotSetCast implements CastsInboundAttributes
 	 *                                 the name of the alternative is included
 	 *                                 into the exception message
 	 */
-	public function __construct(?string $alternative = null)
+	public function __construct(string $alternative = null)
 	{
 		$this->alternative = $alternative;
 	}

app/Console/Commands/ExifLens.php

@@ -77,57 +77,57 @@ public function handle(): int
 						$updated = true;
 					}
 					if (
-						($photo->iso === null || $photo->iso === '') &&
-						$info->iso !== null &&
-						$info->iso !== ''
+						($photo->iso === null || $photo->iso === '')
+						&& $info->iso !== null
+						&& $info->iso !== ''
 					) {
 						$photo->iso = $info->iso;
 						$updated = true;
 					}
 					if (
-						($photo->aperture === null || $photo->aperture === '') &&
-						$info->aperture !== null &&
-						$info->aperture !== ''
+						($photo->aperture === null || $photo->aperture === '')
+						&& $info->aperture !== null
+						&& $info->aperture !== ''
 					) {
 						$photo->aperture = $info->aperture;
 						$updated = true;
 					}
 					if (
-						($photo->make === null || $photo->make === '') &&
-						$info->make !== null &&
-						$info->make !== ''
+						($photo->make === null || $photo->make === '')
+						&& $info->make !== null
+						&& $info->make !== ''
 					) {
 						$photo->make = $info->make;
 						$updated = true;
 					}
 					if (
-						($photo->model === null || $photo->model === '') &&
-						$info->model !== null &&
-						$info->model !== ''
+						($photo->model === null || $photo->model === '')
+						&& $info->model !== null
+						&& $info->model !== ''
 					) {
 						$photo->model = $info->model;
 						$updated = true;
 					}
 					if (
-						($photo->lens === null || $photo->lens === '') &&
-						$info->lens !== null &&
-						$info->lens !== ''
+						($photo->lens === null || $photo->lens === '')
+						&& $info->lens !== null
+						&& $info->lens !== ''
 					) {
 						$photo->lens = $info->lens;
 						$updated = true;
 					}
 					if (
-						($photo->shutter === null || $photo->shutter === '') &&
-						$info->shutter !== null &&
-						$info->shutter !== ''
+						($photo->shutter === null || $photo->shutter === '')
+						&& $info->shutter !== null
+						&& $info->shutter !== ''
 					) {
 						$photo->shutter = $info->shutter;
 						$updated = true;
 					}
 					if (
-						($photo->focal === null || $photo->focal === '') &&
-						$info->focal !== null &&
-						$info->focal !== ''
+						($photo->focal === null || $photo->focal === '')
+						&& $info->focal !== null
+						&& $info->focal !== ''
 					) {
 						$photo->focal = $info->focal;
 						$updated = true;

app/Console/Commands/Optimize.php

@@ -101,11 +101,11 @@ public function handle(): void
 	protected function isNonProductive(): bool
 	{
 		return
-			'production' !== $this->getLaravel()->environment() ||
-			true === config('app.debug', false) ||
-			true === config('debugbar.enabled', false) ||
-			file_exists(base_path('vendor/bin/phpunit')) ||
-			file_exists(base_path('vendor/bin/phpstan')) ||
-			file_exists(base_path('vendor/bin/phpstan.phar'));
+			'production' !== $this->getLaravel()->environment()
+			|| true === config('app.debug', false)
+			|| true === config('debugbar.enabled', false)
+			|| file_exists(base_path('vendor/bin/phpunit'))
+			|| file_exists(base_path('vendor/bin/phpstan'))
+			|| file_exists(base_path('vendor/bin/phpstan.phar'));
 	}
 }

app/Console/Commands/Sync.php

@@ -9,7 +9,6 @@
 use App\Exceptions\UnexpectedException;
 use App\Models\Album;
 use App\Models\Configs;
-use Exception;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Exception\ExceptionInterface as SymfonyConsoleException;
 

app/Contracts/Models/SizeVariantFactory.php

@@ -35,7 +35,7 @@ interface SizeVariantFactory
 	 *
 	 * @throws LycheeException
 	 */
-	public function init(Photo $photo, ?ImageHandlerInterface $referenceImage = null, ?AbstractSizeVariantNamingStrategy $namingStrategy = null): void;
+	public function init(Photo $photo, ImageHandlerInterface $referenceImage = null, AbstractSizeVariantNamingStrategy $namingStrategy = null): void;
 
 	/**
 	 * Conditionally creates a size variant for the designated size variant.

app/DTO/ImportEventReport.php

@@ -15,7 +15,7 @@ class ImportEventReport extends BaseImportReport
 	protected string $message;
 	protected ?\Throwable $throwable;
 
-	protected function __construct(string $subtype, SeverityType $severity, ?string $path, string $message, ?\Throwable $throwable = null)
+	protected function __construct(string $subtype, SeverityType $severity, ?string $path, string $message, \Throwable $throwable = null)
 	{
 		parent::__construct(self::REPORT_TYPE);
 		$this->subtype = $subtype;

app/Exceptions/BaseLycheeException.php

@@ -51,7 +51,7 @@ abstract class BaseLycheeException extends HttpException implements ExternalLych
 	 *                                        for a typical end-user)
 	 * @param \Throwable|null $previous       an optional previous exception
 	 */
-	protected function __construct(int $httpStatusCode, string $message, ?\Throwable $previous = null)
+	protected function __construct(int $httpStatusCode, string $message, \Throwable $previous = null)
 	{
 		$code = null;
 		if ($previous !== null) {

app/Exceptions/FileOperationException.php

@@ -23,7 +23,7 @@
  */
 class FileOperationException extends BaseLycheeException
 {
-	public function __construct(string $msg, ?\Throwable $previous = null)
+	public function __construct(string $msg, \Throwable $previous = null)
 	{
 		parent::__construct(Response::HTTP_INTERNAL_SERVER_ERROR, $msg, $previous);
 	}

app/Exceptions/Internal/InvalidUserIdException.php

@@ -4,7 +4,7 @@
 
 class InvalidUserIdException extends LycheeDomainException
 {
-	public function __construct(?\Throwable $previous = null)
+	public function __construct(\Throwable $previous = null)
 	{
 		parent::__construct('Invalid user ID', $previous);
 	}

app/Exceptions/Internal/LycheeAssertionError.php

@@ -6,7 +6,7 @@
 
 class LycheeAssertionError extends \AssertionError implements InternalLycheeException
 {
-	public function __construct(string $msg, ?\Throwable $previous = null)
+	public function __construct(string $msg, \Throwable $previous = null)
 	{
 		parent::__construct($msg, $previous !== null ? $previous->getCode() : 0, $previous);
 	}

app/Exceptions/Internal/LycheeDomainException.php

@@ -6,7 +6,7 @@
 
 class LycheeDomainException extends \DomainException implements InternalLycheeException
 {
-	public function __construct(string $msg, ?\Throwable $previous = null)
+	public function __construct(string $msg, \Throwable $previous = null)
 	{
 		parent::__construct($msg, $previous !== null ? $previous->getCode() : 0, $previous);
 	}

app/Exceptions/MediaFileOperationException.php

@@ -23,7 +23,7 @@
  */
 class MediaFileOperationException extends FileOperationException
 {
-	public function __construct(string $msg, ?\Throwable $previous = null)
+	public function __construct(string $msg, \Throwable $previous = null)
 	{
 		parent::__construct($msg, $previous);
 	}

app/Http/Controllers/Administration/SettingsController.php

@@ -26,7 +26,6 @@
 use App\Http\Requests\Settings\SetPublicSearchSettingRequest;
 use App\Http\Requests\Settings\SetSortingSettingsRequest;
 use App\Models\Configs;
-use App\Models\User;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Storage;

app/Http/Controllers/ImportController.php

@@ -13,7 +13,6 @@
 use App\Models\Photo;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Illuminate\Routing\Controller;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
 use Symfony\Component\HttpFoundation\StreamedResponse;