Reverted fixes by cs-updater.php

.php-cs-fixer.php

@@ -28,6 +28,11 @@ function (PhpCsFixer\Finder $finder, $dir) {
 	'concat_space' => ['spacing' => 'one'],
 	'no_superfluous_phpdoc_tags' => false,
 	'phpdoc_to_comment' => false, // required until https://github.com/phpstan/phpstan/issues/7486 got fixed
+	'blank_line_between_import_groups' => false, // not PSR-12 compatible, but preserves old behaviour
+	'ordered_imports' => [
+		'sort_algorithm' => 'alpha',
+		'imports_order' => null, // for PSR-12 compatability, this need to be `['class', 'function', 'const']`, but no grouping preserves old behaviour
+	],
 ];
 $config = new PhpCsFixer\Config();
 

app/Actions/Album/Archive.php

@@ -15,10 +15,8 @@
 use App\SmartAlbums\BaseSmartAlbum;
 use Illuminate\Support\Collection;
 use Safe\Exceptions\InfoException;
-
 use function Safe\ini_get;
 use function Safe\set_time_limit;
-
 use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use ZipStream\Exception\FileNotFoundException;

app/Actions/Album/Delete.php

@@ -15,7 +15,6 @@
 use App\SmartAlbums\UnsortedAlbum;
 use Illuminate\Database\Query\Builder as BaseBuilder;
 use Safe\Exceptions\ArrayException;
