From 46b88f3a752810189a2cc86ba8d2880255617870 Mon Sep 17 00:00:00 2001
From: Camille Simiand <camille.simiand@tetras-libre.fr>
Date: Mon, 10 Jan 2022 10:43:55 +0100
Subject: [PATCH] Fix phpstan level 5 errors
---
phpstan-tests.neon | 4 +++-
src/Entity/Capsule.php | 6 +-----
src/Security/EmailVerifier.php | 8 ++++++--
tests/object-manager.php | 1 +
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/phpstan-tests.neon b/phpstan-tests.neon
index 9f2ead4..456c701 100644
--- a/phpstan-tests.neon
+++ b/phpstan-tests.neon
@@ -3,4 +3,6 @@ parameters:
paths:
- tests/
symfony:
- container_xml_path: var/cache/test/App_KernelTestDebugContainer.xml
\ No newline at end of file
+ container_xml_path: var/cache/test/App_KernelTestDebugContainer.xml
+ doctrine:
+ objectManagerLoader: tests/object-manager.php
\ No newline at end of file
diff --git a/src/Entity/Capsule.php b/src/Entity/Capsule.php
index 877fee8..b3dc11d 100644
--- a/src/Entity/Capsule.php
+++ b/src/Entity/Capsule.php
@@ -31,11 +31,9 @@ class Capsule
private string $name;
/**
- *
- * @ORM\Column(name="aut_crea", type="int", length=255, nullable=false)
*
* @ORM\ManyToOne(targetEntity="App\Entity\User", inversedBy="capsulesCreated")
- * @ORM\JoinColumn(name="aut_crea", referencedColumnName="id")
+ * @ORM\JoinColumn(name="aut_crea", referencedColumnName="id", nullable=false)
*
*/
private User $creation_author;
@@ -47,8 +45,6 @@ class Capsule
private \DateTime $creation_date;
/**
- *
- * @ORM\Column(name="aut_maj", type="int", length=255)
*
* @ORM\ManyToOne(targetEntity="App\Entity\User", inversedBy="capsulesEdited")
* @ORM\JoinColumn(name="aut_maj", referencedColumnName="id")
diff --git a/src/Security/EmailVerifier.php b/src/Security/EmailVerifier.php
index bb618e4..84ee1df 100644
--- a/src/Security/EmailVerifier.php
+++ b/src/Security/EmailVerifier.php
@@ -33,7 +33,7 @@ class EmailVerifier
): void {
$signatureComponents = $this->verifyEmailHelper->generateSignature(
$verifyEmailRouteName,
- $user->getId(),
+ (string) $user->getId(),
$user->getEmail(),
['id' => $user->getId()]
);
@@ -55,7 +55,11 @@ class EmailVerifier
Request $request,
User $user
): void {
- $this->verifyEmailHelper->validateEmailConfirmation($request->getUri(), $user->getId(), $user->getEmail());
+ $this->verifyEmailHelper->validateEmailConfirmation(
+ $request->getUri(),
+ (string) $user->getId(),
+ $user->getEmail()
+ );
$user->setIsVerified(true);
diff --git a/tests/object-manager.php b/tests/object-manager.php
index c15dbe9..4819cce 100644
--- a/tests/object-manager.php
+++ b/tests/object-manager.php
@@ -1,4 +1,5 @@
<?php
+
use App\Kernel;
use Symfony\Component\Dotenv\Dotenv;
--
GitLab