Release 2.2.0 (#4359)

* deactivate deprecation logging in prod for now
* fix several deprecations
* enable CSRF for logout
* allow more twig methods and functions in InvoiceSecurity policy

src/Entity/Timesheet.php

@@ -188,8 +188,8 @@ class Timesheet implements EntityWithMetaFields, ExportableItem
     #[ORM\Column(name: 'category', type: 'string', length: 10, nullable: false, options: ['default' => 'work'])]
     #[Assert\NotNull]
     private ?string $category = self::WORK;
-    #[ORM\Column(name: 'modified_at', type: 'datetime', nullable: true)]
-    private \DateTimeInterface $modifiedAt;
+    #[ORM\Column(name: 'modified_at', type: 'datetime_immutable', nullable: true)]
+    private \DateTimeImmutable $modifiedAt; // @phpstan-ignore-line - create migration and update all null values and then make it not null
     /**
      * Tags
      *
@@ -586,12 +586,12 @@ class Timesheet implements EntityWithMetaFields, ExportableItem
         return $this;
     }
 
-    public function getModifiedAt(): \DateTimeInterface
+    public function getModifiedAt(): \DateTimeImmutable
     {
         return $this->modifiedAt;
     }
 
-    public function setModifiedAt(\DateTimeInterface $dateTime): void
+    public function setModifiedAt(\DateTimeImmutable $dateTime): void
     {
         $this->modifiedAt = $dateTime;
     }

src/Entity/User.php

@@ -196,8 +196,8 @@ class User implements UserInterface, EquatableInterface, ThemeUserInterface, Pas
     #[ORM\Column(name: 'confirmation_token', type: 'string', length: 180, unique: true, nullable: true)]
     #[Assert\Length(max: 180)]
     private ?string $confirmationToken = null;
-    #[ORM\Column(name: 'password_requested_at', type: 'datetime', nullable: true)]
-    private ?\DateTime $passwordRequestedAt = null;
+    #[ORM\Column(name: 'password_requested_at', type: 'datetime_immutable', nullable: true)]
+    private ?\DateTimeImmutable $passwordRequestedAt = null;
     /**
      * List of all role names
      */
@@ -958,26 +958,31 @@ class User implements UserInterface, EquatableInterface, ThemeUserInterface, Pas
         return $this;
     }
 
-    public function setConfirmationToken($confirmationToken): User
+    public function setConfirmationToken($confirmationToken): void
     {
         $this->confirmationToken = $confirmationToken;
-
-        return $this;
     }
 
-    public function setPasswordRequestedAt(?\DateTime $date = null): User
+    public function markPasswordRequested(): void
+    {
+        $this->setPasswordRequestedAt(new \DateTimeImmutable('now', new \DateTimeZone($this->getTimezone())));
+    }
+
+    public function markPasswordResetted(): void
+    {
+        $this->setConfirmationToken(null);
+        $this->setPasswordRequestedAt(null);
+    }
+
+    public function setPasswordRequestedAt(?\DateTimeImmutable $date): void
     {
         $this->passwordRequestedAt = $date;
-
-        return $this;
     }
 
     /**
      * Gets the timestamp that the user requested a password reset.
-     *
-     * @return DateTime|null
      */
-    public function getPasswordRequestedAt(): ?DateTime
+    public function getPasswordRequestedAt(): ?\DateTimeImmutable
     {
         return $this->passwordRequestedAt;
     }

src/Entity/WorkingTime.php

@@ -41,9 +41,9 @@ class WorkingTime
     #[ORM\ManyToOne(targetEntity: User::class)]
     #[ORM\JoinColumn(name: 'approved_by', nullable: true, onDelete: 'SET NULL')]
     private ?User $approvedBy = null;
-    #[ORM\Column(name: 'approved_at', type: 'datetime', nullable: true)]
+    #[ORM\Column(name: 'approved_at', type: 'datetime_immutable', nullable: true)]
     #[Assert\NotNull]
-    private ?\DateTimeInterface $approvedAt = null;
+    private ?\DateTimeImmutable $approvedAt = null;
 
     public function __construct(User $user, \DateTimeInterface $date)
     {
@@ -96,12 +96,12 @@ class WorkingTime
         $this->approvedBy = $approvedBy;
     }
 
-    public function getApprovedAt(): ?\DateTimeInterface
+    public function getApprovedAt(): ?\DateTimeImmutable
     {
         return $this->approvedAt;
     }
 
-    public function setApprovedAt(?\DateTimeInterface $approvedAt): void
+    public function setApprovedAt(?\DateTimeImmutable $approvedAt): void
     {
         $this->approvedAt = $approvedAt;
     }