Merge branch '4.6' into main

Sztig · Sztig · commit 9fef2a0624dd · 2026-04-24T11:37:10.000+02:00
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -46299,13 +46299,13 @@ parameters:
 		-
 			message: '#^Parameter \#1 \$originalClassName of method PHPUnit\\Framework\\TestCase\:\:createMock\(\) expects class\-string\<mixed\>, string given\.$#'
 			identifier: argument.type
-			count: 4
+			count: 3
 			path: tests/lib/Persistence/Cache/TrashHandlerTest.php
 
 		-
 			message: '#^Unable to resolve the template type T in call to method PHPUnit\\Framework\\TestCase\:\:createMock\(\)$#'
 			identifier: argument.templateType
-			count: 4
+			count: 3
 			path: tests/lib/Persistence/Cache/TrashHandlerTest.php
 
 		-
diff --git a/src/bundle/Core/Resources/config/services.yml b/src/bundle/Core/Resources/config/services.yml
@@ -371,3 +371,4 @@ services:
         decoration_priority: 500
         arguments:
             $inner: '@.inner'
+
diff --git a/src/lib/Persistence/Cache/TrashHandler.php b/src/lib/Persistence/Cache/TrashHandler.php
@@ -9,13 +9,15 @@
 
 use Ibexa\Contracts\Core\Persistence\Content\Location\Trash\Handler as TrashHandlerInterface;
 use Ibexa\Contracts\Core\Persistence\Content\Relation;
