From f3521c8ba414277c6fc6750943a835433913cfe0 Mon Sep 17 00:00:00 2001
From: Ilya Prokopenko <dsrev@protonmail.com>
Date: Tue, 9 Aug 2022 12:58:47 +0700
Subject: [PATCH] Combine classes from one category into single line

... kinda
---
 Web/Presenters/AuthPresenter.php              | 10 ++--------
 Web/Presenters/BlobPresenter.php              | 20 +++++++++----------
 Web/Presenters/NotesPresenter.php             |  3 +--
 Web/Presenters/PhotosPresenter.php            |  9 ++-------
 Web/Presenters/SearchPresenter.php            |  6 ++----
 Web/Presenters/SupportPresenter.php           |  6 ++----
 .../UnknownTextRouteStrategyPresenter.php     |  3 +--
 Web/Presenters/UserPresenter.php              | 14 +++----------
 Web/Presenters/VideosPresenter.php            |  3 +--
 9 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/Web/Presenters/AuthPresenter.php b/Web/Presenters/AuthPresenter.php
index 599efe8f..ac5a30c2 100644
--- a/Web/Presenters/AuthPresenter.php
+++ b/Web/Presenters/AuthPresenter.php
@@ -1,14 +1,8 @@
 <?php declare(strict_types=1);
 namespace openvk\Web\Presenters;
-use openvk\Web\Models\Entities\IP;
-use openvk\Web\Models\Entities\User;
-use openvk\Web\Models\Entities\PasswordReset;
-use openvk\Web\Models\Entities\EmailVerification;
+use openvk\Web\Models\Entities\{IP, User, PasswordReset, EmailVerification};
+use openvk\Web\Models\Repositories\{IPs, Users, Restores, Verifications};
 use openvk\Web\Models\Exceptions\InvalidUserNameException;
-use openvk\Web\Models\Repositories\IPs;
-use openvk\Web\Models\Repositories\Users;
-use openvk\Web\Models\Repositories\Restores;
-use openvk\Web\Models\Repositories\Verifications;
 use openvk\Web\Util\Validator;
 use Chandler\Session\Session;
 use Chandler\Security\User as ChandlerUser;
diff --git a/Web/Presenters/BlobPresenter.php b/Web/Presenters/BlobPresenter.php
index 21bba2da..970b8f19 100644
--- a/Web/Presenters/BlobPresenter.php
+++ b/Web/Presenters/BlobPresenter.php
@@ -25,15 +25,15 @@ final class BlobPresenter extends OpenVKPresenter
             $this->notFound();
         
         if(isset($_SERVER["HTTP_IF_NONE_MATCH"]))
-                exit(header("HTTP/1.1 304 Not Modified"));
-            
-            header("Content-Type: " . mime_content_type($path));
-            header("Content-Size: " . filesize($path));
-            header("Cache-Control: public, max-age=1210000");
-            header("X-Accel-Expires: 1210000");
-            header("ETag: W/\"" . hash_file("snefru", $path) . "\"");
-            
-            readfile($path);
-            exit;
+            exit(header("HTTP/1.1 304 Not Modified"));
+        
+        header("Content-Type: " . mime_content_type($path));
+        header("Content-Size: " . filesize($path));
+        header("Cache-Control: public, max-age=1210000");
+        header("X-Accel-Expires: 1210000");
+        header("ETag: W/\"" . hash_file("snefru", $path) . "\"");
+        
+        readfile($path);
+        exit;
     }
 }
diff --git a/Web/Presenters/NotesPresenter.php b/Web/Presenters/NotesPresenter.php
index d88c6365..2eb75f91 100644
--- a/Web/Presenters/NotesPresenter.php
+++ b/Web/Presenters/NotesPresenter.php
@@ -1,7 +1,6 @@
 <?php declare(strict_types=1);
 namespace openvk\Web\Presenters;
-use openvk\Web\Models\Repositories\Users;
-use openvk\Web\Models\Repositories\Notes;
+use openvk\Web\Models\Repositories\{Users, Notes};
 use openvk\Web\Models\Entities\Note;
 
 final class NotesPresenter extends OpenVKPresenter
diff --git a/Web/Presenters/PhotosPresenter.php b/Web/Presenters/PhotosPresenter.php
index 24b8bd7c..eacf76d4 100644
--- a/Web/Presenters/PhotosPresenter.php
+++ b/Web/Presenters/PhotosPresenter.php
@@ -1,12 +1,7 @@
 <?php declare(strict_types=1);
 namespace openvk\Web\Presenters;
-use openvk\Web\Models\Entities\Club;
-use openvk\Web\Models\Entities\Photo;
-use openvk\Web\Models\Entities\Album;
-use openvk\Web\Models\Repositories\Photos;
-use openvk\Web\Models\Repositories\Albums;
-use openvk\Web\Models\Repositories\Users;
-use openvk\Web\Models\Repositories\Clubs;
+use openvk\Web\Models\Entities\{Club, Photo, Album};
+use openvk\Web\Models\Repositories\{Photos, Albums, Users, Clubs};
 use Nette\InvalidStateException as ISE;
 
 final class PhotosPresenter extends OpenVKPresenter
