Merge branch '4.6'

# Conflicts:
#	phpstan-baseline.neon
#	src/contracts/Notification/UserPasswordReset.php
#	src/contracts/Notification/UserRegister.php
#	src/lib/EventListener/ViewTemplatesListener.php
#	src/lib/Form/Data/UserInvitationData.php
#	src/lib/Permission/UserPermissionsLimitationType.php
#	src/lib/Templating/Twig/DateTimeExtension.php
#	src/lib/UserSetting/DateTimeFormat/Formatter.php
#	src/lib/UserSetting/DateTimeFormat/FormatterInterface.php

Author: MateuszKolankowski

.github/workflows/browser-tests.yaml

@@ -16,6 +16,9 @@ jobs:
             test-suite:  '--profile=browser --suite=password'
         secrets:
             SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+            AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }}
+            AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }}
+            AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
     login-providers:
         name: "User login providers tests"
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
@@ -25,3 +28,6 @@ jobs:
             test-setup-phase-1: '--mode=standard --profile=setup --suite=login-methods'
         secrets:
             SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+            AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }}
+            AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }}
+            AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }}

phpstan-baseline.neon

@@ -156,12 +156,6 @@ parameters:
 			count: 1
 			path: src/lib/Form/DataTransformer/LimitationValueTransformer.php
 
-		-
-			message: '#^Cannot call method getContentType\(\) on Ibexa\\User\\Form\\Data\\UserPasswordResetData\|null\.$#'
-			identifier: method.nonObject
-			count: 1
-			path: src/lib/Form/Factory/FormFactory.php
-
 		-
 			message: '#^Method Ibexa\\User\\Form\\Factory\\FormFactory\:\:changeUserPassword\(\) return type with generic interface Symfony\\Component\\Form\\FormInterface does not specify its types\: TData$#'
 			identifier: missingType.generics

src/contracts/Notification/UserRegister.php

@@ -22,7 +22,7 @@ public function __construct(
         parent::__construct();
     }
 
-    public function asEmailMessage(EmailRecipientInterface $recipient, string $transport = null): ?EmailMessage
+    public function asEmailMessage(EmailRecipientInterface $recipient, ?string $transport = null): ?EmailMessage
     {
         return null;
     }

src/lib/Form/Factory/FormFactory.php

@@ -20,6 +20,7 @@
 use Ibexa\User\Form\Type\UserPasswordForgotWithLoginType;
 use Ibexa\User\Form\Type\UserPasswordResetType;
 use Ibexa\User\Form\Type\UserSettingUpdateType;
+use InvalidArgumentException;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\Util\StringUtil;
@@ -35,7 +36,7 @@ public function __construct(
 
     public function changeUserPassword(
         ContentType $contentType,
-        UserPasswordChangeData $data = null,
+        ?UserPasswordChangeData $data = null,
         ?string $name = null,
         ?User $user = null
     ): FormInterface {
@@ -56,7 +57,7 @@ public function changeUserPassword(
      * @throws \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
      */
     public function forgotUserPassword(
-        UserPasswordForgotData $data = null,
+        ?UserPasswordForgotData $data = null,
         ?string $name = null
     ): FormInterface {
         $name = $name ?: StringUtil::fqcnToBlockPrefix(UserPasswordForgotType::class);
@@ -68,7 +69,7 @@ public function forgotUserPassword(
      * @throws \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
      */
     public function forgotUserPasswordWithLogin(
-        UserPasswordForgotWithLoginData $data = null,
+        ?UserPasswordForgotWithLoginData $data = null,
         ?string $name = null
     ): FormInterface {
         $name = $name ?: StringUtil::fqcnToBlockPrefix(UserPasswordForgotWithLoginType::class);
@@ -80,13 +81,16 @@ public function forgotUserPasswordWithLogin(
      * @throws \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
      */
     public function resetUserPassword(
-        UserPasswordResetData $data = null,
+        ?UserPasswordResetData $data = null,
         ?string $name = null,
         ?ContentType $contentType = null,
         ?User $user = null
     ): FormInterface {
         $name = $name ?: StringUtil::fqcnToBlockPrefix(UserPasswordResetType::class);
 
+        if (null === $data) {
+            throw new InvalidArgumentException('UserPasswordResetData is required for resetting user password');
+        }
         $userContentType = $contentType ?? $data->getContentType();
 
         return $this->formFactory->createNamed(
@@ -102,7 +106,7 @@ public function resetUserPassword(
 
     public function updateUserSetting(
         string $userSettingIdentifier,
-        UserSettingUpdateData $data = null,
+        ?UserSettingUpdateData $data = null,
         ?string $name = null
     ): FormInterface {
         $name = $name ?: StringUtil::fqcnToBlockPrefix(UserSettingUpdateType::class);

src/lib/Permission/UserPermissionsLimitationType.php

@@ -140,7 +140,7 @@ public function buildValue(array $limitationValues): APILimitationValue
      * @param \Ibexa\Contracts\Core\Repository\Values\ValueObject $object
      * @param \Ibexa\Contracts\Core\Repository\Values\ValueObject[]|null $targets The context of the $object, like Location of Content, if null none where provided by caller
      */
-    public function evaluate(APILimitationValue $value, APIUserReference $currentUser, object $object, array $targets = null): ?bool
+    public function evaluate(APILimitationValue $value, APIUserReference $currentUser, object $object, ?array $targets = null): ?bool
     {
         if (!$value instanceof UserPermissionsLimitation) {
             throw new InvalidArgumentException('$value', 'Must be of type: APISiteAccessLimitation');