-
 use function Safe\usort;
 
 /**

app/Actions/Diagnostics/Checks/BasicPermissionCheck.php

@@ -14,7 +14,6 @@
 use League\Flysystem\Adapter\Local as LocalFlysystem;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-
 use function Safe\sprintf;
 
 class BasicPermissionCheck implements DiagnosticCheckInterface

app/Actions/Diagnostics/Checks/ImageOptCheck.php

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

app/Actions/Diagnostics/Checks/IniSettingsCheck.php

@@ -4,7 +4,6 @@
 
 use App\Contracts\DiagnosticCheckInterface;
 use App\Models\Configs;
-
 use function Safe\ini_get;
 use function Safe\preg_match;
 

app/Actions/Diagnostics/Info.php

@@ -11,7 +11,6 @@
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
 use Imagick;
-
 use function Safe\ini_get;
 
 class Info extends Diagnostics

app/Actions/Import/Exec.php

@@ -25,15 +25,13 @@
 use Safe\Exceptions\FilesystemException;
 use Safe\Exceptions\InfoException;
 use Safe\Exceptions\StringsException;
-
 use function Safe\file;
 use function Safe\glob;
 use function Safe\ini_get;
 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/FromServer.php

@@ -4,9 +4,7 @@
 
 use App\Actions\Photo\Strategies\ImportMode;
 use App\Models\Album;
-
 use function Safe\ini_get;
-
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class FromServer

app/Actions/Import/FromUrl.php

@@ -13,7 +13,6 @@
 use App\Models\Photo;
 use Illuminate\Support\Collection;
 use Safe\Exceptions\InfoException;
-
 use function Safe\ini_get;
 use function Safe\parse_url;
 use function Safe\set_time_limit;

app/Actions/Install/ApplyMigration.php

@@ -6,7 +6,6 @@
 use App\Exceptions\Internal\FrameworkException;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Facades\Artisan;
-
 use function Safe\unlink;
 
 class ApplyMigration

app/Actions/Install/RequirementsChecker.php

@@ -3,7 +3,6 @@
 namespace App\Actions\Install;
 
 use App\Facades\Helpers;
-
 use function Safe\preg_match;
 
 class RequirementsChecker

app/Actions/Photo/Archive.php

@@ -15,13 +15,11 @@
 use DateTimeInterface;
 use Illuminate\Database\Eloquent\Collection;
 use Safe\Exceptions\InfoException;
-
 use function Safe\fclose;
 use function Safe\fopen;
 use function Safe\ini_get;
 use function Safe\set_time_limit;
 use function Safe\stream_copy_to_stream;
-
 use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use ZipStream\Option\File as ZipFileOption;

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;
 
 /**

app/Actions/Update/Apply.php

@@ -11,7 +11,6 @@
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Config;
-
 use function Safe\chdir;
 use function Safe\preg_replace;
 use function Safe\putenv;

app/Actions/WebAuth/VerifyAuthentication.php

@@ -7,7 +7,6 @@
 use App\Facades\AccessControl;
 use App\Models\User;
 use DarkGhostHunter\Larapass\Facades\WebAuthn;
-
 use function Safe\base64_decode;
 
 class VerifyAuthentication

app/Assets/Helpers.php

@@ -5,12 +5,10 @@
 use App\Exceptions\Internal\ZeroModuloException;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Facades\File;
-
 use function Safe\getallheaders;
 use function Safe\ini_get;
 use function Safe\parse_url;
 use function Safe\substr;
-
 use WhichBrowser\Parser as BrowserParser;
 
 class Helpers

app/Console/Commands/ExifLens.php

@@ -12,7 +12,6 @@
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Safe\Exceptions\InfoException;
-
 use function Safe\set_time_limit;
 
 class ExifLens extends Command

app/Console/Commands/FixPermissions.php

@@ -4,11 +4,9 @@
 
 use App\Actions\Diagnostics\Checks\BasicPermissionCheck;
 use Illuminate\Console\Command;
-
 use function Safe\chmod;
 use function Safe\fileowner;
 use function Safe\sprintf;
-
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 
 class FixPermissions extends Command

app/Console/Commands/GenerateThumbs.php

@@ -10,14 +10,10 @@
 use App\Models\SizeVariant;
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Builder;
-
 use function Safe\array_flip;
-
 use Safe\Exceptions\InfoException;
-
 use function Safe\set_time_limit;
 use function Safe\sprintf;
-
 use Symfony\Component\Console\Exception\ExceptionInterface as SymfonyConsoleException;
 
 class GenerateThumbs extends Command

app/Console/Commands/Ghostbuster.php

@@ -12,11 +12,9 @@
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Storage;
 use League\Flysystem\Adapter\Local as LocalFlysystem;
-
 use function Safe\readlink;
 use function Safe\scandir;
 use function Safe\unlink;
-
 use Symfony\Component\Console\Exception\ExceptionInterface as SymfonyConsoleException;
 
 class Ghostbuster extends Command

app/Console/Commands/Sync.php

@@ -12,9 +12,7 @@
 use App\Models\Configs;
 use Exception;
 use Illuminate\Console\Command;
-
 use function Safe\sprintf;
-
 use Symfony\Component\Console\Exception\ExceptionInterface as SymfonyConsoleException;
 
 class Sync extends Command

app/Console/Commands/Takedate.php

@@ -12,9 +12,7 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Carbon;
 use Safe\Exceptions\InfoException;
-
 use function Safe\set_time_limit;
-
 use Symfony\Component\Console\Exception\ExceptionInterface as SymfonyConsoleException;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Output\ConsoleOutput;

app/Console/Commands/VideoData.php

@@ -13,10 +13,8 @@
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Builder;
 use Safe\Exceptions\InfoException;
-
 use function Safe\set_time_limit;
 use function Safe\sprintf;
-
 use Symfony\Component\Console\Exception\ExceptionInterface as SymfonyConsoleException;
 
 class VideoData extends Command

app/DTO/DTO.php

@@ -5,7 +5,6 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Database\Eloquent\JsonEncodingException;
-
 use function Safe\json_encode;
 use function Safe\json_last_error_msg;
 

app/Exceptions/Handlers/NoEncryptionKey.php

@@ -5,9 +5,7 @@
 use App\Contracts\HttpExceptionHandler;
 use App\Redirections\ToInstall;
 use Illuminate\Encryption\MissingAppKeyException;
-
 use function Safe\touch;
-
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface as HttpException;
 use Throwable;

app/Factories/DiagnosticsChecksFactory.php

@@ -3,7 +3,6 @@
 namespace App\Factories;
 
 use App\Contracts\DiagnosticCheckInterface;
-
 use function Safe\scandir;
 use function Safe\substr;
 

app/Factories/LangFactory.php

@@ -4,7 +4,6 @@
 
 use App\Contracts\Language;
 use App\Locale\English;
-
 use function Safe\scandir;
 use function Safe\substr;
 

app/Http/Controllers/DemoController.php

@@ -13,9 +13,7 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Response;
 use Illuminate\Routing\Controller;
-
 use function Safe\json_encode;
-
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
 class DemoController extends Controller

app/Http/Controllers/IndexController.php

@@ -11,7 +11,6 @@
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Routing\Controller;
 use Illuminate\View\View;
-
 use function Safe\phpinfo;
 
 class IndexController extends Controller

app/Http/Controllers/Install/EnvController.php

@@ -8,7 +8,6 @@
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
-
 use function Safe\file_get_contents;
 use function Safe\file_put_contents;
 

app/Http/Controllers/Install/MigrationController.php

@@ -8,7 +8,6 @@
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Contracts\View\View;
 use Illuminate\Routing\Controller;
-
 use function Safe\date;
 use function Safe\file_put_contents;
 

app/Http/Controllers/SearchController.php

@@ -7,7 +7,6 @@
 use App\Contracts\LycheeException;
 use App\Http\Requests\Search\SearchRequest;
 use Illuminate\Routing\Controller;
-
 use function Safe\json_encode;
 
 class SearchController extends Controller

app/Image/DownloadedFile.php

@@ -4,7 +4,6 @@
 
 use App\Exceptions\MediaFileOperationException;
 use Safe\Exceptions\PcreException;
-
 use function Safe\fclose;
 use function Safe\fopen;
 use function Safe\parse_url;

app/Image/FileDeleter.php

@@ -8,7 +8,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Storage;
 use League\Flysystem\Adapter\Local as LocalAdapter;
-
 use function Safe\unlink;
 
 /**

app/Image/FlysystemFile.php

@@ -7,7 +7,6 @@
 use Illuminate\Contracts\Filesystem\Filesystem;
 use League\Flysystem\Adapter\Local as LocalAdapter;
 use League\Flysystem\Exception as FlyException;
-
 use function Safe\fclose;
 
 /**

app/Image/GdHandler.php

@@ -9,7 +9,6 @@
 use App\Exceptions\MediaFileOperationException;
 use App\Exceptions\MediaFileUnsupportedException;
 use Safe\Exceptions\ImageException;
-
 use function Safe\imagecopyresampled;
 use function Safe\imagecopyresized;
 use function Safe\imagecreatetruecolor;

app/Image/NativeLocalFile.php

@@ -4,7 +4,6 @@
 
 use App\Exceptions\MediaFileOperationException;
 use App\Exceptions\MediaFileUnsupportedException;
-
 use function Safe\filemtime;
 use function Safe\filesize;
 use function Safe\fopen;

app/Image/TemporaryLocalFile.php

@@ -3,7 +3,6 @@
 namespace App\Image;
 
 use App\Exceptions\MediaFileOperationException;
-
 use function Safe\fopen;
 
 /**

app/Metadata/Extractor.php

@@ -16,7 +16,6 @@
 use PHPExif\Exif;
 use PHPExif\Reader\Reader;
 use Safe\Exceptions\StringsException;
-
 use function Safe\substr;
 
 /**

app/Metadata/GitHubFunctions.php

@@ -8,7 +8,6 @@
 use App\Models\Configs;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Support\Facades\Config;
-
 use function Safe\file_get_contents;
 use function Safe\sprintf;
 use function Safe\substr;

app/Metadata/LycheeVersion.php

@@ -10,7 +10,6 @@
 use App\Exceptions\VersionControlException;
 use App\Models\Configs;
 use Illuminate\Contracts\Container\BindingResolutionException;
-
 use function Safe\file_get_contents;
 
 class LycheeVersion