PHP code modernization work. Not finished.

config/packages/doctrine.yaml

@@ -30,7 +30,7 @@ doctrine:
                 mappings:
                     App:
                         is_bundle: false
-                        type: annotation
+                        type: attribute
                         dir: '%kernel.project_dir%/src/Entity'
                         prefix: 'App\Entity'
                         alias: App
@@ -39,7 +39,7 @@ doctrine:
                 mappings:
                     Magnetico:
                         is_bundle: false
-                        type: annotation
+                        type: attribute
                         dir: '%kernel.project_dir%/src/Magnetico/Entity'
                         prefix: 'App\Magnetico'
                         alias: Magnetico

config/packages/security.yaml

@@ -6,10 +6,9 @@ security:
                 class: App\Entity\User
                 property: username
                 manager_name: default
-    encoders:
+    password_hashers:
         App\Entity\User:
-            # https://symfony.com/blog/new-in-symfony-4-3-native-password-encoder
-            algorithm: 'auto'
+            algorithm: sodium
     firewalls:
         dev:
             pattern: ^/(_(profiler|wdt)|css|images|js)/

src/Api/V1/Controller/AbstractApiController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Api\V1\Controller;
 

src/Api/V1/Controller/RssController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Api\V1\Controller;
 

src/Api/V1/Controller/SecurityController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Api\V1\Controller;
 

src/Api/V1/Controller/TorrentController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Api\V1\Controller;
 

src/Api/V1/DTO/ApiResponse.php

