Add 2.9.4 support (#23)

* Add 2.9.4 support * update readme
sspat · Jan 17, 2022 · 718aadf · 718aadf
1 parent 43dd8ad
commit 718aadf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git 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.4 doctrine/orm:2.9.4`
 - 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`

diff --git 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.3"
+        "doctrine/orm": "2.9.4"
     },
     "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.3/patch/nullable_embeddables.patch"
+                "Allow nullable embeddables": "https://raw.githubusercontent.com/sspat/doctrine-nullable-embeddables/v2.9.4/patch/nullable_embeddables.patch"
             }
         }
     },

diff --git a/patch/nullable_embeddables.patch b/patch/nullable_embeddables.patch
@@ -1,13 +1,14 @@
 diff --git a/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php b/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php
-index d08be94..47bc91d 100644
+index 4a89c90..60f67be 100644
 --- a/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php
 +++ b/lib/Doctrine/ORM/Mapping/ReflectionEmbeddedProperty.php
-@@ -65,13 +65,15 @@ class ReflectionEmbeddedProperty extends ReflectionProperty
+@@ -67,13 +67,16 @@ class ReflectionEmbeddedProperty extends ReflectionProperty
      #[ReturnTypeWillChange]
      public function getValue($object = null)
      {
 -        $embeddedObject = $this->parentProperty->getValue($object);
-+        $embeddedObject = ! $this->parentProperty->getDeclaringClass()->isInstance($object) || $this->parentProperty->isInitialized($object) ?
++        $embeddedObject = ! $this->parentProperty->getDeclaringClass()->isInstance($object) ||
++        $this->parentProperty->isInitialized($object) ?
 +            $this->parentProperty->getValue($object) :
 +            null;
 
@@ -20,7 +21,7 @@ index d08be94..47bc91d 100644
      }
 
      /**
-@@ -80,7 +82,20 @@ class ReflectionEmbeddedProperty extends ReflectionProperty
+@@ -84,7 +87,20 @@ class ReflectionEmbeddedProperty extends ReflectionProperty
      #[ReturnTypeWillChange]
      public function setValue($object, $value = null)
      {