diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae831b8..5a24270 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
             - run: composer install --no-interaction
             - run: vendor/bin/tester tests -s -C
             - if: failure()
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
               with:
                   name: output
                   path: tests/**/output
diff --git a/composer.json b/composer.json
index 1b7372e..0575646 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
 		"classmap": ["tests/phpstan/DibiFluentDynamicReturnTypeExtension.php"]
 	},
 	"require": {
-		"php": "7.2 - 8.3",
+		"php": "7.2 - 8.4",
 		"dibi/dibi": "^4.0 || ^5.0"
 	},
 	"require-dev": {
diff --git a/src/LeanMapper/Entity.php b/src/LeanMapper/Entity.php
index 7ecf411..39d65ef 100644
--- a/src/LeanMapper/Entity.php
+++ b/src/LeanMapper/Entity.php
@@ -735,8 +735,8 @@ protected function getCurrentReflection(): EntityReflection
      */
     protected function getValueByPropertyWithRelationship(
         $property,
-        Filtering $targetTableFiltering = null,
-        Filtering $relationshipTableFiltering = null
+        ?Filtering $targetTableFiltering = null,
+        ?Filtering $relationshipTableFiltering = null
     ) {
         if (is_string($property)) {
             $property = $this->getCurrentReflection()->getEntityProperty($property);
diff --git a/src/LeanMapper/IEntityReflectionProvider.php b/src/LeanMapper/IEntityReflectionProvider.php
index 88d2b21..39384c3 100644
--- a/src/LeanMapper/IEntityReflectionProvider.php
+++ b/src/LeanMapper/IEntityReflectionProvider.php
@@ -23,7 +23,7 @@ interface IEntityReflectionProvider
     /**
      * @return Property[]
      */
-    function getProperties(EntityReflection $entityClass, IMapper $mapper = null): array;
+    function getProperties(EntityReflection $entityClass, ?IMapper $mapper = null): array;
 
 
     /**