diff --git a/Web/Presenters/SearchPresenter.php b/Web/Presenters/SearchPresenter.php
index a5eaedc7..2171297c 100644
--- a/Web/Presenters/SearchPresenter.php
+++ b/Web/Presenters/SearchPresenter.php
@@ -1,9 +1,7 @@
 <?php declare(strict_types=1);
 namespace openvk\Web\Presenters;
-use openvk\Web\Models\Repositories\Users;
-use openvk\Web\Models\Entities\User;
-use openvk\Web\Models\Repositories\Clubs;
-use openvk\Web\Models\Entities\Club;
+use openvk\Web\Models\Entities\{User, Club};
+use openvk\Web\Models\Repositories\{Users, Clubs};
 use Chandler\Database\DatabaseConnection;
 
 final class SearchPresenter extends OpenVKPresenter
diff --git a/Web/Presenters/SupportPresenter.php b/Web/Presenters/SupportPresenter.php
index 105af4e6..22f09201 100644
--- a/Web/Presenters/SupportPresenter.php
+++ b/Web/Presenters/SupportPresenter.php
@@ -1,9 +1,7 @@
 <?php declare(strict_types=1);
 namespace openvk\Web\Presenters;
-use openvk\Web\Models\Entities\Ticket;
-use openvk\Web\Models\Repositories\{Tickets, Users};
-use openvk\Web\Models\Entities\TicketComment;
-use openvk\Web\Models\Repositories\TicketComments;
+use openvk\Web\Models\Entities\{Ticket, TicketComment};
+use openvk\Web\Models\Repositories\{Tickets, Users, TicketComments};
 use openvk\Web\Util\Telegram;
 use Chandler\Session\Session;
 use Chandler\Database\DatabaseConnection;
diff --git a/Web/Presenters/UnknownTextRouteStrategyPresenter.php b/Web/Presenters/UnknownTextRouteStrategyPresenter.php
index 6032a4a0..004da043 100644
--- a/Web/Presenters/UnknownTextRouteStrategyPresenter.php
+++ b/Web/Presenters/UnknownTextRouteStrategyPresenter.php
@@ -1,7 +1,6 @@
 <?php declare(strict_types=1);
 namespace openvk\Web\Presenters;
-use openvk\Web\Models\Repositories\Users;
-use openvk\Web\Models\Repositories\Clubs;
+use openvk\Web\Models\Repositories\{Users, Clubs};
 
 final class UnknownTextRouteStrategyPresenter extends OpenVKPresenter
 {
diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php
index 186d5823..a86cf8ae 100644
--- a/Web/Presenters/UserPresenter.php
+++ b/Web/Presenters/UserPresenter.php
@@ -2,19 +2,11 @@
 namespace openvk\Web\Presenters;
 use openvk\Web\Util\Sms;
 use openvk\Web\Themes\Themepacks;
-use openvk\Web\Models\Entities\Photo;
-use openvk\Web\Models\Entities\Post;
-use openvk\Web\Models\Repositories\Users;
-use openvk\Web\Models\Repositories\Clubs;
-use openvk\Web\Models\Repositories\Albums;
-use openvk\Web\Models\Repositories\Videos;
-use openvk\Web\Models\Repositories\Notes;
-use openvk\Web\Models\Repositories\Vouchers;
-use openvk\Web\Models\Repositories\EmailChangeVerifications;
+use openvk\Web\Models\Entities\{Photo, Post, EmailChangeVerification};
+use openvk\Web\Models\Entities\Notifications\{CoinsTransferNotification, RatingUpNotification};
+use openvk\Web\Models\Repositories\{Users, Clubs, Albums, Videos, Notes, Vouchers, EmailChangeVerifications};
 use openvk\Web\Models\Exceptions\InvalidUserNameException;
 use openvk\Web\Util\Validator;
-use openvk\Web\Models\Entities\Notifications\{CoinsTransferNotification, RatingUpNotification};
-use openvk\Web\Models\Entities\EmailChangeVerification;
 use Chandler\Security\Authenticator;
 use lfkeitel\phptotp\{Base32, Totp};
 use chillerlan\QRCode\{QRCode, QROptions};
diff --git a/Web/Presenters/VideosPresenter.php b/Web/Presenters/VideosPresenter.php
index a0963f53..e7b24344 100644
--- a/Web/Presenters/VideosPresenter.php
+++ b/Web/Presenters/VideosPresenter.php
@@ -1,8 +1,7 @@
 <?php declare(strict_types=1);
 namespace openvk\Web\Presenters;
 use openvk\Web\Models\Entities\Video;
-use openvk\Web\Models\Repositories\Users;
-use openvk\Web\Models\Repositories\Videos;
+use openvk\Web\Models\Repositories\{Users, Videos};
 use Nette\InvalidStateException as ISE;
 
 final class VideosPresenter extends OpenVKPresenter