+use Ibexa\Contracts\Core\Persistence\User\RoleAssignment;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query\CriterionInterface;
 
 class TrashHandler extends AbstractHandler implements TrashHandlerInterface
 {
     private const EMPTY_TRASH_BULK_SIZE = 100;
     private const CONTENT_IDENTIFIER = 'content';
     private const LOCATION_PATH_IDENTIFIER = 'location_path';
+    private const ROLE_ASSIGNMENT_ROLE_LIST_IDENTIFIER = 'role_assignment_role_list';
 
     /**
      * {@inheritdoc}
@@ -34,13 +36,14 @@ public function trashSubtree($locationId)
     {
         $this->logger->logCall(__METHOD__, ['locationId' => $locationId]);
 
-        $location = $this->persistenceHandler->locationHandler()->load($locationId);
+        $contentId = $this->persistenceHandler->locationHandler()->load($locationId)->contentId;
+        $roleAssignments = $this->persistenceHandler->userHandler()->loadRoleAssignmentsByGroupId($contentId);
         $limit = $this->persistenceHandler->contentHandler()->countRelations(
-            $location->contentId
+            $contentId
         );
 
         $reverseRelations = $this->persistenceHandler->contentHandler()->loadRelationList(
-            $location->contentId,
+            $contentId,
             $limit
         );
         $return = $this->persistenceHandler->trashHandler()->trashSubtree($locationId);
@@ -55,12 +58,20 @@ public function trashSubtree($locationId)
             }, $reverseRelations);
         }
 
+        $roleAssignmentTags = array_map(function (RoleAssignment $roleAssignment): string {
+            return $this->cacheIdentifierGenerator->generateTag(
+                self::ROLE_ASSIGNMENT_ROLE_LIST_IDENTIFIER,
+                [$roleAssignment->roleId]
+            );
+        }, $roleAssignments);
+
         $tags = array_merge(
             [
-                $this->cacheIdentifierGenerator->generateTag(self::CONTENT_IDENTIFIER, [$location->contentId]),
+                $this->cacheIdentifierGenerator->generateTag(self::CONTENT_IDENTIFIER, [$contentId]),
                 $this->cacheIdentifierGenerator->generateTag(self::LOCATION_PATH_IDENTIFIER, [$locationId]),
             ],
-            $relationTags
+            $relationTags,
+            $roleAssignmentTags
         );
         $this->cache->invalidateTags(array_values(array_unique($tags)));
 
@@ -76,14 +87,15 @@ public function recover($trashedId, $newParentId)
 
         $return = $this->persistenceHandler->trashHandler()->recover($trashedId, $newParentId);
 
-        $location = $this->persistenceHandler->locationHandler()->load($return);
+        $contentId = $this->persistenceHandler->locationHandler()->load($return)->contentId;
+        $roleAssignments = $this->persistenceHandler->userHandler()->loadRoleAssignmentsByGroupId($contentId);
 
         $limit = $this->persistenceHandler->contentHandler()->countRelations(
-            $location->contentId
+            $contentId
         );
 
         $reverseRelations = $this->persistenceHandler->contentHandler()->loadRelationList(
-            $location->contentId,
+            $contentId,
             $limit
         );
 
@@ -94,12 +106,20 @@ public function recover($trashedId, $newParentId)
             }, $reverseRelations);
         }
 
+        $roleAssignmentTags = array_map(function (RoleAssignment $roleAssignment): string {
+            return $this->cacheIdentifierGenerator->generateTag(
+                self::ROLE_ASSIGNMENT_ROLE_LIST_IDENTIFIER,
+                [$roleAssignment->roleId]
+            );
+        }, $roleAssignments);
+
         $tags = array_merge(
             [
-                $this->cacheIdentifierGenerator->generateTag(self::CONTENT_IDENTIFIER, [$location->contentId]),
+                $this->cacheIdentifierGenerator->generateTag(self::CONTENT_IDENTIFIER, [$contentId]),
                 $this->cacheIdentifierGenerator->generateTag(self::LOCATION_PATH_IDENTIFIER, [$trashedId]),
             ],
-            $relationTags
+            $relationTags,
+            $roleAssignmentTags
         );
         $this->cache->invalidateTags(array_values(array_unique($tags)));
 
diff --git a/src/lib/Persistence/Legacy/User/Role/Gateway/DoctrineDatabase.php b/src/lib/Persistence/Legacy/User/Role/Gateway/DoctrineDatabase.php
@@ -15,6 +15,7 @@
 use Ibexa\Contracts\Core\Persistence\User\Policy;
 use Ibexa\Contracts\Core\Persistence\User\Role;
 use Ibexa\Contracts\Core\Persistence\User\RoleUpdateStruct;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Ibexa\Core\Persistence\Legacy\Content\Gateway as ContentGateway;
 use Ibexa\Core\Persistence\Legacy\Content\Location\Gateway as LocationGateway;
 use Ibexa\Core\Persistence\Legacy\User\Role\Gateway;
@@ -371,16 +372,20 @@ public function countRoleAssignments(int $roleId): int
     private function buildLoadRoleAssignmentsQuery(array $columns, int $roleId): QueryBuilder
     {
         $query = $this->connection->createQueryBuilder();
+        $expr = $query->expr();
         $query
             ->select(...$columns)
             ->from(self::USER_ROLE_TABLE, 'user_role')
             ->innerJoin(
                 'user_role',
                 ContentGateway::CONTENT_ITEM_TABLE,
                 'content_object',
-                'user_role.contentobject_id = content_object.id'
+                (string) $expr->and(
+                    $expr->eq('user_role.contentobject_id', 'content_object.id'),
+                    $expr->eq('content_object.status', ContentInfo::STATUS_PUBLISHED)
+                )
             )->where(
-                $query->expr()->eq(
+                $expr->eq(
                     'role_id',
                     $query->createPositionalParameter($roleId, ParameterType::INTEGER)
                 )
diff --git a/tests/lib/Persistence/Cache/TrashHandlerTest.php b/tests/lib/Persistence/Cache/TrashHandlerTest.php
@@ -11,6 +11,8 @@
 use Ibexa\Contracts\Core\Persistence\Content\Location\Trash\Handler as TrashHandler;
 use Ibexa\Contracts\Core\Persistence\Content\Location\Trashed;
 use Ibexa\Contracts\Core\Persistence\Content\Relation;
+use Ibexa\Contracts\Core\Persistence\User\Handler as PersistenceUserHandler;
+use Ibexa\Contracts\Core\Persistence\User\RoleAssignment;
 use Ibexa\Contracts\Core\Repository\Values\Content\Trash\TrashItemDeleteResult;
 use Ibexa\Core\Persistence\Cache\ContentHandler;
 use Ibexa\Core\Persistence\Cache\LocationHandler;
@@ -57,72 +59,51 @@ public function testRecover()
         $originalLocationId = 6;
         $targetLocationId = 2;
         $contentId = 42;
-
-        $tags = [
-            'c-' . $contentId,
-            'lp-' . $originalLocationId,
-        ];
-
-        $handlerMethodName = $this->getHandlerMethodName();
+        $roleId = 1;
 
         $this->loggerMock->expects(self::once())->method('logCall');
 
-        $innerHandler = $this->createMock($this->getHandlerClassName());
-        $contentHandlerMock = $this->createMock(ContentHandler::class);
-        $locationHandlerMock = $this->createMock(LocationHandler::class);
-
-        $locationHandlerMock
-            ->method('load')
-            ->willReturn(new Location(['id' => $originalLocationId, 'contentId' => $contentId]));
-
-        $this->persistenceHandlerMock
-            ->method('contentHandler')
-            ->willReturn($contentHandlerMock);
-
-        $this->persistenceHandlerMock
-            ->method('locationHandler')
-            ->willReturn($locationHandlerMock);
-
-        $this->persistenceHandlerMock
-            ->expects(self::once())
-            ->method($handlerMethodName)
-            ->willReturn($innerHandler);
+        $innerHandler = $this->setUpRoleAssignmentInvalidation($originalLocationId, $contentId, $roleId);
 
         $innerHandler
             ->expects(self::once())
             ->method('recover')
             ->with($originalLocationId, $targetLocationId)
             ->willReturn(null);
 
-        $this->cacheIdentifierGeneratorMock
-            ->expects(self::exactly(2))
-            ->method('generateTag')
-            ->withConsecutive(
-                ['content', [$contentId], false],
-                ['location_path', [$originalLocationId], false]
-            )
-            ->willReturnOnConsecutiveCalls(
-                'c-' . $contentId,
-                'lp-' . $originalLocationId
-            );
-
-        $this->cacheMock
-            ->expects(self::once())
-            ->method('invalidateTags')
-            ->with($tags);
-
-        $handler = $this->persistenceCacheHandler->$handlerMethodName();
+        $handler = $this->persistenceCacheHandler->{$this->getHandlerMethodName()}();
         $handler->recover($originalLocationId, $targetLocationId);
     }
 
     public function testTrashSubtree()
     {
         $locationId = 6;
         $contentId = 42;
+        $roleId = 1;
+
+        $this->loggerMock->expects($this->once())->method('logCall');
+
+        $innerHandler = $this->setUpRoleAssignmentInvalidation($locationId, $contentId, $roleId);
+
+        $innerHandler
+            ->expects(self::once())
+            ->method('trashSubtree')
+            ->with($locationId)
+            ->willReturn(null);
 
+        $handler = $this->persistenceCacheHandler->{$this->getHandlerMethodName()}();
+        $handler->trashSubtree($locationId);
+    }
+
+    /**
+     * @return \PHPUnit\Framework\MockObject\MockObject
+     */
+    private function setUpRoleAssignmentInvalidation(int $locationId, int $contentId, int $roleId): object
+    {
         $tags = [
             'c-' . $contentId,
             'lp-' . $locationId,
+            'rarl-' . $roleId,
         ];
 
         $handlerMethodName = $this->getHandlerMethodName();
@@ -132,11 +113,17 @@ public function testTrashSubtree()
         $innerHandler = $this->createMock($this->getHandlerClassName());
         $contentHandlerMock = $this->createMock(ContentHandler::class);
         $locationHandlerMock = $this->createMock(LocationHandler::class);
+        $userHandlerMock = $this->createMock(PersistenceUserHandler::class);
 
         $locationHandlerMock
             ->method('load')
             ->willReturn(new Location(['id' => $locationId, 'contentId' => $contentId]));
 
+        $userHandlerMock
+            ->method('loadRoleAssignmentsByGroupId')
+            ->with($contentId)
+            ->willReturn([new RoleAssignment(['roleId' => $roleId, 'contentId' => $contentId])]);
+
         $this->persistenceHandlerMock
             ->method('contentHandler')
             ->willReturn($contentHandlerMock);
@@ -146,32 +133,34 @@ public function testTrashSubtree()
             ->willReturn($locationHandlerMock);
 
         $this->persistenceHandlerMock
-            ->expects(self::once())
-            ->method($handlerMethodName)
-            ->willReturn($innerHandler);
+            ->method('userHandler')
+            ->willReturn($userHandlerMock);
 
-        $innerHandler
+        $this->persistenceHandlerMock
             ->expects(self::once())
-            ->method('trashSubtree')
-            ->with($locationId)
-            ->willReturn(null);
+            ->method($this->getHandlerMethodName())
+            ->willReturn($innerHandler);
 
         $this->cacheIdentifierGeneratorMock
-            ->expects(self::exactly(2))
+            ->expects(self::exactly(3))
             ->method('generateTag')
             ->withConsecutive(
+                ['role_assignment_role_list', [$roleId], false],
                 ['content', [$contentId], false],
                 ['location_path', [$locationId], false]
             )
-            ->willReturnOnConsecutiveCalls(...$tags);
+            ->willReturnOnConsecutiveCalls(
+                'rarl-' . $roleId,
+                'c-' . $contentId,
+                'lp-' . $locationId
+            );
 
         $this->cacheMock
             ->expects(self::once())
             ->method('invalidateTags')
             ->with($tags);
 
-        $handler = $this->persistenceCacheHandler->$handlerMethodName();
-        $handler->trashSubtree($locationId);
+        return $innerHandler;
     }
 
     public function testDeleteTrashItem()
diff --git a/tests/lib/Persistence/Legacy/User/_fixtures/roles.php b/tests/lib/Persistence/Legacy/User/_fixtures/roles.php
@@ -134,9 +134,11 @@
     ContentGateway::CONTENT_ITEM_TABLE => [
         [
             'id' => '11',
+            'status' => '1',
         ],
         [
             'id' => '42',
+            'status' => '1',
         ],
     ],
 ];

