Regenerated baseline

ibexa · Nov 23, 2023 · 09ce9d6 · 09ce9d6
1 parent fbbb64c
commit 09ce9d6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -2701,7 +2701,7 @@ parameters:
 			path: src/lib/Core/Debug/Shell/Shell.php
 
 		-
-			message: "#^Parameter \\#2 \\$callback of function array_filter expects callable\\(int\\|string\\)\\: mixed, Closure\\(string\\)\\: bool given\\.$#"
+			message: "#^Parameter \\#2 \\$callback of function array_filter expects \\(callable\\(int\\|string\\)\\: mixed\\)\\|null, Closure\\(string\\)\\: bool given\\.$#"
 			count: 1
 			path: src/lib/Core/Debug/Shell/Shell.php
 

diff --git a/src/lib/API/Context/UserContext.php b/src/lib/API/Context/UserContext.php
@@ -13,7 +13,6 @@
 use Ibexa\Behat\API\Facade\UserFacade;
 use Ibexa\Behat\Core\Behat\ArgumentParser;
 use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
-use Ibexa\Contracts\Core\Repository\RoleService;
 
 class UserContext implements Context
 {
@@ -23,13 +22,10 @@ class UserContext implements Context
     /** @var \Ibexa\Behat\Core\Behat\ArgumentParser */
     private $argumentParser;
 
-    private RoleService $roleService;
-
-    public function __construct(UserFacade $userFacade, ArgumentParser $argumentParser, RoleService $roleService)
+    public function __construct(UserFacade $userFacade, ArgumentParser $argumentParser)
     {
         $this->userFacade = $userFacade;
         $this->argumentParser = $argumentParser;
-        $this->roleService = $roleService;
     }
 
     /**
@@ -65,8 +61,18 @@ public function assignUserToRole(string $userName, string $roleName): void
     public function assignUserToRoleIfPossible(string $userName, string $roleIdentifier): void
     {
         try {
-            $this->roleService->loadRoleByIdentifier($roleIdentifier);
-            $this->userFacade->assignUserToRole($userName, $roleIdentifier);
+            $this->assignUserToRole($userName, $roleIdentifier);
+        } catch (NotFoundException $e) {
+        }
+    }
+
+    /**
+     * @Given I assign user group :userGroupName to role :roleIdentifier if possible
+     */
+    public function assignUserGroupToRoleIfPossible(string $userGroupName, string $roleIdentifier): void
+    {
+        try {
+            $this->assignUserGroupToRole($userGroupName, $roleIdentifier);
         } catch (NotFoundException $e) {
         }
     }