- Refactor ORM annotations across entities for consistency.

- Adjusted migrations to align with refactored ORM annotations.
- Added new PHPStan and PHP-CS-Fixer configurations, including stricter rules.
- Introduced `tests/object-manager.php` to improve test environment setup.

src/Entity/Answer.php

@@ -16,17 +16,17 @@ use Tvdt\Repository\AnswerRepository;
 #[ORM\Entity(repositoryClass: AnswerRepository::class)]
 class Answer
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME)]
-    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
+    #[ORM\Id]
     private Uuid $id;
 
     #[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
     private int $ordering = 0;
 
-    #[ORM\ManyToOne(inversedBy: 'answers')]
     #[ORM\JoinColumn(nullable: false)]
+    #[ORM\ManyToOne(inversedBy: 'answers')]
     private Question $question;
 
     /** @var Collection<int, Candidate> */

src/Entity/Candidate.php

@@ -17,14 +17,14 @@ use Tvdt\Repository\CandidateRepository;
 #[ORM\UniqueConstraint(fields: ['name', 'season'])]
 class Candidate
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME, unique: true)]
-    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
+    #[ORM\Id]
     private Uuid $id;
 
-    #[ORM\ManyToOne(inversedBy: 'candidates')]
     #[ORM\JoinColumn(nullable: false)]
+    #[ORM\ManyToOne(inversedBy: 'candidates')]
     private Season $season;
 
     /** @var Collection<int, Answer> */

src/Entity/Elimination.php

@@ -21,10 +21,10 @@ class Elimination
 
     public const string SCREEN_RED = 'red';
 
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME, unique: true)]
-    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
+    #[ORM\Id]
     private Uuid $id;
 
     /** @var array<string, mixed> */
@@ -35,8 +35,8 @@ class Elimination
     private \DateTimeImmutable $created;
 
     public function __construct(
-        #[ORM\ManyToOne(inversedBy: 'eliminations')]
         #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
+        #[ORM\ManyToOne(inversedBy: 'eliminations')]
         private Quiz $quiz,
     ) {}
 

src/Entity/GivenAnswer.php

@@ -16,26 +16,26 @@ use Tvdt\Repository\GivenAnswerRepository;
 #[ORM\HasLifecycleCallbacks]
 class GivenAnswer
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME, unique: true)]
-    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
+    #[ORM\Id]
     private Uuid $id;
 
     #[ORM\Column(type: Types::DATETIMETZ_IMMUTABLE, nullable: false)]
     private \DateTimeImmutable $created;
 
     public function __construct(
-        #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
         #[ORM\JoinColumn(nullable: false)]
+        #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
         private Candidate $candidate,
 
-        #[ORM\ManyToOne]
         #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
+        #[ORM\ManyToOne]
         private Quiz $quiz,
 
-        #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
         #[ORM\JoinColumn(nullable: false)]
+        #[ORM\ManyToOne(inversedBy: 'givenAnswers')]
         private Answer $answer,
     ) {}
 

src/Entity/Question.php

@@ -16,10 +16,10 @@ use Tvdt\Repository\QuestionRepository;
 #[ORM\Entity(repositoryClass: QuestionRepository::class)]
 class Question
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME)]
-    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
+    #[ORM\Id]
     private Uuid $id;
 
     #[ORM\Column(type: Types::SMALLINT, options: ['default' => 0])]
@@ -28,8 +28,8 @@ class Question
     #[ORM\Column(type: Types::STRING, length: 255)]
     private string $question;
 
-    #[ORM\ManyToOne(inversedBy: 'questions')]
     #[ORM\JoinColumn(nullable: false)]
+    #[ORM\ManyToOne(inversedBy: 'questions')]
     private Quiz $quiz;
 
     #[ORM\Column]

src/Entity/Quiz.php