@@ -1,9 +1,10 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Api\V1\DTO;
 
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Serializer\Annotation\{Groups, MaxDepth};
+use Symfony\Component\Serializer\Annotation\Groups;
 
 class ApiResponse
 {
@@ -12,33 +13,20 @@ class ApiResponse
     public const STATUS_FAIL = 'fail';
     public const STATUS_UNKNOWN = 'unknown';
 
-    /**
-     * @var int HTTP response status code
-     *
-     * @Groups({"api"})
-     */
-    private $code;
+    #[Groups(['api'])]
+    private int $code;
 
-    /**
-     * @var string Status text: 'success' (1xx-3xx), 'error' (4xx), 'fail' (5xx) or 'unknown'
-     *
-     * @Groups({"api"})
-     */
-    private $status;
+    /** Status text: 'success' (1xx-3xx), 'error' (4xx), 'fail' (5xx) or 'unknown' */
+    #[Groups(['api'])]
+    private string $status;
 
-    /**
-     * @var string|null Used for 'fail' and 'error'
-     *
-     * @Groups({"api"})
-     */
-    private $message;
+    /** Used for 'fail' and 'error') */
+    #[Groups(['api'])]
+    private ?string $message;
 
-    /**
-     * @var string|\object|array|null Response body. In case of 'error' or 'fail' contains cause or exception name.
-     *
-     * @Groups({"api"})
-     */
-    private $data;
+    /** @Response body. In case of 'error' or 'fail' contains cause or exception name. */
+    #[Groups(['api'])]
+    private string|object|array|null $data;
 
     public function __construct($data = null, int $code = Response::HTTP_OK, string $message = null, string $status = '')
     {

src/Api/V1/DTO/ListPage.php

@@ -1,46 +1,27 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Api\V1\DTO;
 
 use Pagerfanta\Pagerfanta;
-use Symfony\Component\Serializer\Annotation as Serializer;
+use Symfony\Component\Serializer\Annotation\Groups;
 
 class ListPage
 {
-    /**
-     * @var int
-     *
-     * @Serializer\Groups({"api"})
-     */
-    private $numberOfPages;
+    #[Groups(['api'])]
+    private int $numberOfPages;
 
-    /**
-     * @var int
-     *
-     * @Serializer\Groups({"api"})
-     */
-    private $currentPage;
+    #[Groups(['api'])]
+    private int $currentPage;
 
-    /**
-     * @var int
-     *
-     * @Serializer\Groups({"api"})
-     */
-    private $numberOfResults;
+    #[Groups(['api'])]
+    private int $numberOfResults;
 
-    /**
-     * @var int
-     *
-     * @Serializer\Groups({"api"})
-     */
-    private $maxPerPage;
+    #[Groups(['api'])]
+    private int $maxPerPage;
 
-    /**
-     * @var \Traversable
-     *
-     * @Serializer\Groups({"api"})
-     */
-    protected $items;
+    #[Groups(['api'])]
+    protected \Traversable $items;
 
     public function __construct(\Traversable $items, int $numberOfResults, int $numberOfPages, int $currentPage, int $maxPerPage)
     {

src/Command/AddInvitesCommand.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Command;
 
@@ -11,22 +12,12 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class AddInvitesCommand extends Command
 {
-    /** @var EntityManagerInterface */
-    private $em;
-
-    /** @var UserRepository */
-    private $userRepo;
-
-    /** @var InviteManager */
-    private $inviteManager;
-
-    public function __construct(EntityManagerInterface $em, UserRepository $userRepo, InviteManager $inviteManager)
-    {
+    public function __construct(
+        private readonly EntityManagerInterface $em,
+        private readonly UserRepository $userRepo,
+        private readonly InviteManager $inviteManager
+    ) {
         parent::__construct();
-
-        $this->em = $em;
-        $this->userRepo = $userRepo;
-        $this->inviteManager = $inviteManager;
     }
 
     protected function configure()
@@ -38,15 +29,15 @@ class AddInvitesCommand extends Command
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $username = $input->getArgument('username');
-        $number = $input->getArgument('number');
+        $number = (int) $input->getArgument('number');
 
         if (null === $user = $this->userRepo->findOneBy(['username' => $username])) {
             $output->writeln('<error>User not found.</error>');
 
-            return 1;
+            return Command::FAILURE;
         }
 
         $this->inviteManager->createInvitesForUser($user, $number);
@@ -55,6 +46,6 @@ class AddInvitesCommand extends Command
 
         $output->writeln(sprintf('<info>%d invites added to \'%s\'.</info>', $number, $user->getUsername()));
 
-        return 0;
+        return Command::SUCCESS;
     }
 }

src/Command/AddUserCommand.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Command;
 
@@ -13,26 +14,13 @@ use Symfony\Component\Console\Question\Question;
 
 class AddUserCommand extends Command
 {
-    /** @var EntityManagerInterface */
-    private $em;
-
-    /** @var UserManager */
-    private $userManager;
-
-    /** @var UserRepository */
-    private $userRepo;
-
-    /** @var InviteManager */
-    private $inviteManager;
-
-    public function __construct(EntityManagerInterface $em, UserManager $userManager, UserRepository $userRepo, InviteManager $inviteManager)
-    {
+    public function __construct(
+        private readonly EntityManagerInterface $em,
+        private readonly UserManager $userManager,
+        private readonly UserRepository $userRepo,
+        private readonly InviteManager $inviteManager,
+    ) {
         parent::__construct();
-
-        $this->em = $em;
-        $this->userManager = $userManager;
-        $this->userRepo = $userRepo;
-        $this->inviteManager = $inviteManager;
     }
 
     protected function configure()
@@ -47,7 +35,7 @@ class AddUserCommand extends Command
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $username = $input->getArgument('username');
         $email = $input->getArgument('email');
@@ -68,7 +56,7 @@ class AddUserCommand extends Command
         if (!$password) {
             $output->writeln('<error>User password cannot be empty.</error>');
 
-            return 1;
+            return Command::FAILURE;
         }
 
         if ($roles) {
@@ -88,7 +76,7 @@ class AddUserCommand extends Command
 
         $output->writeln(sprintf('<info>User \'%s\' registered, %d invites added.</info>', $user->getUsername(), $invites));
 
-        return 0;
+        return Command::SUCCESS;
     }
 
 }

src/Controller/AccountController.php

@@ -1,11 +1,10 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Controller;
 
-use App\Entity\ApiToken;
-use App\Entity\User;
-use App\Repository\ApiTokenRepository;
-use App\Repository\InviteRepository;
+use App\Entity\{ApiToken, User};
+use App\Repository\{ApiTokenRepository, InviteRepository};
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;

src/Controller/MagnetRedirectController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Controller;
 

src/Controller/MainController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Controller;
 

src/Controller/SecurityController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Controller;
 

src/Controller/TorrentController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Controller;
 

src/Controller/UserController.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Controller;
 

src/Doctrine/ORM/AST/BaseFunction.php

@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 namespace App\Doctrine\ORM\AST;
@@ -14,14 +13,13 @@ use Doctrine\ORM\Query\{AST\Functions\FunctionNode, AST\Node, Lexer, Parser, Sql
  */
 abstract class BaseFunction extends FunctionNode
 {
-    /** @var string */
-    protected $functionPrototype;
+    protected string $functionPrototype;
 
     /** @var string[] */
-    protected $nodesMapping = [];
+    protected array $nodesMapping = [];
 
     /** @var Node[] */
-    protected $nodes = [];
+    protected array $nodes = [];
 
     abstract protected function customiseFunction(): void;
 
@@ -70,4 +68,4 @@ abstract class BaseFunction extends FunctionNode
 
         return \vsprintf($this->functionPrototype, $dispatched);
     }
-}
+}

src/Doctrine/ORM/AST/Ilike.php

@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 namespace App\Doctrine\ORM\AST;

src/Entity/ApiToken.php

@@ -1,40 +1,27 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Entity;
 
+use App\Repository\ApiTokenRepository;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
-/**
- * @ORM\Table(name="api_tokens", schema="users")
- * @ORM\Entity(repositoryClass="App\Repository\ApiTokenRepository", readOnly=true)
- */
+#[ORM\Table(name: 'api_tokens', schema: 'users')]
+#[ORM\Entity(repositoryClass: ApiTokenRepository::class, readOnly: true)]
 class ApiToken
 {
-    /**
-     * @var User
-     *
-     * @ORM\ManyToOne(targetEntity="App\Entity\User")
-     * @ORM\JoinColumn(name="user_id", nullable=false)
-     */
-    private $user;
+    #[ORM\ManyToOne(targetEntity: User::class)]
+    #[ORM\JoinColumn(name: 'user_id', nullable: false)]
+    private User $user;
 
-    /**
-     * @var string
-     *
-     * @Serializer\Groups({"api", "api_v1_login"})
-     *
-     * @ORM\Id()
-     * @ORM\Column(name="key", type="string", length=32)
-     */
-    private $key;
+    #[Serializer\Groups(['api', 'api_v1_login'])]
+    #[ORM\Id]
+    #[ORM\Column(name: 'key', type: 'string', length: 32)]
+    private string $key;
 
-    /**
-     * @var \DateTime
-     *
-     * @ORM\Column(name="created_at", type="datetime")
-     */
-    private $createdAt;
+    #[ORM\Column(name: 'created_at', type: 'datetime')]
+    private \DateTime $createdAt;
 
     public function __construct(User $user)
     {
@@ -57,4 +44,4 @@ class ApiToken
     {
         return $this->createdAt;
     }
-}
+}

src/Entity/Invite.php

@@ -1,51 +1,35 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Entity;
 
+use App\Repository\InviteRepository;
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Table(name="invites", schema="users")
- * @ORM\Entity(repositoryClass="App\Repository\InviteRepository")
- */
+#[ORM\Table(name: 'invites', schema: 'users')]
+#[ORM\Entity(repositoryClass: InviteRepository::class)]
 class Invite
 {
-    /**
-     * @var int
-     *
-     * @ORM\Id()
-     * @ORM\GeneratedValue(strategy="AUTO")
-     * @ORM\Column(name="id", type="integer")
-     */
-    private $id;
+    #[ORM\Id]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    #[ORM\Column(name: 'id', type: 'integer')]
+    private int $id;
 
-    /**
-     * @var User
-     *
-     * @ORM\ManyToOne(targetEntity="App\Entity\User", inversedBy="invites")
-     * @ORM\JoinColumn(name="user_id", nullable=false)
-     */
-    private $user;
+    #[ORM\ManyToOne(targetEntity: User::class, inversedBy: 'invites')]
+    #[ORM\JoinColumn(name: 'user_id', nullable: false)]
+    private User $user;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="code", type="string", length=32, unique=true)
-     */
-    private $code;
+    #[ORM\Column(name: 'code', type: 'string', length: 32, unique: true)]
+    private string $code;
 
-    /**
-     * @var User|null
-     *
-     * @ORM\ManyToOne(targetEntity="App\Entity\User")
-     * @ORM\JoinColumn(name="used_by_id", nullable=true)
-     */
-    private $usedBy;
+    #[ORM\ManyToOne(targetEntity: User::class)]
+    #[ORM\JoinColumn(name: 'used_by_id', nullable: true)]
+    private ?User $usedBy;
 
     public function __construct(User $forUser)
     {
         $this->user = $forUser;
-        $this->code = md5(random_bytes(100));
+        $this->code = md5(\random_bytes(100));
     }
 
     public function getId(): int
@@ -81,4 +65,4 @@ class Invite
 
         $this->usedBy = $user;
     }
-}
+}

src/Entity/PasswordResetToken.php

@@ -1,38 +1,24 @@
 <?php
-
+declare(strict_types=1);
 
 namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * @ORM\Table(schema="users", name="password_reset_tokens")
- * @ORM\Entity(readOnly=true)
- */
+#[ORM\Table(schema: 'users', name: 'password_reset_tokens')]
+#[ORM\Entity(readOnly: true)]
 class PasswordResetToken
 {
-    /**
-     * @var User
-     *
-     * @ORM\ManyToOne(targetEntity="User", fetch="EAGER")
-     * @ORM\JoinColumn(name="user_id", nullable=false, onDelete="CASCADE")
-     */
-    private $user;
+    #[ORM\ManyToOne(targetEntity: User::class, fetch: 'EAGER')]
+    #[ORM\JoinColumn(name: 'user_id', nullable: false, onDelete: 'CASCADE')]
+    private User $user;
 
-    /**
-     * @var string
-     *
-     * @ORM\Id()
-     * @ORM\Column(name="code", type="text", nullable=false)
-     */
-    private $code;
+    #[ORM\Id]
+    #[ORM\Column(name: 'code', type: 'text', nullable: false)]
+    private string $code;
 
-    /**
-     * @var \DateTime
-     *
-     * @ORM\Column(name="valid_until", type="datetime", nullable=false)
-     */
-    private $validUntil;
+    #[ORM\Column(name: 'valid_until', type: 'datetime', nullable: false)]
+    private \DateTime $validUntil;
 
     public function __construct(User $user, \DateInterval $validFor = null)
     {

src/Entity/User.php

@@ -1,73 +1,46 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Entity;
 
+use App\Repository\UserRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Security\Core\Encoder\PasswordEncoderInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\PasswordHasher\PasswordHasherInterface;
+use Symfony\Component\Security\Core\User\{PasswordAuthenticatedUserInterface, UserInterface};
 
-/**
- * @ORM\Table(name="users", schema="users")
- * @ORM\Entity(repositoryClass="App\Repository\UserRepository")
- */
-class User implements UserInterface, \Serializable
+#[ORM\Table(name: 'users', schema: 'users')]
+#[ORM\Entity(repositoryClass: UserRepository::class)]
+class User implements UserInterface, PasswordAuthenticatedUserInterface
 {
-    /**
-     * @var int
-     *
-     * @ORM\Id
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
+    #[ORM\Id]
+    #[ORM\Column(name: 'id', type: 'integer')]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    private int $id;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="username", type="string", length=25, unique=true)
-     */
-    private $username;
+    #[ORM\Column(name: 'username', type: 'string', length: 25, unique: true)]
+    private string $username;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="password", type="text")
-     */
-    private $password;
+    #[ORM\Column(name: 'password', type: 'text')]
+    private string $password;
 
-    /**
-     * @var string
-     *
-     * @ORM\Column(name="email", type="string", length=254, unique=true)
-     */
-    private $email;
+    #[ORM\Column(name: 'email', type: 'string', length: 254, unique: true)]
+    private string $email;
 
-    /**
-     * @var string[]
-     *
-     * @ORM\Column(name="roles", type="json")
-     */
-    private $roles = [];
+    #[ORM\Column(name: 'roles', type: 'json')]
+    private array $roles = [];
 
-    /**
-     * @var \DateTime
-     *
-     * @ORM\Column(name="created_at", type="datetime")
-     */
-    private $createdAt;
+    #[ORM\Column(name: 'created_at', type: 'datetime')]
+    private \DateTime $createdAt;
 
-    /**
-     * @var Invite[]|ArrayCollection
-     *
-     * @ORM\OneToMany(targetEntity="App\Entity\Invite", mappedBy="user", fetch="EXTRA_LAZY")
-     */
+    /** @var Invite[]|ArrayCollection */
+    #[ORM\OneToMany(targetEntity: Invite::class, mappedBy: 'user', fetch: 'EXTRA_LAZY')]
     private $invites;
 
-    public function __construct(string $username, PasswordEncoderInterface $encoder, string $rawPassword, string $email, array $roles = [])
+    public function __construct(string $username, PasswordHasherInterface $hasher, string $rawPassword, string $email, array $roles = [])
     {
         $this->username = $username;
-        $this->password = $encoder->encodePassword($rawPassword, null);
+        $this->password = $hasher->hash($rawPassword);
         $this->email = $email;
         $this->roles = $roles ?: ['ROLE_USER'];
         $this->createdAt = new \DateTime();
@@ -78,22 +51,29 @@ class User implements UserInterface, \Serializable
         return $this->id;
     }
 
-    public function getUsername()
+    public function getUserIdentifier(): string
     {
         return $this->username;
     }
 
-    public function getPassword()
+    /** @deprecated since Symfony 5.3, use getUserIdentifier() instead */
+    public function getUsername(): string
+    {
+        return $this->username;
+    }
+
+    public function getPassword(): string
     {
         return $this->password;
     }
 
-    public function changePassword(PasswordEncoderInterface $encoder, string $rawPassword): void
+    public function changePassword(PasswordHasherInterface $hasher, string $rawPassword): void
     {
-        $this->password = $encoder->encodePassword($rawPassword, null);
+        $this->password = $hasher->hash($rawPassword);
     }
 
-    public function getSalt()
+    /** @deprecated since Symfony 5.3 */
+    public function getSalt(): ?string
     {
         // Salt is not needed when using Argon2i
         // @see https://symfony.com/doc/current/reference/configuration/security.html#using-the-argon2i-password-encoder
@@ -132,7 +112,7 @@ class User implements UserInterface, \Serializable
     }
 
     /** @see \Serializable::serialize() */
-    public function serialize()
+    public function serialize(): string
     {
         return serialize([
             $this->id,
@@ -142,7 +122,7 @@ class User implements UserInterface, \Serializable
     }
 
     /** @see \Serializable::unserialize() */
-    public function unserialize($serialized)
+    public function unserialize($serialized): void
     {
         [
             $this->id,

src/Feed/RssGenerator.php

@@ -1,7 +1,6 @@
 <?php
 declare(strict_types=1);
 
-
 namespace App\Feed;
 
 use App\Magnet\MagnetGenerator;
@@ -21,15 +20,12 @@ class RssGenerator
     private const PER_PAGE = 1000;
     private const MIME_TYPE = 'application/x-bittorrent';
 
-    private TorrentRepository $repo;
-    private RouterInterface $router;
-    private MagnetGenerator $magnetGenerator;
+    public function __construct(
+        private readonly TorrentRepository $repo,
+        private readonly RouterInterface $router,
+        private readonly MagnetGenerator $magnetGenerator
+    ) {
 
-    public function __construct(TorrentRepository $repo, RouterInterface $router, MagnetGenerator $magnetGenerator)
-    {
-        $this->repo = $repo;
-        $this->router = $router;
-        $this->magnetGenerator = $magnetGenerator;
     }
 
     public function generateLast(int $page): string
@@ -43,8 +39,6 @@ class RssGenerator
 
     /**
      * @param Torrent[] $torrents
-     *
-     * @return Feed
      */
     private function createFeedFromTorrents(array $torrents): Feed
     {

src/Form/Data/PasswordResetData.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Form\Data;
 
@@ -6,12 +7,8 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 class PasswordResetData
 {
-    /**
-     * @var string
-     *
-     * @Assert\NotBlank
-     * @Assert\Length(min="8", max="4096")
-     * @Assert\NotCompromisedPassword(skipOnError=true)
-     */
-    public $password;
+    #[Assert\NotBlank]
+    #[Assert\Length(min: 8, max: 4096)]
+    #[Assert\NotCompromisedPassword(skipOnError: true)]
+    public string $password;
 }

src/Form/Data/PasswordResetRequestData.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Form\Data;
 
@@ -7,18 +8,10 @@ use Symfony\Component\Validator\Constraints as Assert;
 
 class PasswordResetRequestData
 {
-    /**
-     * @var string
-     *
-     * @Assert\Email()
-     * @Assert\NotBlank()
-     */
-    public $email;
+    #[Assert\Email]
+    #[Assert\NotBlank]
+    public string $email;
 
-    /**
-     * @var string
-     *
-     * @ReCaptcha\IsTrueV3()
-     */
-    public $recaptcha;
+    #[ReCaptcha\IsTrueV3]
+    public string $recaptcha;
 }

src/Form/Data/RegisterData.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Form\Data;
 
@@ -10,37 +11,21 @@ use App\Validator\Constraints as AppAssert;
  */
 class RegisterData
 {
-    /**
-     * @var string
-     *
-     * @Assert\NotBlank()
-     * @Assert\Length(min="2", max="25")
-     */
-    public $username;
+    #[Assert\NotBlank]
+    #[Assert\Length(min: 2, max: 25)]
+    public string $username;
 
-    /**
-     * @var string
-     *
-     * @Assert\NotBlank()
-     * @Assert\Length(min="8", max="4096")
-     */
-    public $password;
+    #[Assert\NotBlank]
+    #[Assert\Length(min: 8, max: 4096)]
+    public string $password;
 
-    /**
-     * @var string
-     *
-     * @Assert\Email()
-     */
-    public $email;
+    #[Assert\Email]
+    public string $email;
 
-    /**
-     * @var string
-     *
-     * @Assert\NotBlank()
-     * @Assert\Length(min="32", max="32")
-     * @AppAssert\ValidInvite()
-     */
-    public $inviteCode;
+    #[Assert\NotBlank]
+    #[Assert\Length(min: 32, max: 32)]
+    #[AppAssert\ValidInvite()]
+    public string $inviteCode;
 
     public function __construct(string $inviteCode = null)
     {

src/Form/LoginType.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Form;
 
@@ -16,9 +17,9 @@ class LoginType extends AbstractType
         ;
     }
 
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
-        // Empty prefix for default UsernamePasswordFrormAuthenticationListener
+        // Empty prefix for default UsernamePasswordFormAuthenticationListener
         return '';
     }
 }

src/Form/PasswordResetRequestType.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Form;
 

src/Form/PasswordResetType.php

@@ -1,10 +1,11 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Form;
 
 use App\Form\Data\PasswordResetData;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\{HiddenType, PasswordType, RepeatedType};
+use Symfony\Component\Form\Extension\Core\Type\{PasswordType, RepeatedType};
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 

src/Form/RegisterType.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Form;
 

src/Helper/BsTreeviewFileTreeBuilder.php

@@ -1,11 +1,12 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Helper;
 
 use App\Magnetico\Entity\Torrent;
 use App\View\Torrent\FileTreeNode;
 
-class BstreeviewFileTreeBuilder
+class BsTreeviewFileTreeBuilder
 {
     private const DEFAULT_FILE_ICON = 'fas fa-file';
     private const DEFAULT_DIR_ICON = 'fas fa-folder';
@@ -64,4 +65,4 @@ class BstreeviewFileTreeBuilder
 
         return $data;
     }
-}
+}

src/Helper/FileSizeHumanizer.php

@@ -30,11 +30,7 @@ class FileSizeHumanizer
 
         $maxSuffixIndex = count(self::SIZE_SUFFIXES) - 1;
 
-        if ($maxSuffixIndex >= $factor) {
-            $suffixIndex = $factor;
-        } else {
-            $suffixIndex = $maxSuffixIndex;
-        }
+        $suffixIndex = min($maxSuffixIndex, $factor);
 
         $suffix = self::SIZE_SUFFIXES[$suffixIndex];
 

src/Kernel.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App;
 

src/Magnet/MagnetGenerator.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Magnet;
 
@@ -33,4 +34,4 @@ class MagnetGenerator
 
         return $url;
     }
-}
+}

src/Magnetico/Entity/File.php

@@ -1,51 +1,32 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Magnetico\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
-/**
- * @ORM\Table(schema="magneticod", name="files", indexes={
- *     @ORM\Index(name="file_info_hash_index", columns={"torrent_id"})
- * })
- * @ORM\Entity(readOnly=true)
- */
+#[ORM\Entity(readOnly: true)]
+#[ORM\Table(schema: 'magneticod', name: 'files')]
+#[ORM\Index(name: 'file_info_hash_index', columns: ['torrent_id'])]
 class File
 {
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     */
-    private $id;
+    #[ORM\Id]
+    #[ORM\Column(name: 'id', type: 'integer')]
+    private int $id;
 
-    /**
-     * @var Torrent
-     *
-     * @ORM\ManyToOne(targetEntity="App\Magnetico\Entity\Torrent", inversedBy="files")
-     * @ORM\JoinColumn(name="torrent_id")
-     */
-    private $torrent;
+    #[ORM\ManyToOne(targetEntity: Torrent::class, inversedBy: 'files')]
+    #[ORM\JoinColumn(name: 'torrent_id')]
+    private Torrent $torrent;
 
-    /**
-     * @var int File size in bytes
-     *
-     * @Serializer\Groups({"api_v1_show"})
-     *
-     * @ORM\Column(name="size", type="bigint", nullable=false)
-     */
-    private $size;
+    /** File size in bytes */
+    #[Serializer\Groups(['api_v1_show'])]
+    #[ORM\Column(name: 'size', type: 'bigint', nullable: false)]
+    private int $size;
 
-    /**
-     * @var string
-     *
-     * @Serializer\Groups({"api_v1_show"})
-     *
-     * @ORM\Column(name="path", type="text", nullable=false)
-     */
-    private $path;
+    #[Serializer\Groups(['api_v1_show'])]
+    #[ORM\Column(name: 'path', type: 'text', nullable: false)]
+    private string $path;
 
     public function getId(): int
     {

src/Magnetico/Entity/Torrent.php

@@ -1,78 +1,49 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Magnetico\Entity;
 
+use App\Magnetico\Repository\TorrentRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
-/**
- * @ORM\Table(schema="magneticod", name="torrents", indexes={
- *     @ORM\Index(name="discovered_on_index", columns={"discovered_on"}),
- *     @ORM\Index(name="info_hash_index", columns={"info_hash"})
- * })
- * @ORM\Entity(readOnly=true, repositoryClass="App\Magnetico\Repository\TorrentRepository")
- */
+#[ORM\Entity(repositoryClass: TorrentRepository::class, readOnly: true)]
+#[ORM\Table(schema: 'magneticod', name: 'torrents')]
+#[ORM\Index(name: 'discovered_on_index', columns: ['discovered_on'])]
+#[ORM\Index(name: 'info_hash_index', columns: ['info_hash'])]
 class Torrent
 {
-    /**
-     * @var int
-     *
-     * @Serializer\Groups({"api_v1_search", "api_v1_show"})
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     */
-    private $id;
+    #[Serializer\Groups(['api_v1_search', 'api_v1_show'])]
+    #[ORM\Id]
+    #[ORM\Column(name: 'id', type: 'integer')]
+    private int $id;
 
-    /**
-     * @var resource Resource pointing to info-hash BLOB
-     *
-     * @Serializer\Groups({"api_v1_search", "api_v1_show"})
-     *
-     * @ORM\Column(name="info_hash", type="blob", nullable=false)
-     */
+    /** @var resource Resource pointing to info-hash BLOB */
+    #[Serializer\Groups(['api_v1_search', 'api_v1_show'])]
+    #[ORM\Column(name: 'info_hash', type: 'blob', nullable: false)]
     private $infoHash;
 
-    /**
-     * @var string Cached value of self::infoHash in HEX string
-     */
-    private $infoHashHexCache;
+    /** Cached value of self::infoHash in HEX string */
+    private string $infoHashHexCache;
 
-    /**
-     * @var string Torrent name
-     *
-     * @Serializer\Groups({"api_v1_search", "api_v1_show"})
-     *
-     * @ORM\Column(name="name", type="text", nullable=false)
-     */
-    private $name;
+    #[Serializer\Groups(['api_v1_search', 'api_v1_show'])]
+    #[ORM\Column(name: 'name', type: 'text', nullable: false)]
+    private string $name;
 
-    /**
-     * @var int Torrent files total size in bytes
-     *
-     * @Serializer\Groups({"api_v1_search", "api_v1_show"})
-     *
-     * @ORM\Column(name="total_size", type="bigint", nullable=false)
-     */
-    private $totalSize;
+    /** Torrent files total size in bytes */
+    #[Serializer\Groups(['api_v1_search', 'api_v1_show'])]
+    #[ORM\Column(name: 'total_size', type: 'bigint', nullable: false)]
+    private int $totalSize;
 
-    /**
-     * @var int Torrent discovery timestamp
-     *
-     * @Serializer\Groups({"api_v1_search", "api_v1_show"})
-     *
-     * @ORM\Column(name="discovered_on", type="integer", nullable=false)
-     */
+    /** Torrent discovery timestamp */
+    #[Serializer\Groups(['api_v1_search', 'api_v1_show'])]
+    #[ORM\Column(name: 'discovered_on', type: 'integer', nullable: false)]
     private $discoveredOn;
 
-    /**
-     * @var File[]|ArrayCollection
-     *
-     * @Serializer\Groups({"api_v1_show"})
-     *
-     * @ORM\OneToMany(targetEntity="App\Magnetico\Entity\File", fetch="EXTRA_LAZY", mappedBy="torrent")
-     */
+    /** @var File[]|ArrayCollection */
+    #[Serializer\Groups(['api_v1_show'])]
+    #[ORM\OneToMany(targetEntity: File::class, fetch: 'EXTRA_LAZY', mappedBy: 'torrent')]
     private $files;
 
     public function getId(): int

src/Magnetico/Repository/TorrentRepository.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Magnetico\Repository;
 
@@ -25,4 +26,4 @@ class TorrentRepository extends ServiceEntityRepository
             return 0;
         }
     }
-}
+}

src/Pager/View/TwitterBootstrap4PagelessView.php

@@ -1,13 +1,11 @@
 <?php
-
 declare(strict_types=1);
 
 namespace App\Pager\View;
 
 use Pagerfanta\Pagerfanta;
 use Pagerfanta\PagerfantaInterface;
-use Pagerfanta\View\Template\TemplateInterface;
-use Pagerfanta\View\Template\TwitterBootstrap4Template;
+use Pagerfanta\View\Template\{TemplateInterface, TwitterBootstrap4Template};
 use Pagerfanta\View\ViewInterface;
 
 /**
@@ -48,31 +46,31 @@ class TwitterBootstrap4PagelessView implements ViewInterface
         return new TwitterBootstrap4Template();
     }
 
-    private function initializePagerfanta(PagerfantaInterface $pagerfanta)
+    private function initializePagerfanta(PagerfantaInterface $pagerfanta): void
     {
         $this->pagerfanta = $pagerfanta;
         $this->currentPage = $pagerfanta->getCurrentPage();
     }
 
-    private function configureTemplate($routeGenerator, $options)
+    private function configureTemplate($routeGenerator, $options): void
     {
         $this->template->setRouteGenerator($routeGenerator);
         $this->template->setOptions($options);
     }
 
-    private function generate()
+    private function generate(): array|string
     {
         $pages = $this->generatePages();
 
         return $this->generateContainer($pages);
     }
 
-    private function generateContainer($pages)
+    private function generateContainer($pages): array|string
     {
         return str_replace('%pages%', $pages, $this->template->container());
     }
 
-    private function generatePages()
+    private function generatePages(): string
     {
         return $this->previous().$this->currentPage().$this->next();
     }

src/Repository/ApiTokenRepository.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Repository;
 
@@ -32,4 +33,4 @@ class ApiTokenRepository extends ServiceEntityRepository
 
         return $qb->getQuery()->getOneOrNullResult();
     }
-}
+}

src/Repository/InviteRepository.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Repository;
 
@@ -32,4 +33,4 @@ class InviteRepository extends ServiceEntityRepository
 
         return $qb->getQuery()->getResult();
     }
-}
+}

src/Repository/PasswordResetTokenRepository.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Repository;
 

src/Repository/UserRepository.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Repository;
 
@@ -17,4 +18,4 @@ class UserRepository extends ServiceEntityRepository
     {
         $this->getEntityManager()->persist($user);
     }
-}
+}

src/Search/TorrentSearcher.php

@@ -13,16 +13,11 @@ class TorrentSearcher
 
     private const ORDER_DISABLED_FIELDS = ['infoHash'];
 
-    /** @var TorrentRepository */
-    private $torrentRepo;
+    public function __construct(
+        private readonly TorrentRepository $torrentRepo,
+        private readonly ClassMetadata $classMetadata
+    ) {
 
-    /** @var ClassMetadata */
-    private $classMetadata;
-
-    public function __construct(TorrentRepository $torrentRepo, ClassMetadata $classMetadata)
-    {
-        $this->torrentRepo = $torrentRepo;
-        $this->classMetadata = $classMetadata;
     }
 
     public function createSearchQueryBuilder(string $query, string $orderBy = null, string $order = 'asc'): QueryBuilder

src/Twig/FileSizeHumanizerExtension.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Twig;
 
@@ -21,4 +22,4 @@ class FileSizeHumanizerExtension extends AbstractExtension
             new TwigFilter('humanize_size', [$this->humanizer, 'humanize']),
         ];
     }
-}
+}

