diff --git a/README.md b/README.md index 23bbadf..9ebf4eb 100644 --- a/README.md +++ b/README.md @@ -226,6 +226,7 @@ If you choose this path, you can install this package in the following steps: ``` Then depending on the version of doctrine/orm you want to use: +- run `composer require sspat/doctrine-nullable-embeddables:v2.9.3 doctrine/orm:2.9.3` - run `composer require sspat/doctrine-nullable-embeddables:v2.9.2 doctrine/orm:2.9.2` - run `composer require sspat/doctrine-nullable-embeddables:v2.9.1 doctrine/orm:2.9.1` - run `composer require sspat/doctrine-nullable-embeddables:v2.9.0 doctrine/orm:2.9.0` diff --git a/composer.json b/composer.json index 08b082a..ad54ff4 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require": { "php": "^7.4|^8.0", "cweagans/composer-patches": "^1.6|^1.7", - "doctrine/orm": "2.9.2" + "doctrine/orm": "2.9.3" }, "require-dev": { "phpunit/phpunit": "^9.5" @@ -31,7 +31,7 @@ "extra": { "patches": { "doctrine/orm": { - "Allow nullable embeddables": "https://raw.githubusercontent.com/sspat/doctrine-nullable-embeddables/v2.9.2/patch/nullable_embeddables.patch" + "Allow nullable embeddables": "https://raw.githubusercontent.com/sspat/doctrine-nullable-embeddables/v2.9.3/patch/nullable_embeddables.patch" } } }, diff --git a/patch/nullable_embeddables.patch b/patch/nullable_embeddables.patch index b7b568d..009f0fc 100644 --- a/patch/nullable_embeddables.patch +++ b/patch/nullable_embeddables.patch @@ -1,9 +1,9 @@ diff --git a/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php b/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php -index 49a2ab2..8f3d6f7 100644 +index d08be94..47bc91d 100644 --- a/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php +++ b/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php -@@ -63,13 +63,15 @@ class ReflectionEmbeddedProperty extends ReflectionProperty - */ +@@ -65,13 +65,15 @@ class ReflectionEmbeddedProperty extends ReflectionProperty + #[ReturnTypeWillChange] public function getValue($object = null) { - $embeddedObject = $this->parentProperty->getValue($object); @@ -20,8 +20,8 @@ index 49a2ab2..8f3d6f7 100644 } /** -@@ -77,7 +79,20 @@ class ReflectionEmbeddedProperty extends ReflectionProperty - */ +@@ -80,7 +82,20 @@ class ReflectionEmbeddedProperty extends ReflectionProperty + #[ReturnTypeWillChange] public function setValue($object, $value = null) { - $embeddedObject = $this->parentProperty->getValue($object);