Original file line number	Diff line number	Diff line change
`@@ -46299,13 +46299,13 @@ parameters:`
`46299`	`46299`	`-`
`46300`	`46300`	`message: '#^Parameter \#1 \$originalClassName of method PHPUnit\\Framework\\TestCase\:\:createMock\(\) expects class\-string\<mixed\>, string given\.$#'`
`46301`	`46301`	`identifier: argument.type`
`46302`		`- count: 4`
	`46302`	`+ count: 3`
`46303`	`46303`	`path: tests/lib/Persistence/Cache/TrashHandlerTest.php`
`46304`	`46304`
`46305`	`46305`	`-`
`46306`	`46306`	`message: '#^Unable to resolve the template type T in call to method PHPUnit\\Framework\\TestCase\:\:createMock\(\)$#'`
`46307`	`46307`	`identifier: argument.templateType`
`46308`		`- count: 4`
	`46308`	`+ count: 3`
`46309`	`46309`	`path: tests/lib/Persistence/Cache/TrashHandlerTest.php`
`46310`	`46310`
`46311`	`46311`	`-`
Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,11 @@`
`134`	`134`	`ContentGateway::CONTENT_ITEM_TABLE => [`
`135`	`135`	`[`
`136`	`136`	`'id' => '11',`
	`137`	`+ 'status' => '1',`
`137`	`138`	`],`
`138`	`139`	`[`
`139`	`140`	`'id' => '42',`
	`141`	`+ 'status' => '1',`
`140`	`142`	`],`
`141`	`143`	`],`
`142`	`144`	`];`