src/Twig/FileTreeExtension.php

@@ -1,21 +1,22 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Twig;
 
-use App\Helper\BstreeviewFileTreeBuilder;
+use App\Helper\BsTreeviewFileTreeBuilder;
 use Twig\Extension\AbstractExtension;
 use Twig\{TwigFilter};
 
 class FileTreeExtension extends AbstractExtension
 {
-    private BstreeviewFileTreeBuilder $builder;
+    private BsTreeviewFileTreeBuilder $builder;
 
-    public function __construct(BstreeviewFileTreeBuilder $builder)
+    public function __construct(BsTreeviewFileTreeBuilder $builder)
     {
         $this->builder = $builder;
     }
 
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
             new TwigFilter('file_tree', [$this->builder, 'buildFileTreeDataArray']),

src/Twig/MagnetExtension.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Twig;
 
@@ -8,12 +9,10 @@ use Twig\{TwigFilter, TwigFunction};
 
 class MagnetExtension extends AbstractExtension
 {
-    /** @var MagnetGenerator */
-    private $magnetGenerator;
+    public function __construct(
+        private readonly MagnetGenerator $magnetGenerator
+    ) {
 
-    public function __construct(MagnetGenerator $magnetGenerator)
-    {
-        $this->magnetGenerator = $magnetGenerator;
     }
 
     public function getFunctions(): array
@@ -23,10 +22,10 @@ class MagnetExtension extends AbstractExtension
         ];
     }
 
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
             new TwigFilter('magnet', [$this->magnetGenerator, 'generate']),
         ];
     }