@@ -16,17 +16,17 @@ use Tvdt\Repository\QuizRepository;
 #[ORM\UniqueConstraint(fields: ['name', 'season'])]
 class Quiz
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME)]
-    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
+    #[ORM\Id]
     private Uuid $id;
 
     #[ORM\Column(length: 64)]
     private string $name;
 
-    #[ORM\ManyToOne(inversedBy: 'quizzes')]
     #[ORM\JoinColumn(nullable: false)]
+    #[ORM\ManyToOne(inversedBy: 'quizzes')]
     private Season $season;
 
     /** @var Collection<int, Question> */

src/Entity/QuizCandidate.php

@@ -13,14 +13,14 @@ use Symfony\Component\Uid\Uuid;
 use Tvdt\Repository\QuizCandidateRepository;
 
 #[ORM\Entity(repositoryClass: QuizCandidateRepository::class)]
-#[ORM\UniqueConstraint(columns: ['candidate_id', 'quiz_id'])]
 #[ORM\HasLifecycleCallbacks]
+#[ORM\UniqueConstraint(columns: ['candidate_id', 'quiz_id'])]
 class QuizCandidate
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME, unique: true)]
-    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
+    #[ORM\Id]
     private Uuid $id;
 
     #[ORM\Column]
@@ -30,12 +30,12 @@ class QuizCandidate
     private \DateTimeImmutable $created;
 
     public function __construct(
-        #[ORM\ManyToOne(inversedBy: 'candidateData')]
         #[ORM\JoinColumn(nullable: false)]
+        #[ORM\ManyToOne(inversedBy: 'candidateData')]
         private Quiz $quiz,
 
-        #[ORM\ManyToOne(inversedBy: 'quizData')]
         #[ORM\JoinColumn(nullable: false)]
+        #[ORM\ManyToOne(inversedBy: 'quizData')]
         private Candidate $candidate,
     ) {}
 

src/Entity/Season.php

@@ -17,10 +17,10 @@ class Season
 {
     private const string SEASON_CODE_CHARACTERS = 'bcdfghjklmnpqrstvwxz';
 
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME)]
-    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
+    #[ORM\Id]
     private Uuid $id;
 
     #[ORM\Column(length: 64)]
@@ -42,12 +42,12 @@ class Season
     #[ORM\ManyToMany(targetEntity: User::class, inversedBy: 'seasons')]
     private Collection $owners;
 
-    #[ORM\ManyToOne]
     #[ORM\JoinColumn(nullable: true, onDelete: 'SET NULL')]
+    #[ORM\ManyToOne]
     private ?Quiz $ActiveQuiz = null;
 
-    #[ORM\OneToOne(cascade: ['persist', 'remove'])]
     #[ORM\JoinColumn(nullable: true)]
+    #[ORM\OneToOne(cascade: ['persist', 'remove'])]
     private ?SeasonSettings $settings = null;
 
     public function __construct()

src/Entity/SeasonSettings.php

@@ -14,10 +14,10 @@ use Tvdt\Repository\SeasonSettingsRepository;
 #[ORM\Entity(repositoryClass: SeasonSettingsRepository::class)]
 class SeasonSettings
 {
-    #[ORM\Id]
-    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
     #[ORM\Column(type: UuidType::NAME)]
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
+    #[ORM\Id]
     private Uuid $id;
 
     #[ORM\Column(type: Types::BOOLEAN, options: ['default' => false])]

src/Entity/User.php

@@ -22,10 +22,10 @@ use Tvdt\Repository\UserRepository;
 #[UniqueEntity(fields: ['email'], message: 'There is already an account with this email')]
 class User implements UserInterface, PasswordAuthenticatedUserInterface
 {
-    #[ORM\Id]
     #[ORM\Column(type: UuidType::NAME, unique: true)]
-    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
     #[ORM\CustomIdGenerator(class: UuidGenerator::class)]
+    #[ORM\GeneratedValue(strategy: 'CUSTOM')]
+    #[ORM\Id]
     private Uuid $id;
 
     #[ORM\Column(length: 180)]