diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 58cd9f3b..fc4eb547 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -12,6 +12,6 @@ on: jobs: coding-standards: name: "Coding Standards" - uses: "doctrine/.github/.github/workflows/coding-standards.yml@2.1.0" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0" with: composer-root-version: "2.5" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 2ba75210..2ee03ebb 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -12,7 +12,7 @@ on: jobs: phpunit: name: "PHPUnit" - uses: "doctrine/.github/.github/workflows/continuous-integration.yml@2.1.0" + uses: "doctrine/.github/.github/workflows/continuous-integration.yml@3.0.0" with: composer-root-version: "2.5" php-versions: '["7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2"]' diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index 949de820..44c68ffe 100644 --- a/.github/workflows/release-on-milestone-closed.yml +++ b/.github/workflows/release-on-milestone-closed.yml @@ -8,7 +8,7 @@ on: jobs: release: name: "Git tag, release & create merge-up PR" - uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@2.1.0" + uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.0.0" secrets: GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }} GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }} diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 9f84874d..d8070fdc 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -12,6 +12,6 @@ on: jobs: static-analysis: name: "Static Analysis" - uses: "doctrine/.github/.github/workflows/static-analysis.yml@2.1.0" + uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.0.0" with: composer-root-version: "2.5" diff --git a/composer.json b/composer.json index 6bbc745f..4d7590ad 100644 --- a/composer.json +++ b/composer.json @@ -29,13 +29,13 @@ }, "require-dev": { "composer/package-versions-deprecated": "^1.11", - "phpstan/phpstan": "~1.4.10 || 1.8.8", + "phpstan/phpstan": "~1.4.10 || 1.9.4", "doctrine/annotations": "^1.0", - "doctrine/coding-standard": "^9 || ^10", + "doctrine/coding-standard": "^9 || ^11", "doctrine/common": "^3.0", "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.5", "symfony/cache": "^4.4 || ^5.4 || ^6.0", - "vimeo/psalm": "4.29.0" + "vimeo/psalm": "4.30.0 || 5.3.0" }, "conflict": { "doctrine/annotations": "<1.0 || >=2.0", diff --git a/psalm.xml b/psalm.xml index ef3da827..a84e2998 100644 --- a/psalm.xml +++ b/psalm.xml @@ -47,5 +47,11 @@ + + + + + + diff --git a/src/Persistence/Reflection/RuntimePublicReflectionProperty.php b/src/Persistence/Reflection/RuntimePublicReflectionProperty.php index d116671e..ecf0fa68 100644 --- a/src/Persistence/Reflection/RuntimePublicReflectionProperty.php +++ b/src/Persistence/Reflection/RuntimePublicReflectionProperty.php @@ -61,7 +61,9 @@ public function setValue($object, $value = null) $originalInitializer = $object->__getInitializer(); $object->__setInitializer(null); + parent::setValue($object, $value); + $object->__setInitializer($originalInitializer); } }