diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index fcdf961..9522877 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -660,12 +660,6 @@ parameters:
 			count: 1
 			path: src/lib/Pagination/Pagerfanta/UserSettingsAdapter.php
 
-		-
-			message: '#^Method Ibexa\\User\\Permission\\UserPermissionsLimitationType\:\:evaluate\(\) should return bool but returns null\.$#'
-			identifier: return.type
-			count: 1
-			path: src/lib/Permission/UserPermissionsLimitationType.php
-
 		-
 			message: '#^Method Ibexa\\User\\Strategy\\DefaultThumbnailStrategy\:\:__construct\(\) has parameter \$initialsFieldDefIdentifiers with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
diff --git a/src/lib/Permission/UserPermissionsLimitationType.php b/src/lib/Permission/UserPermissionsLimitationType.php
index a2f4e43..3e40228 100644
--- a/src/lib/Permission/UserPermissionsLimitationType.php
+++ b/src/lib/Permission/UserPermissionsLimitationType.php
@@ -4,6 +4,7 @@
  * @copyright Copyright (C) Ibexa AS. All rights reserved.
  * @license For full copyright and license information view LICENSE file distributed with this source code.
  */
+declare(strict_types=1);
 
 namespace Ibexa\User\Permission;
 
@@ -12,6 +13,7 @@
 use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException;
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\CriterionInterface;
 use Ibexa\Contracts\Core\Repository\Values\User\Limitation as APILimitationValue;
 use Ibexa\Contracts\Core\Repository\Values\User\Role;
 use Ibexa\Contracts\Core\Repository\Values\User\UserReference as APIUserReference;
@@ -81,7 +83,7 @@ public function acceptValue(APILimitationValue $limitationValue): void
      *
      * @return \Ibexa\Contracts\Core\FieldType\ValidationError[]
      */
-    public function validate(APILimitationValue $limitationValue)
+    public function validate(APILimitationValue $limitationValue): array
     {
         $validationErrors = [];
 
@@ -129,7 +131,7 @@ public function validate(APILimitationValue $limitationValue)
      *
      * @return \Ibexa\Contracts\Core\Repository\Values\User\Limitation
      */
-    public function buildValue(array $limitationValues)
+    public function buildValue(array $limitationValues): APILimitationValue
     {
         return new UserPermissionsLimitation(['limitationValues' => $limitationValues]);
     }
@@ -149,7 +151,7 @@ public function buildValue(array $limitationValues)
      *
      * @return bool
      */
-    public function evaluate(APILimitationValue $value, APIUserReference $currentUser, ValueObject $object, array $targets = null)
+    public function evaluate(APILimitationValue $value, APIUserReference $currentUser, ValueObject $object, array $targets = null): ?bool
     {
         if (!$value instanceof UserPermissionsLimitation) {
             throw new InvalidArgumentException('$value', 'Must be of type: APISiteAccessLimitation');
@@ -182,7 +184,7 @@ public function evaluate(APILimitationValue $value, APIUserReference $currentUse
      *
      * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\CriterionInterface
      */
-    public function getCriterion(APILimitationValue $value, APIUserReference $currentUser)
+    public function getCriterion(APILimitationValue $value, APIUserReference $currentUser): CriterionInterface
     {
         throw new NotImplementedException(__METHOD__);
     }
@@ -193,7 +195,7 @@ public function getCriterion(APILimitationValue $value, APIUserReference $curren
      * @return mixed[]|int In case of array, a hash with key as valid limitations value and value as human readable name
      *                     of that option, in case of int on of VALUE_SCHEMA_ constants.
      */
-    public function valueSchema()
+    public function valueSchema(): int|array
     {
         throw new NotImplementedException(__METHOD__);
     }