Merge tag v2.7.0 into develop

Author: roadiz-ci

composer.json

@@ -22,21 +22,21 @@
         "php": ">=8.3",
         "api-platform/symfony": "^4.1.18",
         "doctrine/orm": "~2.20.0",
-        "roadiz/core-bundle": "2.7.x-dev",
-        "roadiz/models": "2.7.x-dev",
+        "roadiz/core-bundle": "2.7.*",
+        "roadiz/models": "2.7.*",
         "symfony/framework-bundle": "7.4.*",
         "symfony/lock": "7.4.*",
         "symfony/rate-limiter": "7.4.*"
     },
     "require-dev": {
         "php-coveralls/php-coveralls": "^2.4",
-        "phpstan/phpstan": "^1.5.3",
+        "phpstan/phpstan": "^2.1.36",
         "phpstan/phpdoc-parser": "<2",
-        "phpstan/phpstan-doctrine": "^1.3",
-        "roadiz/doc-generator": "2.7.x-dev",
-        "roadiz/entity-generator": "2.7.x-dev",
-        "roadiz/jwt": "2.7.x-dev",
-        "roadiz/random": "2.7.x-dev"
+        "phpstan/phpstan-doctrine": "^2.0.13",
+        "roadiz/doc-generator": "2.7.*",
+        "roadiz/entity-generator": "2.7.*",
+        "roadiz/jwt": "2.7.*",
+        "roadiz/random": "2.7.*"
     },
     "config": {
         "optimize-autoloader": true,
@@ -58,8 +58,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.6.x-dev",
-            "dev-develop": "2.7.x-dev"
+            "dev-main": "2.7.x-dev",
+            "dev-develop": "2.8.x-dev"
         }
     }
 }

config/packages/security.yaml config/packages/role_hierarchy.yamlconfig/packages/security.yaml renamed to config/packages/role_hierarchy.yaml

@@ -10,11 +10,9 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Validator\Constraints as Assert;
 
-#[
-    ORM\Table(name: 'user_validation_tokens'),
+#[ORM\Table(name: 'user_validation_tokens'),
     UniqueEntity('token'),
-    ORM\Entity(repositoryClass: UserValidationTokenRepository::class)
-]
+    ORM\Entity(repositoryClass: UserValidationTokenRepository::class)]
 class UserValidationToken
 {
     #[ORM\Column(name: 'id', type: 'integer')]

src/Entity/UserValidationToken.php

@@ -71,7 +71,7 @@ private function sendUserValidationEmail(UserValidationToken $userValidationToke
     {
         $user = $userValidationToken->getUser();
 
-        if (!($user instanceof User)) {
+        if (!$user instanceof User) {
             return;
         }
 

src/Manager/UserValidationTokenManager.php

@@ -30,7 +30,7 @@ public function getChannels(RecipientInterface $recipient): array
     }
 
     #[\Override]
-    public function asEmailMessage(EmailRecipientInterface $recipient, ?string $transport = null): ?EmailMessage
+    public function asEmailMessage(EmailRecipientInterface $recipient, ?string $transport = null): EmailMessage
     {
         $email = new NotificationEmail();
         $email

src/Notifier/UserPasswordRequestNotification.php

@@ -30,7 +30,7 @@ public function getChannels(RecipientInterface $recipient): array
     }
 
     #[\Override]
-    public function asEmailMessage(EmailRecipientInterface $recipient, ?string $transport = null): ?EmailMessage
+    public function asEmailMessage(EmailRecipientInterface $recipient, ?string $transport = null): EmailMessage
     {
         $email = new NotificationEmail();
         $email

src/Notifier/ValidateUserNotification.php

@@ -55,7 +55,7 @@ public function process($data, Operation $operation, array $uriVariables = [], a
             throw new AccessDeniedHttpException('Token does not belong to current account');
         }
 
-        if (!($user instanceof User)) {
+        if (!$user instanceof User) {
             throw new UnprocessableEntityHttpException('User is not a valid user.');
         }