Merge branch 'master' into 1838

.env.example

@@ -31,6 +31,7 @@ DB_PORT=
 DB_USERNAME=
 DB_PASSWORD=
 DB_LOG_SQL=false
+DB_LOG_SQL_EXPLAIN=false #only for MySQL
 
 # List foreign keys in diagnostic page
 DB_LIST_FOREIGN_KEYS=true

.github/workflows/php-cs-fixer.yml

@@ -30,7 +30,7 @@ jobs:
           coverage: none
       - name: Install PHP-CS-Fixer
         run: |
-          curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.16.0/php-cs-fixer.phar -o .github/build/php-cs-fixer
+          curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.18.0/php-cs-fixer.phar -o .github/build/php-cs-fixer
           chmod a+x .github/build/php-cs-fixer
       - name: Prepare Git User
         run: |

.php-cs-fixer.php

@@ -17,6 +17,7 @@ function (PhpCsFixer\Finder $finder, $dir) {
 )->notName('*.blade.php');
 $rules = [
 	'@Symfony' => true,
+	'nullable_type_declaration_for_default_null_value' => true,
 	'align_multiline_comment' => true,
 	'array_indentation' => true,
 	'backtick_to_shell_exec' => true,
@@ -38,6 +39,10 @@ function (PhpCsFixer\Finder $finder, $dir) {
 	'no_unneeded_control_parentheses' => [
 		'statements' => ['break', 'clone', 'continue', 'echo_print', 'switch_case', 'yield'],
 	],
+	'operator_linebreak' => [
+		'only_booleans' => true,
+		'position' => 'end'
+	],
 ];
 $config = new PhpCsFixer\Config();
 

app/Actions/Album/SetProtectionPolicy.php

@@ -30,7 +30,7 @@ class SetProtectionPolicy extends Action
 	public function do(BaseAlbum $album, AlbumProtectionPolicy $protectionPolicy, bool $shallSetPassword, ?string $password): void
 	{
 		$album->is_nsfw = $protectionPolicy->is_nsfw;
-		$active_permissions = $album->public_permissions;
+		$active_permissions = $album->public_permissions();
 
 		if (!$protectionPolicy->is_public) {
 			$active_permissions?->delete();
@@ -58,9 +58,8 @@ public function do(BaseAlbum $album, AlbumProtectionPolicy $protectionPolicy, bo
 				$active_permissions->password = null;
 			}
 		}
-		$album->public_permissions()->save($active_permissions);
+		$active_permissions->base_album_id = $album->id;
 		$active_permissions->save();
-		// $album->save();
 
 		// Reset permissions for photos
 		$album->photos()->update(['photos.is_public' => false]);

app/Actions/Album/Unlock.php

@@ -32,8 +32,8 @@ public function __construct()
 	 */
 	public function do(BaseAlbum $album, string $password): void
 	{
-		if ($album->public_permissions !== null) {
-			$album_password = $album->public_permissions->password;
+		if ($album->public_permissions() !== null) {
+			$album_password = $album->public_permissions()->password;
 			if (
 				$album_password === null ||
 				$album_password === '' ||

app/Actions/Albums/Top.php

@@ -74,15 +74,15 @@ public function get(): TopAlbumsResource
 		}
 
 		$tagAlbumQuery = $this->albumQueryPolicy
-			->applyVisibilityFilter(TagAlbum::query()->with(['owner']));
+			->applyVisibilityFilter(TagAlbum::query()->with(['access_permissions', 'owner']));
 		/** @var BaseCollection<TagAlbum> $tagAlbums */
 		$tagAlbums = (new SortingDecorator($tagAlbumQuery))
 			->orderBy($this->sorting->column, $this->sorting->order)
 			->get();
 
 		/** @var NsQueryBuilder $query */
 		$query = $this->albumQueryPolicy
-			->applyVisibilityFilter(Album::query()->with(['owner'])->whereIsRoot());
+			->applyVisibilityFilter(Album::query()->with(['access_permissions', 'owner'])->whereIsRoot());
 
 		$userID = Auth::id();
 		if ($userID !== null) {

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

@@ -21,8 +21,8 @@ public function handle(array &$data, \Closure $next): array
 				// @codeCoverageIgnoreEnd
 			}
 			if (
-				!$gdVersion['GIF Read Support']
-				|| !$gdVersion['GIF Create Support']
+				!$gdVersion['GIF Read Support'] ||
+				!$gdVersion['GIF Create Support']
 			) {
 				// @codeCoverageIgnoreStart
 				$data[] = 'Error: PHP gd extension without full gif support';

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/FromUrl.php

@@ -55,9 +55,11 @@ public function do(array $urls, ?Album $album, int $intendedOwnerId): Collection
 				$path = parse_url($url, PHP_URL_PATH);
 				$extension = '.' . pathinfo($path, PATHINFO_EXTENSION);
 
-				// Validate photo extension even when `$create->add()` will do later.
-				// This prevents us from downloading unsupported files.
-				BaseMediaFile::assertIsSupportedOrAcceptedFileExtension($extension);
+				if ($extension !== '.') {
+					// Validate photo extension even when `$create->add()` will do later.
+					// This prevents us from downloading unsupported files.
+					BaseMediaFile::assertIsSupportedOrAcceptedFileExtension($extension);
+				}
 
 				// Download file
 				$downloadedFile = new DownloadedFile($url);

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/Settings/UpdateLogin.php

@@ -41,9 +41,9 @@ public function do(?string $username, string $password, string $oldPassword, str
 			throw new UnauthenticatedException('Previous password is invalid');
 		}
 
-		if ($username !== null
-			&& $username !== ''
-			&& Configs::getValueAsBool('allow_username_change')) {
+		if ($username !== null &&
+			$username !== '' &&
+			Configs::getValueAsBool('allow_username_change')) {
 			$this->updateUsername($user, $username, $ip);
 		}