IBX-9511: Fixed incorrect object type in PolicyValueResolver (#1442)

* Fixed incorrect object type in PolicyValueResolver
* [Tests] Aligned PolicyValueResolverTest with the changes

Author: alongosz

src/bundle/ValueResolver/PolicyValueResolver.php

@@ -43,15 +43,18 @@ protected function validateValue(string $value): bool
         return is_numeric($value);
     }
 
+    /**
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
+     */
     protected function load(array $key): object
     {
         $roleId = (int)$key[self::ATTRIBUTE_ROLE_ID];
         $policyId = (int)$key[self::ATTRIBUTE_POLICY_ID];
 
-        $roleDraft = $this->roleService->loadRole($roleId);
-        foreach ($roleDraft->getPolicies() as $policy) {
-            /** @var \Ibexa\Contracts\Core\Repository\Values\User\PolicyDraft $policy */
-            if ($policy->originalId === $policyId) {
+        $role = $this->roleService->loadRole($roleId);
+        foreach ($role->getPolicies() as $policy) {
+            if ($policy->id === $policyId) {
                 return $policy;
             }
         }

tests/bundle/ValueResolver/PolicyValueResolverTest.php

@@ -10,7 +10,9 @@
 
 use Ibexa\Bundle\AdminUi\ValueResolver\PolicyValueResolver;
 use Ibexa\Contracts\Core\Repository\RoleService;
+use Ibexa\Contracts\Core\Repository\Values\User\Policy;
 use Ibexa\Contracts\Core\Repository\Values\User\PolicyDraft;
+use Ibexa\Contracts\Core\Repository\Values\User\Role;
 use Ibexa\Contracts\Core\Repository\Values\User\RoleDraft;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -32,16 +34,16 @@ protected function setUp(): void
 
     public function testResolve(): void
     {
-        $policyDraft = $this->createMock(PolicyDraft::class);
-        $policyDraft
+        $policy = $this->createMock(Policy::class);
+        $policy
             ->method('__get')
-            ->with('originalId')
+            ->with('id')
             ->willReturn(123);
 
-        $roleDraft = $this->createMock(RoleDraft::class);
-        $roleDraft
+        $role = $this->createMock(Role::class);
+        $role
             ->method('getPolicies')
-            ->willReturn([$policyDraft]);
+            ->willReturn([$policy]);
 
         $attributes = [
             'roleId' => '456',
@@ -51,18 +53,18 @@ public function testResolve(): void
         $this->roleService->expects(self::once())
             ->method('loadRole')
             ->with(456)
-            ->willReturn($roleDraft);
+            ->willReturn($role);
 
         $argumentMetadata = $this->createMock(ArgumentMetadata::class);
-        $argumentMetadata->method('getType')->willReturn(PolicyDraft::class);
+        $argumentMetadata->method('getType')->willReturn(Policy::class);
         $argumentMetadata->method('getName')->willReturn('policy');
 
         $request = new Request([], [], $attributes);
 
         $result = iterator_to_array($this->resolver->resolve($request, $argumentMetadata));
 
         self::assertCount(1, $result);
-        self::assertSame($policyDraft, $result[0]);
+        self::assertSame($policy, $result[0]);
     }
 
     public function testResolvePolicyNotFound(): void