IBX-7055: Allowed to return null when content is not deleted

ibexa · Nov 24, 2023 · d1da7ce · d1da7ce
1 parent 2708c2e
commit d1da7ce
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -6220,11 +6220,6 @@ parameters:
 			count: 1
 			path: src/contracts/Repository/Events/Trash/BeforeRecoverEvent.php
 
-		-
-			message: "#^Method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Events\\\\Trash\\\\BeforeTrashEvent\\:\\:getResult\\(\\) should return Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\TrashItem but returns Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\TrashItem\\|null\\.$#"
-			count: 1
-			path: src/contracts/Repository/Events/Trash/BeforeTrashEvent.php
-
 		-
 			message: "#^Property Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Events\\\\Trash\\\\RecoverEvent\\:\\:\\$newParentLocation \\(Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location\\) does not accept Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Location\\|null\\.$#"
 			count: 1

diff --git a/src/contracts/Repository/Events/Trash/BeforeTrashEvent.php b/src/contracts/Repository/Events/Trash/BeforeTrashEvent.php
@@ -34,7 +34,7 @@ public function getLocation(): Location
         return $this->location;
     }
 
-    public function getResult(): TrashItem
+    public function getResult(): ?TrashItem
     {
         if (!$this->isResultSet()) {
             throw new UnexpectedValueException(sprintf('Return value is not set or not of type %s (or null). Check isResultSet() or set it using setResult() before you call the getter.', TrashItem::class));