From a246e355dd0e188d5a04db3401d1541528e5af37 Mon Sep 17 00:00:00 2001 From: tomburakvikshop Date: Fri, 20 Dec 2024 13:55:53 +0100 Subject: [PATCH 1/2] Added support for PHP 8.4 --- composer.json | 2 +- src/LeanMapper/Entity.php | 4 ++-- src/LeanMapper/IEntityReflectionProvider.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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; /** From 9903fc72c6f1fe1de65f8a2836d712624b0f548b Mon Sep 17 00:00:00 2001 From: tomburakvikshop Date: Tue, 31 Dec 2024 14:06:20 +0100 Subject: [PATCH 2/2] GA: updated to actions/upload-artifact@v4 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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