Composer update (#1893)

* composer update
* fix complaints

.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/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/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);
 		}
 

app/Assets/Helpers.php

@@ -122,9 +122,10 @@ public function hasFullPermissions(string $path): bool
 		// Check if the given path is readable and writable
 		// Both functions are also verifying that the path exists
 		if (
-			file_exists($path) === true && is_readable($path) === true
-			&& is_executable($path) === true
-			&& is_writeable($path) === true
+			file_exists($path) === true &&
+			is_readable($path) === true &&
+			is_executable($path) === true &&
+			is_writeable($path) === true
 		) {
 			return true;
 		}

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/Exceptions/AdminUserAlreadySetException.php

@@ -6,7 +6,7 @@
 
 class AdminUserAlreadySetException extends BaseLycheeException
 {
-	public function __construct(\Throwable $previous = null)
+	public function __construct(?\Throwable $previous = null)
 	{
 		parent::__construct(Response::HTTP_FORBIDDEN, 'Admin User has already been set', $previous);
 	}

app/Exceptions/AdminUserRequiredException.php

@@ -6,7 +6,7 @@
 
 class AdminUserRequiredException extends BaseLycheeException
 {
-	public function __construct(\Throwable $previous = null)
+	public function __construct(?\Throwable $previous = null)
 	{
 		parent::__construct(Response::HTTP_SERVICE_UNAVAILABLE, 'Admin user not found', $previous);
 	}

app/Exceptions/BadRequestHeaderException.php

@@ -6,7 +6,7 @@
 
 class BadRequestHeaderException extends BaseLycheeException
 {
-	public function __construct(string $msg, \Throwable $previous = null)
+	public function __construct(string $msg, ?\Throwable $previous = null)
 	{
 		parent::__construct(Response::HTTP_BAD_REQUEST, $msg, $previous);
 	}

app/Exceptions/ConfigurationException.php

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

app/Exceptions/ConfigurationKeyMissingException.php

@@ -11,7 +11,7 @@
  */
 class ConfigurationKeyMissingException 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/ConflictingPropertyException.php

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

app/Exceptions/ExternalComponentFailedException.php

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

app/Exceptions/ExternalComponentMissingException.php

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

app/Exceptions/FlySystemLycheeException.php

@@ -12,7 +12,7 @@
  */
 class FlySystemLycheeException extends BaseLycheeException implements FilesystemException
 {
-	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/Handler.php

@@ -14,7 +14,9 @@
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Log;
@@ -214,14 +216,14 @@ protected function mapException(\Throwable $e): \Throwable
 	 * @param Request    $request
 	 * @param \Throwable $e
 	 *
-	 * @return SymfonyResponse
+	 * @return RedirectResponse|Response
 	 *
 	 * @throws BindingResolutionException
 	 * @throws \InvalidArgumentException
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
 	 */
-	protected function prepareResponse($request, \Throwable $e): SymfonyResponse
+	protected function prepareResponse($request, \Throwable $e): RedirectResponse|Response
 	{
 		if (!$this->isHttpException($e) && config('app.debug') === true) {
 			return $this->toIlluminateResponse($this->convertExceptionToResponse($e), $e);

app/Exceptions/HttpHoneyPotException.php

@@ -18,7 +18,7 @@ class HttpHoneyPotException extends HttpException
 	 *
 	 * @return void
 	 */
-	public function __construct(string $path, \Throwable $previous = null)
+	public function __construct(string $path, ?\Throwable $previous = null)
 	{
 		parent::__construct(Response::HTTP_I_AM_A_TEAPOT, sprintf('The route %s could not be found.', $path), $previous);
 	}

app/Exceptions/ImageProcessingException.php

@@ -24,7 +24,7 @@
  */
 class ImageProcessingException 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/ImportCancelledException.php

@@ -8,7 +8,7 @@ class ImportCancelledException extends BaseLycheeException
 {
 	public const DEFAULT_MESSAGE = 'Import cancelled';
 
-	public function __construct(string $msg = self::DEFAULT_MESSAGE, \Throwable $previous = null)
+	public function __construct(string $msg = self::DEFAULT_MESSAGE, ?\Throwable $previous = null)
 	{
 		parent::__construct(Response::HTTP_INTERNAL_SERVER_ERROR, $msg, $previous);
 	}

app/Exceptions/InstallationAlreadyCompletedException.php

@@ -6,7 +6,7 @@
 
 class InstallationAlreadyCompletedException extends BaseLycheeException
 {
-	public function __construct(\Throwable $previous = null)
+	public function __construct(?\Throwable $previous = null)
 	{
 		parent::__construct(Response::HTTP_FORBIDDEN, 'Installation has already been run', $previous);
 	}

app/Exceptions/InstallationFailedException.php

@@ -6,7 +6,7 @@
 
 class InstallationFailedException 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/InstallationRequiredException.php

@@ -6,7 +6,7 @@
 
 class InstallationRequiredException extends BaseLycheeException
 {
-	public function __construct(\Throwable $previous = null)
+	public function __construct(?\Throwable $previous = null)
 	{
 		parent::__construct(Response::HTTP_SERVICE_UNAVAILABLE, 'Installation not complete', $previous);
 	}

app/Exceptions/InsufficientEntropyException.php

@@ -11,7 +11,7 @@
  */
 class InsufficientEntropyException extends BaseLycheeException
 {
-	public function __construct(\Throwable $previous = null)
+	public function __construct(?\Throwable $previous = null)
 	{
 		parent::__construct(Response::HTTP_SERVICE_UNAVAILABLE, 'Insufficient entropy', $previous);
 	}

app/Exceptions/InsufficientFilesystemPermissions.php

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

app/Exceptions/Internal/FailedModelAssumptionException.php

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

app/Exceptions/Internal/FrameworkException.php

@@ -20,7 +20,7 @@
  */
 class FrameworkException extends LycheeLogicException
 {
-	public function __construct(string $what, \Throwable $previous = null)
+	public function __construct(string $what, ?\Throwable $previous = null)
 	{
 		parent::__construct($what . ' failed', $previous);
 	}

app/Exceptions/Internal/InvalidConfigOption.php

@@ -4,7 +4,7 @@
 
 class InvalidConfigOption extends LycheeDomainException
 {
-	public function __construct(string $msg, \Throwable $previous = null)
+	public function __construct(string $msg, ?\Throwable $previous = null)
 	{
 		parent::__construct($msg, $previous);
 	}

app/Exceptions/Internal/JsonRequestFailedException.php

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

app/Exceptions/Internal/LycheeInvalidArgumentException.php

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

app/Exceptions/Internal/LycheeLogicException.php

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

app/Exceptions/Internal/QueryBuilderException.php

@@ -14,7 +14,7 @@
  */
 class QueryBuilderException extends FrameworkException
 {
-	public function __construct(\Throwable $previous = null)
+	public function __construct(?\Throwable $previous = null)
 	{
 		parent::__construct('Laravel/Eloquent query builder', $previous);
 	}

app/Exceptions/Internal/TimeBasedIdException.php

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

app/Exceptions/InvalidDirectoryException.php

@@ -16,7 +16,7 @@ class InvalidDirectoryException extends InvalidPropertyException
 {
 	public const DEFAULT_MESSAGE = 'Given path is not a directory';
 
-	public function __construct(string $msg = self::DEFAULT_MESSAGE, \Throwable $previous = null)
+	public function __construct(string $msg = self::DEFAULT_MESSAGE, ?\Throwable $previous = null)
 	{
 		parent::__construct($msg, $previous);
 	}

app/Exceptions/InvalidPropertyException.php

@@ -21,7 +21,7 @@
  */
 class InvalidPropertyException extends BaseLycheeException
 {
-	public function __construct(string $msg, \Throwable $previous = null, int $statusCode = Response::HTTP_UNPROCESSABLE_ENTITY)
+	public function __construct(string $msg, ?\Throwable $previous = null, int $statusCode = Response::HTTP_UNPROCESSABLE_ENTITY)
 	{
 		parent::__construct($statusCode, $msg, $previous);
 	}

app/Exceptions/MediaFileMissingException.php

@@ -14,7 +14,7 @@ class MediaFileMissingException extends BaseLycheeException
 {
 	public const DEFAULT_MESSAGE = 'The media file is missing';
 
-	public function __construct(string $msg = self::DEFAULT_MESSAGE, \Throwable $previous = null)
+	public function __construct(string $msg = self::DEFAULT_MESSAGE, ?\Throwable $previous = null)
 	{
 		parent::__construct(Response::HTTP_NOT_FOUND, $msg, $previous);
 	}

app/Exceptions/MediaFileUnsupportedException.php

@@ -14,7 +14,7 @@ class MediaFileUnsupportedException extends BaseLycheeException
 {
 	public const DEFAULT_MESSAGE = 'File format not supported';
 
-	public function __construct(string $msg = self::DEFAULT_MESSAGE, \Throwable $previous = null)
+	public function __construct(string $msg = self::DEFAULT_MESSAGE, ?\Throwable $previous = null)
 	{
 		parent::__construct(Response::HTTP_UNPROCESSABLE_ENTITY, $msg, $previous);
 	}