-}
+}

src/User/Exception/InvalidInviteException.php

@@ -1,8 +1,9 @@
 <?php
+declare(strict_types=1);
 
 namespace App\User\Exception;
 
 class InvalidInviteException extends \InvalidArgumentException
 {
     protected $message = 'Invalid invite';
-}
+}

src/User/Exception/UserNotFoundException.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\User\Exception;
 

src/User/InviteManager.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\User;
 
@@ -7,16 +8,11 @@ use App\Repository\InviteRepository;
 
 class InviteManager
 {
-    /** @var InviteRepository */
-    private $inviteRepo;
+    public function __construct(
+        private readonly InviteRepository $inviteRepo,
+        private readonly int $newUserInvites = 0
+    ) {
 
-    /** @var int Which amount of invites we need to give to the new user */
-    private $newUserInvites;
-
-    public function __construct(InviteRepository $inviteRepo, int $newUserInvites = 0)
-    {
-        $this->inviteRepo = $inviteRepo;
-        $this->newUserInvites = $newUserInvites;
     }
 
     /**
@@ -28,7 +24,7 @@ class InviteManager
             return [];
         }
 
-        $amount = (null !== $forceAmount) ? $forceAmount : $this->newUserInvites;
+        $amount = $forceAmount ?? $this->newUserInvites;
 
         $invites = [];
 
@@ -40,4 +36,4 @@ class InviteManager
 
         return $invites;
     }
-}
+}

src/User/PasswordResetManager.php

@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 
 namespace App\User;
 
@@ -14,38 +14,15 @@ use Symfony\Component\Routing\{Generator\UrlGeneratorInterface, RouterInterface}
 
 class PasswordResetManager
 {
-    /** @var UserRepository */
-    private $userRepo;
-
-    /** @var PasswordResetTokenRepository */
-    private $tokenRepo;
-
-    /** @var EntityManagerInterface */
-    private $em;
-
-    /** @var MailerInterface */
-    private $mailer;
-
-    /** @var RouterInterface */
-    private $router;
-
-    /** @var string */
-    private $fromAddress;
-
     public function __construct(
-        UserRepository $userRepo,
-        PasswordResetTokenRepository $tokenRepo,
-        EntityManagerInterface $em,
-        MailerInterface $mailer,
-        RouterInterface $router,
-        string $fromAddress
+        private readonly UserRepository $userRepo,
+        private readonly PasswordResetTokenRepository $tokenRepo,
+        private readonly EntityManagerInterface $em,
+        private readonly MailerInterface $mailer,
+        private readonly RouterInterface $router,
+        private readonly string $fromAddress
     ) {
-        $this->userRepo = $userRepo;
-        $this->tokenRepo = $tokenRepo;
-        $this->em = $em;
-        $this->mailer = $mailer;
-        $this->router = $router;
-        $this->fromAddress = $fromAddress;
+
     }
 
     public function sendResetLink(string $address): void

src/User/UserManager.php

@@ -1,37 +1,29 @@
 <?php
+declare(strict_types=1);
 
 namespace App\User;
 
 use App\Entity\{Invite, User};
-use App\Repository\{InviteRepository, UserRepository};
+use App\Repository\UserRepository;
 use App\User\Exception\InvalidInviteException;
-use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface;
+use Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface;
 
 class UserManager
 {
     private const DEFAULT_ROLES = ['ROLE_USER'];
 
-    /** @var UserRepository */
-    private $userRepo;
+    public function __construct(
+        private readonly PasswordHasherFactoryInterface $hasherFactory,
+        private readonly UserRepository                 $userRepo,
+    ) {
 
-    /** @var InviteRepository */
-    private $inviteRepo;
-
-    /** @var EncoderFactoryInterface */
-    private $encoderFactory;
-
-    public function __construct(EncoderFactoryInterface $encoderFactory, UserRepository $userRepo, InviteRepository $inviteRepo)
-    {
-        $this->userRepo = $userRepo;
-        $this->inviteRepo = $inviteRepo;
-        $this->encoderFactory = $encoderFactory;
     }
 
     public function createUser(string $username, string $password, string $email, array $roles = self::DEFAULT_ROLES): User
     {
         $user = new User(
             $username,
-            $this->encoderFactory->getEncoder(User::class),
+            $this->hasherFactory->getPasswordHasher(User::class),
             $password,
             $email,
             $roles
@@ -44,10 +36,7 @@ class UserManager
 
     public function changePassword(User $user, string $rawPassword): void
     {
-        $user->changePassword(
-            $this->encoderFactory->getEncoder(User::class),
-            $rawPassword
-        );
+        $user->changePassword($this->hasherFactory->getPasswordHasher(User::class), $rawPassword);
     }
 
     public function createUserByInvite(string $username, string $password, string $email, Invite $invite, array $roles = self::DEFAULT_ROLES): User

src/Validator/Constraints/ValidInvite.php

@@ -1,12 +1,11 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
-/**
- * @Annotation
- */
+#[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD)]
 class ValidInvite extends Constraint
 {
     public $notFoundMessage = 'Invite {{ code }} not found.';
@@ -14,6 +13,6 @@ class ValidInvite extends Constraint
 
     public function validatedBy(): string
     {
-        return get_class($this).'Validator';
+        return static::class.'Validator';
     }
-}
+}

src/Validator/Constraints/ValidInviteValidator.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace App\Validator\Constraints;
 
@@ -8,19 +9,16 @@ use Symfony\Component\Validator\{Constraint, ConstraintValidator};
 
 class ValidInviteValidator extends ConstraintValidator
 {
-    /** @var InviteRepository */
-    private $inviteRepo;
+    public function __construct(
+        private readonly InviteRepository $inviteRepo
+    ) {
 
-    public function __construct(InviteRepository $inviteRepo)
-    {
-        $this->inviteRepo = $inviteRepo;
     }
 
     /**
-     * @param mixed $value
      * @param ValidInvite $constraint
      */
-    public function validate($value, Constraint $constraint)
+    public function validate(mixed $value, Constraint $constraint)
     {
         /** @var Invite $invite */
         if (null === $invite = $this->inviteRepo->findOneBy(['code' => $value])) {
@@ -39,4 +37,4 @@ class ValidInviteValidator extends ConstraintValidator
             ;
         }
     }
-}
+}

src/View/Torrent/FileTreeNode.php

@@ -1,9 +1,9 @@
 <?php
+declare(strict_types=1);
 
 namespace App\View\Torrent;
 
-use App\Magnetico\Entity\File;
-use App\Magnetico\Entity\Torrent;
+use App\Magnetico\Entity\{File, Torrent};
 
 class FileTreeNode
 {
@@ -52,7 +52,7 @@ class FileTreeNode
 
         // If we have file only file and not a tree.
         if (1 === count($pathParts)) {
-            $this->addChild($path, FileTreeNode::createFromFile($path, $file, $this));
+            $this->addChild($path, self::createFromFile($path, $file, $this));
 
             return;
         }
@@ -89,12 +89,7 @@ class FileTreeNode
         return array_key_exists($name, $this->children);
     }
 
-    /**
-     * @param string $name
-     *
-     * @return FileTreeNode|File
-     */
-    public function getChild(string $name)
+    public function getChild(string $name): File|FileTreeNode
     {
         if (!array_key_exists($name, $this->children)) {
             throw new \InvalidArgumentException(sprintf(
@@ -119,7 +114,7 @@ class FileTreeNode
         $files = [];
 
         foreach ($this->children as $name => $child) {
-            if ($child instanceof FileTreeNode) {
+            if ($child instanceof self) {
                 $dirs[$name] = $child;
             } elseif ($child instanceof File) {
                 $files[] = $child;